Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: fr.po v2.4.0 round 2
author
Jean-Noel Avila
<jn.avila@free.fr>
Sat, 4 Apr 2015 16:04:56 +0000
(18:04 +0200)
committer
Jean-Noel Avila
<jn.avila@free.fr>
Sat, 4 Apr 2015 16:04:56 +0000
(18:04 +0200)
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
po/fr.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
9af95af
)
diff --git
a/po/fr.po
b/po/fr.po
index d6cae341c5fce23e79881110715ca2cb53be711f..00bfefdf51049a4a6007eb23165c007bf65d76cf 100644
(file)
--- a/
po/fr.po
+++ b/
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"
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-0
3-27 13:3
3+0800\n"
-"PO-Revision-Date: 2015-0
3-30 10:5
3+0200\n"
+"POT-Creation-Date: 2015-0
4-03 08:1
3+0800\n"
+"PO-Revision-Date: 2015-0
4-04 18:0
3+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"
"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"
@@
-108,7
+108,9
@@
msgstr "git archive --list"
#: archive.c:13
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
#: archive.c:13
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>...]"
+msgstr ""
+"git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou "
+"apparenté> [<chemin>...]"
#: archive.c:14
msgid "git archive --remote <repo> [--exec <cmd>] --list"
#: archive.c:14
msgid "git archive --remote <repo> [--exec <cmd>] --list"
@@
-323,7
+325,7
@@
msgstr "'%s' ne semble pas être un fichier bundle v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:76
4
+#: bundle.c:87 builtin/commit.c:76
6
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@
-333,7
+335,7
@@
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
-#: builtin/branch.c:659 builtin/commit.c:104
3
builtin/log.c:330
+#: builtin/branch.c:659 builtin/commit.c:104
5
builtin/log.c:330
#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
@@
-956,27
+958,27
@@
msgstr "échec de fusion des arbres %s et %s"
msgid "Unprocessed path??? %s"
msgstr "Chemin non traité ??? %s"
msgid "Unprocessed path??? %s"
msgstr "Chemin non traité ??? %s"
-#: merge-recursive.c:1
898
+#: merge-recursive.c:1
901
msgid "Merging:"
msgstr "Fusion :"
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:191
1
+#: merge-recursive.c:191
4
#, 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 :"
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ancêtre commun trouvé :"
msgstr[1] "%u ancêtres communs trouvés :"
-#: merge-recursive.c:19
48
+#: merge-recursive.c:19
51
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:200
5
+#: merge-recursive.c:200
8
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:201
6
builtin/merge.c:667
+#: merge-recursive.c:201
9
builtin/merge.c:667
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
@@
-1107,7
+1109,7
@@
msgstr "impossible d'analyser le format --pretty"
msgid "done"
msgstr "fait"
msgid "done"
msgstr "fait"
-#: read-cache.c:127
3
+#: read-cache.c:127
5
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@
-1116,7
+1118,7
@@
msgstr ""
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:128
3
+#: read-cache.c:128
5
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@
-1227,8
+1229,8
@@
msgid "the receiving end does not support --signed push"
msgstr "Le receveur ne gère pas les poussées avec --signed"
#: send-pack.c:366
msgstr "Le receveur ne gère pas les poussées avec --signed"
#: send-pack.c:366
-msgid "
server
does not support --atomic push"
-msgstr "
le serveur ne gère pas push
--atomic"
+msgid "
the receiving end
does not support --atomic push"
+msgstr "
Le receveur ne gère pas les poussées avec
--atomic"
#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
#: builtin/merge.c:1005
#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
#: builtin/merge.c:1005
@@
-1437,7
+1439,7
@@
msgstr "impossible de résoudre HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:908 builtin/apply.c:428
6
+#: sequencer.c:908 builtin/apply.c:428
8
#, c-format
msgid "cannot open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
#, c-format
msgid "cannot open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
@@
-2092,7
+2094,7
@@
msgstr "git add [<options>] [--] <chemin>..."
msgid "unexpected diff status %c"
msgstr "status de diff inattendu %c"
msgid "unexpected diff status %c"
msgstr "status de diff inattendu %c"
-#: builtin/add.c:70 builtin/commit.c:27
5
+#: builtin/add.c:70 builtin/commit.c:27
7
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
@@
-2143,8
+2145,8
@@
msgstr ""
msgid "dry run"
msgstr "simuler l'action"
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:249 builtin/apply.c:457
5
builtin/check-ignore.c:19
-#: builtin/commit.c:132
0
builtin/count-objects.c:63 builtin/fsck.c:608
+#: builtin/add.c:249 builtin/apply.c:457
7
builtin/check-ignore.c:19
+#: builtin/commit.c:132
2
builtin/count-objects.c:63 builtin/fsck.c:608
#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "mode verbeux"
#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "mode verbeux"
@@
-2225,11
+2227,11
@@
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
-#: builtin/commit.c:33
3
builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
+#: builtin/commit.c:33
5
builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/add.c:446 builtin/apply.c:467
3
builtin/mv.c:279 builtin/rm.c:431
+#: builtin/add.c:446 builtin/apply.c:467
5
builtin/mv.c:279 builtin/rm.c:431
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
@@
-2372,19
+2374,19
@@
msgstr "ouverture ou lecture de %s impossible"
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: builtin/apply.c:289
6
+#: builtin/apply.c:289
7
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "La section 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)."
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "La section 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)."
-#: builtin/apply.c:290
8
+#: builtin/apply.c:290
9
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
-#: builtin/apply.c:291
4
+#: builtin/apply.c:291
5
#, c-format
msgid ""
"while searching for:\n"
#, c-format
msgid ""
"while searching for:\n"
@@
-2393,347
+2395,347
@@
msgstr ""
"pendant la recherche de :\n"
"%.*s"
"pendant la recherche de :\n"
"%.*s"
-#: builtin/apply.c:293
3
+#: builtin/apply.c:293
5
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: builtin/apply.c:303
4
+#: builtin/apply.c:303
6
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: builtin/apply.c:304
0
+#: builtin/apply.c:304
2
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
-#: builtin/apply.c:306
1
+#: builtin/apply.c:306
3
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: builtin/apply.c:318
5
+#: builtin/apply.c:318
7
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: builtin/apply.c:323
0 builtin/apply.c:3241 builtin/apply.c:3286
+#: builtin/apply.c:323
2 builtin/apply.c:3243 builtin/apply.c:3288
#, c-format
msgid "read of %s failed"
msgstr "échec de la lecture de %s"
#, c-format
msgid "read of %s failed"
msgstr "échec de la lecture de %s"
-#: builtin/apply.c:32
38
+#: builtin/apply.c:32
40
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: builtin/apply.c:326
6 builtin/apply.c:3488
+#: builtin/apply.c:326
8 builtin/apply.c:3490
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: builtin/apply.c:334
7 builtin/apply.c:3502
+#: builtin/apply.c:334
9 builtin/apply.c:3504
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: builtin/apply.c:335
1 builtin/apply.c:3494 builtin/apply.c:3516
+#: builtin/apply.c:335
3 builtin/apply.c:3496 builtin/apply.c:3518
#, c-format
msgid "%s: %s"
msgstr "%s : %s"
#, c-format
msgid "%s: %s"
msgstr "%s : %s"
-#: builtin/apply.c:335
6 builtin/apply.c:3510
+#: builtin/apply.c:335
8 builtin/apply.c:3512
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: builtin/apply.c:34
58
+#: builtin/apply.c:34
60
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: builtin/apply.c:352
7
+#: builtin/apply.c:352
9
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: builtin/apply.c:35
29
+#: builtin/apply.c:35
31
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: builtin/apply.c:36
88 builtin/apply.c:3690
+#: builtin/apply.c:36
90 builtin/apply.c:3692
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: builtin/apply.c:374
5
+#: builtin/apply.c:374
7
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: builtin/apply.c:37
48
+#: builtin/apply.c:37
50
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: builtin/apply.c:37
68
+#: builtin/apply.c:37
70
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: builtin/apply.c:377
3
+#: builtin/apply.c:377
5
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: builtin/apply.c:379
3
+#: builtin/apply.c:379
5
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: builtin/apply.c:379
7
+#: builtin/apply.c:379
9
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: builtin/apply.c:381
1
+#: builtin/apply.c:381
3
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: builtin/apply.c:390
4
builtin/checkout.c:231 builtin/reset.c:135
+#: builtin/apply.c:390
6
builtin/checkout.c:231 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: builtin/apply.c:404
7
+#: builtin/apply.c:404
9
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: builtin/apply.c:407
6
+#: builtin/apply.c:407
8
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: builtin/apply.c:408
0
+#: builtin/apply.c:408
2
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: builtin/apply.c:408
5
+#: builtin/apply.c:408
7
#, 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"
#, 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"
-#: builtin/apply.c:40
88 builtin/apply.c:4196
+#: builtin/apply.c:40
90 builtin/apply.c:4198
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: builtin/apply.c:412
1
+#: builtin/apply.c:412
3
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: builtin/apply.c:417
0
+#: builtin/apply.c:417
2
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: builtin/apply.c:425
7
+#: builtin/apply.c:425
9
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: builtin/apply.c:426
5
+#: builtin/apply.c:426
7
msgid "internal error"
msgstr "erreur interne"
msgid "internal error"
msgstr "erreur interne"
-#: builtin/apply.c:42
68
+#: builtin/apply.c:42
70
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: builtin/apply.c:42
78
+#: builtin/apply.c:42
80
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: builtin/apply.c:4
299
+#: builtin/apply.c:4
301
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: builtin/apply.c:430
2
+#: builtin/apply.c:430
4
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: builtin/apply.c:439
2
+#: builtin/apply.c:439
4
msgid "unrecognized input"
msgstr "entrée non reconnue"
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: builtin/apply.c:440
3
+#: builtin/apply.c:440
5
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: builtin/apply.c:452
0 builtin/apply.c:4523
builtin/clone.c:92
+#: builtin/apply.c:452
2 builtin/apply.c:4525
builtin/clone.c:92
#: builtin/fetch.c:92
msgid "path"
msgstr "chemin"
#: builtin/fetch.c:92
msgid "path"
msgstr "chemin"
-#: builtin/apply.c:452
1
+#: builtin/apply.c:452
3
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:452
4
+#: builtin/apply.c:452
6
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:452
6
+#: builtin/apply.c:452
8
msgid "num"
msgstr "num"
msgid "num"
msgstr "num"
-#: builtin/apply.c:452
7
+#: builtin/apply.c:452
9
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: builtin/apply.c:453
0
+#: builtin/apply.c:453
2
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: builtin/apply.c:453
2
+#: builtin/apply.c:453
4
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"
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: builtin/apply.c:453
6
+#: builtin/apply.c:453
8
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: builtin/apply.c:45
38
+#: builtin/apply.c:45
40
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
-#: builtin/apply.c:454
0
+#: builtin/apply.c:454
2
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"
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: builtin/apply.c:454
2
+#: builtin/apply.c:454
4
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: builtin/apply.c:454
4
+#: builtin/apply.c:454
6
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: builtin/apply.c:454
6
+#: builtin/apply.c:454
8
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: builtin/apply.c:45
48
+#: builtin/apply.c:45
50
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-#: builtin/apply.c:455
0
+#: builtin/apply.c:455
2
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"
msgid "attempt three-way merge if a patch does not apply"
msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
-#: builtin/apply.c:455
2
+#: builtin/apply.c:455
4
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: builtin/apply.c:455
4
builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:455
6
builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: builtin/apply.c:455
7
+#: builtin/apply.c:455
9
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: builtin/apply.c:45
58
+#: builtin/apply.c:45
60
msgid "action"
msgstr "action"
msgid "action"
msgstr "action"
-#: builtin/apply.c:45
59
+#: builtin/apply.c:45
61
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"
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: builtin/apply.c:456
2 builtin/apply.c:4565
+#: builtin/apply.c:456
4 builtin/apply.c:4567
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: builtin/apply.c:45
68
+#: builtin/apply.c:45
70
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: builtin/apply.c:457
0
+#: builtin/apply.c:457
2
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: builtin/apply.c:457
2
+#: builtin/apply.c:457
4
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: builtin/apply.c:457
4
+#: builtin/apply.c:457
6
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: builtin/apply.c:457
7
+#: builtin/apply.c:457
9
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"
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"
-#: builtin/apply.c:458
0
+#: builtin/apply.c:458
2
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"
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"
-#: builtin/apply.c:458
2
+#: builtin/apply.c:458
4
msgid "root"
msgstr "racine"
msgid "root"
msgstr "racine"
-#: builtin/apply.c:458
3
+#: builtin/apply.c:458
5
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
-#: builtin/apply.c:460
5
+#: builtin/apply.c:460
7
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: builtin/apply.c:461
3
+#: builtin/apply.c:461
5
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: builtin/apply.c:461
6
+#: builtin/apply.c:461
8
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: builtin/apply.c:463
5
+#: builtin/apply.c:463
7
#, c-format
msgid "can't open patch '%s'"
msgstr "ouverture impossible du patch '%s'"
#, c-format
msgid "can't open patch '%s'"
msgstr "ouverture impossible du patch '%s'"
-#: builtin/apply.c:46
49
+#: builtin/apply.c:46
51
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
-#: builtin/apply.c:465
5 builtin/apply.c:4665
+#: builtin/apply.c:465
7 builtin/apply.c:4667
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@
-2917,7
+2919,8
@@
msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
#: builtin/branch.c:27
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
#: builtin/branch.c:27
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
+msgstr ""
+"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
#: builtin/branch.c:152
#, c-format
#: builtin/branch.c:152
#, c-format
@@
-3149,8
+3152,8
@@
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
msgstr "agir sur les branches de suivi distantes"
#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
-#: builtin/branch.c:867 builtin/commit.c:158
0 builtin/commit.c:1581
-#: builtin/commit.c:158
2 builtin/commit.c:1583
builtin/tag.c:616
+#: builtin/branch.c:867 builtin/commit.c:158
2 builtin/commit.c:1583
+#: builtin/commit.c:158
4 builtin/commit.c:1585
builtin/tag.c:616
#: builtin/tag.c:622
msgid "commit"
msgstr "commit"
#: builtin/tag.c:622
msgid "commit"
msgstr "commit"
@@
-3385,7
+3388,8
@@
msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."
#: builtin/check-attr.c:12
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
#: builtin/check-attr.c:12
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <liste-de-chemins>"
+msgstr ""
+"git check-attr --stdin [-z] [-a | --all | <attr>...] < <liste-de-chemins>"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@
-3643,7
+3647,8
@@
msgid ""
" git branch <new-branch-name> %s\n"
"\n"
msgstr ""
" git branch <new-branch-name> %s\n"
"\n"
msgstr ""
-"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n"
+"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon "
+"moment\n"
"pour le faire avec :\n"
"\n"
"git branch <nouvelle-branche> %s\n"
"pour le faire avec :\n"
"\n"
"git branch <nouvelle-branche> %s\n"
@@
-4402,70
+4407,70
@@
msgstr ""
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:30
2
+#: builtin/commit.c:30
4
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:34
2
+#: builtin/commit.c:34
4
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:3
48
+#: builtin/commit.c:3
50
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:3
59
+#: builtin/commit.c:3
61
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/commit.c:36
1
+#: builtin/commit.c:36
3
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:36
3
+#: builtin/commit.c:36
5
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:38
7 builtin/commit.c:412 builtin/commit.c:461
+#: builtin/commit.c:38
9 builtin/commit.c:414 builtin/commit.c:463
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:44
3
+#: builtin/commit.c:44
5
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:44
5
+#: builtin/commit.c:44
7
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:45
4
+#: builtin/commit.c:45
6
msgid "cannot read the index"
msgstr "impossible de lire l'index"
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:47
3
+#: builtin/commit.c:47
5
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:5
78
+#: builtin/commit.c:5
80
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:58
0
+#: builtin/commit.c:58
2
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:
599
+#: builtin/commit.c:
601
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:60
7
+#: builtin/commit.c:60
9
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: builtin/commit.c:65
1
+#: builtin/commit.c:65
3
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@
-4473,43
+4478,43
@@
msgstr ""
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:6
88 builtin/commit.c:721 builtin/commit.c:1078
+#: builtin/commit.c:6
90 builtin/commit.c:723 builtin/commit.c:1080
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:70
0
builtin/shortlog.c:273
+#: builtin/commit.c:70
2
builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:70
2
+#: builtin/commit.c:70
4
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:70
6
+#: builtin/commit.c:70
8
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:7
28
+#: builtin/commit.c:7
30
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:73
2
+#: builtin/commit.c:73
4
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:73
6
+#: builtin/commit.c:73
8
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/commit.c:78
3
+#: builtin/commit.c:78
5
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:80
1
+#: builtin/commit.c:80
3
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
@@
-4524,7
+4529,7
@@
msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:80
6
+#: builtin/commit.c:80
8
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
@@
-4539,7
+4544,7
@@
msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:8
19
+#: builtin/commit.c:8
21
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@
-4549,7
+4554,7
@@
msgstr ""
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:82
6
+#: builtin/commit.c:82
8
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@
-4560,147
+4565,149
@@
msgstr ""
"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"
"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"
-#: builtin/commit.c:84
6
+#: builtin/commit.c:84
8
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:85
4
+#: builtin/commit.c:85
6
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:86
1
+#: builtin/commit.c:86
3
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:8
79
+#: builtin/commit.c:8
81
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:93
6
+#: builtin/commit.c:93
8
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:95
1
builtin/tag.c:495
+#: builtin/commit.c:95
3
builtin/tag.c:495
#, 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"
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:105
3
+#: builtin/commit.c:105
5
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun auteur existant"
+msgstr ""
+"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
+"auteur existant"
-#: builtin/commit.c:10
68 builtin/commit.c:1308
+#: builtin/commit.c:10
70 builtin/commit.c:1310
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:110
5
+#: builtin/commit.c:110
7
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:113
5
+#: builtin/commit.c:113
7
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:114
4
+#: builtin/commit.c:114
6
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:114
7
+#: builtin/commit.c:114
9
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:11
49
+#: builtin/commit.c:11
51
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
-#: builtin/commit.c:115
2
+#: builtin/commit.c:115
4
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:116
2
+#: builtin/commit.c:116
4
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-#: builtin/commit.c:116
4
+#: builtin/commit.c:116
6
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."
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
-#: builtin/commit.c:117
2
+#: builtin/commit.c:117
4
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."
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
-#: builtin/commit.c:11
89
+#: builtin/commit.c:11
91
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:119
1
+#: builtin/commit.c:119
3
msgid "No paths with --include/--only does not make sense."
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
msgid "No paths with --include/--only does not make sense."
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
-#: builtin/commit.c:119
3
+#: builtin/commit.c:119
5
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
-#: builtin/commit.c:119
5
+#: builtin/commit.c:119
7
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-#: builtin/commit.c:120
7
builtin/tag.c:728
+#: builtin/commit.c:120
9
builtin/tag.c:728
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:121
2
+#: builtin/commit.c:121
4
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:132
2 builtin/commit.c:1602
+#: builtin/commit.c:132
4 builtin/commit.c:1604
msgid "show status concisely"
msgstr "afficher le statut avec concision"
msgid "show status concisely"
msgstr "afficher le statut avec concision"
-#: builtin/commit.c:132
4 builtin/commit.c:1604
+#: builtin/commit.c:132
6 builtin/commit.c:1606
msgid "show branch information"
msgstr "afficher l'information de branche"
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:132
6 builtin/commit.c:1606
builtin/push.c:509
+#: builtin/commit.c:132
8 builtin/commit.c:1608
builtin/push.c:509
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:13
29 builtin/commit.c:1608
+#: builtin/commit.c:13
31 builtin/commit.c:1610
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
-#: builtin/commit.c:133
2 builtin/commit.c:1611
+#: builtin/commit.c:133
4 builtin/commit.c:1613
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:133
4 builtin/commit.c:1614
builtin/fast-export.c:980
+#: builtin/commit.c:133
6 builtin/commit.c:1616
builtin/fast-export.c:980
#: builtin/fast-export.c:983 builtin/tag.c:603
msgid "mode"
msgstr "mode"
#: builtin/fast-export.c:983 builtin/tag.c:603
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:133
5 builtin/commit.c:1614
+#: builtin/commit.c:133
7 builtin/commit.c:1616
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:13
38
+#: builtin/commit.c:13
40
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:13
39
parse-options.h:153
+#: builtin/commit.c:13
41
parse-options.h:153
msgid "when"
msgstr "quand"
msgid "when"
msgstr "quand"
-#: builtin/commit.c:134
0
+#: builtin/commit.c:134
2
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@
-4708,209
+4715,209
@@
msgstr ""
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:134
2
+#: builtin/commit.c:134
4
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:14
29
+#: builtin/commit.c:14
31
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:143
1
+#: builtin/commit.c:143
3
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:147
6
+#: builtin/commit.c:147
8
msgid "detached HEAD"
msgstr "HEAD détachée"
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:14
79
+#: builtin/commit.c:14
81
msgid " (root-commit)"
msgstr " (commit racine)"
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:157
2
+#: builtin/commit.c:157
4
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:157
3
+#: builtin/commit.c:157
5
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:157
5
+#: builtin/commit.c:157
7
msgid "Commit message options"
msgstr "Options du message de validation"
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:157
6
builtin/tag.c:601
+#: builtin/commit.c:157
8
builtin/tag.c:601
msgid "read message from file"
msgstr "lire le message depuis un fichier"
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:157
7
+#: builtin/commit.c:157
9
msgid "author"
msgstr "auteur"
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:157
7
+#: builtin/commit.c:157
9
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:15
78
builtin/gc.c:275
+#: builtin/commit.c:15
80
builtin/gc.c:275
msgid "date"
msgstr "date"
msgid "date"
msgstr "date"
-#: builtin/commit.c:15
78
+#: builtin/commit.c:15
80
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:15
79
builtin/merge.c:218 builtin/notes.c:391
+#: builtin/commit.c:15
81
builtin/merge.c:218 builtin/notes.c:391
#: builtin/notes.c:554 builtin/tag.c:599
msgid "message"
msgstr "message"
#: builtin/notes.c:554 builtin/tag.c:599
msgid "message"
msgstr "message"
-#: builtin/commit.c:15
79
+#: builtin/commit.c:15
81
msgid "commit message"
msgstr "message de validation"
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:158
0
+#: builtin/commit.c:158
2
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:158
1
+#: builtin/commit.c:158
3
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:158
2
+#: builtin/commit.c:158
4
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:158
3
+#: builtin/commit.c:158
5
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message au format autosquash pour compresser le commit spécifié"
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message au format autosquash pour compresser le commit spécifié"
-#: builtin/commit.c:158
4
+#: builtin/commit.c:158
6
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:158
5
builtin/log.c:1191 builtin/revert.c:86
+#: builtin/commit.c:158
7
builtin/log.c:1191 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:158
6
+#: builtin/commit.c:158
8
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:158
7
+#: builtin/commit.c:158
9
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:15
88
+#: builtin/commit.c:15
90
msgid "default"
msgstr "défaut"
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:15
88
builtin/tag.c:604
+#: builtin/commit.c:15
90
builtin/tag.c:604
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:15
89
+#: builtin/commit.c:15
91
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:159
0
builtin/merge.c:225 builtin/revert.c:92
+#: builtin/commit.c:159
2
builtin/merge.c:225 builtin/revert.c:92
#: builtin/tag.c:605
msgid "key-id"
msgstr "id de clé"
#: builtin/tag.c:605
msgid "key-id"
msgstr "id de clé"
-#: builtin/commit.c:159
1
builtin/merge.c:226 builtin/revert.c:93
+#: builtin/commit.c:159
3
builtin/merge.c:226 builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:159
4
+#: builtin/commit.c:159
6
msgid "Commit contents options"
msgstr "Valider les options des contenus"
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:159
5
+#: builtin/commit.c:159
7
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:159
6
+#: builtin/commit.c:159
8
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:159
7
+#: builtin/commit.c:159
9
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1
598
+#: builtin/commit.c:1
600
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1
599
+#: builtin/commit.c:1
601
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:160
0
+#: builtin/commit.c:160
2
msgid "bypass pre-commit hook"
msgstr "éviter d'utiliser le crochet pre-commit"
msgid "bypass pre-commit hook"
msgstr "éviter d'utiliser le crochet pre-commit"
-#: builtin/commit.c:160
1
+#: builtin/commit.c:160
3
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:161
2
+#: builtin/commit.c:161
4
msgid "amend previous commit"
msgstr "corriger la validation précédente"
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:161
3
+#: builtin/commit.c:161
5
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:16
18
+#: builtin/commit.c:16
20
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:162
0
+#: builtin/commit.c:162
2
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:16
49
+#: builtin/commit.c:16
51
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:16
88
builtin/merge.c:519
+#: builtin/commit.c:16
90
builtin/merge.c:519
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: builtin/commit.c:169
5
+#: builtin/commit.c:169
7
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:170
2
+#: builtin/commit.c:170
4
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:172
1
+#: builtin/commit.c:172
3
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:173
2
+#: builtin/commit.c:173
4
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
-#: builtin/commit.c:173
7
+#: builtin/commit.c:173
9
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation du à un message de validation vide\n"
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation du à un message de validation vide\n"
-#: builtin/commit.c:175
2
builtin/merge.c:851 builtin/merge.c:876
+#: builtin/commit.c:175
4
builtin/merge.c:851 builtin/merge.c:876
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/commit.c:178
5
+#: builtin/commit.c:178
7
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@
-5573,7
+5580,8
@@
msgstr ""
#: builtin/fmt-merge-msg.c:13
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
#: builtin/fmt-merge-msg.c:13
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
+msgstr ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
@@
-6005,7
+6013,9
@@
msgstr "--cached et des arbres sont fournis en même temps."
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
-msgstr "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] [--] <fichier>..."
+msgstr ""
+"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
+"[--] <fichier>..."
#: builtin/hash-object.c:83
msgid "git hash-object --stdin-paths < <list-of-paths>"
#: builtin/hash-object.c:83
msgid "git hash-object --stdin-paths < <list-of-paths>"
@@
-6566,7
+6576,9
@@
msgstr " partagé"
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
-msgstr "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--shared[=<permissions>]] [<répertoire>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
+"shared[=<permissions>]] [<répertoire>]"
#: builtin/init-db.c:498
msgid "permissions"
#: builtin/init-db.c:498
msgid "permissions"
@@
-7446,7
+7458,9
@@
msgstr "trouver où <validation> a divergé du reflog de <référence>"
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
-msgstr "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> <fichier-orig> <fichier2>"
+msgstr ""
+"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> "
+"<fichier-orig> <fichier2>"
#: builtin/merge-file.c:33
msgid "send results to standard output"
#: builtin/merge-file.c:33
msgid "send results to standard output"
@@
-7639,17
+7653,22
@@
msgstr "git notes [--ref <références-notes>] [list [<object>]]"
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
-msgstr "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"
+msgstr ""
+"git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> "
+"| -F <fichier> | (-c | -C) <objet>] [<objet>]"
#: builtin/notes.c:26
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
#: builtin/notes.c:26
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
+msgstr ""
+"git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
#: builtin/notes.c:27
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
#: builtin/notes.c:27
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
-msgstr "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"
+msgstr ""
+"git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -"
+"F <fichier> | (-c | -C) <objet>] [<objet>]"
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
@@
-7662,7
+7681,9
@@
msgstr "git notes [--ref <références-notes>] show [<objet>]"
#: builtin/notes.c:30
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
#: builtin/notes.c:30
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] <références-notes>"
+msgstr ""
+"git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] "
+"<références-notes>"
#: builtin/notes.c:31
msgid "git notes merge --commit [-v | -q]"
#: builtin/notes.c:31
msgid "git notes merge --commit [-v | -q]"
@@
-8636,7
+8657,9
@@
msgstr "git remote [-v | --verbose]"
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
-msgstr "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <nom> <url>"
+msgstr ""
+"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nom> <url>"
#: builtin/remote.c:14 builtin/remote.c:33
msgid "git remote rename <old> <new>"
#: builtin/remote.c:14 builtin/remote.c:33
msgid "git remote rename <old> <new>"
@@
-9289,7
+9312,8
@@
msgstr "utiliser ce format"
#: builtin/rerere.c:12
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
#: builtin/rerere.c:12
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
+msgstr ""
+"git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
#: builtin/rerere.c:57
msgid "register clean resolutions in index"
#: builtin/rerere.c:57
msgid "register clean resolutions in index"
@@
-9458,7
+9482,8
@@
msgstr ""
" ou : git rev-parse --sq-quote [<argument>...]\n"
" ou : git rev-parse [options] [<argument>...]\n"
"\n"
" ou : git rev-parse --sq-quote [<argument>...]\n"
" ou : git rev-parse [options] [<argument>...]\n"
"\n"
-"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur l'utilisation principale."
+"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur "
+"l'utilisation principale."
#: builtin/revert.c:22
msgid "git revert [<options>] <commit-ish>..."
#: builtin/revert.c:22
msgid "git revert [<options>] <commit-ish>..."
@@
-9771,7
+9796,9
@@
msgstr ""
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
-msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
@@
-9847,7
+9874,9
@@
msgstr "raison de la mise à jour"
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
-msgstr "git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-étiquette> [<head>]"
+msgstr ""
+"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-"
+"étiquette> [<head>]"
#: builtin/tag.c:23
msgid "git tag -d <tagname>..."
#: builtin/tag.c:23
msgid "git tag -d <tagname>..."
@@
-10073,119
+10102,119
@@
msgstr "Dépaquetage des objets"
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:75
6
+#: builtin/update-index.c:75
7
msgid "continue refresh even when index needs update"
msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
msgid "continue refresh even when index needs update"
msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
-#: builtin/update-index.c:7
59
+#: builtin/update-index.c:7
60
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:76
2
+#: builtin/update-index.c:76
3
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:76
4
+#: builtin/update-index.c:76
5
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:76
6
+#: builtin/update-index.c:76
7
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:76
8
+#: builtin/update-index.c:76
9
msgid "refresh even if index contains unmerged entries"
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
msgid "refresh even if index contains unmerged entries"
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
-#: builtin/update-index.c:77
1
+#: builtin/update-index.c:77
2
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:77
5
+#: builtin/update-index.c:77
6
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:7
79
+#: builtin/update-index.c:7
80
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:78
0
+#: builtin/update-index.c:78
1
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:78
4
+#: builtin/update-index.c:78
5
msgid "(+/-)x"
msgstr "(+/-)x"
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:78
5
+#: builtin/update-index.c:78
6
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/update-index.c:7
89
+#: builtin/update-index.c:7
90
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:79
2
+#: builtin/update-index.c:79
3
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:79
5
+#: builtin/update-index.c:79
6
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:79
8
+#: builtin/update-index.c:79
9
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:80
1
+#: builtin/update-index.c:80
2
msgid "add to index only; do not add content to object database"
msgstr ""
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
"données des objets"
msgid "add to index only; do not add content to object database"
msgstr ""
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
"données des objets"
-#: builtin/update-index.c:80
3
+#: builtin/update-index.c:80
4
msgid "remove named paths even if present in worktree"
msgstr ""
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
"travail"
msgid "remove named paths even if present in worktree"
msgstr ""
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
"travail"
-#: builtin/update-index.c:80
5
+#: builtin/update-index.c:80
6
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
-#: builtin/update-index.c:80
7
+#: builtin/update-index.c:80
8
msgid "read list of paths to be updated from standard input"
msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
msgid "read list of paths to be updated from standard input"
msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
-#: builtin/update-index.c:81
1
+#: builtin/update-index.c:81
2
msgid "add entries from standard input to the index"
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
msgid "add entries from standard input to the index"
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
-#: builtin/update-index.c:81
5
+#: builtin/update-index.c:81
6
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
-#: builtin/update-index.c:8
19
+#: builtin/update-index.c:8
20
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:82
3
+#: builtin/update-index.c:82
4
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:82
6
+#: builtin/update-index.c:82
7
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:82
8
+#: builtin/update-index.c:82
9
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:83
2
+#: builtin/update-index.c:83
3
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:83
4
+#: builtin/update-index.c:83
5
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
@@
-10195,7
+10224,9
@@
msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
-msgstr "git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-valeur>]"
+msgstr ""
+"git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-"
+"valeur>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] --stdin [-z]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] --stdin [-z]"
@@
-10609,7
+10640,9
@@
msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD"
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-valide>'."
+msgstr ""
+"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-"
+"valide>'."
#: git-bisect.sh:140
msgid "won't bisect on cg-seek'ed tree"
#: git-bisect.sh:140
msgid "won't bisect on cg-seek'ed tree"
@@
-11387,6
+11420,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 "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
+#~ msgid "server does not support --atomic push"
+#~ msgstr "le serveur ne gère pas push --atomic"
+
#~ msgid "(detached from %s)"
#~ msgstr "(détaché de %s)"
#~ msgid "(detached from %s)"
#~ msgstr "(détaché de %s)"