3509754cae · matheusbsbs/matheus-bagliano

@@ -74,8 +74,8 @@ msgid ""

74 msgstr ""

75 "Project-Id-Version: git\n"

76 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

77 -"POT-Creation-Date: 2018-05-31 23:32+0800\n"

78 -"PO-Revision-Date: 2018-06-03 16:32+0200\n"

77 +"POT-Creation-Date: 2018-06-16 22:06+0800\n"

78 +"PO-Revision-Date: 2018-06-16 20:42+0200\n"

79 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"

80 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"

81 "Language: fr\n"

@@ -126,7 +126,7 @@ msgstr ""

126 msgid "Exiting because of an unresolved conflict."

127 msgstr "Abandon à cause de conflit non résolu."

128

129 -#: advice.c:168 builtin/merge.c:1249

129 +#: advice.c:168 builtin/merge.c:1250

130 msgid "You have not concluded your merge (MERGE_HEAD exists)."

131 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."

132

@@ -841,23 +841,23 @@ msgstr "git archive --remote <dépôt> [--exec <commande>] --list"

841 msgid "pathspec '%s' did not match any files"

842 msgstr "le chemin '%s' ne correspond à aucun fichier"

843

844 -#: archive.c:436

844 +#: archive.c:434

845 msgid "fmt"

846 msgstr "fmt"

847

848 -#: archive.c:436

848 +#: archive.c:434

849 msgid "archive format"

850 msgstr "format d'archive"

851

852 -#: archive.c:437 builtin/log.c:1462

852 +#: archive.c:435 builtin/log.c:1462

853 msgid "prefix"

854 msgstr "préfixe"

855

856 -#: archive.c:438

856 +#: archive.c:436

857 msgid "prepend prefix to each pathname in the archive"

858 msgstr "préfixer chaque chemin de fichier dans l'archive"

859

860 -#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

860 +#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

861 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

862 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

863 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

@@ -865,69 +865,69 @@ msgstr "préfixer chaque chemin de fichier dans l'archive"

865 msgid "file"

866 msgstr "fichier"

867

868 -#: archive.c:440 builtin/archive.c:89

868 +#: archive.c:438 builtin/archive.c:89

869 msgid "write the archive to this file"

870 msgstr "écrire l'archive dans ce fichier"

871

872 -#: archive.c:442

872 +#: archive.c:440

873 msgid "read .gitattributes in working directory"

874 msgstr "lire .gitattributes dans le répertoire de travail"

875

876 -#: archive.c:443

876 +#: archive.c:441

877 msgid "report archived files on stderr"

878 msgstr "afficher les fichiers archivés sur stderr"

879

880 -#: archive.c:444

880 +#: archive.c:442

881 msgid "store only"

882 msgstr "stockage seulement"

883

884 -#: archive.c:445

884 +#: archive.c:443

885 msgid "compress faster"

886 msgstr "compression rapide"

887

888 -#: archive.c:453

888 +#: archive.c:451

889 msgid "compress better"

890 msgstr "compression efficace"

891

892 -#: archive.c:456

892 +#: archive.c:454

893 msgid "list supported archive formats"

894 msgstr "afficher les formats d'archive supportés"

895

896 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

896 +#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

897 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

898 msgid "repo"

899 msgstr "dépôt"

900

901 -#: archive.c:459 builtin/archive.c:91

901 +#: archive.c:457 builtin/archive.c:91

902 msgid "retrieve the archive from remote repository <repo>"

903 msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"

904

905 -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489

905 +#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

906 msgid "command"

907 msgstr "commande"

908

909 -#: archive.c:461 builtin/archive.c:93

909 +#: archive.c:459 builtin/archive.c:93

910 msgid "path to the remote git-upload-archive command"

911 msgstr "chemin vers la commande distante git-upload-archive"

912

913 -#: archive.c:468

913 +#: archive.c:466

914 msgid "Unexpected option --remote"

915 msgstr "Option --remote inattendue"

916

917 -#: archive.c:470

917 +#: archive.c:468

918 msgid "Option --exec can only be used together with --remote"

919 msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"

920

921 -#: archive.c:472

921 +#: archive.c:470

922 msgid "Unexpected option --output"

923 msgstr "Option --output inattendue"

924

925 -#: archive.c:494

925 +#: archive.c:492

926 #, c-format

927 msgid "Unknown archive format '%s'"

928 msgstr "Format d'archive inconnu '%s'"

929

930 -#: archive.c:501

930 +#: archive.c:499

931 #, c-format

932 msgid "Argument not supported for format '%s': -%d"

933 msgstr "Argument non supporté pour le format '%s' : -%d"

@@ -1079,9 +1079,9 @@ msgstr ""

1079 "--reverse et --first-parent ensemble nécessitent la spécification d'un "

1080 "dernier commit"

1081

1082 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860

1083 -#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1084 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371

1082 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861

1083 +#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1084 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

1085 #: builtin/shortlog.c:192

1086 msgid "revision walk setup failed"

1087 msgstr "échec de la préparation du parcours des révisions"

@@ -1261,7 +1261,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

1261 msgid "unrecognized header: %s%s (%d)"

1262 msgstr "en-tête non reconnu : %s%s (%d)"

1263

1264 -#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755

1264 +#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755

1265 #, c-format

1266 msgid "could not open '%s'"

1267 msgstr "impossible d'ouvrir '%s'"

@@ -1328,7 +1328,7 @@ msgstr "l'index de groupe a disparu"

1328 msgid "invalid color value: %.*s"

1329 msgstr "Valeur invalide de couleur : %.*s"

1330

1331 -#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465

1331 +#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

1332 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

1333 #: builtin/replace.c:448

1334 #, c-format

@@ -1360,7 +1360,7 @@ msgstr ""

1360 "Supprimez ce message en lançant\n"

1361 "\"git config advice.graftFileDeprecated false\""

1362

1363 -#: commit.c:1537

1363 +#: commit.c:1540

1364 msgid ""

1365 "Warning: commit message did not conform to UTF-8.\n"

1366 "You may want to amend it after fixing the message, or set the config\n"

@@ -1564,11 +1564,11 @@ msgstr "impossible de régler '%s' à '%s'"

1564 msgid "could not unset '%s'"

1565 msgstr "impossible de désinitialiser '%s'"

1566

1567 -#: connect.c:60

1567 +#: connect.c:61

1568 msgid "The remote end hung up upon initial contact"

1569 msgstr "L'hôte distant a fermé la connexion lors du contact initial"

1570

1571 -#: connect.c:62

1571 +#: connect.c:63

1572 msgid ""

1573 "Could not read from remote repository.\n"

1574 "\n"

@@ -1636,7 +1636,9 @@ msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"

1636 msgid ""

1637 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

1638 "tree-encoding."

1639 -msgstr "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez utiliser UTF-%s comme encodage d'arbre de travail."

1639 +msgstr ""

1640 +"Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez "

1641 +"utiliser UTF-%s comme encodage d'arbre de travail."

1642

1643 #: convert.c:304

1644 #, c-format

@@ -1648,7 +1650,10 @@ msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"

1650 msgid ""

1651 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

1652 "%sLE (depending on the byte order) as working-tree-encoding."

1651 -msgstr "Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre de travail."

1653 +msgstr ""

1654 +"Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez "

1655 +"utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre "

1656 +"de travail."

1657

1658 #: convert.c:424

1659 #, c-format

@@ -1658,7 +1663,9 @@ msgstr "échec de l'encodage de '%s' de %s vers %s"

1663 #: convert.c:467

1664 #, c-format

1665 msgid "encoding '%s' from %s to %s and back is not the same"

1661 -msgstr "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même contenu"

1666 +msgstr ""

1667 +"encoder '%s' depuis %s vers %s puis inversement ne produit pas le même "

1668 +"contenu"

1669

1670 #: convert.c:1225

1671 msgid "true/false are no valid working-tree-encodings"

@@ -2098,20 +2105,82 @@ msgstr "échec du stat de '%s'"

2105 msgid "'%s': short read"

2106 msgstr "'%s' : lecture tronquée"

2107

2101 -#: help.c:179

2108 +#: help.c:23

2109 +msgid "start a working area (see also: git help tutorial)"

2110 +msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"

2111 +

2112 +#: help.c:24

2113 +msgid "work on the current change (see also: git help everyday)"

2114 +msgstr ""

2115 +"travailler sur la modification actuelle (voir aussi : git help revisions)"

2116 +

2117 +#: help.c:25

2118 +msgid "examine the history and state (see also: git help revisions)"

2119 +msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"

2120 +

2121 +#: help.c:26

2122 +msgid "grow, mark and tweak your common history"

2123 +msgstr "agrandir, marquer et modifier votre historique"

2124 +

2125 +#: help.c:27

2126 +msgid "collaborate (see also: git help workflows)"

2127 +msgstr "collaborer (voir aussi : git help workflows)"

2128 +

2129 +#: help.c:31

2130 +msgid "Main Porcelain Commands"

2131 +msgstr "Commandes Porcelaine Principales"

2132 +

2133 +#: help.c:32

2134 +msgid "Ancillary Commands / Manipulators"

2135 +msgstr "Commandes Auxiliaires / Manipulateurs"

2136 +

2137 +#: help.c:33

2138 +msgid "Ancillary Commands / Interrogators"

2139 +msgstr "Commandes Auxiliaires / Interrogateurs"

2140 +

2141 +#: help.c:34

2142 +msgid "Interacting with Others"

2143 +msgstr "Interaction avec d'autres développeurs"

2144 +

2145 +#: help.c:35

2146 +msgid "Low-level Commands / Manipulators"

2147 +msgstr "Commandes bas-niveau / Manipulateurs"

2148 +

2149 +#: help.c:36

2150 +msgid "Low-level Commands / Interrogators"

2151 +msgstr "Commandes bas niveau / Interrogateurs"

2152 +

2153 +#: help.c:37

2154 +msgid "Low-level Commands / Synching Repositories"

2155 +msgstr "Commandes bas niveau / Synchronisation de dépôts"

2156 +

2157 +#: help.c:38

2158 +msgid "Low-level Commands / Internal Helpers"

2159 +msgstr "Commandes bas niveau / Assistants internes"

2160 +

2161 +#: help.c:293

2162 #, c-format

2163 msgid "available git commands in '%s'"

2164 msgstr "commandes git disponibles dans '%s'"

2165

2106 -#: help.c:186

2166 +#: help.c:300

2167 msgid "git commands available from elsewhere on your $PATH"

2168 msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"

2169

2110 -#: help.c:217

2170 +#: help.c:309

2171 msgid "These are common Git commands used in various situations:"

2172 msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"

2173

2114 -#: help.c:281

2174 +#: help.c:358 git.c:90

2175 +#, c-format

2176 +msgid "unsupported command listing type '%s'"

2177 +msgstr "type de liste de commandes non supporté '%s'"

2178 +

2179 +#: help.c:405

2180 +msgid "The common Git guides are:"

2181 +msgstr "Les guides Git populaires sont :"

2182 +

2183 +#: help.c:467

2184 #, c-format

2185 msgid ""

2186 "'%s' appears to be a git command, but we were not\n"

@@ -2120,33 +2189,33 @@ msgstr ""

2189 "'%s' semble être une commande git, mais elle n'a pas pu\n"

2190 "être exécutée. Peut-être git-%s est-elle cassée ?"

2191

2123 -#: help.c:336

2192 +#: help.c:526

2193 msgid "Uh oh. Your system reports no Git commands at all."

2194 msgstr "Ahem. Votre système n'indique aucune commande Git."

2195

2127 -#: help.c:358

2196 +#: help.c:548

2197 #, c-format

2198 msgid "WARNING: You called a Git command named '%s', which does not exist."

2199 msgstr ""

2200 "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."

2201

2133 -#: help.c:363

2202 +#: help.c:553

2203 #, c-format

2204 msgid "Continuing under the assumption that you meant '%s'."

2205 msgstr "Continuons en supposant que vous avez voulu dire '%s'."

2206

2138 -#: help.c:368

2207 +#: help.c:558

2208 #, c-format

2209 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2210 msgstr ""

2211 "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."

2212

2144 -#: help.c:376

2213 +#: help.c:566

2214 #, c-format

2215 msgid "git: '%s' is not a git command. See 'git --help'."

2216 msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."

2217

2149 -#: help.c:380

2218 +#: help.c:570

2219 msgid ""

2220 "\n"

2221 "The most similar command is"

@@ -2160,16 +2229,16 @@ msgstr[1] ""

2229 "\n"

2230 "Les commandes les plus ressemblantes sont"

2231

2163 -#: help.c:395

2232 +#: help.c:585

2233 msgid "git version [<options>]"

2234 msgstr "git version [<options>]"

2235

2167 -#: help.c:462

2236 +#: help.c:652

2237 #, c-format

2238 msgid "%s: %s - %s"

2239 msgstr "%s: %s - %s"

2240

2172 -#: help.c:466

2241 +#: help.c:656

2242 msgid ""

2243 "\n"

2244 "Did you mean this?"

@@ -2358,7 +2427,9 @@ msgstr "Échec de fusion du sous-module %s (commits non présents)"

2427 #: merge-recursive.c:1200

2428 #, c-format

2429 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2361 -msgstr "Échec de la fusion du sous-module %s (les commits ne descendent pas de la base de fusion)"

2430 +msgstr ""

2431 +"Échec de la fusion du sous-module %s (les commits ne descendent pas de la "

2432 +"base de fusion)"

2433

2434 #: merge-recursive.c:1208 merge-recursive.c:1220

2435 #, c-format

@@ -2367,13 +2438,14 @@ msgstr "Avance rapide du sous-module %s au commit suivant :"

2438

2439 #: merge-recursive.c:1211 merge-recursive.c:1223

2440 #, c-format

2370 -msgid "Fast-forwarding submodule %s to %s"

2371 -msgstr "Avance rapide du sous-module %s à %s"

2441 +msgid "Fast-forwarding submodule %s"

2442 +msgstr "Avance rapide du sous-module %s"

2443

2444 #: merge-recursive.c:1245

2445 #, c-format

2446 msgid "Failed to merge submodule %s (merge following commits not found)"

2376 -msgstr "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"

2447 +msgstr ""

2448 +"Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"

2449

2450 #: merge-recursive.c:1249

2451 #, c-format

@@ -2423,7 +2495,9 @@ msgstr "Fusion automatique de %s"

2495 #: merge-recursive.c:1423

2496 #, c-format

2497 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2426 -msgstr "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la place."

2498 +msgstr ""

2499 +"Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

2500 +"place."

2501

2502 #: merge-recursive.c:1475

2503 #, c-format

@@ -2521,35 +2595,46 @@ msgid ""

2595 "CONFLICT (directory rename split): Unclear where to place %s because "

2596 "directory %s was renamed to multiple other directories, with no destination "

2597 "getting a majority of the files."

2524 -msgstr "CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire parce que le répertoire %s a été renommé en plusieurs autres répertoires, sans aucune destination récupérant la majorité des fichiers."

2598 +msgstr ""

2599 +"CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire "

2600 +"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

2601 +"sans aucune destination récupérant la majorité des fichiers."

2602

2603 #: merge-recursive.c:1983

2604 #, c-format

2605 msgid ""

2606 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

2607 "implicit directory rename(s) putting the following path(s) there: %s."

2531 -msgstr "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne des renommages implicites de répertoire déplaçant les chemins suivants : %s."

2608 +msgstr ""

2609 +"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

2610 +"des renommages implicites de répertoire déplaçant les chemins suivants : %s."

2611

2612 #: merge-recursive.c:1993

2613 #, c-format

2614 msgid ""

2615 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

2616 "implicit directory renames tried to put these paths there: %s"

2538 -msgstr "CONFLIT (renommage implicite de répertoire) : impossible de transformer plusieurs chemins sur %s ; les chemins concernés sont : %s"

2617 +msgstr ""

2618 +"CONFLIT (renommage implicite de répertoire) : impossible de transformer "

2619 +"plusieurs chemins sur %s ; les chemins concernés sont : %s"

2620

2621 #: merge-recursive.c:2085

2622 #, c-format

2623 msgid ""

2624 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

2625 ">%s in %s"

2545 -msgstr "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. Renommage de répertoire %s->%s dans %s"

2626 +msgstr ""

2627 +"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

2628 +"Renommage de répertoire %s->%s dans %s"

2629

2630 #: merge-recursive.c:2330

2631 #, c-format

2632 msgid ""

2633 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

2634 "renamed."

2552 -msgstr "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été renommé."

2635 +msgstr ""

2636 +"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

2637 +"renommé."

2638

2639 #: merge-recursive.c:2736

2640 #, c-format

@@ -2665,7 +2750,7 @@ msgstr "la fusion n'a pas retourné de commit"

2750 msgid "Could not parse object '%s'"

2751 msgstr "Impossible d'analyser l'objet '%s'"

2752

2668 -#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815

2753 +#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

2754 msgid "Unable to write index."

2755 msgstr "Impossible d'écrire l'index."

2756

@@ -2870,12 +2955,12 @@ msgstr ""

2955 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"

2956 "Utilisation de la version %i"

2957

2873 -#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047

2958 +#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

2959 #, c-format

2960 msgid "could not close '%s'"

2961 msgstr "impossible de fermer '%s'"

2962

2878 -#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233

2963 +#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

2964 #, c-format

2965 msgid "could not stat '%s'"

2966 msgstr "stat impossible de '%s'"

@@ -2890,7 +2975,7 @@ msgstr "impossible d'ouvrir le répertoire git : %s"

2975 msgid "unable to unlink: %s"

2976 msgstr "échec lors de l'unlink : %s"

2977

2893 -#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395

2978 +#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

2979 #: builtin/am.c:779

2980 #, c-format

2981 msgid "could not open '%s' for writing"

@@ -3353,34 +3438,34 @@ msgstr "Le receveur ne gère pas les poussées avec --atomic"

3438 msgid "the receiving end does not support push options"

3439 msgstr "Le receveur ne gère pas les options de poussées"

3440

3356 -#: sequencer.c:174

3441 +#: sequencer.c:175

3442 #, c-format

3443 msgid "invalid commit message cleanup mode '%s'"

3444 msgstr "mode de nettoyage invalide de message de validation '%s'"

3445

3361 -#: sequencer.c:274

3446 +#: sequencer.c:275

3447 #, c-format

3448 msgid "could not delete '%s'"

3449 msgstr "Impossible de supprimer '%s'"

3450

3366 -#: sequencer.c:300

3451 +#: sequencer.c:301

3452 msgid "revert"

3453 msgstr "revert"

3454

3370 -#: sequencer.c:302

3455 +#: sequencer.c:303

3456 msgid "cherry-pick"

3457 msgstr "cherry-pick"

3458

3374 -#: sequencer.c:304

3459 +#: sequencer.c:305

3460 msgid "rebase -i"

3461 msgstr "rebase -i"

3462

3378 -#: sequencer.c:306

3463 +#: sequencer.c:307

3464 #, c-format

3465 msgid "Unknown action: %d"

3466 msgstr "Action inconnue : %d"

3467

3383 -#: sequencer.c:363

3468 +#: sequencer.c:364

3469 msgid ""

3470 "after resolving the conflicts, mark the corrected paths\n"

3471 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3388,7 +3473,7 @@ msgstr ""

3473 "après résolution des conflits, marquez les chemins corrigés\n"

3474 "avec 'git add <chemins>' ou 'git rm <chemins>'"

3475

3391 -#: sequencer.c:366

3476 +#: sequencer.c:367

3477 msgid ""

3478 "after resolving the conflicts, mark the corrected paths\n"

3479 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3398,45 +3483,45 @@ msgstr ""

3483 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"

3484 "puis validez le résultat avec 'git commit'"

3485

3401 -#: sequencer.c:379 sequencer.c:2467

3486 +#: sequencer.c:380 sequencer.c:2468

3487 #, c-format

3488 msgid "could not lock '%s'"

3489 msgstr "impossible de verrouiller '%s'"

3490

3406 -#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485

3407 -#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656

3491 +#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486

3492 +#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

3493 #, c-format

3494 msgid "could not write to '%s'"

3495 msgstr "impossible d'écrire dans '%s'"

3496

3412 -#: sequencer.c:386

3497 +#: sequencer.c:387

3498 #, c-format

3499 msgid "could not write eol to '%s'"

3500 msgstr "impossible d'écrire la fin de ligne dans '%s'"

3501

3417 -#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487

3418 -#: sequencer.c:2701

3502 +#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488

3503 +#: sequencer.c:2702

3504 #, c-format

3505 msgid "failed to finalize '%s'"

3506 msgstr "échec lors de la finalisation de '%s'"

3507

3423 -#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370

3424 -#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727

3425 -#: builtin/merge.c:1045

3508 +#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371

3509 +#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727

3510 +#: builtin/merge.c:1046

3511 #, c-format

3512 msgid "could not read '%s'"

3513 msgstr "impossible de lire '%s'"

3514

3430 -#: sequencer.c:440

3515 +#: sequencer.c:441

3516 #, c-format

3517 msgid "your local changes would be overwritten by %s."

3518 msgstr "vos modifications locales seraient écrasées par %s."

3519

3435 -#: sequencer.c:444

3520 +#: sequencer.c:445

3521 msgid "commit your changes or stash them to proceed."

3522 msgstr "validez vos modifications ou les remiser pour continuer."

3523

3439 -#: sequencer.c:473

3524 +#: sequencer.c:474

3525 #, c-format

3526 msgid "%s: fast-forward"

3527 msgstr "%s : avance rapide"

@@ -3444,20 +3529,20 @@ msgstr "%s : avance rapide"

3529 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3530 #. "rebase -i".

3531 #.

3447 -#: sequencer.c:562

3532 +#: sequencer.c:563

3533 #, c-format

3534 msgid "%s: Unable to write new index file"

3535 msgstr "%s: Impossible d'écrire le nouveau fichier index"

3536

3452 -#: sequencer.c:578

3537 +#: sequencer.c:579

3538 msgid "unable to update cache tree"

3539 msgstr "impossible de mettre à jour l'arbre de cache"

3540

3456 -#: sequencer.c:591

3541 +#: sequencer.c:592

3542 msgid "could not resolve HEAD commit"

3543 msgstr "impossible de résoudre le commit HEAD"

3544

3460 -#: sequencer.c:748

3545 +#: sequencer.c:749

3546 #, c-format

3547 msgid ""

3548 "you have staged changes in your working tree\n"

@@ -3486,15 +3571,15 @@ msgstr ""

3571 "\n"

3572 " git rebase --continue\n"

3573

3489 -#: sequencer.c:817

3574 +#: sequencer.c:818

3575 msgid "writing root commit"

3576 msgstr "écriture du commit racine"

3577

3493 -#: sequencer.c:1042

3578 +#: sequencer.c:1043

3579 msgid "'prepare-commit-msg' hook failed"

3580 msgstr "échec du crochet 'prepare-commit-msg'"

3581

3497 -#: sequencer.c:1049

3582 +#: sequencer.c:1050

3583 msgid ""

3584 "Your name and email address were configured automatically based\n"

3585 "on your username and hostname. Please check that they are accurate.\n"

@@ -3522,7 +3607,7 @@ msgstr ""

3607 "\n"

3608 " git commit --amend --reset-author\n"

3609

3525 -#: sequencer.c:1062

3610 +#: sequencer.c:1063

3611 msgid ""

3612 "Your name and email address were configured automatically based\n"

3613 "on your username and hostname. Please check that they are accurate.\n"

@@ -3548,316 +3633,316 @@ msgstr ""

3633 "\n"

3634 " git commit --amend --reset-author\n"

3635

3551 -#: sequencer.c:1102

3636 +#: sequencer.c:1103

3637 msgid "couldn't look up newly created commit"

3638 msgstr "impossible de retrouver le commit nouvellement créé"

3639

3555 -#: sequencer.c:1104

3640 +#: sequencer.c:1105

3641 msgid "could not parse newly created commit"

3642 msgstr "impossible d'analyser le commit nouvellement créé"

3643

3559 -#: sequencer.c:1150

3644 +#: sequencer.c:1151

3645 msgid "unable to resolve HEAD after creating commit"

3646 msgstr "impossible de résoudre HEAD après création du commit"

3647

3563 -#: sequencer.c:1152

3648 +#: sequencer.c:1153

3649 msgid "detached HEAD"

3650 msgstr "HEAD détachée"

3651

3567 -#: sequencer.c:1156

3652 +#: sequencer.c:1157

3653 msgid " (root-commit)"

3654 msgstr " (commit racine)"

3655

3571 -#: sequencer.c:1177

3656 +#: sequencer.c:1178

3657 msgid "could not parse HEAD"

3658 msgstr "impossible de lire HEAD"

3659

3575 -#: sequencer.c:1179

3660 +#: sequencer.c:1180

3661 #, c-format

3662 msgid "HEAD %s is not a commit!"

3663 msgstr "HEAD %s n'est pas un commit !"

3664

3580 -#: sequencer.c:1183 builtin/commit.c:1528

3665 +#: sequencer.c:1184 builtin/commit.c:1528

3666 msgid "could not parse HEAD commit"

3667 msgstr "impossible d'analyser le commit HEAD"

3668

3584 -#: sequencer.c:1234 sequencer.c:1831

3669 +#: sequencer.c:1235 sequencer.c:1832

3670 msgid "unable to parse commit author"

3671 msgstr "impossible d'analyser l'auteur du commit"

3672

3588 -#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644

3673 +#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645

3674 msgid "git write-tree failed to write a tree"

3675 msgstr "git write-tree a échoué à écrire un arbre"

3676

3592 -#: sequencer.c:1261 sequencer.c:1316

3677 +#: sequencer.c:1262 sequencer.c:1317

3678 #, c-format

3679 msgid "unable to read commit message from '%s'"

3680 msgstr "impossible de lire le message de validation de '%s'"

3681

3597 -#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824

3598 -#: builtin/merge.c:849

3682 +#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825

3683 +#: builtin/merge.c:850

3684 msgid "failed to write commit object"

3685 msgstr "échec de l'écriture de l'objet commit"

3686

3602 -#: sequencer.c:1343

3687 +#: sequencer.c:1344

3688 #, c-format

3689 msgid "could not parse commit %s"

3690 msgstr "impossible d'analyser le commit %s"

3691

3607 -#: sequencer.c:1348

3692 +#: sequencer.c:1349

3693 #, c-format

3694 msgid "could not parse parent commit %s"

3695 msgstr "impossible d'analyser le commit parent %s"

3696

3612 -#: sequencer.c:1499 sequencer.c:1524

3697 +#: sequencer.c:1500 sequencer.c:1525

3698 #, c-format

3699 msgid "This is a combination of %d commits."

3700 msgstr "Ceci est la combinaison de %d commits."

3701

3617 -#: sequencer.c:1509 sequencer.c:4354

3702 +#: sequencer.c:1510 sequencer.c:4355

3703 msgid "need a HEAD to fixup"

3704 msgstr "une HEAD est nécessaire à la correction"

3705

3621 -#: sequencer.c:1511 sequencer.c:2728

3706 +#: sequencer.c:1512 sequencer.c:2729

3707 msgid "could not read HEAD"

3708 msgstr "Impossible de lire HEAD"

3709

3625 -#: sequencer.c:1513

3710 +#: sequencer.c:1514

3711 msgid "could not read HEAD's commit message"

3712 msgstr "impossible de lire le message de validation de HEAD"

3713

3629 -#: sequencer.c:1519

3714 +#: sequencer.c:1520

3715 #, c-format

3716 msgid "cannot write '%s'"

3717 msgstr "impossible d'écrire '%s'"

3718

3634 -#: sequencer.c:1526 git-rebase--interactive.sh:457

3719 +#: sequencer.c:1527 git-rebase--interactive.sh:457

3720 msgid "This is the 1st commit message:"

3721 msgstr "Ceci est le premier message de validation :"

3722

3638 -#: sequencer.c:1534

3723 +#: sequencer.c:1535

3724 #, c-format

3725 msgid "could not read commit message of %s"

3726 msgstr "impossible de lire le message de validation de %s"

3727

3643 -#: sequencer.c:1541

3728 +#: sequencer.c:1542

3729 #, c-format

3730 msgid "This is the commit message #%d:"

3731 msgstr "Ceci est le message de validation numéro %d :"

3732

3648 -#: sequencer.c:1547

3733 +#: sequencer.c:1548

3734 #, c-format

3735 msgid "The commit message #%d will be skipped:"

3736 msgstr "Le message de validation %d sera ignoré :"

3737

3653 -#: sequencer.c:1552

3738 +#: sequencer.c:1553

3739 #, c-format

3740 msgid "unknown command: %d"

3741 msgstr "commande inconnue : %d"

3742

3658 -#: sequencer.c:1630

3743 +#: sequencer.c:1631

3744 msgid "your index file is unmerged."

3745 msgstr "votre fichier d'index n'est pas fusionné."

3746

3662 -#: sequencer.c:1637

3747 +#: sequencer.c:1638

3748 msgid "cannot fixup root commit"

3749 msgstr "impossible de réparer le commit racine"

3750

3666 -#: sequencer.c:1656

3751 +#: sequencer.c:1657

3752 #, c-format

3753 msgid "commit %s is a merge but no -m option was given."

3754 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

3755

3671 -#: sequencer.c:1664

3756 +#: sequencer.c:1665

3757 #, c-format

3758 msgid "commit %s does not have parent %d"

3759 msgstr "le commit %s n'a pas de parent %d"

3760

3676 -#: sequencer.c:1668

3761 +#: sequencer.c:1669

3762 #, c-format

3763 msgid "mainline was specified but commit %s is not a merge."

3764 msgstr ""

3765 "une branche principale a été spécifiée mais le commit %s n'est pas une "

3766 "fusion."

3767

3683 -#: sequencer.c:1674

3768 +#: sequencer.c:1675

3769 #, c-format

3770 msgid "cannot get commit message for %s"

3771 msgstr "impossible d'obtenir un message de validation pour %s"

3772

3773 #. TRANSLATORS: The first %s will be a "todo" command like

3774 #. "revert" or "pick", the second %s a SHA1.

3690 -#: sequencer.c:1693

3775 +#: sequencer.c:1694

3776 #, c-format

3777 msgid "%s: cannot parse parent commit %s"

3778 msgstr "%s : impossible d'analyser le commit parent %s"

3779

3695 -#: sequencer.c:1758

3780 +#: sequencer.c:1759

3781 #, c-format

3782 msgid "could not rename '%s' to '%s'"

3783 msgstr "impossible de renommer '%s' en '%s'"

3784

3700 -#: sequencer.c:1812

3785 +#: sequencer.c:1813

3786 #, c-format

3787 msgid "could not revert %s... %s"

3788 msgstr "impossible d'annuler %s... %s"

3789

3705 -#: sequencer.c:1813

3790 +#: sequencer.c:1814

3791 #, c-format

3792 msgid "could not apply %s... %s"

3793 msgstr "impossible d'appliquer %s... %s"

3794

3710 -#: sequencer.c:1863

3795 +#: sequencer.c:1864

3796 msgid "empty commit set passed"

3797 msgstr "l'ensemble de commits spécifié est vide"

3798

3714 -#: sequencer.c:1873

3799 +#: sequencer.c:1874

3800 #, c-format

3801 msgid "git %s: failed to read the index"

3802 msgstr "git %s : échec à la lecture de l'index"

3803

3719 -#: sequencer.c:1880

3804 +#: sequencer.c:1881

3805 #, c-format

3806 msgid "git %s: failed to refresh the index"

3807 msgstr "git %s : échec du rafraîchissement de l'index"

3808

3724 -#: sequencer.c:1960

3809 +#: sequencer.c:1961

3810 #, c-format

3811 msgid "%s does not accept arguments: '%s'"

3812 msgstr "%s n'accepte pas d'argument : '%s'"

3813

3729 -#: sequencer.c:1969

3814 +#: sequencer.c:1970

3815 #, c-format

3816 msgid "missing arguments for %s"

3817 msgstr "argument manquant pour %s"

3818

3734 -#: sequencer.c:2028

3819 +#: sequencer.c:2029

3820 #, c-format

3821 msgid "invalid line %d: %.*s"

3822 msgstr "ligne %d invalide : %.*s"

3823

3739 -#: sequencer.c:2036

3824 +#: sequencer.c:2037

3825 #, c-format

3826 msgid "cannot '%s' without a previous commit"

3827 msgstr "'%s' impossible avec le commit précédent"

3828

3744 -#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172

3829 +#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

3830 #, c-format

3831 msgid "could not read '%s'."

3832 msgstr "impossible de lire '%s'."

3833

3749 -#: sequencer.c:2107

3834 +#: sequencer.c:2108

3835 msgid "please fix this using 'git rebase --edit-todo'."

3836 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

3837

3753 -#: sequencer.c:2109

3838 +#: sequencer.c:2110

3839 #, c-format

3840 msgid "unusable instruction sheet: '%s'"

3841 msgstr "feuille d'instruction inutilisable : '%s'"

3842

3758 -#: sequencer.c:2114

3843 +#: sequencer.c:2115

3844 msgid "no commits parsed."

3845 msgstr "aucun commit analysé."

3846

3762 -#: sequencer.c:2125

3847 +#: sequencer.c:2126

3848 msgid "cannot cherry-pick during a revert."

3849 msgstr "impossible de picorer pendant l'annulation d'un commit."

3850

3766 -#: sequencer.c:2127

3851 +#: sequencer.c:2128

3852 msgid "cannot revert during a cherry-pick."

3853 msgstr "impossible d'annuler un commit pendant un picorage."

3854

3770 -#: sequencer.c:2194

3855 +#: sequencer.c:2195

3856 #, c-format

3857 msgid "invalid key: %s"

3858 msgstr "clé invalide : %s"

3859

3775 -#: sequencer.c:2197

3860 +#: sequencer.c:2198

3861 #, c-format

3862 msgid "invalid value for %s: %s"

3863 msgstr "valeur invalide pour %s : %s"

3864

3780 -#: sequencer.c:2268

3865 +#: sequencer.c:2269

3866 msgid "unusable squash-onto"

3867 msgstr "\"écrase-sur\" inutilisable"

3868

3784 -#: sequencer.c:2284

3869 +#: sequencer.c:2285

3870 #, c-format

3871 msgid "malformed options sheet: '%s'"

3872 msgstr "feuille d'options malformée : %s"

3873

3789 -#: sequencer.c:2322

3874 +#: sequencer.c:2323

3875 msgid "a cherry-pick or revert is already in progress"

3876 msgstr "un picorage ou un retour est déjà en cours"

3877

3793 -#: sequencer.c:2323

3878 +#: sequencer.c:2324

3879 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3880 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

3881

3797 -#: sequencer.c:2326

3882 +#: sequencer.c:2327

3883 #, c-format

3884 msgid "could not create sequencer directory '%s'"

3885 msgstr "impossible de créer le répertoire de séquenceur '%s'"

3886

3802 -#: sequencer.c:2340

3887 +#: sequencer.c:2341

3888 msgid "could not lock HEAD"

3889 msgstr "impossible de verrouiller HEAD"

3890

3806 -#: sequencer.c:2395 sequencer.c:3402

3891 +#: sequencer.c:2396 sequencer.c:3403

3892 msgid "no cherry-pick or revert in progress"

3893 msgstr "aucun picorage ou retour en cours"

3894

3810 -#: sequencer.c:2397

3895 +#: sequencer.c:2398

3896 msgid "cannot resolve HEAD"

3897 msgstr "impossible de résoudre HEAD"

3898

3814 -#: sequencer.c:2399 sequencer.c:2434

3899 +#: sequencer.c:2400 sequencer.c:2435

3900 msgid "cannot abort from a branch yet to be born"

3901 msgstr "impossible d'abandonner depuis une branche non encore créée"

3902

3818 -#: sequencer.c:2420 builtin/grep.c:720

3903 +#: sequencer.c:2421 builtin/grep.c:720

3904 #, c-format

3905 msgid "cannot open '%s'"

3906 msgstr "impossible d'ouvrir '%s'"

3907

3823 -#: sequencer.c:2422

3908 +#: sequencer.c:2423

3909 #, c-format

3910 msgid "cannot read '%s': %s"

3911 msgstr "impossible de lire '%s' : %s"

3912

3828 -#: sequencer.c:2423

3913 +#: sequencer.c:2424

3914 msgid "unexpected end of file"

3915 msgstr "fin de fichier inattendue"

3916

3832 -#: sequencer.c:2429

3917 +#: sequencer.c:2430

3918 #, c-format

3919 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3920 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

3921

3837 -#: sequencer.c:2440

3922 +#: sequencer.c:2441

3923 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3924 msgstr ""

3925 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

3926

3842 -#: sequencer.c:2544 sequencer.c:3320

3927 +#: sequencer.c:2545 sequencer.c:3321

3928 #, c-format

3929 msgid "could not update %s"

3930 msgstr "impossible de mettre à jour %s"

3931

3847 -#: sequencer.c:2582 sequencer.c:3300

3932 +#: sequencer.c:2583 sequencer.c:3301

3933 msgid "cannot read HEAD"

3934 msgstr "impossible de lire HEAD"

3935

3851 -#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639

3936 +#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639

3937 #, c-format

3938 msgid "could not copy '%s' to '%s'"

3939 msgstr "impossible de copier '%s' vers '%s'"

3940

3856 -#: sequencer.c:2640

3941 +#: sequencer.c:2641

3942 msgid "could not read index"

3943 msgstr "impossible de lire l'index"

3944

3860 -#: sequencer.c:2645

3945 +#: sequencer.c:2646

3946 #, c-format

3947 msgid ""

3948 "execution failed: %s\n"

@@ -3872,11 +3957,11 @@ msgstr ""

3957 "git rebase --continue\n"

3958 "\n"

3959

3875 -#: sequencer.c:2651

3960 +#: sequencer.c:2652

3961 msgid "and made changes to the index and/or the working tree\n"

3962 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

3963

3879 -#: sequencer.c:2657

3964 +#: sequencer.c:2658

3965 #, c-format

3966 msgid ""

3967 "execution succeeded: %s\n"

@@ -3893,62 +3978,62 @@ msgstr ""

3978 " git rebase --continue\n"

3979 "\n"

3980

3896 -#: sequencer.c:2770

3981 +#: sequencer.c:2771

3982 msgid "writing fake root commit"

3983 msgstr "écriture d'un commit racine bidon"

3984

3900 -#: sequencer.c:2775

3985 +#: sequencer.c:2776

3986 msgid "writing squash-onto"

3987 msgstr "écriture de 'écraser-sur'"

3988

3904 -#: sequencer.c:2810

3989 +#: sequencer.c:2811

3990 #, c-format

3991 msgid "failed to find tree of %s"

3992 msgstr "impossible de trouver l'arbre de %s"

3993

3909 -#: sequencer.c:2828

3994 +#: sequencer.c:2829

3995 msgid "could not write index"

3996 msgstr "impossible d'écrire l'index"

3997

3913 -#: sequencer.c:2860

3998 +#: sequencer.c:2861

3999 msgid "cannot merge without a current revision"

4000 msgstr "impossible de fusionner avec une révision courante"

4001

3917 -#: sequencer.c:2883

4002 +#: sequencer.c:2884

4003 #, c-format

4004 msgid "could not resolve '%s'"

4005 msgstr "impossible de résoudre '%s'"

4006

3922 -#: sequencer.c:2905

4007 +#: sequencer.c:2906

4008 #, c-format

4009 msgid "could not get commit message of '%s'"

4010 msgstr "impossible de lire le message de validation de '%s'"

4011

3927 -#: sequencer.c:2915 sequencer.c:2940

4012 +#: sequencer.c:2916 sequencer.c:2941

4013 #, c-format

4014 msgid "could not write '%s'"

4015 msgstr "impossible d'écrire '%s'"

4016

3932 -#: sequencer.c:3004

4017 +#: sequencer.c:3005

4018 #, c-format

4019 msgid "could not even attempt to merge '%.*s'"

4020 msgstr "impossible de seulement essayer de fusionner '%.*s'"

4021

3937 -#: sequencer.c:3020

4022 +#: sequencer.c:3021

4023 msgid "merge: Unable to write new index file"

4024 msgstr "fusion : Impossible d'écrire le nouveau fichier index"

4025

3941 -#: sequencer.c:3087

4026 +#: sequencer.c:3088

4027 #, c-format

4028 msgid "Applied autostash.\n"

4029 msgstr "Autoremisage appliqué.\n"

4030

3946 -#: sequencer.c:3099

4031 +#: sequencer.c:3100

4032 #, c-format

4033 msgid "cannot store %s"

4034 msgstr "impossible de stocker %s"

4035

3951 -#: sequencer.c:3102 git-rebase.sh:188

4036 +#: sequencer.c:3103 git-rebase.sh:188

4037 #, c-format

4038 msgid ""

4039 "Applying autostash resulted in conflicts.\n"

@@ -3959,7 +4044,7 @@ msgstr ""

4044 "Vos modifications sont à l'abri dans la remise.\n"

4045 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

4046

3962 -#: sequencer.c:3133

4047 +#: sequencer.c:3134

4048 #, c-format

4049 msgid ""

4050 "Could not execute the todo command\n"

@@ -3980,48 +4065,48 @@ msgstr ""

4065 " git rebase --edit-todo\n"

4066 " git rebase --continue\n"

4067

3983 -#: sequencer.c:3201

4068 +#: sequencer.c:3202

4069 #, c-format

4070 msgid "Stopped at %s... %.*s\n"

4071 msgstr "arrêt à %s... %.*s\n"

4072

3988 -#: sequencer.c:3263

4073 +#: sequencer.c:3264

4074 #, c-format

4075 msgid "unknown command %d"

4076 msgstr "commande inconnue %d"

4077

3993 -#: sequencer.c:3308

4078 +#: sequencer.c:3309

4079 msgid "could not read orig-head"

4080 msgstr "impossible de lire orig-head"

4081

3997 -#: sequencer.c:3313 sequencer.c:4351

4082 +#: sequencer.c:3314 sequencer.c:4352

4083 msgid "could not read 'onto'"

4084 msgstr "impossible de lire 'onto'"

4085

4001 -#: sequencer.c:3327

4086 +#: sequencer.c:3328

4087 #, c-format

4088 msgid "could not update HEAD to %s"

4089 msgstr "impossible de mettre à jour HEAD sur %s"

4090

4006 -#: sequencer.c:3413

4091 +#: sequencer.c:3414

4092 msgid "cannot rebase: You have unstaged changes."

4093 msgstr "impossible de rebaser : vous avez des modifications non indexées."

4094

4010 -#: sequencer.c:3422

4095 +#: sequencer.c:3423

4096 msgid "cannot amend non-existing commit"

4097 msgstr "impossible de corriger un commit non-existant"

4098

4014 -#: sequencer.c:3424

4099 +#: sequencer.c:3425

4100 #, c-format

4101 msgid "invalid file: '%s'"

4102 msgstr "fichier invalide : '%s'"

4103

4019 -#: sequencer.c:3426

4104 +#: sequencer.c:3427

4105 #, c-format

4106 msgid "invalid contents: '%s'"

4107 msgstr "contenu invalide : '%s'"

4108

4024 -#: sequencer.c:3429

4109 +#: sequencer.c:3430

4110 msgid ""

4111 "\n"

4112 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -4031,54 +4116,54 @@ msgstr ""

4116 "Vous avez des modifications non validées dans votre copie de travail.\n"

4117 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

4118

4034 -#: sequencer.c:3454 sequencer.c:3492

4119 +#: sequencer.c:3455 sequencer.c:3493

4120 #, c-format

4121 msgid "could not write file: '%s'"

4122 msgstr "impossible d'écrire le fichier : '%s'"

4123

4039 -#: sequencer.c:3507

4124 +#: sequencer.c:3508

4125 msgid "could not remove CHERRY_PICK_HEAD"

4126 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

4127

4043 -#: sequencer.c:3514

4128 +#: sequencer.c:3515

4129 msgid "could not commit staged changes."

4130 msgstr "impossible de valider les modifications indexées."

4131

4047 -#: sequencer.c:3611

4132 +#: sequencer.c:3612

4133 #, c-format

4134 msgid "%s: can't cherry-pick a %s"

4135 msgstr "%s : impossible de picorer un %s"

4136

4052 -#: sequencer.c:3615

4137 +#: sequencer.c:3616

4138 #, c-format

4139 msgid "%s: bad revision"

4140 msgstr "%s : mauvaise révision"

4141

4057 -#: sequencer.c:3648

4142 +#: sequencer.c:3649

4143 msgid "can't revert as initial commit"

4144 msgstr "impossible d'annuler en tant que commit initial"

4145

4061 -#: sequencer.c:4097

4146 +#: sequencer.c:4098

4147 msgid "make_script: unhandled options"

4148 msgstr "make_script : options non gérées"

4149

4065 -#: sequencer.c:4100

4150 +#: sequencer.c:4101

4151 msgid "make_script: error preparing revisions"

4152 msgstr "make_script : erreur lors de la préparation des révisions"

4153

4069 -#: sequencer.c:4141 sequencer.c:4176

4154 +#: sequencer.c:4142 sequencer.c:4177

4155 #, c-format

4156 msgid "unusable todo list: '%s'"

4157 msgstr "liste à faire inutilisable : '%s'"

4158

4074 -#: sequencer.c:4235

4159 +#: sequencer.c:4236

4160 #, c-format

4161 msgid ""

4162 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4163 msgstr ""

4164 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

4165

4081 -#: sequencer.c:4301

4166 +#: sequencer.c:4302

4167 #, c-format

4168 msgid ""

4169 "Warning: some commits may have been dropped accidentally.\n"

@@ -4087,7 +4172,7 @@ msgstr ""

4172 "Attention : certains commits ont pu être accidentellement supprimés.\n"

4173 "Commits supprimés (du plus jeune au plus vieux) :\n"

4174

4090 -#: sequencer.c:4308

4175 +#: sequencer.c:4309

4176 #, c-format

4177 msgid ""

4178 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4105,7 +4190,7 @@ msgstr ""

4190 "Les comportements disponibles sont : ignore, warn, error.\n"

4191 "\n"

4192

4108 -#: sequencer.c:4320

4193 +#: sequencer.c:4321

4194 #, c-format

4195 msgid ""

4196 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -4116,12 +4201,12 @@ msgstr ""

4201 "rebase --continue'.\n"

4202 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

4203

4119 -#: sequencer.c:4374

4204 +#: sequencer.c:4375

4205 #, c-format

4206 msgid "could not parse commit '%s'"

4207 msgstr "impossible d'analyser le commit '%s'"

4208

4124 -#: sequencer.c:4489

4209 +#: sequencer.c:4490

4210 msgid "the script was already rearranged."

4211 msgstr "le script a déjà été réarrangé."

4212

@@ -4395,27 +4480,27 @@ msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"

4480 msgid "Failed to resolve HEAD as a valid ref."

4481 msgstr "Échec de résolution de HEAD comme référence valide."

4482

4398 -#: submodule.c:1373

4483 +#: submodule.c:1375

4484 #, c-format

4485 msgid "'%s' not recognized as a git repository"

4486 msgstr "'%s' n'est pas reconnu comme dépôt git"

4487

4403 -#: submodule.c:1511

4488 +#: submodule.c:1513

4489 #, c-format

4490 msgid "could not start 'git status' in submodule '%s'"

4491 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"

4492

4408 -#: submodule.c:1524

4493 +#: submodule.c:1526

4494 #, c-format

4495 msgid "could not run 'git status' in submodule '%s'"

4496 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

4497

4413 -#: submodule.c:1617

4498 +#: submodule.c:1619

4499 #, c-format

4500 msgid "submodule '%s' has dirty index"

4501 msgstr "le sous-module '%s' a un index sale"

4502

4418 -#: submodule.c:1716

4503 +#: submodule.c:1718

4504 #, c-format

4505 msgid ""

4506 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -4423,18 +4508,18 @@ msgstr ""

4508 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "

4509 "n'est pas supporté"

4510

4426 -#: submodule.c:1728 submodule.c:1784

4511 +#: submodule.c:1730 submodule.c:1786

4512 #, c-format

4513 msgid "could not lookup name for submodule '%s'"

4514 msgstr "impossible de trouve le nom pour le sous-module '%s'"

4515

4431 -#: submodule.c:1732 builtin/submodule--helper.c:1261

4516 +#: submodule.c:1734 builtin/submodule--helper.c:1261

4517 #: builtin/submodule--helper.c:1271

4518 #, c-format

4519 msgid "could not create directory '%s'"

4520 msgstr "impossible de créer le répertoire '%s'"

4521

4437 -#: submodule.c:1735

4522 +#: submodule.c:1737

4523 #, c-format

4524 msgid ""

4525 "Migrating git directory of '%s%s' from\n"

@@ -4445,16 +4530,16 @@ msgstr ""

4530 "'%s' sur\n"

4531 "'%s'\n"

4532

4448 -#: submodule.c:1819

4533 +#: submodule.c:1821

4534 #, c-format

4535 msgid "could not recurse into submodule '%s'"

4536 msgstr "récursion impossible dans le sous-module '%s'"

4537

4453 -#: submodule.c:1863

4538 +#: submodule.c:1865

4539 msgid "could not start ls-files in .."

4540 msgstr "impossible de démarrer ls-files dans .."

4541

4457 -#: submodule.c:1902

4542 +#: submodule.c:1904

4543 #, c-format

4544 msgid "ls-tree returned unexpected return code %d"

4545 msgstr "ls-tree a renvoyé un code de retour inattendu %d"

@@ -4910,7 +4995,7 @@ msgid "could not open '%s' for reading and writing"

4995 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

4996

4997 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4913 -#: builtin/am.c:862 builtin/merge.c:1042

4998 +#: builtin/am.c:862 builtin/merge.c:1043

4999 #, c-format

5000 msgid "could not open '%s' for reading"

5001 msgstr "impossible d'ouvrir '%s' en lecture"

@@ -5449,7 +5534,7 @@ msgstr "suppression de '%s'\n"

5534 msgid "Unstaged changes after refreshing the index:"

5535 msgstr "Modifications non indexées après rafraîchissement de l'index :"

5536

5452 -#: builtin/add.c:233 builtin/rev-parse.c:888

5537 +#: builtin/add.c:233 builtin/rev-parse.c:892

5538 msgid "Could not read the index"

5539 msgstr "Impossible de lire l'index"

5540

@@ -5912,7 +5997,7 @@ msgid "pass it through git-apply"

5997 msgstr "le passer jusqu'à git-apply"

5998

5999 #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665

5915 -#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207

6000 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208

6001 #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201

6002 #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631

6003 #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144

@@ -5966,7 +6051,7 @@ msgstr "mentir sur la date de validation"

6051 msgid "use current timestamp for author date"

6052 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

6053

5969 -#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238

6054 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239

6055 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

6056 msgid "key-id"

6057 msgstr "id-clé"

@@ -6204,7 +6289,8 @@ msgstr "Ignorer les différences d'espace"

6289

6290 #: builtin/blame.c:802

6291 msgid "color redundant metadata from previous line differently"

6207 -msgstr "colorer différemment les métadonnées redondantes avec la ligne précédente"

6292 +msgstr ""

6293 +"colorer différemment les métadonnées redondantes avec la ligne précédente"

6294

6295 #: builtin/blame.c:803

6296 msgid "color lines by age"

@@ -7165,7 +7251,7 @@ msgstr "forcer l'extraction (laisser tomber les modifications locales)"

7251 msgid "perform a 3-way merge with the new branch"

7252 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

7253

7168 -#: builtin/checkout.c:1131 builtin/merge.c:240

7254 +#: builtin/checkout.c:1131 builtin/merge.c:241

7255 msgid "update ignored files (default)"

7256 msgstr "mettre à jour les fichiers ignorés (par défaut)"

7257

@@ -7191,7 +7277,7 @@ msgstr ""

7277 "ne pas vérifier si une autre copie de travail contient le référence fournie"

7278

7279 #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149

7194 -#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572

7280 +#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572

7281 #: builtin/send-pack.c:174

7282 msgid "force progress reporting"

7283 msgstr "forcer l'affichage de l'état d'avancement"

@@ -8158,7 +8244,9 @@ msgstr "ne pas détecter les renommages"

8244

8245 #: builtin/commit.c:1332

8246 msgid "detect renames, optionally set similarity index"

8161 -msgstr "détecter les renommages, en spécifiant optionnellement le facteur de similarité"

8247 +msgstr ""

8248 +"détecter les renommages, en spécifiant optionnellement le facteur de "

8249 +"similarité"

8250

8251 #: builtin/commit.c:1352

8252 msgid "Unsupported combination of ignored and untracked-files arguments"

@@ -8197,7 +8285,7 @@ msgstr "date"

8285 msgid "override date for commit"

8286 msgstr "remplacer la date pour la validation"

8287

8200 -#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402

8288 +#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402

8289 #: builtin/notes.c:565 builtin/tag.c:392

8290 msgid "message"

8291 msgstr "message"

@@ -8234,7 +8322,7 @@ msgid "the commit is authored by me now (used with -C/-c/--amend)"

8322 msgstr ""

8323 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

8324

8237 -#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241

8325 +#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242

8326 #: builtin/pull.c:154 builtin/revert.c:105

8327 msgid "add Signed-off-by:"

8328 msgstr "ajouter une entrée Signed-off-by :"

@@ -8259,7 +8347,7 @@ msgstr "comment éliminer les espaces et les commentaires # du message"

8347 msgid "include status in commit message template"

8348 msgstr "inclure l'état dans le modèle de message de validation"

8349

8262 -#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184

8350 +#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184

8351 #: builtin/revert.c:113

8352 msgid "GPG sign commit"

8353 msgstr "signer la validation avec GPG"

@@ -8358,7 +8446,9 @@ msgstr "git commit-graph read [--object-dir <objdir>]"

8446 msgid ""

8447 "git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"

8448 "stdin-commits]"

8361 -msgstr "git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--stdin-commits]"

8449 +msgstr ""

8450 +"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"

8451 +"stdin-commits]"

8452

8453 #: builtin/commit-graph.c:39 builtin/commit-graph.c:92

8454 #: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466

@@ -8380,7 +8470,8 @@ msgstr "commencer le parcours aux commits listés sur stdin"

8470

8471 #: builtin/commit-graph.c:99

8472 msgid "include all commits already in the commit-graph file"

8383 -msgstr "inclure tous les commits déjà présents dans le fichier de graphe de commits"

8473 +msgstr ""

8474 +"inclure tous les commits déjà présents dans le fichier de graphe de commits"

8475

8476 #: builtin/commit-graph.c:108

8477 msgid "cannot use both --stdin-commits and --stdin-packs"

@@ -8861,23 +8952,23 @@ msgstr "réalise un diff de répertoire complet"

8952 msgid "do not prompt before launching a diff tool"

8953 msgstr "ne pas confirmer avant de lancer l'outil de diff"

8954

8864 -#: builtin/difftool.c:705

8955 +#: builtin/difftool.c:704

8956 msgid "use symlinks in dir-diff mode"

8957 msgstr "utiliser les liens symboliques en mode de diff de répertoire"

8958

8868 -#: builtin/difftool.c:706

8959 +#: builtin/difftool.c:705

8960 msgid "<tool>"

8961 msgstr "<outil>"

8962

8872 -#: builtin/difftool.c:707

8963 +#: builtin/difftool.c:706

8964 msgid "use the specified diff tool"

8965 msgstr "utiliser l'outil de diff spécifié"

8966

8876 -#: builtin/difftool.c:709

8967 +#: builtin/difftool.c:708

8968 msgid "print a list of diff tools that may be used with `--tool`"

8969 msgstr "afficher une liste des outils de diff utilisables avec `--tool`"

8970

8880 -#: builtin/difftool.c:712

8971 +#: builtin/difftool.c:711

8972 msgid ""

8973 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "

8974 "code"

@@ -8885,19 +8976,19 @@ msgstr ""

8976 "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "

8977 "non-nul"

8978

8888 -#: builtin/difftool.c:714

8979 +#: builtin/difftool.c:713

8980 msgid "<command>"

8981 msgstr "<commande>"

8982

8892 -#: builtin/difftool.c:715

8983 +#: builtin/difftool.c:714

8984 msgid "specify a custom command for viewing diffs"

8985 msgstr "spécifier une commande personnalisée pour visualiser les différences"

8986

8896 -#: builtin/difftool.c:739

8987 +#: builtin/difftool.c:738

8988 msgid "no <tool> given for --tool=<tool>"

8989 msgstr "pas d'<outil> spécifié pour --tool=<outil>"

8990

8900 -#: builtin/difftool.c:746

8991 +#: builtin/difftool.c:745

8992 msgid "no <cmd> given for --extcmd=<cmd>"

8993 msgstr "pas de <commande> spécifié pour --extcmd=<commande>"

8994

@@ -9513,7 +9604,7 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s"

9604 #. variable for tweaking threads, currently

9605 #. grep.threads

9606 #.

9516 -#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723

9607 +#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727

9608 #, c-format

9609 msgid "no threads support, ignoring %s"

9610 msgstr "pas de support des fils, ignore %s"

@@ -9730,7 +9821,7 @@ msgstr ""

9821 msgid "unable to resolve revision: %s"

9822 msgstr "impossible de résoudre la révision : %s"

9823

9733 -#: builtin/grep.c:1036 builtin/index-pack.c:1527

9824 +#: builtin/grep.c:1036 builtin/index-pack.c:1531

9825 #, c-format

9826 msgid "invalid number of threads specified (%d)"

9827 msgstr "nombre de fils spécifié invalide (%d)"

@@ -9803,58 +9894,62 @@ msgstr ""

9894 msgid "process file as it were from this path"

9895 msgstr "traiter le fichier comme s'il venait de ce chemin"

9896

9806 -#: builtin/help.c:43

9897 +#: builtin/help.c:45

9898 msgid "print all available commands"

9899 msgstr "afficher toutes les commandes disponibles"

9900

9810 -#: builtin/help.c:44

9901 +#: builtin/help.c:46

9902 msgid "exclude guides"

9903 msgstr "exclure les guides"

9904

9814 -#: builtin/help.c:45

9905 +#: builtin/help.c:47

9906 msgid "print list of useful guides"

9907 msgstr "afficher une liste de guides utiles"

9908

9818 -#: builtin/help.c:46

9909 +#: builtin/help.c:48

9910 msgid "show man page"

9911 msgstr "afficher la page de manuel"

9912

9822 -#: builtin/help.c:47

9913 +#: builtin/help.c:49

9914 msgid "show manual in web browser"

9915 msgstr "afficher le manuel dans un navigateur web"

9916

9826 -#: builtin/help.c:49

9917 +#: builtin/help.c:51

9918 msgid "show info page"

9919 msgstr "afficher la page info"

9920

9830 -#: builtin/help.c:55

9921 +#: builtin/help.c:53

9922 +msgid "print command description"

9923 +msgstr "afficher la description de la commande"

9924 +

9925 +#: builtin/help.c:58

9926 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"

9927 msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"

9928

9834 -#: builtin/help.c:67

9929 +#: builtin/help.c:70

9930 #, c-format

9931 msgid "unrecognized help format '%s'"

9932 msgstr "format d'aide non reconnu '%s'"

9933

9839 -#: builtin/help.c:94

9934 +#: builtin/help.c:97

9935 msgid "Failed to start emacsclient."

9936 msgstr "échec de démarrage d'emacsclient."

9937

9843 -#: builtin/help.c:107

9938 +#: builtin/help.c:110

9939 msgid "Failed to parse emacsclient version."

9940 msgstr "échec d'analyse de la version d'emacsclient."

9941

9847 -#: builtin/help.c:115

9942 +#: builtin/help.c:118

9943 #, c-format

9944 msgid "emacsclient version '%d' too old (< 22)."

9945 msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."

9946

9852 -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173

9947 +#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176

9948 #, c-format

9949 msgid "failed to exec '%s'"

9950 msgstr "échec de l'exécution de '%s'"

9951

9857 -#: builtin/help.c:211

9952 +#: builtin/help.c:214

9953 #, c-format

9954 msgid ""

9955 "'%s': path for unsupported man viewer.\n"

@@ -9863,7 +9958,7 @@ msgstr ""

9958 "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"

9959 "Veuillez utiliser plutôt 'man.<outil>.cmd'."

9960

9866 -#: builtin/help.c:223

9961 +#: builtin/help.c:226

9962 #, c-format

9963 msgid ""

9964 "'%s': cmd for supported man viewer.\n"

@@ -9872,62 +9967,25 @@ msgstr ""

9967 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"

9968 "Veuillez utiliser plutôt 'man.<outil>.cmd'."

9969

9875 -#: builtin/help.c:340

9970 +#: builtin/help.c:343

9971 #, c-format

9972 msgid "'%s': unknown man viewer."

9973 msgstr "'%s' : visualiseur de manuel inconnu."

9974

9880 -#: builtin/help.c:357

9975 +#: builtin/help.c:360

9976 msgid "no man viewer handled the request"

9977 msgstr "aucun visualiseur de manuel n'a pris en charge la demande"

9978

9884 -#: builtin/help.c:365

9979 +#: builtin/help.c:368

9980 msgid "no info viewer handled the request"

9981 msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"

9982

9888 -#: builtin/help.c:407

9889 -msgid "Defining attributes per path"

9890 -msgstr "Définition des attributs par chemin"

9891 -

9892 -#: builtin/help.c:408

9893 -msgid "Everyday Git With 20 Commands Or So"

9894 -msgstr "Git de tous les jours avec à peu près 20 commandes"

9895 -

9896 -#: builtin/help.c:409

9897 -msgid "A Git glossary"

9898 -msgstr "Un glossaire Git"

9899 -

9900 -#: builtin/help.c:410

9901 -msgid "Specifies intentionally untracked files to ignore"

9902 -msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"

9903 -

9904 -#: builtin/help.c:411

9905 -msgid "Defining submodule properties"

9906 -msgstr "Définition des propriétés de sous-module"

9907 -

9908 -#: builtin/help.c:412

9909 -msgid "Specifying revisions and ranges for Git"

9910 -msgstr "Spécification des révisions et portées pour Git"

9911 -

9912 -#: builtin/help.c:413

9913 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

9914 -msgstr ""

9915 -"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"

9916 -

9917 -#: builtin/help.c:414

9918 -msgid "An overview of recommended workflows with Git"

9919 -msgstr "Un aperçu des flux de travail recommandés avec Git"

9920 -

9921 -#: builtin/help.c:426

9922 -msgid "The common Git guides are:\n"

9923 -msgstr "Les guides Git populaires sont : \n"

9924 -

9925 -#: builtin/help.c:444

9983 +#: builtin/help.c:415

9984 #, c-format

9985 msgid "'%s' is aliased to '%s'"

9986 msgstr "'%s' est un alias de '%s'"

9987

9930 -#: builtin/help.c:466 builtin/help.c:483

9988 +#: builtin/help.c:442 builtin/help.c:459

9989 #, c-format

9990 msgid "usage: %s%s"

9991 msgstr "usage : %s%s"

@@ -10175,58 +10233,58 @@ msgstr "impossible de stocker le fichier paquet"

10233 msgid "cannot store index file"

10234 msgstr "impossible de stocker le fichier d'index"

10235

10178 -#: builtin/index-pack.c:1521

10236 +#: builtin/index-pack.c:1525

10237 #, c-format

10238 msgid "bad pack.indexversion=%<PRIu32>"

10239 msgstr "mauvais pack.indexversion=%<PRIu32>"

10240

10183 -#: builtin/index-pack.c:1590

10241 +#: builtin/index-pack.c:1594

10242 #, c-format

10243 msgid "Cannot open existing pack file '%s'"

10244 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"

10245

10188 -#: builtin/index-pack.c:1592

10246 +#: builtin/index-pack.c:1596

10247 #, c-format

10248 msgid "Cannot open existing pack idx file for '%s'"

10249 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"

10250

10193 -#: builtin/index-pack.c:1640

10251 +#: builtin/index-pack.c:1644

10252 #, c-format

10253 msgid "non delta: %d object"

10254 msgid_plural "non delta: %d objects"

10255 msgstr[0] "pas un delta : %d objet"

10256 msgstr[1] "pas un delta : %d objets"

10257

10200 -#: builtin/index-pack.c:1647

10258 +#: builtin/index-pack.c:1651

10259 #, c-format

10260 msgid "chain length = %d: %lu object"

10261 msgid_plural "chain length = %d: %lu objects"

10262 msgstr[0] "longueur chaînée = %d : %lu objet"

10263 msgstr[1] "longueur chaînée = %d : %lu objets"

10264

10207 -#: builtin/index-pack.c:1684

10265 +#: builtin/index-pack.c:1688

10266 msgid "Cannot come back to cwd"

10267 msgstr "Impossible de revenir au répertoire de travail courant"

10268

10211 -#: builtin/index-pack.c:1735 builtin/index-pack.c:1738

10212 -#: builtin/index-pack.c:1754 builtin/index-pack.c:1758

10269 +#: builtin/index-pack.c:1739 builtin/index-pack.c:1742

10270 +#: builtin/index-pack.c:1758 builtin/index-pack.c:1762

10271 #, c-format

10272 msgid "bad %s"

10273 msgstr "mauvais %s"

10274

10217 -#: builtin/index-pack.c:1774

10275 +#: builtin/index-pack.c:1778

10276 msgid "--fix-thin cannot be used without --stdin"

10277 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"

10278

10221 -#: builtin/index-pack.c:1776

10279 +#: builtin/index-pack.c:1780

10280 msgid "--stdin requires a git repository"

10281 msgstr "--stdin requiert un dépôt git"

10282

10225 -#: builtin/index-pack.c:1782

10283 +#: builtin/index-pack.c:1786

10284 msgid "--verify with no packfile name given"

10285 msgstr "--verify sans nom de fichier paquet donné"

10286

10229 -#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578

10287 +#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578

10288 msgid "fsck error in pack objects"

10289 msgstr "erreur de fsck dans les objets paquets"

10290

@@ -10267,8 +10325,8 @@ msgstr "modèle %s ignoré"

10325

10326 #: builtin/init-db.c:120

10327 #, c-format

10270 -msgid "templates not found %s"

10271 -msgstr "modèles non trouvés %s"

10328 +msgid "templates not found in %s"

10329 +msgstr "modèles non trouvés dans %s"

10330

10331 #: builtin/init-db.c:135

10332 #, c-format

@@ -10962,185 +11020,185 @@ msgstr ""

11020 msgid "empty mbox: '%s'"

11021 msgstr "mbox vide : '%s'"

11022

10965 -#: builtin/merge.c:50

11023 +#: builtin/merge.c:51

11024 msgid "git merge [<options>] [<commit>...]"

11025 msgstr "git merge [<options>] [<commit>...]"

11026

10969 -#: builtin/merge.c:51

11027 +#: builtin/merge.c:52

11028 msgid "git merge --abort"

11029 msgstr "git merge --abort"

11030

10973 -#: builtin/merge.c:52

11031 +#: builtin/merge.c:53

11032 msgid "git merge --continue"

11033 msgstr "git merge --continue"

11034

10977 -#: builtin/merge.c:109

11035 +#: builtin/merge.c:110

11036 msgid "switch `m' requires a value"

11037 msgstr "le commutateur `m' a besoin d'une valeur"

11038

10981 -#: builtin/merge.c:146

11039 +#: builtin/merge.c:147

11040 #, c-format

11041 msgid "Could not find merge strategy '%s'.\n"

11042 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"

11043

10986 -#: builtin/merge.c:147

11044 +#: builtin/merge.c:148

11045 #, c-format

11046 msgid "Available strategies are:"

11047 msgstr "Les stratégies disponibles sont :"

11048

10991 -#: builtin/merge.c:152

11049 +#: builtin/merge.c:153

11050 #, c-format

11051 msgid "Available custom strategies are:"

11052 msgstr "Les stratégies personnalisées sont :"

11053

10996 -#: builtin/merge.c:202 builtin/pull.c:142

11054 +#: builtin/merge.c:203 builtin/pull.c:142

11055 msgid "do not show a diffstat at the end of the merge"

11056 msgstr "ne pas afficher un diffstat à la fin de la fusion"

11057

11000 -#: builtin/merge.c:205 builtin/pull.c:145

11058 +#: builtin/merge.c:206 builtin/pull.c:145

11059 msgid "show a diffstat at the end of the merge"

11060 msgstr "afficher un diffstat à la fin de la fusion"

11061

11004 -#: builtin/merge.c:206 builtin/pull.c:148

11062 +#: builtin/merge.c:207 builtin/pull.c:148

11063 msgid "(synonym to --stat)"

11064 msgstr "(synonyme de --stat)"

11065

11008 -#: builtin/merge.c:208 builtin/pull.c:151

11066 +#: builtin/merge.c:209 builtin/pull.c:151

11067 msgid "add (at most <n>) entries from shortlog to merge commit message"

11068 msgstr ""

11069 "ajouter (au plus <n>) éléments du journal court au message de validation de "

11070 "la fusion"

11071

11014 -#: builtin/merge.c:211 builtin/pull.c:157

11072 +#: builtin/merge.c:212 builtin/pull.c:157

11073 msgid "create a single commit instead of doing a merge"

11074 msgstr "créer une validation unique au lieu de faire une fusion"

11075

11018 -#: builtin/merge.c:213 builtin/pull.c:160

11076 +#: builtin/merge.c:214 builtin/pull.c:160

11077 msgid "perform a commit if the merge succeeds (default)"

11078 msgstr "effectuer une validation si la fusion réussit (défaut)"

11079

11022 -#: builtin/merge.c:215 builtin/pull.c:163

11080 +#: builtin/merge.c:216 builtin/pull.c:163

11081 msgid "edit message before committing"

11082 msgstr "éditer le message avant la validation"

11083

11026 -#: builtin/merge.c:216

11084 +#: builtin/merge.c:217

11085 msgid "allow fast-forward (default)"

11086 msgstr "autoriser l'avance rapide (défaut)"

11087

11030 -#: builtin/merge.c:218 builtin/pull.c:169

11088 +#: builtin/merge.c:219 builtin/pull.c:169

11089 msgid "abort if fast-forward is not possible"

11090 msgstr "abandonner si l'avance rapide n'est pas possible"

11091

11034 -#: builtin/merge.c:222 builtin/pull.c:172

11092 +#: builtin/merge.c:223 builtin/pull.c:172

11093 msgid "verify that the named commit has a valid GPG signature"

11094 msgstr "vérifier que le commit nommé a une signature GPG valide"

11095

11038 -#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176

11096 +#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176

11097 #: builtin/revert.c:109

11098 msgid "strategy"

11099 msgstr "stratégie"

11100

11043 -#: builtin/merge.c:224 builtin/pull.c:177

11101 +#: builtin/merge.c:225 builtin/pull.c:177

11102 msgid "merge strategy to use"

11103 msgstr "stratégie de fusion à utiliser"

11104

11047 -#: builtin/merge.c:225 builtin/pull.c:180

11105 +#: builtin/merge.c:226 builtin/pull.c:180

11106 msgid "option=value"

11107 msgstr "option=valeur"

11108

11051 -#: builtin/merge.c:226 builtin/pull.c:181

11109 +#: builtin/merge.c:227 builtin/pull.c:181

11110 msgid "option for selected merge strategy"

11111 msgstr "option pour la stratégie de fusion sélectionnée"

11112

11055 -#: builtin/merge.c:228

11113 +#: builtin/merge.c:229

11114 msgid "merge commit message (for a non-fast-forward merge)"

11115 msgstr ""

11116 "message de validation de la fusion (pour une fusion sans avance rapide)"

11117

11060 -#: builtin/merge.c:232

11118 +#: builtin/merge.c:233

11119 msgid "abort the current in-progress merge"

11120 msgstr "abandonner la fusion en cours"

11121

11064 -#: builtin/merge.c:234

11122 +#: builtin/merge.c:235

11123 msgid "continue the current in-progress merge"

11124 msgstr "continuer la fusion en cours"

11125

11068 -#: builtin/merge.c:236 builtin/pull.c:188

11126 +#: builtin/merge.c:237 builtin/pull.c:188

11127 msgid "allow merging unrelated histories"

11128 msgstr "permettre la fusion d'historiques sans rapport"

11129

11072 -#: builtin/merge.c:242

11130 +#: builtin/merge.c:243

11131 msgid "verify commit-msg hook"

11132 msgstr "vérifier le crochet commit-msg"

11133

11076 -#: builtin/merge.c:267

11134 +#: builtin/merge.c:268

11135 msgid "could not run stash."

11136 msgstr "impossible de lancer le remisage."

11137

11080 -#: builtin/merge.c:272

11138 +#: builtin/merge.c:273

11139 msgid "stash failed"

11140 msgstr "échec du remisage"

11141

11084 -#: builtin/merge.c:277

11142 +#: builtin/merge.c:278

11143 #, c-format

11144 msgid "not a valid object: %s"

11145 msgstr "pas un objet valide : %s"

11146

11089 -#: builtin/merge.c:299 builtin/merge.c:316

11147 +#: builtin/merge.c:300 builtin/merge.c:317

11148 msgid "read-tree failed"

11149 msgstr "read-tree a échoué"

11150

11093 -#: builtin/merge.c:346

11151 +#: builtin/merge.c:347

11152 msgid " (nothing to squash)"

11153 msgstr " (rien à compresser)"

11154

11097 -#: builtin/merge.c:357

11155 +#: builtin/merge.c:358

11156 #, c-format

11157 msgid "Squash commit -- not updating HEAD\n"

11158 msgstr "Validation compressée -- HEAD non mise à jour\n"

11159

11102 -#: builtin/merge.c:407

11160 +#: builtin/merge.c:408

11161 #, c-format

11162 msgid "No merge message -- not updating HEAD\n"

11163 msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"

11164

11107 -#: builtin/merge.c:457

11165 +#: builtin/merge.c:458

11166 #, c-format

11167 msgid "'%s' does not point to a commit"

11168 msgstr "'%s' ne pointe pas sur un commit"

11169

11112 -#: builtin/merge.c:547

11170 +#: builtin/merge.c:548

11171 #, c-format

11172 msgid "Bad branch.%s.mergeoptions string: %s"

11173 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"

11174

11117 -#: builtin/merge.c:668

11175 +#: builtin/merge.c:669

11176 msgid "Not handling anything other than two heads merge."

11177 msgstr "Impossible de gérer autre chose que la fusion de deux têtes."

11178

11121 -#: builtin/merge.c:682

11179 +#: builtin/merge.c:683

11180 #, c-format

11181 msgid "Unknown option for merge-recursive: -X%s"

11182 msgstr "Options inconnue pour merge-recursive : -X%s"

11183

11126 -#: builtin/merge.c:697

11184 +#: builtin/merge.c:698

11185 #, c-format

11186 msgid "unable to write %s"

11187 msgstr "impossible d'écrire %s"

11188

11131 -#: builtin/merge.c:748

11189 +#: builtin/merge.c:749

11190 #, c-format

11191 msgid "Could not read from '%s'"

11192 msgstr "Impossible de lire depuis '%s'"

11193

11136 -#: builtin/merge.c:757

11194 +#: builtin/merge.c:758

11195 #, c-format

11196 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

11197 msgstr ""

11198 "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "

11199 "fusion.\n"

11200

11143 -#: builtin/merge.c:763

11201 +#: builtin/merge.c:764

11202 #, c-format

11203 msgid ""

11204 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -11157,70 +11215,70 @@ msgstr ""

11215 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"

11216 "abandonne la validation.\n"

11217

11160 -#: builtin/merge.c:799

11218 +#: builtin/merge.c:800

11219 msgid "Empty commit message."

11220 msgstr "Message de validation vide."

11221

11164 -#: builtin/merge.c:818

11222 +#: builtin/merge.c:819

11223 #, c-format

11224 msgid "Wonderful.\n"

11225 msgstr "Merveilleux.\n"

11226

11169 -#: builtin/merge.c:871

11227 +#: builtin/merge.c:872

11228 #, c-format

11229 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

11230 msgstr ""

11231 "La fusion automatique a échoué ; réglez les conflits et validez le "

11232 "résultat.\n"

11233

11176 -#: builtin/merge.c:910

11234 +#: builtin/merge.c:911

11235 msgid "No current branch."

11236 msgstr "Pas de branche courante."

11237

11180 -#: builtin/merge.c:912

11238 +#: builtin/merge.c:913

11239 msgid "No remote for the current branch."

11240 msgstr "Pas de branche distante pour la branche courante."

11241

11184 -#: builtin/merge.c:914

11242 +#: builtin/merge.c:915

11243 msgid "No default upstream defined for the current branch."

11244 msgstr "Pas de branche amont par défaut définie pour la branche courante."

11245

11188 -#: builtin/merge.c:919

11246 +#: builtin/merge.c:920

11247 #, c-format

11248 msgid "No remote-tracking branch for %s from %s"

11249 msgstr "Pas de branche de suivi pour %s depuis %s"

11250

11193 -#: builtin/merge.c:972

11251 +#: builtin/merge.c:973

11252 #, c-format

11253 msgid "Bad value '%s' in environment '%s'"

11254 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"

11255

11198 -#: builtin/merge.c:1074

11256 +#: builtin/merge.c:1075

11257 #, c-format

11258 msgid "not something we can merge in %s: %s"

11259 msgstr "pas possible de fusionner ceci dans %s : %s"

11260

11203 -#: builtin/merge.c:1108

11261 +#: builtin/merge.c:1109

11262 msgid "not something we can merge"

11263 msgstr "pas possible de fusionner ceci"

11264

11207 -#: builtin/merge.c:1210

11265 +#: builtin/merge.c:1211

11266 msgid "--abort expects no arguments"

11267 msgstr "--abort n'accepte pas d'argument"

11268

11211 -#: builtin/merge.c:1214

11269 +#: builtin/merge.c:1215

11270 msgid "There is no merge to abort (MERGE_HEAD missing)."

11271 msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."

11272

11215 -#: builtin/merge.c:1226

11273 +#: builtin/merge.c:1227

11274 msgid "--continue expects no arguments"

11275 msgstr "--continue ne supporte aucun argument"

11276

11219 -#: builtin/merge.c:1230

11277 +#: builtin/merge.c:1231

11278 msgid "There is no merge in progress (MERGE_HEAD missing)."

11279 msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."

11280

11223 -#: builtin/merge.c:1246

11281 +#: builtin/merge.c:1247

11282 msgid ""

11283 "You have not concluded your merge (MERGE_HEAD exists).\n"

11284 "Please, commit your changes before you merge."

@@ -11228,7 +11286,7 @@ msgstr ""

11286 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"

11287 "Veuillez valider vos modifications avant de pouvoir fusionner."

11288

11231 -#: builtin/merge.c:1253

11289 +#: builtin/merge.c:1254

11290 msgid ""

11291 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

11292 "Please, commit your changes before you merge."

@@ -11236,114 +11294,114 @@ msgstr ""

11294 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"

11295 "Veuillez valider vos modifications avant de pouvoir fusionner."

11296

11239 -#: builtin/merge.c:1256

11297 +#: builtin/merge.c:1257

11298 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

11299 msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."

11300

11243 -#: builtin/merge.c:1265

11301 +#: builtin/merge.c:1266

11302 msgid "You cannot combine --squash with --no-ff."

11303 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."

11304

11247 -#: builtin/merge.c:1273

11305 +#: builtin/merge.c:1274

11306 msgid "No commit specified and merge.defaultToUpstream not set."

11307 msgstr ""

11308 "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."

11309

11252 -#: builtin/merge.c:1290

11310 +#: builtin/merge.c:1291

11311 msgid "Squash commit into empty head not supported yet"

11312 msgstr "La validation compressée vers une tête vide n'est pas encore supportée"

11313

11256 -#: builtin/merge.c:1292

11314 +#: builtin/merge.c:1293

11315 msgid "Non-fast-forward commit does not make sense into an empty head"

11316 msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"

11317

11260 -#: builtin/merge.c:1297

11318 +#: builtin/merge.c:1298

11319 #, c-format

11320 msgid "%s - not something we can merge"

11321 msgstr "%s - pas possible de fusionner ceci"

11322

11265 -#: builtin/merge.c:1299

11323 +#: builtin/merge.c:1300

11324 msgid "Can merge only exactly one commit into empty head"

11325 msgstr ""

11326 "Possible de fusionner exactement une seule validation dans une tête vide"

11327

11270 -#: builtin/merge.c:1333

11328 +#: builtin/merge.c:1334

11329 #, c-format

11330 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

11331 msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."

11332

11275 -#: builtin/merge.c:1336

11333 +#: builtin/merge.c:1337

11334 #, c-format

11335 msgid "Commit %s has a bad GPG signature allegedly by %s."

11336 msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."

11337

11280 -#: builtin/merge.c:1339

11338 +#: builtin/merge.c:1340

11339 #, c-format

11340 msgid "Commit %s does not have a GPG signature."

11341 msgstr "La validation %s n'a pas de signature GPG."

11342

11285 -#: builtin/merge.c:1342

11343 +#: builtin/merge.c:1343

11344 #, c-format

11345 msgid "Commit %s has a good GPG signature by %s\n"

11346 msgstr "La validation %s a une signature GPG correcte par %s\n"

11347

11290 -#: builtin/merge.c:1401

11348 +#: builtin/merge.c:1402

11349 msgid "refusing to merge unrelated histories"

11350 msgstr "refus de fusionner des historiques sans relation"

11351

11294 -#: builtin/merge.c:1410

11352 +#: builtin/merge.c:1411

11353 msgid "Already up to date."

11354 msgstr "Déjà à jour."

11355

11298 -#: builtin/merge.c:1420

11356 +#: builtin/merge.c:1421

11357 #, c-format

11358 msgid "Updating %s..%s\n"

11359 msgstr "Mise à jour %s..%s\n"

11360

11303 -#: builtin/merge.c:1461

11361 +#: builtin/merge.c:1462

11362 #, c-format

11363 msgid "Trying really trivial in-index merge...\n"

11364 msgstr "Essai de fusion vraiment triviale dans l'index...\n"

11365

11308 -#: builtin/merge.c:1468

11366 +#: builtin/merge.c:1469

11367 #, c-format

11368 msgid "Nope.\n"

11369 msgstr "Non.\n"

11370

11313 -#: builtin/merge.c:1493

11371 +#: builtin/merge.c:1494

11372 msgid "Already up to date. Yeeah!"

11373 msgstr "Déjà à jour. Ouais !"

11374

11317 -#: builtin/merge.c:1499

11375 +#: builtin/merge.c:1500

11376 msgid "Not possible to fast-forward, aborting."

11377 msgstr "Pas possible d'avancer rapidement, abandon."

11378

11321 -#: builtin/merge.c:1522 builtin/merge.c:1601

11379 +#: builtin/merge.c:1523 builtin/merge.c:1602

11380 #, c-format

11381 msgid "Rewinding the tree to pristine...\n"

11382 msgstr "Retour de l'arbre à l'original...\n"

11383

11326 -#: builtin/merge.c:1526

11384 +#: builtin/merge.c:1527

11385 #, c-format

11386 msgid "Trying merge strategy %s...\n"

11387 msgstr "Essai de la stratégie de fusion %s...\n"

11388

11331 -#: builtin/merge.c:1592

11389 +#: builtin/merge.c:1593

11390 #, c-format

11391 msgid "No merge strategy handled the merge.\n"

11392 msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"

11393

11336 -#: builtin/merge.c:1594

11394 +#: builtin/merge.c:1595

11395 #, c-format

11396 msgid "Merge with strategy %s failed.\n"

11397 msgstr "La fusion avec la stratégie %s a échoué.\n"

11398

11341 -#: builtin/merge.c:1603

11399 +#: builtin/merge.c:1604

11400 #, c-format

11401 msgid "Using the %s to prepare resolving by hand.\n"

11402 msgstr "Utilisation de %s pour préparer la résolution à la main.\n"

11403

11346 -#: builtin/merge.c:1615

11404 +#: builtin/merge.c:1616

11405 #, c-format

11406 msgid "Automatic merge went well; stopped before committing as requested\n"

11407 msgstr ""

@@ -13893,23 +13951,23 @@ msgstr "rev-list ne supporte l'affichage des notes"

13951 msgid "cannot combine --use-bitmap-index with object filtering"

13952 msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"

13953

13896 -#: builtin/rev-parse.c:402

13954 +#: builtin/rev-parse.c:406

13955 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"

13956 msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"

13957

13900 -#: builtin/rev-parse.c:407

13958 +#: builtin/rev-parse.c:411

13959 msgid "keep the `--` passed as an arg"

13960 msgstr "garder le `--` passé en argument"

13961

13904 -#: builtin/rev-parse.c:409

13962 +#: builtin/rev-parse.c:413

13963 msgid "stop parsing after the first non-option argument"

13964 msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"

13965

13908 -#: builtin/rev-parse.c:412

13966 +#: builtin/rev-parse.c:416

13967 msgid "output in stuck long form"

13968 msgstr "sortie en forme longue fixée"

13969

13912 -#: builtin/rev-parse.c:545

13970 +#: builtin/rev-parse.c:549

13971 msgid ""

13972 "git rev-parse --parseopt [<options>] -- [<args>...]\n"

13973 " or: git rev-parse --sq-quote [<arg>...]\n"

@@ -15415,7 +15473,9 @@ msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"

15473 #: builtin/worktree.c:375

15474 #, c-format

15475 msgid "Preparing worktree (resetting branch '%s'; was at %s)"

15418 -msgstr "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; précédemment sur %s)"

15476 +msgstr ""

15477 +"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "

15478 +"précédemment sur %s)"

15479

15480 #: builtin/worktree.c:384

15481 #, c-format

@@ -15612,7 +15672,7 @@ msgstr ""

15672 msgid "print debugging messages to stderr"

15673 msgstr "afficher les messages de debug sur stderr"

15674

15615 -#: git.c:26

15675 +#: git.c:27

15676 msgid ""

15677 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"

15678 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"

@@ -15622,12 +15682,14 @@ msgid ""

15682 " <command> [<args>]"

15683 msgstr ""

15684 "git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n"

15625 -" [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n"

15626 -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"

15685 +" [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-"

15686 +"path]\n"

15687 +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"

15688 +"bare]\n"

15689 " [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"

15690 " <commande> [<args>]"

15691

15630 -#: git.c:33

15692 +#: git.c:34

15693 msgid ""

15694 "'git help -a' and 'git help -g' list available subcommands and some\n"

15695 "concept guides. See 'git help <command>' or 'git help <concept>'\n"

@@ -15637,48 +15699,48 @@ msgstr ""

15699 "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"

15700 "pour en lire plus à propos d'une commande spécifique ou d'un concept."

15701

15640 -#: git.c:113

15702 +#: git.c:173

15703 #, c-format

15704 msgid "no directory given for --git-dir\n"

15705 msgstr "aucun répertoire fourni pour --git-dir\n"

15706

15645 -#: git.c:127

15707 +#: git.c:187

15708 #, c-format

15709 msgid "no namespace given for --namespace\n"

15710 msgstr "aucun espace de nom fournit pour --namespace\n"

15711

15650 -#: git.c:141

15712 +#: git.c:201

15713 #, c-format

15714 msgid "no directory given for --work-tree\n"

15715 msgstr "aucun répertoire fourni pour --work-tree\n"

15716

15655 -#: git.c:155

15717 +#: git.c:215

15718 #, c-format

15719 msgid "no prefix given for --super-prefix\n"

15720 msgstr "aucun préfixe fourni pour --super-prefix\n"

15721

15660 -#: git.c:177

15722 +#: git.c:237

15723 #, c-format

15724 msgid "-c expects a configuration string\n"

15725 msgstr "-c requiert une chaîne de configuration\n"

15726

15665 -#: git.c:215

15727 +#: git.c:275

15728 #, c-format

15729 msgid "no directory given for -C\n"

15730 msgstr "aucun répertoire fourni pour -C\n"

15731

15670 -#: git.c:233

15732 +#: git.c:300

15733 #, c-format

15734 msgid "unknown option: %s\n"

15735 msgstr "option inconnue : %s\n"

15736

15675 -#: git.c:698

15737 +#: git.c:765

15738 #, c-format

15739 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"

15740 msgstr ""

15741 "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"

15742

15681 -#: git.c:710

15743 +#: git.c:777

15744 #, c-format

15745 msgid "failed to run command '%s': %s\n"

15746 msgstr "échec au lancement de la commande '%s' : %s\n"

@@ -15721,133 +15783,678 @@ msgstr "args"

15783 msgid "object filtering"

15784 msgstr "filtrage d'objet"

15785

15724 -#: common-cmds.h:9

15725 -msgid "start a working area (see also: git help tutorial)"

15726 -msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"

15786 +#: parse-options.h:157

15787 +msgid "expiry-date"

15788 +msgstr "date-d'expiration"

15789

15728 -#: common-cmds.h:10

15729 -msgid "work on the current change (see also: git help everyday)"

15730 -msgstr ""

15731 -"travailler sur la modification actuelle (voir aussi : git help revisions)"

15790 +#: parse-options.h:172

15791 +msgid "no-op (backward compatibility)"

15792 +msgstr "sans action (rétrocompatibilité)"

15793

15733 -#: common-cmds.h:11

15734 -msgid "examine the history and state (see also: git help revisions)"

15735 -msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"

15794 +#: parse-options.h:251

15795 +msgid "be more verbose"

15796 +msgstr "être plus verbeux"

15797

15737 -#: common-cmds.h:12

15738 -msgid "grow, mark and tweak your common history"

15739 -msgstr "agrandir, marquer et modifier votre historique"

15798 +#: parse-options.h:253

15799 +msgid "be more quiet"

15800 +msgstr "être plus silencieux"

15801

15741 -#: common-cmds.h:13

15742 -msgid "collaborate (see also: git help workflows)"

15743 -msgstr "collaborer (voir aussi : git help workflows)"

15802 +#: parse-options.h:259

15803 +msgid "use <n> digits to display SHA-1s"

15804 +msgstr "utiliser <n> chiffres pour afficher les SHA-1s"

15805

15745 -#: common-cmds.h:17

15806 +#: command-list.h:50

15807 msgid "Add file contents to the index"

15808 msgstr "Ajouter le contenu de fichiers dans l'index"

15809

15749 -#: common-cmds.h:18

15810 +#: command-list.h:51

15811 +msgid "Apply a series of patches from a mailbox"

15812 +msgstr "Appliquer une série de patchs depuis une boîte mail"

15813 +

15814 +#: command-list.h:52

15815 +msgid "Annotate file lines with commit information"

15816 +msgstr "Annoter les lignes du fichier avec l'information de commit"

15817 +

15818 +#: command-list.h:53

15819 +msgid "Apply a patch to files and/or to the index"

15820 +msgstr "Appliquer une patch à des fichiers ou à l'index"

15821 +

15822 +#: command-list.h:54

15823 +msgid "Import an Arch repository into Git"

15824 +msgstr "Importer dans Git un dépôt Arch"

15825 +

15826 +#: command-list.h:55

15827 +msgid "Create an archive of files from a named tree"

15828 +msgstr "Créer une archive des fichiers depuis un arbre nommé"

15829 +

15830 +#: command-list.h:56

15831 msgid "Use binary search to find the commit that introduced a bug"

15832 msgstr "Trouver par recherche binaire la modification qui a introduit un bogue"

15833

15753 -#: common-cmds.h:19

15834 +#: command-list.h:57

15835 +msgid "Show what revision and author last modified each line of a file"

15836 +msgstr ""

15837 +"Montrer la révision et l'auteur qui ont modifié en dernier chaque ligne d'un "

15838 +"fichier"

15839 +

15840 +#: command-list.h:58

15841 msgid "List, create, or delete branches"

15842 msgstr "Lister, créer ou supprimer des branches"

15843

15757 -#: common-cmds.h:20

15844 +#: command-list.h:59

15845 +msgid "Move objects and refs by archive"

15846 +msgstr "Déplacer les objets et références par archive"

15847 +

15848 +#: command-list.h:60

15849 +msgid "Provide content or type and size information for repository objects"

15850 +msgstr ""

15851 +"Fournir les contenu ou l'information de type et taille pour les objets du "

15852 +"dépôt"

15853 +

15854 +#: command-list.h:61

15855 +msgid "Display gitattributes information"

15856 +msgstr "Afficher les informations gitattributes"

15857 +

15858 +#: command-list.h:62

15859 +msgid "Debug gitignore / exclude files"

15860 +msgstr "Déboguer gitignore / les fichiers d'exclusion"

15861 +

15862 +#: command-list.h:63

15863 +msgid "Show canonical names and email addresses of contacts"

15864 +msgstr "Afficher les noms canoniques et les adresses courriel des contacts"

15865 +

15866 +#: command-list.h:64

15867 msgid "Switch branches or restore working tree files"

15868 msgstr "Basculer de branche ou restaurer la copie de travail"

15869

15761 -#: common-cmds.h:21

15870 +#: command-list.h:65

15871 +msgid "Copy files from the index to the working tree"

15872 +msgstr "Copier les fichiers depuis l'index dans la copie de travail"

15873 +

15874 +#: command-list.h:66

15875 +msgid "Ensures that a reference name is well formed"

15876 +msgstr "Assure qu'un nom de référence est bien formé"

15877 +

15878 +#: command-list.h:67

15879 +msgid "Find commits yet to be applied to upstream"

15880 +msgstr "Trouver les commits à appliquer en amont"

15881 +

15882 +#: command-list.h:68

15883 +msgid "Apply the changes introduced by some existing commits"

15884 +msgstr "Appliquer les modifications introduites par des commits existants"

15885 +

15886 +#: command-list.h:69

15887 +msgid "Graphical alternative to git-commit"

15888 +msgstr "Alternative graphique à git-commit"

15889 +

15890 +#: command-list.h:70

15891 +msgid "Remove untracked files from the working tree"

15892 +msgstr "Supprimer les fichiers non-suivis de l'arbre de travail"

15893 +

15894 +#: command-list.h:71

15895 msgid "Clone a repository into a new directory"

15896 msgstr "Cloner un dépôt dans un nouveau répertoire"

15897

15765 -#: common-cmds.h:22

15898 +#: command-list.h:72

15899 +msgid "Display data in columns"

15900 +msgstr "Afficher les données en colonnes"

15901 +

15902 +#: command-list.h:73

15903 msgid "Record changes to the repository"

15904 msgstr "Enregistrer les modifications dans le dépôt"

15905

15769 -#: common-cmds.h:23

15906 +#: command-list.h:74

15907 +msgid "Write and verify Git commit graph files"

15908 +msgstr "Écrire et vérifier les fichiers de graphe de commit Git"

15909 +

15910 +#: command-list.h:75

15911 +msgid "Create a new commit object"

15912 +msgstr "Créer un nouvel objet commit"

15913 +

15914 +#: command-list.h:76

15915 +msgid "Get and set repository or global options"

15916 +msgstr "voir et régler les options globales ou de dépôt"

15917 +

15918 +#: command-list.h:77

15919 +msgid "Count unpacked number of objects and their disk consumption"

15920 +msgstr ""

15921 +"Compter le nombre d'objets non-empaquetés et leur consommation d'espace "

15922 +"disque"

15923 +

15924 +#: command-list.h:78

15925 +msgid "Retrieve and store user credentials"

15926 +msgstr "Récupérer et sauvegarder les certificats d'utilisateur"

15927 +

15928 +#: command-list.h:79

15929 +msgid "Helper to temporarily store passwords in memory"

15930 +msgstr "Assistant pour maintenir temporairement en mémoire les mots de passe"

15931 +

15932 +#: command-list.h:80

15933 +msgid "Helper to store credentials on disk"

15934 +msgstr "Assistant pour sauvegarder les certificats sur disque"

15935 +

15936 +#: command-list.h:81

15937 +msgid "Export a single commit to a CVS checkout"

15938 +msgstr "Exporter un commit unique en extraction CVS"

15939 +

15940 +#: command-list.h:82

15941 +msgid "Salvage your data out of another SCM people love to hate"

15942 +msgstr "Sauver vos données depuis un autre SCM qu'on aime à haïr"

15943 +

15944 +#: command-list.h:83

15945 +msgid "A CVS server emulator for Git"

15946 +msgstr "Un émulateur de serveur CVS pour Git"

15947 +

15948 +#: command-list.h:84

15949 +msgid "A really simple server for Git repositories"

15950 +msgstr "Un serveur vraiment simple pour les dépôts Git"

15951 +

15952 +#: command-list.h:85

15953 +msgid "Give an object a human readable name based on an available ref"

15954 +msgstr ""

15955 +"Baptiser un objet avec un nom lisible à partir d'une référence disponible"

15956 +

15957 +#: command-list.h:86

15958 msgid "Show changes between commits, commit and working tree, etc"

15959 msgstr ""

15960 "Afficher les changements entre les validations, entre validation et copie de "

15961 "travail, etc"

15962

15775 -#: common-cmds.h:24

15963 +#: command-list.h:87

15964 +msgid "Compares files in the working tree and the index"

15965 +msgstr "Compare des fichiers de l'arbre de travail et de l'index"

15966 +

15967 +#: command-list.h:88

15968 +msgid "Compare a tree to the working tree or index"

15969 +msgstr "Comparer un arbre avec l'arbre de travail ou l'index"

15970 +

15971 +#: command-list.h:89

15972 +msgid "Compares the content and mode of blobs found via two tree objects"

15973 +msgstr "Compare le contenu et la mode des blobs trouvés via deux objets arbre"

15974 +

15975 +#: command-list.h:90

15976 +msgid "Show changes using common diff tools"

15977 +msgstr "Afficher les modifications en utilisant les outils habituel de diff"

15978 +

15979 +#: command-list.h:91

15980 +msgid "Git data exporter"

15981 +msgstr "Exporteur de données Git"

15982 +

15983 +#: command-list.h:92

15984 +msgid "Backend for fast Git data importers"

15985 +msgstr "Moteur pour les importateurs rapides de données Git"

15986 +

15987 +#: command-list.h:93

15988 msgid "Download objects and refs from another repository"

15989 msgstr "Télécharger les objets et références depuis un autre dépôt"

15990

15779 -#: common-cmds.h:25

15991 +#: command-list.h:94

15992 +msgid "Receive missing objects from another repository"

15993 +msgstr "Télécharger les objets manquants depuis un autre dépôt"

15994 +

15995 +#: command-list.h:95

15996 +msgid "Rewrite branches"

15997 +msgstr "Réécrire les branches"

15998 +

15999 +#: command-list.h:96

16000 +msgid "Produce a merge commit message"

16001 +msgstr "Produire un message de validation de fusion"

16002 +

16003 +#: command-list.h:97

16004 +msgid "Output information on each ref"

16005 +msgstr "Afficher l'information de chaque référence"

16006 +

16007 +#: command-list.h:98

16008 +msgid "Prepare patches for e-mail submission"

16009 +msgstr "Préparer les patchs pour soumission par courriel"

16010 +

16011 +#: command-list.h:99

16012 +msgid "Verifies the connectivity and validity of the objects in the database"

16013 +msgstr ""

16014 +"Vérifier la connectivité et la validité des objets dans la base de données"

16015 +

16016 +#: command-list.h:100

16017 +msgid "Cleanup unnecessary files and optimize the local repository"

16018 +msgstr "Effacer les fichiers non-nécessaires et optimiser le dépôt local"

16019 +

16020 +#: command-list.h:101

16021 +msgid "Extract commit ID from an archive created using git-archive"

16022 +msgstr "Extraire l'ID du commit depuis une archive créée par git-archive"

16023 +

16024 +#: command-list.h:102

16025 msgid "Print lines matching a pattern"

16026 msgstr "Afficher les lignes correspondant à un motif"

16027

15783 -#: common-cmds.h:26

16028 +#: command-list.h:103

16029 +msgid "A portable graphical interface to Git"

16030 +msgstr "Une interface graphique portable pour Git"

16031 +

16032 +#: command-list.h:104

16033 +msgid "Compute object ID and optionally creates a blob from a file"

16034 +msgstr ""

16035 +"Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier"

16036 +

16037 +#: command-list.h:105

16038 +msgid "Display help information about Git"

16039 +msgstr "Afficher l'information d'aide à propos de Git"

16040 +

16041 +#: command-list.h:106

16042 +msgid "Server side implementation of Git over HTTP"

16043 +msgstr "Implantation côté serveur de Git sur HTTP"

16044 +

16045 +#: command-list.h:107

16046 +msgid "Download from a remote Git repository via HTTP"

16047 +msgstr "Télécharger depuis un dépôt Git distant via HTTP"

16048 +

16049 +#: command-list.h:108

16050 +msgid "Push objects over HTTP/DAV to another repository"

16051 +msgstr "Pousser les objets sur un autre dépôt via HTTP/DAV"

16052 +

16053 +#: command-list.h:109

16054 +msgid "Send a collection of patches from stdin to an IMAP folder"

16055 +msgstr "Envoyer un ensemble de patchs depuis stdin vers un répertoire IMAP"

16056 +

16057 +#: command-list.h:110

16058 +msgid "Build pack index file for an existing packed archive"

16059 +msgstr ""

16060 +"Construire un fichier d'index pack depuis une archive compactée existante"

16061 +

16062 +#: command-list.h:111

16063 msgid "Create an empty Git repository or reinitialize an existing one"

16064 msgstr "Créer un dépôt Git vide ou réinitialiser un existant"

16065

15787 -#: common-cmds.h:27

16066 +#: command-list.h:112

16067 +msgid "Instantly browse your working repository in gitweb"

16068 +msgstr "Naviguer instantanément votre dépôt de travail dans gitweb"

16069 +

16070 +#: command-list.h:113

16071 +msgid "add or parse structured information in commit messages"

16072 +msgstr ""

16073 +"ajouter ou analyser l'information structurée dans les messages de validation"

16074 +

16075 +#: command-list.h:114

16076 +msgid "The Git repository browser"

16077 +msgstr "Le navigateur de dépôt Git"

16078 +

16079 +#: command-list.h:115

16080 msgid "Show commit logs"

16081 msgstr "Afficher l'historique des validations"

16082

15791 -#: common-cmds.h:28

16083 +#: command-list.h:116

16084 +msgid "Show information about files in the index and the working tree"

16085 +msgstr ""

16086 +"Afficher l'information à propos des fichiers dans l'index ou l'arbre de "

16087 +"travail"

16088 +

16089 +#: command-list.h:117

16090 +msgid "List references in a remote repository"

16091 +msgstr "Lister les références dans un dépôt distant"

16092 +

16093 +#: command-list.h:118

16094 +msgid "List the contents of a tree object"

16095 +msgstr "Afficher le contenu d'un objet arbre"

16096 +

16097 +#: command-list.h:119

16098 +msgid "Extracts patch and authorship from a single e-mail message"

16099 +msgstr ""

16100 +"Extraire le patch et l'information de d'auteur depuis un simple message de "

16101 +"courriel"

16102 +

16103 +#: command-list.h:120

16104 +msgid "Simple UNIX mbox splitter program"

16105 +msgstr "Programme simple de découpage de mbox UNIX"

16106 +

16107 +#: command-list.h:121

16108 msgid "Join two or more development histories together"

16109 msgstr "Fusionner deux ou plusieurs historiques de développement ensemble"

16110

15795 -#: common-cmds.h:29

16111 +#: command-list.h:122

16112 +msgid "Find as good common ancestors as possible for a merge"

16113 +msgstr "Trouver un ancêtre aussi bon que possible pour une fusion"

16114 +

16115 +#: command-list.h:123

16116 +msgid "Run a three-way file merge"

16117 +msgstr "Lancer une fusion à 3 points"

16118 +

16119 +#: command-list.h:124

16120 +msgid "Run a merge for files needing merging"

16121 +msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner"

16122 +

16123 +#: command-list.h:125

16124 +msgid "The standard helper program to use with git-merge-index"

16125 +msgstr "Le programme assistant standard à utiliser avec git-merge-index"

16126 +

16127 +#: command-list.h:126

16128 +msgid "Run merge conflict resolution tools to resolve merge conflicts"

16129 +msgstr ""

16130 +"Lancer les outils de résolution de conflit de fusion pour résoudre les "

16131 +"conflits de fusion"

16132 +

16133 +#: command-list.h:127

16134 +msgid "Show three-way merge without touching index"

16135 +msgstr "Afficher la fusion à trois points sans modifier l'index"

16136 +

16137 +#: command-list.h:128

16138 +msgid "Creates a tag object"

16139 +msgstr "Créer un objet étiquette"

16140 +

16141 +#: command-list.h:129

16142 +msgid "Build a tree-object from ls-tree formatted text"

16143 +msgstr "Construire un objet arbre depuis une texte formaté comme ls-tree"

16144 +

16145 +#: command-list.h:130

16146 msgid "Move or rename a file, a directory, or a symlink"

16147 msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique"

16148

15799 -#: common-cmds.h:30

16149 +#: command-list.h:131

16150 +msgid "Find symbolic names for given revs"

16151 +msgstr "Trouver les noms symboliques pour des révisions données"

16152 +

16153 +#: command-list.h:132

16154 +msgid "Add or inspect object notes"

16155 +msgstr "Ajouter ou inspecter les notes d'un objets"

16156 +

16157 +#: command-list.h:133

16158 +msgid "Import from and submit to Perforce repositories"

16159 +msgstr "Importer et soumettre à des dépôt Perforce"

16160 +

16161 +#: command-list.h:134

16162 +msgid "Create a packed archive of objects"

16163 +msgstr "Créer une archive compactée d'objets"

16164 +

16165 +#: command-list.h:135

16166 +msgid "Find redundant pack files"

16167 +msgstr "Trouver les fichiers pack redondants"

16168 +

16169 +#: command-list.h:136

16170 +msgid "Pack heads and tags for efficient repository access"

16171 +msgstr "Empaqueter les têtes et les étiquettes pour un accès efficace au dépôt"

16172 +

16173 +#: command-list.h:137

16174 +msgid "Routines to help parsing remote repository access parameters"

16175 +msgstr ""

16176 +"Routines pour aider à analyser les paramètres d'accès aux dépôts distants"

16177 +

16178 +#: command-list.h:138

16179 +msgid "Compute unique ID for a patch"

16180 +msgstr "Calculer l'ID unique d'un patch"

16181 +

16182 +#: command-list.h:139

16183 +msgid "Prune all unreachable objects from the object database"

16184 +msgstr ""

16185 +"Éliminer les objets inatteignables depuis la base de données des objets"

16186 +

16187 +#: command-list.h:140

16188 +msgid "Remove extra objects that are already in pack files"

16189 +msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack"

16190 +

16191 +#: command-list.h:141

16192 msgid "Fetch from and integrate with another repository or a local branch"

16193 msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale"

16194

15803 -#: common-cmds.h:31

16195 +#: command-list.h:142

16196 msgid "Update remote refs along with associated objects"

16197 msgstr "Mettre à jour les références distantes ainsi que les objets associés"

16198

15807 -#: common-cmds.h:32

16199 +#: command-list.h:143

16200 +msgid "Applies a quilt patchset onto the current branch"

16201 +msgstr "Appliquer un patchset quilt sur la branche courante"

16202 +

16203 +#: command-list.h:144

16204 +msgid "Reads tree information into the index"

16205 +msgstr "Lire l'information d'arbre dans l'index"

16206 +

16207 +#: command-list.h:145

16208 msgid "Reapply commits on top of another base tip"

16209 msgstr "Réapplication des commits sur le sommet de l'autre base"

16210

15811 -#: common-cmds.h:33

16211 +#: command-list.h:146

16212 +msgid "Receive what is pushed into the repository"

16213 +msgstr "Recevoir ce qui est poussé dans le dépôt"

16214 +

16215 +#: command-list.h:147

16216 +msgid "Manage reflog information"

16217 +msgstr "Gérer l'information de reflog"

16218 +

16219 +#: command-list.h:148

16220 +msgid "Manage set of tracked repositories"

16221 +msgstr "Gérer un ensemble de dépôts suivis"

16222 +

16223 +#: command-list.h:149

16224 +msgid "Pack unpacked objects in a repository"

16225 +msgstr "Empaqueter les objets non-empaquetés d'un dépôt"

16226 +

16227 +#: command-list.h:150

16228 +msgid "Create, list, delete refs to replace objects"

16229 +msgstr "Créer, lister, supprimer des référence pour remplacer des objets"

16230 +

16231 +#: command-list.h:151

16232 +msgid "Generates a summary of pending changes"

16233 +msgstr "Générer une résumé des modifications en attentes"

16234 +

16235 +#: command-list.h:152

16236 +msgid "Reuse recorded resolution of conflicted merges"

16237 +msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles"

16238 +

16239 +#: command-list.h:153

16240 msgid "Reset current HEAD to the specified state"

16241 msgstr "Réinitialiser la HEAD courante à l'état spécifié"

16242

15815 -#: common-cmds.h:34

16243 +#: command-list.h:154

16244 +msgid "Revert some existing commits"

16245 +msgstr "Inverser des commits existants"

16246 +

16247 +#: command-list.h:155

16248 +msgid "Lists commit objects in reverse chronological order"

16249 +msgstr "Afficher les objets commit dans l'ordre chronologique inverse"

16250 +

16251 +#: command-list.h:156

16252 +msgid "Pick out and massage parameters"

16253 +msgstr "Analyser et préparer les paramètres"

16254 +

16255 +#: command-list.h:157

16256 msgid "Remove files from the working tree and from the index"

16257 msgstr "Supprimer des fichiers de la copie de travail et de l'index"

16258

15819 -#: common-cmds.h:35

16259 +#: command-list.h:158

16260 +msgid "Send a collection of patches as emails"

16261 +msgstr "Envoyer un ensemble de patchs comme courriels"

16262 +

16263 +#: command-list.h:159

16264 +msgid "Push objects over Git protocol to another repository"

16265 +msgstr "Pousser les objets sur un autre dépôt via le protocole Git"

16266 +

16267 +#: command-list.h:160

16268 +msgid "Restricted login shell for Git-only SSH access"

16269 +msgstr "shell de login restreint pour un accès SSH vers Git seulement"

16270 +

16271 +#: command-list.h:161

16272 +msgid "Summarize 'git log' output"

16273 +msgstr "Résumer la sortie de 'git log'"

16274 +

16275 +#: command-list.h:162

16276 msgid "Show various types of objects"

16277 msgstr "Afficher différents types d'objets"

16278

15823 -#: common-cmds.h:36

16279 +#: command-list.h:163

16280 +msgid "Show branches and their commits"

16281 +msgstr "Afficher les branches et leurs commits"

16282 +

16283 +#: command-list.h:164

16284 +msgid "Show packed archive index"

16285 +msgstr "Afficher l'index de l'archive empaquetée"

16286 +

16287 +#: command-list.h:165

16288 +msgid "List references in a local repository"

16289 +msgstr "Lister les références du dépôt local"

16290 +

16291 +#: command-list.h:166

16292 +msgid "Git's i18n setup code for shell scripts"

16293 +msgstr "Le code d'initialisation i18n pour les scripts shell"

16294 +

16295 +#: command-list.h:167

16296 +msgid "Common Git shell script setup code"

16297 +msgstr "Le code d'initialisation commun aux scripts shell Git"

16298 +

16299 +#: command-list.h:168

16300 +msgid "Stash the changes in a dirty working directory away"

16301 +msgstr "Remiser les modifications d'un répertoire de travail sale"

16302 +

16303 +#: command-list.h:169

16304 +msgid "Add file contents to the staging area"

16305 +msgstr "Ajouter le contenu de fichiers à l'index"

16306 +

16307 +#: command-list.h:170

16308 msgid "Show the working tree status"

16309 msgstr "Afficher l'état de la copie de travail"

16310

15827 -#: common-cmds.h:37

16311 +#: command-list.h:171

16312 +msgid "Remove unnecessary whitespace"

16313 +msgstr "Retirer les espaces inutiles"

16314 +

16315 +#: command-list.h:172

16316 +msgid "Initialize, update or inspect submodules"

16317 +msgstr "Initialiser, mettre à jour et inspecter les sous-modules"

16318 +

16319 +#: command-list.h:173

16320 +msgid "Bidirectional operation between a Subversion repository and Git"

16321 +msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git"

16322 +

16323 +#: command-list.h:174

16324 +msgid "Read, modify and delete symbolic refs"

16325 +msgstr "Lire, modifier et supprimer les références symboliques"

16326 +

16327 +#: command-list.h:175

16328 msgid "Create, list, delete or verify a tag object signed with GPG"

16329 msgstr ""

16330 "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"

16331

15832 -#: parse-options.h:157

15833 -msgid "expiry-date"

15834 -msgstr "date-d'expiration"

16332 +#: command-list.h:176

16333 +msgid "Creates a temporary file with a blob's contents"

16334 +msgstr "Créer un fichier temporaire avec le contenu d'un blob"

16335

15836 -#: parse-options.h:172

15837 -msgid "no-op (backward compatibility)"

15838 -msgstr "sans action (rétrocompatibilité)"

16336 +#: command-list.h:177

16337 +msgid "Unpack objects from a packed archive"

16338 +msgstr "Dépaqueter les objets depuis une archive empaquetée"

16339

15840 -#: parse-options.h:251

15841 -msgid "be more verbose"

15842 -msgstr "être plus verbeux"

16340 +#: command-list.h:178

16341 +msgid "Register file contents in the working tree to the index"

16342 +msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index"

16343

15844 -#: parse-options.h:253

15845 -msgid "be more quiet"

15846 -msgstr "être plus silencieux"

16344 +#: command-list.h:179

16345 +msgid "Update the object name stored in a ref safely"

16346 +msgstr ""

16347 +"Mettre à jour le nom d'objet stocké dans une référence en toute sécurité"

16348

15848 -#: parse-options.h:259

15849 -msgid "use <n> digits to display SHA-1s"

15850 -msgstr "utiliser <n> chiffres pour afficher les SHA-1s"

16349 +#: command-list.h:180

16350 +msgid "Update auxiliary info file to help dumb servers"

16351 +msgstr ""

16352 +"Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs "

16353 +"idiots"

16354 +

16355 +#: command-list.h:181

16356 +msgid "Send archive back to git-archive"

16357 +msgstr "Renvoyer une archive dans git-archive"

16358 +

16359 +#: command-list.h:182

16360 +msgid "Send objects packed back to git-fetch-pack"

16361 +msgstr "Renvoyer des objets empaquetés dans git-fetch-pack"

16362 +

16363 +#: command-list.h:183

16364 +msgid "Show a Git logical variable"

16365 +msgstr "Afficher un variable logique de Git"

16366 +

16367 +#: command-list.h:184

16368 +msgid "Check the GPG signature of commits"

16369 +msgstr "Vérifier la signature GPG de commits"

16370 +

16371 +#: command-list.h:185

16372 +msgid "Validate packed Git archive files"

16373 +msgstr "Valider des fichiers d'archive Git empaquetés"

16374 +

16375 +#: command-list.h:186

16376 +msgid "Check the GPG signature of tags"

16377 +msgstr "Vérifier la signature GPG d'étiquettes"

16378 +

16379 +#: command-list.h:187

16380 +msgid "Git web interface (web frontend to Git repositories)"

16381 +msgstr "Interface web de Git"

16382 +

16383 +#: command-list.h:188

16384 +msgid "Show logs with difference each commit introduces"

16385 +msgstr "Afficher les journaux avec la différence que chaque commit introduit"

16386 +

16387 +#: command-list.h:189

16388 +msgid "Manage multiple working trees"

16389 +msgstr "Gère de arbres de travail multiples"

16390 +

16391 +#: command-list.h:190

16392 +msgid "Create a tree object from the current index"

16393 +msgstr "Créer un objet arbre depuis l'index courant"

16394 +

16395 +#: command-list.h:191

16396 +msgid "Defining attributes per path"

16397 +msgstr "Définition des attributs par chemin"

16398 +

16399 +#: command-list.h:192

16400 +msgid "Git command-line interface and conventions"

16401 +msgstr "interface en ligne de commande et conventions de Git"

16402 +

16403 +#: command-list.h:193

16404 +msgid "A Git core tutorial for developers"

16405 +msgstr "Tutoriel du cœur de Git pour les développeurs"

16406 +

16407 +#: command-list.h:194

16408 +msgid "Git for CVS users"

16409 +msgstr "Git pour les utilisateurs de CVS"

16410 +

16411 +#: command-list.h:195

16412 +msgid "Tweaking diff output"

16413 +msgstr "Bidouillage de la sortie diff"

16414 +

16415 +#: command-list.h:196

16416 +msgid "A useful minimum set of commands for Everyday Git"

16417 +msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours"

16418 +

16419 +#: command-list.h:197

16420 +msgid "A Git Glossary"

16421 +msgstr "Un glossaire Git"

16422 +

16423 +#: command-list.h:198

16424 +msgid "Hooks used by Git"

16425 +msgstr "Crochets utilisés par Git"

16426 +

16427 +#: command-list.h:199

16428 +msgid "Specifies intentionally untracked files to ignore"

16429 +msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"

16430 +

16431 +#: command-list.h:200

16432 +msgid "Defining submodule properties"

16433 +msgstr "Définition des propriétés de sous-module"

16434 +

16435 +#: command-list.h:201

16436 +msgid "Git namespaces"

16437 +msgstr "Espaces de nom de Git"

16438 +

16439 +#: command-list.h:202

16440 +msgid "Git Repository Layout"

16441 +msgstr "Disposition d'un dépôt Git"

16442 +

16443 +#: command-list.h:203

16444 +msgid "Specifying revisions and ranges for Git"

16445 +msgstr "Spécification des révisions et portées pour Git"

16446 +

16447 +#: command-list.h:204

16448 +msgid "A tutorial introduction to Git: part two"

16449 +msgstr "Une introduction pratique à Git : deuxième partie"

16450 +

16451 +#: command-list.h:205

16452 +msgid "A tutorial introduction to Git"

16453 +msgstr "Une introduction pratique à Git"

16454 +

16455 +#: command-list.h:206

16456 +msgid "An overview of recommended workflows with Git"

16457 +msgstr "Un aperçu des flux de travail recommandés avec Git"

16458

16459 #: rerere.h:40

16460 msgid "update the index with reused conflict resolution if possible"

@@ -16616,7 +17223,7 @@ msgid ""

17223 "e, edit <commit> = use commit, but stop for amending\n"

17224 "s, squash <commit> = use commit, but meld into previous commit\n"

17225 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

16619 -"x, exec <commit> = run command (the rest of the line) using shell\n"

17226 +"x, exec <command> = run command (the rest of the line) using shell\n"

17227 "d, drop <commit> = remove commit\n"

17228 "l, label <label> = label current HEAD with a name\n"

17229 "t, reset <label> = reset HEAD to a label\n"

@@ -16632,11 +17239,12 @@ msgstr ""

17239 " p, pick <commit> = utiliser le commit\n"

17240 " r, reword <commit> = utiliser le commit, mais reformuler son message\n"

17241 " e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n"

16635 -" s, squash <commit> = utiliser le commit, mais le fusionner avec le précédent\n"

17242 +" s, squash <commit> = utiliser le commit, mais le fusionner avec le "

17243 +"précédent\n"

17244 " f, fixup <commit> = comme \"squash\", mais en éliminant son message\n"

17245 " x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"

17246 " d, drop <commit> = supprimer le commit\n"

16639 -" l, label <label> = nommer la HEAD courante\n"

17247 +" l, label <label> = étiqueter la HEAD courante avec un nom\n"

17248 " t, reset <label> = réinitialiser HEAD à label\n"

17249 " m, merge [-C <commit> | -c <commit>] <label> [# <uniligne>]\n"

17250 " créer un commit de fusion utilisant le message de fusion original\n"

@@ -17929,6 +18537,9 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"

18537 msgid "Do you really want to send %s? [y|N]: "

18538 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "

18539

18540 +#~ msgid "Everyday Git With 20 Commands Or So"

18541 +#~ msgstr "Git de tous les jours avec à peu près 20 commandes"

18542 +

18543 #~ msgid "Could not open '%s' for writing"

18544 #~ msgstr "Impossible d'ouvrir '%s' en écriture"

18545

@@ -18135,9 +18746,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "

18746 #~ msgid "blob object"

18747 #~ msgstr "objet blob"

18748

18138 -#~ msgid "other tag object"

18139 -#~ msgstr "objet étiquette autre"

18140 -

18749 #~ msgid ""

18750 #~ "There is nothing to exclude from by :(exclude) patterns.\n"

18751 #~ "Perhaps you forgot to add either ':/' or '.' ?"

@@ -18686,9 +19294,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "

19294 #~ msgid "no branch specified"

19295 #~ msgstr "aucune branche spécifiée"

19296

18689 -#~ msgid "check a branch out in a separate working directory"

18690 -#~ msgstr "extraire une branche dans un répertoire de travail séparé"

18691 -

19297 #~ msgid "prune .git/worktrees"

19298 #~ msgstr "éliminer .git/worktrees"

19299

l10n: fr.po v2.18.0 round 3