@matheusbsbs / matheus-bagliano / commits / 3782d70676

gitk: Update French translation (311t)

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Paul Mackerras <paulus@samba.org>

Jean-Noel Avila committed Jan 29, 2016 at 21:21 UTC 3782d70676fa2dd0c2d66cf57a357c6fce6e4da3
1 file changed +373 -388
po/fr.po
+373 -388
@@ -3,14 +3,14 @@
3 # This file is distributed under the same license as the gitk package.
4 # Translators:
5 # Emmanuel Trillaud <etrillaud@gmail.com>
6 -#
6 +# Jean-Noël Avila <jn.avila@free.fr>
7 msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 -"PO-Revision-Date: 2009-11-19 22:13+0100\n"
13 -"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n"
11 +"POT-Creation-Date: 2016-01-22 22:04+0100\n"
12 +"PO-Revision-Date: 2016-01-22 23:05+0100\n"
13 +"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
14 "Language-Team: git@vger.kernel.org\n"
15 "Language: \n"
16 "MIME-Version: 1.0\n"
@@ -23,13 +23,13 @@ msgstr ""
23 msgid "Couldn't get list of unmerged files:"
24 msgstr "Impossible de récupérer la liste des fichiers non fusionnés :"
25
26 -#: gitk:212 gitk:2381
26 +#: gitk:212 gitk:2399
27 msgid "Color words"
28 -msgstr ""
28 +msgstr "Colorier les mots différents"
29
30 -#: gitk:217 gitk:2381 gitk:8220 gitk:8253
30 +#: gitk:217 gitk:2399 gitk:8239 gitk:8272
31 msgid "Markup words"
32 -msgstr ""
32 +msgstr "Marquer les mots différents"
33
34 #: gitk:324
35 msgid "Error parsing revisions:"
@@ -47,13 +47,10 @@ msgstr ""
47
48 # FIXME : améliorer la traduction de 'file limite'
49 #: gitk:396
50 -#, fuzzy
50 msgid ""
51 "No files selected: --merge specified but no unmerged files are within file "
52 "limit."
54 -msgstr ""
55 -"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné "
56 -"n'est dans la limite des fichiers."
53 +msgstr "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné n'est dans la limite des fichiers."
54
55 #: gitk:418 gitk:566
56 msgid "Error executing git log:"
@@ -63,15 +60,15 @@ msgstr "Erreur à l'exécution de git log :"
60 msgid "Reading"
61 msgstr "Lecture en cours"
62
66 -#: gitk:496 gitk:4525
63 +#: gitk:496 gitk:4544
64 msgid "Reading commits..."
65 msgstr "Lecture des commits..."
66
70 -#: gitk:499 gitk:1637 gitk:4528
67 +#: gitk:499 gitk:1637 gitk:4547
68 msgid "No commits selected"
69 msgstr "Aucun commit sélectionné"
70
74 -#: gitk:1445 gitk:4045 gitk:12432
71 +#: gitk:1445 gitk:4064 gitk:12469
72 msgid "Command line"
73 msgstr "Ligne de commande"
74
@@ -83,290 +80,294 @@ msgstr "Impossible de lire la sortie de git log :"
80 msgid "No commit information available"
81 msgstr "Aucune information disponible sur le commit"
82
86 -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
83 +#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554
84 msgid "OK"
85 msgstr "OK"
86
90 -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
91 -#: gitk:11242 gitk:11522
87 +#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704
88 +#: gitk:11275 gitk:11555
89 msgid "Cancel"
90 msgstr "Annuler"
91
95 -#: gitk:2069
92 +#: gitk:2083
93 msgid "&Update"
94 msgstr "Mise à jour"
95
99 -#: gitk:2070
96 +#: gitk:2084
97 msgid "&Reload"
98 msgstr "Recharger"
99
103 -#: gitk:2071
100 +#: gitk:2085
101 msgid "Reread re&ferences"
102 msgstr "Relire les références"
103
107 -#: gitk:2072
104 +#: gitk:2086
105 msgid "&List references"
106 msgstr "Lister les références"
107
111 -#: gitk:2074
108 +#: gitk:2088
109 msgid "Start git &gui"
110 msgstr "Démarrer git gui"
111
115 -#: gitk:2076
112 +#: gitk:2090
113 msgid "&Quit"
114 msgstr "Quitter"
115
119 -#: gitk:2068
116 +#: gitk:2082
117 msgid "&File"
118 msgstr "Fichier"
119
123 -#: gitk:2080
120 +#: gitk:2094
121 msgid "&Preferences"
122 msgstr "Préférences"
123
127 -#: gitk:2079
124 +#: gitk:2093
125 msgid "&Edit"
126 msgstr "Éditer"
127
131 -#: gitk:2084
128 +#: gitk:2098
129 msgid "&New view..."
130 msgstr "Nouvelle vue..."
131
135 -#: gitk:2085
132 +#: gitk:2099
133 msgid "&Edit view..."
134 msgstr "Éditer la vue..."
135
139 -#: gitk:2086
136 +#: gitk:2100
137 msgid "&Delete view"
138 msgstr "Supprimer la vue"
139
143 -#: gitk:2088 gitk:4043
140 +#: gitk:2102
141 msgid "&All files"
142 msgstr "Tous les fichiers"
143
147 -#: gitk:2083 gitk:4067
144 +#: gitk:2097
145 msgid "&View"
146 msgstr "Vue"
147
151 -#: gitk:2093 gitk:2103 gitk:3012
148 +#: gitk:2107 gitk:2117
149 msgid "&About gitk"
150 msgstr "À propos de gitk"
151
155 -#: gitk:2094 gitk:2108
152 +#: gitk:2108 gitk:2122
153 msgid "&Key bindings"
154 msgstr "Raccourcis clavier"
155
159 -#: gitk:2092 gitk:2107
156 +#: gitk:2106 gitk:2121
157 msgid "&Help"
158 msgstr "Aide"
159
163 -#: gitk:2185 gitk:8652
160 +#: gitk:2199 gitk:8671
161 msgid "SHA1 ID:"
162 msgstr "Id SHA1 :"
163
167 -#: gitk:2229
164 +#: gitk:2243
165 msgid "Row"
166 msgstr "Colonne"
167
171 -#: gitk:2267
168 +#: gitk:2281
169 msgid "Find"
170 msgstr "Recherche"
171
175 -#: gitk:2295
172 +#: gitk:2309
173 msgid "commit"
174 msgstr "commit"
175
179 -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
180 -#: gitk:6912
176 +#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846
177 +#: gitk:6931
178 msgid "containing:"
179 msgstr "contient :"
180
184 -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
181 +#: gitk:2316 gitk:3545 gitk:3550 gitk:4782
182 msgid "touching paths:"
183 msgstr "chemins modifiés :"
184
188 -#: gitk:2303 gitk:4777
185 +#: gitk:2317 gitk:4796
186 msgid "adding/removing string:"
187 msgstr "ajoute/supprime la chaîne :"
188
192 -#: gitk:2304 gitk:4779
189 +#: gitk:2318 gitk:4798
190 msgid "changing lines matching:"
194 -msgstr ""
191 +msgstr "modifie les lignes vérifiant :"
192
196 -#: gitk:2313 gitk:2315 gitk:4766
193 +#: gitk:2327 gitk:2329 gitk:4785
194 msgid "Exact"
195 msgstr "Exact"
196
200 -#: gitk:2315 gitk:4854 gitk:6723
197 +#: gitk:2329 gitk:4873 gitk:6742
198 msgid "IgnCase"
199 msgstr "Ignorer la casse"
200
204 -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
201 +#: gitk:2329 gitk:4755 gitk:4871 gitk:6738
202 msgid "Regexp"
203 msgstr "Expression régulière"
204
208 -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
205 +#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935
206 msgid "All fields"
207 msgstr "Tous les champs"
208
212 -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
209 +#: gitk:2332 gitk:4890 gitk:4923 gitk:6805
210 msgid "Headline"
211 msgstr "Surligner"
212
216 -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
213 +#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408
214 msgid "Comments"
215 msgstr "Commentaires"
216
220 -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
221 -#: gitk:8845
217 +#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849
218 +#: gitk:8864
219 msgid "Author"
220 msgstr "Auteur"
221
225 -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
222 +#: gitk:2333 gitk:4890 gitk:6805 gitk:7345
223 msgid "Committer"
224 msgstr "Auteur du commit"
225
229 -#: gitk:2350
226 +#: gitk:2367
227 msgid "Search"
228 msgstr "Rechercher"
229
233 -#: gitk:2358
230 +#: gitk:2375
231 msgid "Diff"
232 msgstr "Diff"
233
237 -#: gitk:2360
234 +#: gitk:2377
235 msgid "Old version"
236 msgstr "Ancienne version"
237
241 -#: gitk:2362
238 +#: gitk:2379
239 msgid "New version"
240 msgstr "Nouvelle version"
241
245 -#: gitk:2364
242 +#: gitk:2382
243 msgid "Lines of context"
244 msgstr "Lignes de contexte"
245
249 -#: gitk:2374
246 +#: gitk:2392
247 msgid "Ignore space change"
248 msgstr "Ignorer les modifications d'espace"
249
253 -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
250 +#: gitk:2396 gitk:2398 gitk:7978 gitk:8225
251 msgid "Line diff"
255 -msgstr ""
252 +msgstr "différence par ligne"
253
257 -#: gitk:2445
254 +#: gitk:2463
255 msgid "Patch"
256 msgstr "Patch"
257
261 -#: gitk:2447
258 +#: gitk:2465
259 msgid "Tree"
260 msgstr "Arbre"
261
265 -#: gitk:2617 gitk:2637
262 +#: gitk:2635 gitk:2656
263 msgid "Diff this -> selected"
264 msgstr "Diff entre ceci et la sélection"
265
269 -#: gitk:2618 gitk:2638
266 +#: gitk:2636 gitk:2657
267 msgid "Diff selected -> this"
268 msgstr "Diff entre sélection et ceci"
269
273 -#: gitk:2619 gitk:2639
270 +#: gitk:2637 gitk:2658
271 msgid "Make patch"
272 msgstr "Créer patch"
273
277 -#: gitk:2620 gitk:9254
274 +#: gitk:2638 gitk:9273
275 msgid "Create tag"
276 msgstr "Créer tag"
277
281 -#: gitk:2621 gitk:9371
278 +#: gitk:2639
279 +msgid "Copy commit summary"
280 +msgstr "Copié le résumé du commit"
281 +
282 +#: gitk:2640 gitk:9404
283 msgid "Write commit to file"
284 msgstr "Écrire le commit dans un fichier"
285
285 -#: gitk:2622 gitk:9428
286 +#: gitk:2641 gitk:9461
287 msgid "Create new branch"
288 msgstr "Créer une nouvelle branche"
289
289 -#: gitk:2623
290 +#: gitk:2642
291 msgid "Cherry-pick this commit"
292 msgstr "Cueillir (cherry-pick) ce commit"
293
293 -#: gitk:2624
294 +#: gitk:2643
295 msgid "Reset HEAD branch to here"
296 msgstr "Réinitialiser la branche HEAD vers cet état"
297
297 -#: gitk:2625
298 +#: gitk:2644
299 msgid "Mark this commit"
300 msgstr "Marquer ce commit"
301
301 -#: gitk:2626
302 +#: gitk:2645
303 msgid "Return to mark"
304 msgstr "Retourner à la marque"
305
305 -#: gitk:2627
306 +#: gitk:2646
307 msgid "Find descendant of this and mark"
308 msgstr "Chercher le descendant de ceci et le marquer"
309
309 -#: gitk:2628
310 +#: gitk:2647
311 msgid "Compare with marked commit"
312 msgstr "Comparer avec le commit marqué"
313
313 -#: gitk:2629 gitk:2640
314 -#, fuzzy
314 +#: gitk:2648 gitk:2659
315 msgid "Diff this -> marked commit"
316 -msgstr "Diff entre ceci et la sélection"
316 +msgstr "Diff ceci -> sélection"
317
318 -#: gitk:2630 gitk:2641
319 -#, fuzzy
318 +#: gitk:2649 gitk:2660
319 msgid "Diff marked commit -> this"
321 -msgstr "Diff entre sélection et ceci"
320 +msgstr "Diff entre sélection -> ceci"
321
323 -#: gitk:2631
324 -#, fuzzy
322 +#: gitk:2650
323 msgid "Revert this commit"
326 -msgstr "Marquer ce commit"
324 +msgstr "Défaire ce commit"
325
328 -#: gitk:2647
326 +#: gitk:2666
327 msgid "Check out this branch"
328 msgstr "Récupérer cette branche"
329
332 -#: gitk:2648
330 +#: gitk:2667
331 msgid "Remove this branch"
332 msgstr "Supprimer cette branche"
333
336 -#: gitk:2649
334 +#: gitk:2668
335 msgid "Copy branch name"
338 -msgstr ""
336 +msgstr "Copier la nom de la branche"
337
340 -#: gitk:2656
338 +#: gitk:2675
339 msgid "Highlight this too"
340 msgstr "Surligner également ceci"
341
344 -#: gitk:2657
342 +#: gitk:2676
343 msgid "Highlight this only"
344 msgstr "Surligner seulement ceci"
345
348 -#: gitk:2658
346 +#: gitk:2677
347 msgid "External diff"
348 msgstr "Diff externe"
349
352 -#: gitk:2659
350 +#: gitk:2678
351 msgid "Blame parent commit"
352 msgstr "Blâmer le commit parent"
353
356 -#: gitk:2660
354 +#: gitk:2679
355 msgid "Copy path"
358 -msgstr ""
356 +msgstr "Copier le chemin"
357
360 -#: gitk:2667
358 +#: gitk:2686
359 msgid "Show origin of this line"
360 msgstr "Montrer l'origine de cette ligne"
361
364 -#: gitk:2668
362 +#: gitk:2687
363 msgid "Run git gui blame on this line"
364 msgstr "Exécuter git gui blame sur cette ligne"
365
368 -#: gitk:3014
369 -#, fuzzy
366 +#: gitk:3031
367 +msgid "About gitk"
368 +msgstr "À propos de gitk"
369 +
370 +#: gitk:3033
371 msgid ""
372 "\n"
373 "Gitk - a commit viewer for git\n"
@@ -378,327 +379,329 @@ msgstr ""
379 "\n"
380 "Gitk - visualisateur de commit pour git\n"
381 "\n"
381 -"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
382 +"Copyright \\u00a9 2005-2014 Paul Mackerras\n"
383 "\n"
383 -"Utilisation et redistribution soumises aux termes de la GNU General Public "
384 -"License"
384 +"Utilisation et redistribution soumises aux termes de la GNU General Public License"
385
386 -#: gitk:3022 gitk:3089 gitk:9857
386 +#: gitk:3041 gitk:3108 gitk:9890
387 msgid "Close"
388 msgstr "Fermer"
389
390 -#: gitk:3043
390 +#: gitk:3062
391 msgid "Gitk key bindings"
392 msgstr "Raccourcis clavier de Gitk"
393
394 -#: gitk:3046
394 +#: gitk:3065
395 msgid "Gitk key bindings:"
396 msgstr "Raccourcis clavier de Gitk :"
397
398 -#: gitk:3048
398 +#: gitk:3067
399 #, tcl-format
400 msgid "<%s-Q>\t\tQuit"
401 msgstr "<%s-Q>\t\tQuitter"
402
403 -#: gitk:3049
404 -#, fuzzy, tcl-format
403 +#: gitk:3068
404 +#, tcl-format
405 msgid "<%s-W>\t\tClose window"
406 -msgstr "<%s-F>\t\tRechercher"
406 +msgstr "<%s-W>\t\tFermer la fenêtre"
407
408 -#: gitk:3050
408 +#: gitk:3069
409 msgid "<Home>\t\tMove to first commit"
410 msgstr "<Début>\t\tAller au premier commit"
411
412 -#: gitk:3051
412 +#: gitk:3070
413 msgid "<End>\t\tMove to last commit"
414 msgstr "<Fin>\t\tAller au dernier commit"
415
416 -#: gitk:3052
417 -#, fuzzy
416 +#: gitk:3071
417 msgid "<Up>, p, k\tMove up one commit"
419 -msgstr "<Haut>, p, i\t Aller au commit suivant"
418 +msgstr "<Haut>, p, k\t Aller au commit précédent"
419
421 -#: gitk:3053
422 -#, fuzzy
420 +#: gitk:3072
421 msgid "<Down>, n, j\tMove down one commit"
424 -msgstr "<Bas>, n, k\t Aller au commit précédent"
422 +msgstr "<Bas>, n, j\t Aller au commit suivant"
423
426 -#: gitk:3054
427 -#, fuzzy
424 +#: gitk:3073
425 msgid "<Left>, z, h\tGo back in history list"
429 -msgstr "<Gauche>, z, j\tReculer dans l'historique"
426 +msgstr "<Gauche>, z, h\tReculer dans l'historique"
427
431 -#: gitk:3055
428 +#: gitk:3074
429 msgid "<Right>, x, l\tGo forward in history list"
430 msgstr "<Droite>, x, l\tAvancer dans l'historique"
431
435 -#: gitk:3056
432 +#: gitk:3075
433 #, tcl-format
434 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
438 -msgstr ""
435 +msgstr "<%s-n>\tAller sur le n-ième parent du commit dans l'historique"
436
440 -#: gitk:3057
437 +#: gitk:3076
438 msgid "<PageUp>\tMove up one page in commit list"
439 msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
440
444 -#: gitk:3058
441 +#: gitk:3077
442 msgid "<PageDown>\tMove down one page in commit list"
443 msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
444
448 -#: gitk:3059
445 +#: gitk:3078
446 #, tcl-format
447 msgid "<%s-Home>\tScroll to top of commit list"
448 msgstr "<%s-Début>\tAller en haut de la liste des commits"
449
453 -#: gitk:3060
450 +#: gitk:3079
451 #, tcl-format
452 msgid "<%s-End>\tScroll to bottom of commit list"
453 msgstr "<%s-End>\tAller en bas de la liste des commits"
454
458 -#: gitk:3061
455 +#: gitk:3080
456 #, tcl-format
457 msgid "<%s-Up>\tScroll commit list up one line"
458 msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits"
459
463 -#: gitk:3062
460 +#: gitk:3081
461 #, tcl-format
462 msgid "<%s-Down>\tScroll commit list down one line"
463 msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits"
464
468 -#: gitk:3063
465 +#: gitk:3082
466 #, tcl-format
467 msgid "<%s-PageUp>\tScroll commit list up one page"
468 msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits"
469
473 -#: gitk:3064
470 +#: gitk:3083
471 #, tcl-format
472 msgid "<%s-PageDown>\tScroll commit list down one page"
473 msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits"
474
478 -#: gitk:3065
475 +#: gitk:3084
476 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
477 msgstr ""
478 "<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)"
479
483 -#: gitk:3066
480 +#: gitk:3085
481 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
482 msgstr ""
483 "<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)"
484
488 -#: gitk:3067
485 +#: gitk:3086
486 msgid "<Delete>, b\tScroll diff view up one page"
487 msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff"
488
492 -#: gitk:3068
489 +#: gitk:3087
490 msgid "<Backspace>\tScroll diff view up one page"
491 msgstr "<Backspace>\tMonter d'une page dans la vue des diff"
492
496 -#: gitk:3069
493 +#: gitk:3088
494 msgid "<Space>\t\tScroll diff view down one page"
495 msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff"
496
500 -#: gitk:3070
497 +#: gitk:3089
498 msgid "u\t\tScroll diff view up 18 lines"
499 msgstr "u\t\tMonter de 18 lignes dans la vue des diff"
500
504 -#: gitk:3071
501 +#: gitk:3090
502 msgid "d\t\tScroll diff view down 18 lines"
503 msgstr "d\t\tDescendre de 18 lignes dans la vue des diff"
504
508 -#: gitk:3072
505 +#: gitk:3091
506 #, tcl-format
507 msgid "<%s-F>\t\tFind"
508 msgstr "<%s-F>\t\tRechercher"
509
513 -#: gitk:3073
510 +#: gitk:3092
511 #, tcl-format
512 msgid "<%s-G>\t\tMove to next find hit"
513 msgstr "<%s-G>\t\tAller au résultat de recherche suivant"
514
518 -#: gitk:3074
515 +#: gitk:3093
516 msgid "<Return>\tMove to next find hit"
517 msgstr "<Return>\t\tAller au résultat de recherche suivant"
518
522 -#: gitk:3075
523 -#, fuzzy
519 +#: gitk:3094
520 msgid "g\t\tGo to commit"
525 -msgstr "<Fin>\t\tAller au dernier commit"
521 +msgstr "g\t\tAller au commit"
522
527 -#: gitk:3076
523 +#: gitk:3095
524 msgid "/\t\tFocus the search box"
525 msgstr "/\t\tFocus sur la zone de recherche"
526
531 -#: gitk:3077
527 +#: gitk:3096
528 msgid "?\t\tMove to previous find hit"
529 msgstr "?\t\tAller au résultat de recherche précédent"
530
535 -#: gitk:3078
531 +#: gitk:3097
532 msgid "f\t\tScroll diff view to next file"
533 msgstr "f\t\tAller au prochain fichier dans la vue des diff"
534
539 -#: gitk:3079
535 +#: gitk:3098
536 #, tcl-format
537 msgid "<%s-S>\t\tSearch for next hit in diff view"
538 msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff"
539
544 -#: gitk:3080
540 +#: gitk:3099
541 #, tcl-format
542 msgid "<%s-R>\t\tSearch for previous hit in diff view"
543 msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff"
544
549 -#: gitk:3081
545 +#: gitk:3100
546 #, tcl-format
547 msgid "<%s-KP+>\tIncrease font size"
548 msgstr "<%s-KP+>\tAugmenter la taille de la police"
549
554 -#: gitk:3082
550 +#: gitk:3101
551 #, tcl-format
552 msgid "<%s-plus>\tIncrease font size"
553 msgstr "<%s-plus>\tAugmenter la taille de la police"
554
559 -#: gitk:3083
555 +#: gitk:3102
556 #, tcl-format
557 msgid "<%s-KP->\tDecrease font size"
558 msgstr "<%s-KP->\tDiminuer la taille de la police"
559
564 -#: gitk:3084
560 +#: gitk:3103
561 #, tcl-format
562 msgid "<%s-minus>\tDecrease font size"
563 msgstr "<%s-minus>\tDiminuer la taille de la police"
564
569 -#: gitk:3085
565 +#: gitk:3104
566 msgid "<F5>\t\tUpdate"
567 msgstr "<F5>\t\tMise à jour"
568
573 -#: gitk:3550 gitk:3559
569 +#: gitk:3569 gitk:3578
570 #, tcl-format
571 msgid "Error creating temporary directory %s:"
572 msgstr "Erreur lors de la création du répertoire temporaire %s :"
573
578 -#: gitk:3572
574 +#: gitk:3591
575 #, tcl-format
576 msgid "Error getting \"%s\" from %s:"
577 msgstr "Erreur en obtenant \"%s\" de %s:"
578
583 -#: gitk:3635
579 +#: gitk:3654
580 msgid "command failed:"
581 msgstr "échec de la commande :"
582
587 -#: gitk:3784
583 +#: gitk:3803
584 msgid "No such commit"
585 msgstr "Commit inexistant"
586
591 -#: gitk:3798
587 +#: gitk:3817
588 msgid "git gui blame: command failed:"
589 msgstr "git gui blame : échec de la commande :"
590
595 -#: gitk:3829
591 +#: gitk:3848
592 #, tcl-format
593 msgid "Couldn't read merge head: %s"
594 msgstr "Impossible de lire le head de la fusion : %s"
595
600 -#: gitk:3837
596 +#: gitk:3856
597 #, tcl-format
598 msgid "Error reading index: %s"
599 msgstr "Erreur à la lecture de l'index : %s"
600
605 -#: gitk:3862
601 +#: gitk:3881
602 #, tcl-format
603 msgid "Couldn't start git blame: %s"
604 msgstr "Impossible de démarrer git blame : %s"
605
610 -#: gitk:3865 gitk:6754
606 +#: gitk:3884 gitk:6773
607 msgid "Searching"
608 msgstr "Recherche en cours"
609
614 -#: gitk:3897
610 +#: gitk:3916
611 #, tcl-format
612 msgid "Error running git blame: %s"
613 msgstr "Erreur à l'exécution de git blame : %s"
614
619 -#: gitk:3925
615 +#: gitk:3944
616 #, tcl-format
617 msgid "That line comes from commit %s, which is not in this view"
618 msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue"
619
624 -#: gitk:3939
620 +#: gitk:3958
621 msgid "External diff viewer failed:"
626 -msgstr "Échec de l'outil externe de visualisation des diff"
622 +msgstr "Échec de l'outil externe de visualisation des diff :"
623 +
624 +#: gitk:4062
625 +msgid "All files"
626 +msgstr "Tous les fichiers"
627
628 -#: gitk:4070
628 +#: gitk:4086
629 +msgid "View"
630 +msgstr "Vue"
631 +
632 +#: gitk:4089
633 msgid "Gitk view definition"
634 msgstr "Définition des vues de Gitk"
635
632 -#: gitk:4074
636 +#: gitk:4093
637 msgid "Remember this view"
638 msgstr "Se souvenir de cette vue"
639
636 -#: gitk:4075
640 +#: gitk:4094
641 msgid "References (space separated list):"
642 msgstr "Références (liste d'éléments séparés par des espaces) :"
643
640 -#: gitk:4076
644 +#: gitk:4095
645 msgid "Branches & tags:"
646 msgstr "Branches & tags :"
647
644 -#: gitk:4077
648 +#: gitk:4096
649 msgid "All refs"
650 msgstr "Toutes les références"
651
648 -#: gitk:4078
652 +#: gitk:4097
653 msgid "All (local) branches"
654 msgstr "Toutes les branches (locales)"
655
652 -#: gitk:4079
656 +#: gitk:4098
657 msgid "All tags"
658 msgstr "Tous les tags"
659
656 -#: gitk:4080
660 +#: gitk:4099
661 msgid "All remote-tracking branches"
662 msgstr "Toutes les branches de suivi à distance"
663
660 -#: gitk:4081
664 +#: gitk:4100
665 msgid "Commit Info (regular expressions):"
666 msgstr "Info sur les commits (expressions régulières) :"
667
664 -#: gitk:4082
668 +#: gitk:4101
669 msgid "Author:"
670 msgstr "Auteur :"
671
668 -#: gitk:4083
672 +#: gitk:4102
673 msgid "Committer:"
674 msgstr "Commiteur :"
675
672 -#: gitk:4084
676 +#: gitk:4103
677 msgid "Commit Message:"
678 msgstr "Message de commit :"
679
676 -#: gitk:4085
680 +#: gitk:4104
681 msgid "Matches all Commit Info criteria"
682 msgstr "Correspond à tous les critères d'Info sur les commits"
683
680 -#: gitk:4086
681 -#, fuzzy
684 +#: gitk:4105
685 msgid "Matches no Commit Info criteria"
683 -msgstr "Correspond à tous les critères d'Info sur les commits"
686 +msgstr "Ne correspond à aucun des critères d'Info sur les commits"
687
685 -#: gitk:4087
688 +#: gitk:4106
689 msgid "Changes to Files:"
690 msgstr "Changements des fichiers :"
691
689 -#: gitk:4088
692 +#: gitk:4107
693 msgid "Fixed String"
694 msgstr "Chaîne Figée"
695
693 -#: gitk:4089
696 +#: gitk:4108
697 msgid "Regular Expression"
698 msgstr "Expression Régulière"
699
697 -#: gitk:4090
700 +#: gitk:4109
701 msgid "Search string:"
702 msgstr "Recherche de la chaîne :"
703
701 -#: gitk:4091
704 +#: gitk:4110
705 msgid ""
706 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
707 "15:27:38\"):"
@@ -706,204 +709,202 @@ msgstr ""
709 "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
710 "2009 15:27:38\") :"
711
709 -#: gitk:4092
712 +#: gitk:4111
713 msgid "Since:"
714 msgstr "De :"
715
713 -#: gitk:4093
716 +#: gitk:4112
717 msgid "Until:"
718 msgstr "Jusqu'au :"
719
717 -#: gitk:4094
720 +#: gitk:4113
721 msgid "Limit and/or skip a number of revisions (positive integer):"
722 msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :"
723
721 -#: gitk:4095
724 +#: gitk:4114
725 msgid "Number to show:"
726 msgstr "Nombre à afficher :"
727
725 -#: gitk:4096
728 +#: gitk:4115
729 msgid "Number to skip:"
730 msgstr "Nombre à sauter :"
731
729 -#: gitk:4097
732 +#: gitk:4116
733 msgid "Miscellaneous options:"
734 msgstr "Options diverses :"
735
733 -#: gitk:4098
736 +#: gitk:4117
737 msgid "Strictly sort by date"
738 msgstr "Trier par date"
739
740 # FIXME : traduction de "branch sides"
738 -#: gitk:4099
739 -#, fuzzy
741 +#: gitk:4118
742 msgid "Mark branch sides"
741 -msgstr "Marquer les extrémités des branches"
743 +msgstr "Indiquer les côtés des branches"
744
743 -#: gitk:4100
745 +#: gitk:4119
746 msgid "Limit to first parent"
747 msgstr "Limiter au premier ancêtre"
748
747 -#: gitk:4101
749 +#: gitk:4120
750 msgid "Simple history"
751 msgstr "Historique simple"
752
751 -#: gitk:4102
753 +#: gitk:4121
754 msgid "Additional arguments to git log:"
755 msgstr "Arguments supplémentaires de git log :"
756
755 -#: gitk:4103
757 +#: gitk:4122
758 msgid "Enter files and directories to include, one per line:"
759 msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
760
759 -#: gitk:4104
761 +#: gitk:4123
762 msgid "Command to generate more commits to include:"
763 msgstr "Commande pour générer plus de commits à inclure :"
764
763 -#: gitk:4228
765 +#: gitk:4247
766 msgid "Gitk: edit view"
767 msgstr "Gitk : éditer la vue"
768
767 -#: gitk:4236
769 +#: gitk:4255
770 msgid "-- criteria for selecting revisions"
771 msgstr "-- critère pour la sélection des révisions"
772
771 -#: gitk:4241
772 -#, fuzzy
773 +#: gitk:4260
774 msgid "View Name"
774 -msgstr "Nom de la vue :"
775 +msgstr "Nom de la vue"
776
776 -#: gitk:4316
777 +#: gitk:4335
778 msgid "Apply (F5)"
779 msgstr "Appliquer (F5)"
780
780 -#: gitk:4354
781 +#: gitk:4373
782 msgid "Error in commit selection arguments:"
783 msgstr "Erreur dans les arguments de sélection des commits :"
784
784 -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
785 +#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411
786 msgid "None"
787 msgstr "Aucun"
788
788 -#: gitk:5021 gitk:5026
789 +#: gitk:5040 gitk:5045
790 msgid "Descendant"
791 msgstr "Descendant"
792
792 -#: gitk:5022
793 +#: gitk:5041
794 msgid "Not descendant"
795 msgstr "Pas un descendant"
796
796 -#: gitk:5029 gitk:5034
797 +#: gitk:5048 gitk:5053
798 msgid "Ancestor"
799 msgstr "Ancêtre"
800
800 -#: gitk:5030
801 +#: gitk:5049
802 msgid "Not ancestor"
803 msgstr "Pas un ancêtre"
804
804 -#: gitk:5324
805 +#: gitk:5343
806 msgid "Local changes checked in to index but not committed"
807 msgstr "Modifications locales enregistrées dans l'index mais non commitées"
808
808 -#: gitk:5360
809 +#: gitk:5379
810 msgid "Local uncommitted changes, not checked in to index"
811 msgstr "Modifications locales non enregistrées dans l'index et non commitées"
812
812 -#: gitk:7134
813 +#: gitk:7153
814 msgid "and many more"
814 -msgstr ""
815 +msgstr "et beaucoup plus"
816
816 -#: gitk:7137
817 +#: gitk:7156
818 msgid "many"
819 msgstr "nombreux"
820
820 -#: gitk:7328
821 +#: gitk:7347
822 msgid "Tags:"
823 msgstr "Tags :"
824
824 -#: gitk:7345 gitk:7351 gitk:8825
825 +#: gitk:7364 gitk:7370 gitk:8844
826 msgid "Parent"
827 msgstr "Parent"
828
828 -#: gitk:7356
829 +#: gitk:7375
830 msgid "Child"
831 msgstr "Enfant"
832
832 -#: gitk:7365
833 +#: gitk:7384
834 msgid "Branch"
835 msgstr "Branche"
836
836 -#: gitk:7368
837 +#: gitk:7387
838 msgid "Follows"
839 msgstr "Suit"
840
840 -#: gitk:7371
841 +#: gitk:7390
842 msgid "Precedes"
843 msgstr "Précède"
844
844 -#: gitk:7966
845 +#: gitk:7985
846 #, tcl-format
847 msgid "Error getting diffs: %s"
848 msgstr "Erreur lors de la récupération des diff : %s"
849
849 -#: gitk:8650
850 +#: gitk:8669
851 msgid "Goto:"
852 msgstr "Aller à :"
853
853 -#: gitk:8671
854 +#: gitk:8690
855 #, tcl-format
856 msgid "Short SHA1 id %s is ambiguous"
857 msgstr "Id SHA1 court %s est ambigu"
858
858 -#: gitk:8678
859 +#: gitk:8697
860 #, tcl-format
861 msgid "Revision %s is not known"
862 msgstr "Id SHA1 %s est inconnu"
863
863 -#: gitk:8688
864 +#: gitk:8707
865 #, tcl-format
866 msgid "SHA1 id %s is not known"
867 msgstr "Id SHA1 %s est inconnu"
868
868 -#: gitk:8690
869 +#: gitk:8709
870 #, tcl-format
871 msgid "Revision %s is not in the current view"
872 msgstr "La révision %s n'est pas dans la vue courante"
873
873 -#: gitk:8832 gitk:8847
874 +#: gitk:8851 gitk:8866
875 msgid "Date"
876 msgstr "Date"
877
877 -#: gitk:8835
878 +#: gitk:8854
879 msgid "Children"
880 msgstr "Enfants"
881
881 -#: gitk:8898
882 +#: gitk:8917
883 #, tcl-format
884 msgid "Reset %s branch to here"
885 msgstr "Réinitialiser la branche %s vers cet état"
886
886 -#: gitk:8900
887 +#: gitk:8919
888 msgid "Detached head: can't reset"
889 msgstr "Head détaché : impossible de réinitialiser"
890
890 -#: gitk:9005 gitk:9011
891 +#: gitk:9024 gitk:9030
892 msgid "Skipping merge commit "
893 msgstr "Éviter le commit de la fusion "
894
894 -#: gitk:9020 gitk:9025
895 +#: gitk:9039 gitk:9044
896 msgid "Error getting patch ID for "
897 msgstr "Erreur à l'obtention de l'ID du patch pour "
898
898 -#: gitk:9021 gitk:9026
899 +#: gitk:9040 gitk:9045
900 msgid " - stopping\n"
901 msgstr " - arrêt en cours\n"
902
902 -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
903 +#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084
904 msgid "Commit "
905 msgstr "Commit "
906
906 -#: gitk:9035
907 +#: gitk:9054
908 msgid ""
909 " is the same patch as\n"
910 " "
@@ -911,7 +912,7 @@ msgstr ""
912 "est le même patch que \n"
913 " "
914
914 -#: gitk:9043
915 +#: gitk:9062
916 msgid ""
917 " differs from\n"
918 " "
@@ -919,138 +920,137 @@ msgstr ""
920 " diffère de\n"
921 " "
922
922 -#: gitk:9045
923 +#: gitk:9064
924 msgid ""
925 "Diff of commits:\n"
926 "\n"
926 -msgstr ""
927 +msgstr "Diff des commits :\n\n"
928
928 -#: gitk:9057 gitk:9066
929 +#: gitk:9076 gitk:9085
930 #, tcl-format
931 msgid " has %s children - stopping\n"
931 -msgstr "a %s enfants - arrêt en cours\n"
932 +msgstr " a %s enfants - arrêt en cours\n"
933
933 -#: gitk:9085
934 -#, fuzzy, tcl-format
934 +#: gitk:9104
935 +#, tcl-format
936 msgid "Error writing commit to file: %s"
936 -msgstr "Erreur à l'ecriture du commit :"
937 +msgstr "Erreur à l'écriture du commit dans le fichier : %s"
938
938 -#: gitk:9091
939 -#, fuzzy, tcl-format
939 +#: gitk:9110
940 +#, tcl-format
941 msgid "Error diffing commits: %s"
941 -msgstr "Erreur à l'ecriture du commit :"
942 +msgstr "Erreur à la différence des commits : %s"
943
943 -#: gitk:9137
944 +#: gitk:9156
945 msgid "Top"
946 msgstr "Haut"
947
947 -#: gitk:9138
948 +#: gitk:9157
949 msgid "From"
950 msgstr "De"
951
951 -#: gitk:9143
952 +#: gitk:9162
953 msgid "To"
954 msgstr "À"
955
955 -#: gitk:9167
956 +#: gitk:9186
957 msgid "Generate patch"
958 msgstr "Générer le patch"
959
959 -#: gitk:9169
960 +#: gitk:9188
961 msgid "From:"
962 msgstr "De :"
963
963 -#: gitk:9178
964 +#: gitk:9197
965 msgid "To:"
966 msgstr "À :"
967
967 -#: gitk:9187
968 +#: gitk:9206
969 msgid "Reverse"
970 msgstr "Inverser"
971
971 -#: gitk:9189 gitk:9385
972 +#: gitk:9208 gitk:9418
973 msgid "Output file:"
974 msgstr "Fichier de sortie :"
975
975 -#: gitk:9195
976 +#: gitk:9214
977 msgid "Generate"
978 msgstr "Générer"
979
979 -#: gitk:9233
980 +#: gitk:9252
981 msgid "Error creating patch:"
982 msgstr "Erreur à la création du patch :"
983
983 -#: gitk:9256 gitk:9373 gitk:9430
984 +#: gitk:9275 gitk:9406 gitk:9463
985 msgid "ID:"
986 msgstr "ID :"
987
987 -#: gitk:9265
988 +#: gitk:9284
989 msgid "Tag name:"
990 msgstr "Nom du Tag :"
991
991 -#: gitk:9268
992 +#: gitk:9287
993 msgid "Tag message is optional"
993 -msgstr ""
994 +msgstr "Le message du tag est optionnel"
995
995 -#: gitk:9270
996 -#, fuzzy
996 +#: gitk:9289
997 msgid "Tag message:"
998 -msgstr "Nom du Tag :"
998 +msgstr "Message du Tag :"
999
1000 -#: gitk:9274 gitk:9439
1000 +#: gitk:9293 gitk:9472
1001 msgid "Create"
1002 msgstr "Créer"
1003
1004 -#: gitk:9292
1004 +#: gitk:9311
1005 msgid "No tag name specified"
1006 msgstr "Aucun nom de tag spécifié"
1007
1008 -#: gitk:9296
1008 +#: gitk:9315
1009 #, tcl-format
1010 msgid "Tag \"%s\" already exists"
1011 msgstr "Le tag \"%s\" existe déjà"
1012
1013 -#: gitk:9306
1013 +#: gitk:9325
1014 msgid "Error creating tag:"
1015 msgstr "Erreur à la création du tag :"
1016
1017 -#: gitk:9382
1017 +#: gitk:9415
1018 msgid "Command:"
1019 msgstr "Commande :"
1020
1021 -#: gitk:9390
1021 +#: gitk:9423
1022 msgid "Write"
1023 msgstr "Écrire"
1024
1025 -#: gitk:9408
1025 +#: gitk:9441
1026 msgid "Error writing commit:"
1027 msgstr "Erreur à l'ecriture du commit :"
1028
1029 -#: gitk:9435
1029 +#: gitk:9468
1030 msgid "Name:"
1031 msgstr "Nom :"
1032
1033 -#: gitk:9458
1033 +#: gitk:9491
1034 msgid "Please specify a name for the new branch"
1035 msgstr "Veuillez spécifier un nom pour la nouvelle branche"
1036
1037 -#: gitk:9463
1037 +#: gitk:9496
1038 #, tcl-format
1039 msgid "Branch '%s' already exists. Overwrite?"
1040 msgstr "La branche '%s' existe déjà. Écraser?"
1041
1042 -#: gitk:9530
1042 +#: gitk:9563
1043 #, tcl-format
1044 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1045 msgstr ""
1046 "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
1047 "tout?"
1048
1049 -#: gitk:9535
1049 +#: gitk:9568
1050 msgid "Cherry-picking"
1051 msgstr "Cueillir (Cherry-picking)"
1052
1053 -#: gitk:9544
1053 +#: gitk:9577
1054 #, tcl-format
1055 msgid ""
1056 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1061,7 +1061,7 @@ msgstr ""
1061 "Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
1062 "nouveau."
1063
1064 -#: gitk:9550
1064 +#: gitk:9583
1065 msgid ""
1066 "Cherry-pick failed because of merge conflict.\n"
1067 "Do you wish to run git citool to resolve it?"
@@ -1070,67 +1070,58 @@ msgstr ""
1070 "fusion.\n"
1071 "Souhaitez-vous exécuter git citool pour le résoudre ?"
1072
1073 -#: gitk:9566 gitk:9624
1073 +#: gitk:9599 gitk:9657
1074 msgid "No changes committed"
1075 msgstr "Aucun changement commité"
1076
1077 -#: gitk:9593
1078 -#, fuzzy, tcl-format
1077 +#: gitk:9626
1078 +#, tcl-format
1079 msgid "Commit %s is not included in branch %s -- really revert it?"
1080 -msgstr ""
1081 -"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
1082 -"tout?"
1080 +msgstr "Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?"
1081
1084 -#: gitk:9598
1085 -#, fuzzy
1082 +#: gitk:9631
1083 msgid "Reverting"
1087 -msgstr "Réinitialisation"
1084 +msgstr "Commit défait"
1085
1089 -#: gitk:9606
1090 -#, fuzzy, tcl-format
1086 +#: gitk:9639
1087 +#, tcl-format
1088 msgid ""
1089 "Revert failed because of local changes to the following files:%s Please "
1090 "commit, reset or stash your changes and try again."
1094 -msgstr ""
1095 -"La cueillette (cherry-pick) a échouée à cause de modifications locales du "
1096 -"fichier '%s'.\n"
1097 -"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
1098 -"nouveau."
1091 +msgstr "Échec en tentant de défaire le commit à cause de modifications locales des fichiers : %s. Veuillez valider, réinitialiser ou remiser vos modifications et essayer de nouveau."
1092
1100 -#: gitk:9610
1101 -#, fuzzy
1093 +#: gitk:9643
1094 msgid ""
1095 "Revert failed because of merge conflict.\n"
1096 " Do you wish to run git citool to resolve it?"
1097 msgstr ""
1106 -"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une "
1107 -"fusion.\n"
1098 +"Échec en tentant de défaire à cause d'un conflit de fusion.\n"
1099 "Souhaitez-vous exécuter git citool pour le résoudre ?"
1100
1110 -#: gitk:9653
1101 +#: gitk:9686
1102 msgid "Confirm reset"
1103 msgstr "Confirmer la réinitialisation"
1104
1114 -#: gitk:9655
1105 +#: gitk:9688
1106 #, tcl-format
1107 msgid "Reset branch %s to %s?"
1108 msgstr "Réinitialiser la branche %s à %s?"
1109
1119 -#: gitk:9657
1110 +#: gitk:9690
1111 msgid "Reset type:"
1112 msgstr "Type de réinitialisation :"
1113
1123 -#: gitk:9660
1114 +#: gitk:9693
1115 msgid "Soft: Leave working tree and index untouched"
1116 msgstr "Douce : Laisse le répertoire de travail et l'index intacts"
1117
1127 -#: gitk:9663
1118 +#: gitk:9696
1119 msgid "Mixed: Leave working tree untouched, reset index"
1120 msgstr ""
1121 "Hybride : Laisse le répertoire de travail dans son état courant, "
1122 "réinitialise l'index"
1123
1133 -#: gitk:9666
1124 +#: gitk:9699
1125 msgid ""
1126 "Hard: Reset working tree and index\n"
1127 "(discard ALL local changes)"
@@ -1138,21 +1129,20 @@ msgstr ""
1129 "Dure : Réinitialise le répertoire de travail et l'index\n"
1130 "(abandonne TOUS les changements locaux)"
1131
1141 -#: gitk:9683
1132 +#: gitk:9716
1133 msgid "Resetting"
1134 msgstr "Réinitialisation"
1135
1136 # Fixme: Récupération est-il vraiment une mauvaise traduction?
1146 -#: gitk:9743
1147 -#, fuzzy
1137 +#: gitk:9776
1138 msgid "Checking out"
1149 -msgstr "Récupération"
1139 +msgstr "Extraction"
1140
1151 -#: gitk:9796
1141 +#: gitk:9829
1142 msgid "Cannot delete the currently checked-out branch"
1143 msgstr "Impossible de supprimer la branche en cours"
1144
1155 -#: gitk:9802
1145 +#: gitk:9835
1146 #, tcl-format
1147 msgid ""
1148 "The commits on branch %s aren't on any other branch.\n"
@@ -1161,16 +1151,16 @@ msgstr ""
1151 "Les commits de la branche %s ne sont dans aucune autre branche.\n"
1152 "Voulez-vous vraiment supprimer cette branche %s ?"
1153
1164 -#: gitk:9833
1154 +#: gitk:9866
1155 #, tcl-format
1156 msgid "Tags and heads: %s"
1157 msgstr "Tags et heads : %s"
1158
1169 -#: gitk:9850
1159 +#: gitk:9883
1160 msgid "Filter"
1161 msgstr "Filtrer"
1162
1173 -#: gitk:10146
1163 +#: gitk:10179
1164 msgid ""
1165 "Error reading commit topology information; branch and preceding/following "
1166 "tag information will be incomplete."
@@ -1179,207 +1169,202 @@ msgstr ""
1169 "informations sur les branches et les tags précédents/suivants seront "
1170 "incomplètes."
1171
1182 -#: gitk:11123
1172 +#: gitk:11156
1173 msgid "Tag"
1174 msgstr "Tag"
1175
1186 -#: gitk:11127
1176 +#: gitk:11160
1177 msgid "Id"
1178 msgstr "Id"
1179
1190 -#: gitk:11210
1180 +#: gitk:11243
1181 msgid "Gitk font chooser"
1182 msgstr "Sélecteur de police de Gitk"
1183
1194 -#: gitk:11227
1184 +#: gitk:11260
1185 msgid "B"
1186 msgstr "B"
1187
1198 -#: gitk:11230
1188 +#: gitk:11263
1189 msgid "I"
1190 msgstr "I"
1191
1202 -#: gitk:11348
1192 +#: gitk:11381
1193 msgid "Commit list display options"
1194 msgstr "Options d'affichage de la liste des commits"
1195
1206 -#: gitk:11351
1196 +#: gitk:11384
1197 msgid "Maximum graph width (lines)"
1198 msgstr "Longueur maximum du graphe (lignes)"
1199
1200 # FIXME : Traduction standard de "pane"?
1211 -#: gitk:11355
1212 -#, fuzzy, no-tcl-format
1201 +#: gitk:11388
1202 +#, no-tcl-format
1203 msgid "Maximum graph width (% of pane)"
1214 -msgstr "Longueur maximum du graphe (% du panneau)"
1204 +msgstr "Largeur maximum du graphe (% du panneau)"
1205
1216 -#: gitk:11358
1206 +#: gitk:11391
1207 msgid "Show local changes"
1208 msgstr "Montrer les changements locaux"
1209
1220 -#: gitk:11361
1221 -#, fuzzy
1210 +#: gitk:11394
1211 msgid "Auto-select SHA1 (length)"
1223 -msgstr "Sélection auto. du SHA1"
1212 +msgstr "Sélection auto. du SHA1 (longueur)"
1213
1225 -#: gitk:11365
1214 +#: gitk:11398
1215 msgid "Hide remote refs"
1216 msgstr "Cacher les refs distantes"
1217
1229 -#: gitk:11369
1218 +#: gitk:11402
1219 msgid "Diff display options"
1220 msgstr "Options d'affichage des diff"
1221
1233 -#: gitk:11371
1222 +#: gitk:11404
1223 msgid "Tab spacing"
1224 msgstr "Taille des tabulations"
1225
1237 -#: gitk:11374
1238 -#, fuzzy
1226 +#: gitk:11407
1227 msgid "Display nearby tags/heads"
1228 msgstr "Afficher les tags les plus proches"
1229
1242 -#: gitk:11377
1230 +#: gitk:11410
1231 msgid "Maximum # tags/heads to show"
1244 -msgstr ""
1232 +msgstr "Nombre maximum de tags/heads à afficher"
1233
1246 -#: gitk:11380
1234 +#: gitk:11413
1235 msgid "Limit diffs to listed paths"
1236 msgstr "Limiter les différences aux chemins listés"
1237
1250 -#: gitk:11383
1238 +#: gitk:11416
1239 msgid "Support per-file encodings"
1240 msgstr "Support pour un encodage des caractères par fichier"
1241
1254 -#: gitk:11389 gitk:11536
1242 +#: gitk:11422 gitk:11569
1243 msgid "External diff tool"
1244 msgstr "Outil diff externe"
1245
1258 -#: gitk:11390
1246 +#: gitk:11423
1247 msgid "Choose..."
1248 msgstr "Choisir..."
1249
1262 -#: gitk:11395
1263 -#, fuzzy
1250 +#: gitk:11428
1251 msgid "General options"
1265 -msgstr "Générer le patch"
1252 +msgstr "Options générales"
1253
1267 -#: gitk:11398
1254 +#: gitk:11431
1255 msgid "Use themed widgets"
1269 -msgstr ""
1256 +msgstr "Utiliser des widgets en thème"
1257
1271 -#: gitk:11400
1258 +#: gitk:11433
1259 msgid "(change requires restart)"
1273 -msgstr ""
1260 +msgstr "(la modification nécessite un redémarrage)"
1261
1275 -#: gitk:11402
1262 +#: gitk:11435
1263 msgid "(currently unavailable)"
1277 -msgstr ""
1264 +msgstr "(non disponible actuellement)"
1265
1279 -#: gitk:11413
1266 +#: gitk:11446
1267 msgid "Colors: press to choose"
1268 msgstr "Couleurs : cliquer pour choisir"
1269
1283 -#: gitk:11416
1270 +#: gitk:11449
1271 msgid "Interface"
1285 -msgstr ""
1272 +msgstr "Interface"
1273
1287 -#: gitk:11417
1288 -#, fuzzy
1274 +#: gitk:11450
1275 msgid "interface"
1290 -msgstr "Police de l'interface utilisateur"
1276 +msgstr "interface"
1277
1292 -#: gitk:11420
1278 +#: gitk:11453
1279 msgid "Background"
1280 msgstr "Arrière-plan"
1281
1296 -#: gitk:11421 gitk:11451
1282 +#: gitk:11454 gitk:11484
1283 msgid "background"
1284 msgstr "arrière-plan"
1285
1300 -#: gitk:11424
1286 +#: gitk:11457
1287 msgid "Foreground"
1288 msgstr "Premier plan"
1289
1304 -#: gitk:11425
1290 +#: gitk:11458
1291 msgid "foreground"
1292 msgstr "premier plan"
1293
1308 -#: gitk:11428
1294 +#: gitk:11461
1295 msgid "Diff: old lines"
1296 msgstr "Diff : anciennes lignes"
1297
1312 -#: gitk:11429
1298 +#: gitk:11462
1299 msgid "diff old lines"
1300 msgstr "diff anciennes lignes"
1301
1316 -#: gitk:11433
1302 +#: gitk:11466
1303 msgid "Diff: new lines"
1304 msgstr "Diff : nouvelles lignes"
1305
1320 -#: gitk:11434
1306 +#: gitk:11467
1307 msgid "diff new lines"
1308 msgstr "diff nouvelles lignes"
1309
1324 -#: gitk:11438
1310 +#: gitk:11471
1311 msgid "Diff: hunk header"
1312 msgstr "Diff : entête du hunk"
1313
1328 -#: gitk:11440
1314 +#: gitk:11473
1315 msgid "diff hunk header"
1316 msgstr "diff : entête du hunk"
1317
1332 -#: gitk:11444
1318 +#: gitk:11477
1319 msgid "Marked line bg"
1320 msgstr "Arrière-plan de la ligne marquée"
1321
1336 -#: gitk:11446
1322 +#: gitk:11479
1323 msgid "marked line background"
1324 msgstr "Arrière-plan de la ligne marquée"
1325
1340 -#: gitk:11450
1326 +#: gitk:11483
1327 msgid "Select bg"
1328 msgstr "Sélectionner l'arrière-plan"
1329
1344 -#: gitk:11459
1330 +#: gitk:11492
1331 msgid "Fonts: press to choose"
1332 msgstr "Polices : cliquer pour choisir"
1333
1348 -#: gitk:11461
1334 +#: gitk:11494
1335 msgid "Main font"
1336 msgstr "Police principale"
1337
1352 -#: gitk:11462
1338 +#: gitk:11495
1339 msgid "Diff display font"
1340 msgstr "Police d'affichage des diff"
1341
1356 -#: gitk:11463
1342 +#: gitk:11496
1343 msgid "User interface font"
1344 msgstr "Police de l'interface utilisateur"
1345
1360 -#: gitk:11485
1346 +#: gitk:11518
1347 msgid "Gitk preferences"
1348 msgstr "Préférences de Gitk"
1349
1364 -#: gitk:11494
1365 -#, fuzzy
1350 +#: gitk:11527
1351 msgid "General"
1367 -msgstr "Générer"
1352 +msgstr "Général"
1353
1369 -#: gitk:11495
1354 +#: gitk:11528
1355 msgid "Colors"
1371 -msgstr ""
1356 +msgstr "Couleurs"
1357
1373 -#: gitk:11496
1358 +#: gitk:11529
1359 msgid "Fonts"
1375 -msgstr ""
1360 +msgstr "Polices"
1361
1377 -#: gitk:11546
1362 +#: gitk:11579
1363 #, tcl-format
1364 msgid "Gitk: choose color for %s"
1365 msgstr "Gitk : choisir la couleur de %s"
1366
1382 -#: gitk:12059
1367 +#: gitk:12092
1368 msgid ""
1369 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1370 " Gitk requires at least Tcl/Tk 8.4."
@@ -1387,16 +1372,16 @@ msgstr ""
1372 "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n"
1373 " Gitk requiert Tcl/Tk version 8.4 ou supérieur."
1374
1390 -#: gitk:12269
1375 +#: gitk:12302
1376 msgid "Cannot find a git repository here."
1377 msgstr "Impossible de trouver un dépôt git ici."
1378
1394 -#: gitk:12316
1379 +#: gitk:12349
1380 #, tcl-format
1381 msgid "Ambiguous argument '%s': both revision and filename"
1382 msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier"
1383
1399 -#: gitk:12328
1384 +#: gitk:12361
1385 msgid "Bad arguments to gitk:"
1386 msgstr "Arguments invalides pour gitk :"
1387