summaryrefslogtreecommitdiff
path: root/gitk-git/po/fr.po
diff options
context:
space:
mode:
Diffstat (limited to 'gitk-git/po/fr.po')
-rw-r--r--gitk-git/po/fr.po907
1 files changed, 449 insertions, 458 deletions
diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po
index 747ee19..c44f994 100644
--- a/gitk-git/po/fr.po
+++ b/gitk-git/po/fr.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the gitk package.
# Translators:
# Emmanuel Trillaud <etrillaud@gmail.com>
-#
+# Jean-Noël Avila <jn.avila@free.fr>
msgid ""
msgstr ""
"Project-Id-Version: gitk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-15 14:37+1100\n"
-"PO-Revision-Date: 2009-11-19 22:13+0100\n"
-"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n"
+"POT-Creation-Date: 2016-01-22 22:04+0100\n"
+"PO-Revision-Date: 2016-01-22 23:28+0100\n"
+"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: git@vger.kernel.org\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -23,13 +23,13 @@ msgstr ""
msgid "Couldn't get list of unmerged files:"
msgstr "Impossible de récupérer la liste des fichiers non fusionnés :"
-#: gitk:212 gitk:2381
+#: gitk:212 gitk:2399
msgid "Color words"
-msgstr ""
+msgstr "Colorier les mots différents"
-#: gitk:217 gitk:2381 gitk:8201 gitk:8234
+#: gitk:217 gitk:2399 gitk:8239 gitk:8272
msgid "Markup words"
-msgstr ""
+msgstr "Marquer les mots différents"
#: gitk:324
msgid "Error parsing revisions:"
@@ -47,13 +47,10 @@ msgstr ""
# FIXME : améliorer la traduction de 'file limite'
#: gitk:396
-#, fuzzy
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
-msgstr ""
-"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné "
-"n'est dans la limite des fichiers."
+msgstr "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné n'est dans la limite des fichiers."
#: gitk:418 gitk:566
msgid "Error executing git log:"
@@ -63,14 +60,18 @@ msgstr "Erreur à l'exécution de git log :"
msgid "Reading"
msgstr "Lecture en cours"
-#: gitk:496 gitk:4508
+#: gitk:496 gitk:4544
msgid "Reading commits..."
msgstr "Lecture des commits..."
-#: gitk:499 gitk:1637 gitk:4511
+#: gitk:499 gitk:1637 gitk:4547
msgid "No commits selected"
msgstr "Aucun commit sélectionné"
+#: gitk:1445 gitk:4064 gitk:12469
+msgid "Command line"
+msgstr "Ligne de commande"
+
#: gitk:1511
msgid "Can't parse git log output:"
msgstr "Impossible de lire la sortie de git log :"
@@ -79,286 +80,294 @@ msgstr "Impossible de lire la sortie de git log :"
msgid "No commit information available"
msgstr "Aucune information disponible sur le commit"
-#: gitk:1897
-msgid "mc"
-msgstr ""
-
-#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
+#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554
msgid "OK"
msgstr "OK"
-#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
-#: gitk:11221 gitk:11501
+#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704
+#: gitk:11275 gitk:11555
msgid "Cancel"
msgstr "Annuler"
-#: gitk:2069
-msgid "Update"
+#: gitk:2083
+msgid "&Update"
msgstr "Mise à jour"
-#: gitk:2070
-msgid "Reload"
-msgstr "Recharger"
+#: gitk:2084
+msgid "&Reload"
+msgstr "&Recharger"
-#: gitk:2071
-msgid "Reread references"
-msgstr "Relire les références"
+#: gitk:2085
+msgid "Reread re&ferences"
+msgstr "Relire les ré&férences"
-#: gitk:2072
-msgid "List references"
-msgstr "Lister les références"
+#: gitk:2086
+msgid "&List references"
+msgstr "&Lister les références"
-#: gitk:2074
-msgid "Start git gui"
-msgstr "Démarrer git gui"
+#: gitk:2088
+msgid "Start git &gui"
+msgstr "Démarrer git &gui"
-#: gitk:2076
-msgid "Quit"
-msgstr "Quitter"
+#: gitk:2090
+msgid "&Quit"
+msgstr "&Quitter"
-#: gitk:2068
-msgid "File"
-msgstr "Fichier"
+#: gitk:2082
+msgid "&File"
+msgstr "&Fichier"
-#: gitk:2080
-msgid "Preferences"
+#: gitk:2094
+msgid "&Preferences"
msgstr "Préférences"
-#: gitk:2079
-msgid "Edit"
-msgstr "Éditer"
+#: gitk:2093
+msgid "&Edit"
+msgstr "&Éditer"
-#: gitk:2084
-msgid "New view..."
-msgstr "Nouvelle vue..."
+#: gitk:2098
+msgid "&New view..."
+msgstr "&Nouvelle vue..."
-#: gitk:2085
-msgid "Edit view..."
-msgstr "Éditer la vue..."
+#: gitk:2099
+msgid "&Edit view..."
+msgstr "&Éditer la vue..."
-#: gitk:2086
-msgid "Delete view"
+#: gitk:2100
+msgid "&Delete view"
msgstr "Supprimer la vue"
-#: gitk:2088
-msgid "All files"
+#: gitk:2102
+msgid "&All files"
msgstr "Tous les fichiers"
-#: gitk:2083 gitk:4050
-msgid "View"
-msgstr "Vue"
+#: gitk:2097
+msgid "&View"
+msgstr "&Vue"
-#: gitk:2093 gitk:2103 gitk:3009
-msgid "About gitk"
+#: gitk:2107 gitk:2117
+msgid "&About gitk"
msgstr "À propos de gitk"
-#: gitk:2094 gitk:2108
-msgid "Key bindings"
+#: gitk:2108 gitk:2122
+msgid "&Key bindings"
msgstr "Raccourcis clavier"
-#: gitk:2092 gitk:2107
-msgid "Help"
+#: gitk:2106 gitk:2121
+msgid "&Help"
msgstr "Aide"
-#: gitk:2185 gitk:8633
+#: gitk:2199 gitk:8671
msgid "SHA1 ID:"
msgstr "Id SHA1 :"
-#: gitk:2229
+#: gitk:2243
msgid "Row"
msgstr "Colonne"
-#: gitk:2267
+#: gitk:2281
msgid "Find"
msgstr "Recherche"
-#: gitk:2295
+#: gitk:2309
msgid "commit"
msgstr "commit"
-#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
-#: gitk:6893
+#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846
+#: gitk:6931
msgid "containing:"
msgstr "contient :"
-#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
+#: gitk:2316 gitk:3545 gitk:3550 gitk:4782
msgid "touching paths:"
msgstr "chemins modifiés :"
-#: gitk:2303 gitk:4759
+#: gitk:2317 gitk:4796
msgid "adding/removing string:"
msgstr "ajoute/supprime la chaîne :"
-#: gitk:2304 gitk:4761
+#: gitk:2318 gitk:4798
msgid "changing lines matching:"
-msgstr ""
+msgstr "modifie les lignes vérifiant :"
-#: gitk:2313 gitk:2315 gitk:4748
+#: gitk:2327 gitk:2329 gitk:4785
msgid "Exact"
msgstr "Exact"
-#: gitk:2315 gitk:4836 gitk:6704
+#: gitk:2329 gitk:4873 gitk:6742
msgid "IgnCase"
msgstr "Ignorer la casse"
-#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
+#: gitk:2329 gitk:4755 gitk:4871 gitk:6738
msgid "Regexp"
msgstr "Expression régulière"
-#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
+#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935
msgid "All fields"
msgstr "Tous les champs"
-#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
+#: gitk:2332 gitk:4890 gitk:4923 gitk:6805
msgid "Headline"
-msgstr "Surligner"
+msgstr "Titre"
-#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
+#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408
msgid "Comments"
msgstr "Commentaires"
-#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
-#: gitk:8826
+#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849
+#: gitk:8864
msgid "Author"
msgstr "Auteur"
-#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
+#: gitk:2333 gitk:4890 gitk:6805 gitk:7345
msgid "Committer"
-msgstr "Auteur du commit"
+msgstr "Validateur"
-#: gitk:2350
+#: gitk:2367
msgid "Search"
msgstr "Rechercher"
-#: gitk:2358
+#: gitk:2375
msgid "Diff"
msgstr "Diff"
-#: gitk:2360
+#: gitk:2377
msgid "Old version"
msgstr "Ancienne version"
-#: gitk:2362
+#: gitk:2379
msgid "New version"
msgstr "Nouvelle version"
-#: gitk:2364
+#: gitk:2382
msgid "Lines of context"
msgstr "Lignes de contexte"
-#: gitk:2374
+#: gitk:2392
msgid "Ignore space change"
msgstr "Ignorer les modifications d'espace"
-#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
+#: gitk:2396 gitk:2398 gitk:7978 gitk:8225
msgid "Line diff"
-msgstr ""
+msgstr "différence par ligne"
-#: gitk:2445
+#: gitk:2463
msgid "Patch"
msgstr "Patch"
-#: gitk:2447
+#: gitk:2465
msgid "Tree"
msgstr "Arbre"
-#: gitk:2616 gitk:2636
+#: gitk:2635 gitk:2656
msgid "Diff this -> selected"
-msgstr "Diff entre ceci et la sélection"
+msgstr "Diff ceci -> la sélection"
-#: gitk:2617 gitk:2637
+#: gitk:2636 gitk:2657
msgid "Diff selected -> this"
-msgstr "Diff entre sélection et ceci"
+msgstr "Diff sélection -> ceci"
-#: gitk:2618 gitk:2638
+#: gitk:2637 gitk:2658
msgid "Make patch"
msgstr "Créer patch"
-#: gitk:2619 gitk:9235
+#: gitk:2638 gitk:9273
msgid "Create tag"
-msgstr "Créer tag"
+msgstr "Créer étiquette"
-#: gitk:2620 gitk:9352
+#: gitk:2639
+msgid "Copy commit summary"
+msgstr "Copié le résumé du commit"
+
+#: gitk:2640 gitk:9404
msgid "Write commit to file"
msgstr "Écrire le commit dans un fichier"
-#: gitk:2621 gitk:9409
+#: gitk:2641 gitk:9461
msgid "Create new branch"
msgstr "Créer une nouvelle branche"
-#: gitk:2622
+#: gitk:2642
msgid "Cherry-pick this commit"
msgstr "Cueillir (cherry-pick) ce commit"
-#: gitk:2623
+#: gitk:2643
msgid "Reset HEAD branch to here"
msgstr "Réinitialiser la branche HEAD vers cet état"
-#: gitk:2624
+#: gitk:2644
msgid "Mark this commit"
msgstr "Marquer ce commit"
-#: gitk:2625
+#: gitk:2645
msgid "Return to mark"
msgstr "Retourner à la marque"
-#: gitk:2626
+#: gitk:2646
msgid "Find descendant of this and mark"
msgstr "Chercher le descendant de ceci et le marquer"
-#: gitk:2627
+#: gitk:2647
msgid "Compare with marked commit"
msgstr "Comparer avec le commit marqué"
-#: gitk:2628 gitk:2639
-#, fuzzy
+#: gitk:2648 gitk:2659
msgid "Diff this -> marked commit"
-msgstr "Diff entre ceci et la sélection"
+msgstr "Diff ceci -> sélection"
-#: gitk:2629 gitk:2640
-#, fuzzy
+#: gitk:2649 gitk:2660
msgid "Diff marked commit -> this"
-msgstr "Diff entre sélection et ceci"
+msgstr "Diff entre sélection -> ceci"
-#: gitk:2630
-#, fuzzy
+#: gitk:2650
msgid "Revert this commit"
-msgstr "Marquer ce commit"
+msgstr "Défaire ce commit"
-#: gitk:2646
+#: gitk:2666
msgid "Check out this branch"
msgstr "Récupérer cette branche"
-#: gitk:2647
+#: gitk:2667
msgid "Remove this branch"
msgstr "Supprimer cette branche"
-#: gitk:2654
+#: gitk:2668
+msgid "Copy branch name"
+msgstr "Copier la nom de la branche"
+
+#: gitk:2675
msgid "Highlight this too"
msgstr "Surligner également ceci"
-#: gitk:2655
+#: gitk:2676
msgid "Highlight this only"
msgstr "Surligner seulement ceci"
-#: gitk:2656
+#: gitk:2677
msgid "External diff"
msgstr "Diff externe"
-#: gitk:2657
+#: gitk:2678
msgid "Blame parent commit"
msgstr "Blâmer le commit parent"
-#: gitk:2664
+#: gitk:2679
+msgid "Copy path"
+msgstr "Copier le chemin"
+
+#: gitk:2686
msgid "Show origin of this line"
msgstr "Montrer l'origine de cette ligne"
-#: gitk:2665
+#: gitk:2687
msgid "Run git gui blame on this line"
msgstr "Exécuter git gui blame sur cette ligne"
-#: gitk:3011
-#, fuzzy
+#: gitk:3031
+msgid "About gitk"
+msgstr "À propos de gitk"
+
+#: gitk:3033
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
@@ -370,322 +379,329 @@ msgstr ""
"\n"
"Gitk - visualisateur de commit pour git\n"
"\n"
-"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2014 Paul Mackerras\n"
"\n"
-"Utilisation et redistribution soumises aux termes de la GNU General Public "
-"License"
+"Utilisation et redistribution soumises aux termes de la GNU General Public License"
-#: gitk:3019 gitk:3085 gitk:9836
+#: gitk:3041 gitk:3108 gitk:9890
msgid "Close"
msgstr "Fermer"
-#: gitk:3040
+#: gitk:3062
msgid "Gitk key bindings"
msgstr "Raccourcis clavier de Gitk"
-#: gitk:3043
+#: gitk:3065
msgid "Gitk key bindings:"
msgstr "Raccourcis clavier de Gitk :"
-#: gitk:3045
+#: gitk:3067
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tQuitter"
-#: gitk:3046
-#, fuzzy, tcl-format
+#: gitk:3068
+#, tcl-format
msgid "<%s-W>\t\tClose window"
-msgstr "<%s-F>\t\tRechercher"
+msgstr "<%s-W>\t\tFermer la fenêtre"
-#: gitk:3047
+#: gitk:3069
msgid "<Home>\t\tMove to first commit"
msgstr "<Début>\t\tAller au premier commit"
-#: gitk:3048
+#: gitk:3070
msgid "<End>\t\tMove to last commit"
msgstr "<Fin>\t\tAller au dernier commit"
-#: gitk:3049
-#, fuzzy
+#: gitk:3071
msgid "<Up>, p, k\tMove up one commit"
-msgstr "<Haut>, p, i\t Aller au commit suivant"
+msgstr "<Haut>, p, k\t Aller au commit précédent"
-#: gitk:3050
-#, fuzzy
+#: gitk:3072
msgid "<Down>, n, j\tMove down one commit"
-msgstr "<Bas>, n, k\t Aller au commit précédent"
+msgstr "<Bas>, n, j\t Aller au commit suivant"
-#: gitk:3051
-#, fuzzy
+#: gitk:3073
msgid "<Left>, z, h\tGo back in history list"
-msgstr "<Gauche>, z, j\tReculer dans l'historique"
+msgstr "<Gauche>, z, h\tReculer dans l'historique"
-#: gitk:3052
+#: gitk:3074
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Droite>, x, l\tAvancer dans l'historique"
-#: gitk:3053
+#: gitk:3075
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
-msgstr ""
+msgstr "<%s-n>\tAller sur le n-ième parent du commit dans l'historique"
-#: gitk:3054
+#: gitk:3076
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
-#: gitk:3055
+#: gitk:3077
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
-#: gitk:3056
+#: gitk:3078
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Début>\tAller en haut de la liste des commits"
-#: gitk:3057
+#: gitk:3079
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tAller en bas de la liste des commits"
-#: gitk:3058
+#: gitk:3080
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits"
-#: gitk:3059
+#: gitk:3081
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits"
-#: gitk:3060
+#: gitk:3082
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits"
-#: gitk:3061
+#: gitk:3083
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits"
-#: gitk:3062
+#: gitk:3084
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr ""
"<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)"
-#: gitk:3063
+#: gitk:3085
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr ""
"<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)"
-#: gitk:3064
+#: gitk:3086
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff"
-#: gitk:3065
+#: gitk:3087
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tMonter d'une page dans la vue des diff"
-#: gitk:3066
+#: gitk:3088
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff"
-#: gitk:3067
+#: gitk:3089
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tMonter de 18 lignes dans la vue des diff"
-#: gitk:3068
+#: gitk:3090
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tDescendre de 18 lignes dans la vue des diff"
-#: gitk:3069
+#: gitk:3091
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tRechercher"
-#: gitk:3070
+#: gitk:3092
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tAller au résultat de recherche suivant"
-#: gitk:3071
+#: gitk:3093
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\t\tAller au résultat de recherche suivant"
-#: gitk:3072
+#: gitk:3094
+msgid "g\t\tGo to commit"
+msgstr "g\t\tAller au commit"
+
+#: gitk:3095
msgid "/\t\tFocus the search box"
msgstr "/\t\tFocus sur la zone de recherche"
-#: gitk:3073
+#: gitk:3096
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tAller au résultat de recherche précédent"
-#: gitk:3074
+#: gitk:3097
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tAller au prochain fichier dans la vue des diff"
-#: gitk:3075
+#: gitk:3098
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff"
-#: gitk:3076
+#: gitk:3099
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff"
-#: gitk:3077
+#: gitk:3100
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\tAugmenter la taille de la police"
-#: gitk:3078
+#: gitk:3101
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tAugmenter la taille de la police"
-#: gitk:3079
+#: gitk:3102
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\tDiminuer la taille de la police"
-#: gitk:3080
+#: gitk:3103
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tDiminuer la taille de la police"
-#: gitk:3081
+#: gitk:3104
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tMise à jour"
-#: gitk:3546 gitk:3555
+#: gitk:3569 gitk:3578
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Erreur lors de la création du répertoire temporaire %s :"
-#: gitk:3568
+#: gitk:3591
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "Erreur en obtenant \"%s\" de %s:"
-#: gitk:3631
+#: gitk:3654
msgid "command failed:"
msgstr "échec de la commande :"
-#: gitk:3780
+#: gitk:3803
msgid "No such commit"
msgstr "Commit inexistant"
-#: gitk:3794
+#: gitk:3817
msgid "git gui blame: command failed:"
msgstr "git gui blame : échec de la commande :"
-#: gitk:3825
+#: gitk:3848
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Impossible de lire le head de la fusion : %s"
-#: gitk:3833
+#: gitk:3856
#, tcl-format
msgid "Error reading index: %s"
msgstr "Erreur à la lecture de l'index : %s"
-#: gitk:3858
+#: gitk:3881
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "Impossible de démarrer git blame : %s"
-#: gitk:3861 gitk:6735
+#: gitk:3884 gitk:6773
msgid "Searching"
msgstr "Recherche en cours"
-#: gitk:3893
+#: gitk:3916
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Erreur à l'exécution de git blame : %s"
-#: gitk:3921
+#: gitk:3944
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue"
-#: gitk:3935
+#: gitk:3958
msgid "External diff viewer failed:"
-msgstr "Échec de l'outil externe de visualisation des diff"
+msgstr "Échec de l'outil externe de visualisation des diff :"
-#: gitk:4053
+#: gitk:4062
+msgid "All files"
+msgstr "Tous les fichiers"
+
+#: gitk:4086
+msgid "View"
+msgstr "Vue"
+
+#: gitk:4089
msgid "Gitk view definition"
msgstr "Définition des vues de Gitk"
-#: gitk:4057
+#: gitk:4093
msgid "Remember this view"
msgstr "Se souvenir de cette vue"
-#: gitk:4058
+#: gitk:4094
msgid "References (space separated list):"
msgstr "Références (liste d'éléments séparés par des espaces) :"
-#: gitk:4059
+#: gitk:4095
msgid "Branches & tags:"
-msgstr "Branches & tags :"
+msgstr "Branches & étiquettes :"
-#: gitk:4060
+#: gitk:4096
msgid "All refs"
msgstr "Toutes les références"
-#: gitk:4061
+#: gitk:4097
msgid "All (local) branches"
msgstr "Toutes les branches (locales)"
-#: gitk:4062
+#: gitk:4098
msgid "All tags"
-msgstr "Tous les tags"
+msgstr "Toutes les étiquettes"
-#: gitk:4063
+#: gitk:4099
msgid "All remote-tracking branches"
msgstr "Toutes les branches de suivi à distance"
-#: gitk:4064
+#: gitk:4100
msgid "Commit Info (regular expressions):"
msgstr "Info sur les commits (expressions régulières) :"
-#: gitk:4065
+#: gitk:4101
msgid "Author:"
msgstr "Auteur :"
-#: gitk:4066
+#: gitk:4102
msgid "Committer:"
-msgstr "Commiteur :"
+msgstr "Validateur :"
-#: gitk:4067
+#: gitk:4103
msgid "Commit Message:"
msgstr "Message de commit :"
-#: gitk:4068
+#: gitk:4104
msgid "Matches all Commit Info criteria"
msgstr "Correspond à tous les critères d'Info sur les commits"
-#: gitk:4069
-#, fuzzy
-msgid "Matches none Commit Info criteria"
-msgstr "Correspond à tous les critères d'Info sur les commits"
+#: gitk:4105
+msgid "Matches no Commit Info criteria"
+msgstr "Ne correspond à aucun des critères d'Info sur les commits"
-#: gitk:4070
+#: gitk:4106
msgid "Changes to Files:"
msgstr "Changements des fichiers :"
-#: gitk:4071
+#: gitk:4107
msgid "Fixed String"
msgstr "Chaîne Figée"
-#: gitk:4072
+#: gitk:4108
msgid "Regular Expression"
msgstr "Expression Régulière"
-#: gitk:4073
+#: gitk:4109
msgid "Search string:"
msgstr "Recherche de la chaîne :"
-#: gitk:4074
+#: gitk:4110
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
@@ -693,204 +709,201 @@ msgstr ""
"Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
"2009 15:27:38\") :"
-#: gitk:4075
+#: gitk:4111
msgid "Since:"
-msgstr "De :"
+msgstr "Depuis :"
-#: gitk:4076
+#: gitk:4112
msgid "Until:"
msgstr "Jusqu'au :"
-#: gitk:4077
+#: gitk:4113
msgid "Limit and/or skip a number of revisions (positive integer):"
msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :"
-#: gitk:4078
+#: gitk:4114
msgid "Number to show:"
msgstr "Nombre à afficher :"
-#: gitk:4079
+#: gitk:4115
msgid "Number to skip:"
msgstr "Nombre à sauter :"
-#: gitk:4080
+#: gitk:4116
msgid "Miscellaneous options:"
msgstr "Options diverses :"
-#: gitk:4081
+#: gitk:4117
msgid "Strictly sort by date"
msgstr "Trier par date"
-# FIXME : traduction de "branch sides"
-#: gitk:4082
-#, fuzzy
+#: gitk:4118
msgid "Mark branch sides"
-msgstr "Marquer les extrémités des branches"
+msgstr "Indiquer les côtés des branches"
-#: gitk:4083
+#: gitk:4119
msgid "Limit to first parent"
msgstr "Limiter au premier ancêtre"
-#: gitk:4084
+#: gitk:4120
msgid "Simple history"
msgstr "Historique simple"
-#: gitk:4085
+#: gitk:4121
msgid "Additional arguments to git log:"
msgstr "Arguments supplémentaires de git log :"
-#: gitk:4086
+#: gitk:4122
msgid "Enter files and directories to include, one per line:"
msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
-#: gitk:4087
+#: gitk:4123
msgid "Command to generate more commits to include:"
msgstr "Commande pour générer plus de commits à inclure :"
-#: gitk:4211
+#: gitk:4247
msgid "Gitk: edit view"
msgstr "Gitk : éditer la vue"
-#: gitk:4219
+#: gitk:4255
msgid "-- criteria for selecting revisions"
msgstr "-- critère pour la sélection des révisions"
-#: gitk:4224
-#, fuzzy
+#: gitk:4260
msgid "View Name"
-msgstr "Nom de la vue :"
+msgstr "Nom de la vue"
-#: gitk:4299
+#: gitk:4335
msgid "Apply (F5)"
msgstr "Appliquer (F5)"
-#: gitk:4337
+#: gitk:4373
msgid "Error in commit selection arguments:"
msgstr "Erreur dans les arguments de sélection des commits :"
-#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
+#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411
msgid "None"
msgstr "Aucun"
-#: gitk:5003 gitk:5008
+#: gitk:5040 gitk:5045
msgid "Descendant"
msgstr "Descendant"
-#: gitk:5004
+#: gitk:5041
msgid "Not descendant"
msgstr "Pas un descendant"
-#: gitk:5011 gitk:5016
+#: gitk:5048 gitk:5053
msgid "Ancestor"
msgstr "Ancêtre"
-#: gitk:5012
+#: gitk:5049
msgid "Not ancestor"
msgstr "Pas un ancêtre"
-#: gitk:5306
+#: gitk:5343
msgid "Local changes checked in to index but not committed"
-msgstr "Modifications locales enregistrées dans l'index mais non commitées"
+msgstr "Modifications locales enregistrées dans l'index mais non validées"
-#: gitk:5342
+#: gitk:5379
msgid "Local uncommitted changes, not checked in to index"
-msgstr "Modifications locales non enregistrées dans l'index et non commitées"
+msgstr "Modifications locales non enregistrées dans l'index et non validées"
-#: gitk:7115
+#: gitk:7153
msgid "and many more"
-msgstr ""
+msgstr "et beaucoup plus"
-#: gitk:7118
+#: gitk:7156
msgid "many"
msgstr "nombreux"
-#: gitk:7309
+#: gitk:7347
msgid "Tags:"
-msgstr "Tags :"
+msgstr "Étiquettes :"
-#: gitk:7326 gitk:7332 gitk:8806
+#: gitk:7364 gitk:7370 gitk:8844
msgid "Parent"
msgstr "Parent"
-#: gitk:7337
+#: gitk:7375
msgid "Child"
msgstr "Enfant"
-#: gitk:7346
+#: gitk:7384
msgid "Branch"
msgstr "Branche"
-#: gitk:7349
+#: gitk:7387
msgid "Follows"
msgstr "Suit"
-#: gitk:7352
+#: gitk:7390
msgid "Precedes"
msgstr "Précède"
-#: gitk:7947
+#: gitk:7985
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Erreur lors de la récupération des diff : %s"
-#: gitk:8631
+#: gitk:8669
msgid "Goto:"
msgstr "Aller à :"
-#: gitk:8652
+#: gitk:8690
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
-msgstr "Id SHA1 court %s est ambigu"
+msgstr "L'id SHA1 court %s est ambigu"
-#: gitk:8659
+#: gitk:8697
#, tcl-format
msgid "Revision %s is not known"
-msgstr "Id SHA1 %s est inconnu"
+msgstr "La révision %s est inconnu"
-#: gitk:8669
+#: gitk:8707
#, tcl-format
msgid "SHA1 id %s is not known"
-msgstr "Id SHA1 %s est inconnu"
+msgstr "L'id SHA1 %s est inconnu"
-#: gitk:8671
+#: gitk:8709
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "La révision %s n'est pas dans la vue courante"
-#: gitk:8813 gitk:8828
+#: gitk:8851 gitk:8866
msgid "Date"
msgstr "Date"
-#: gitk:8816
+#: gitk:8854
msgid "Children"
msgstr "Enfants"
-#: gitk:8879
+#: gitk:8917
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Réinitialiser la branche %s vers cet état"
-#: gitk:8881
+#: gitk:8919
msgid "Detached head: can't reset"
msgstr "Head détaché : impossible de réinitialiser"
-#: gitk:8986 gitk:8992
+#: gitk:9024 gitk:9030
msgid "Skipping merge commit "
msgstr "Éviter le commit de la fusion "
-#: gitk:9001 gitk:9006
+#: gitk:9039 gitk:9044
msgid "Error getting patch ID for "
msgstr "Erreur à l'obtention de l'ID du patch pour "
-#: gitk:9002 gitk:9007
+#: gitk:9040 gitk:9045
msgid " - stopping\n"
msgstr " - arrêt en cours\n"
-#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
+#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084
msgid "Commit "
msgstr "Commit "
-#: gitk:9016
+#: gitk:9054
msgid ""
" is the same patch as\n"
" "
@@ -898,7 +911,7 @@ msgstr ""
"est le même patch que \n"
" "
-#: gitk:9024
+#: gitk:9062
msgid ""
" differs from\n"
" "
@@ -906,240 +919,226 @@ msgstr ""
" diffère de\n"
" "
-#: gitk:9026
+#: gitk:9064
msgid ""
"Diff of commits:\n"
"\n"
-msgstr ""
+msgstr "Diff des commits :\n\n"
-#: gitk:9038 gitk:9047
+#: gitk:9076 gitk:9085
#, tcl-format
msgid " has %s children - stopping\n"
-msgstr "a %s enfants - arrêt en cours\n"
+msgstr " a %s enfants - arrêt en cours\n"
-#: gitk:9066
-#, fuzzy, tcl-format
+#: gitk:9104
+#, tcl-format
msgid "Error writing commit to file: %s"
-msgstr "Erreur à l'ecriture du commit :"
+msgstr "Erreur à l'écriture du commit dans le fichier : %s"
-#: gitk:9072
-#, fuzzy, tcl-format
+#: gitk:9110
+#, tcl-format
msgid "Error diffing commits: %s"
-msgstr "Erreur à l'ecriture du commit :"
+msgstr "Erreur à la différence des commits : %s"
-#: gitk:9118
+#: gitk:9156
msgid "Top"
msgstr "Haut"
-#: gitk:9119
+#: gitk:9157
msgid "From"
msgstr "De"
-#: gitk:9124
+#: gitk:9162
msgid "To"
msgstr "À"
-#: gitk:9148
+#: gitk:9186
msgid "Generate patch"
msgstr "Générer le patch"
-#: gitk:9150
+#: gitk:9188
msgid "From:"
msgstr "De :"
-#: gitk:9159
+#: gitk:9197
msgid "To:"
msgstr "À :"
-#: gitk:9168
+#: gitk:9206
msgid "Reverse"
msgstr "Inverser"
-#: gitk:9170 gitk:9366
+#: gitk:9208 gitk:9418
msgid "Output file:"
msgstr "Fichier de sortie :"
-#: gitk:9176
+#: gitk:9214
msgid "Generate"
msgstr "Générer"
-#: gitk:9214
+#: gitk:9252
msgid "Error creating patch:"
msgstr "Erreur à la création du patch :"
-#: gitk:9237 gitk:9354 gitk:9411
+#: gitk:9275 gitk:9406 gitk:9463
msgid "ID:"
msgstr "ID :"
-#: gitk:9246
+#: gitk:9284
msgid "Tag name:"
-msgstr "Nom du Tag :"
+msgstr "Nom de l'étiquette :"
-#: gitk:9249
+#: gitk:9287
msgid "Tag message is optional"
-msgstr ""
+msgstr "Le message d'étiquette est optionnel"
-#: gitk:9251
-#, fuzzy
+#: gitk:9289
msgid "Tag message:"
-msgstr "Nom du Tag :"
+msgstr "Message d'étiquette :"
-#: gitk:9255 gitk:9420
+#: gitk:9293 gitk:9472
msgid "Create"
msgstr "Créer"
-#: gitk:9273
+#: gitk:9311
msgid "No tag name specified"
-msgstr "Aucun nom de tag spécifié"
+msgstr "Aucun nom d'étiquette spécifié"
-#: gitk:9277
+#: gitk:9315
#, tcl-format
msgid "Tag \"%s\" already exists"
-msgstr "Le tag \"%s\" existe déjà"
+msgstr "L'étiquette \"%s\" existe déjà"
-#: gitk:9287
+#: gitk:9325
msgid "Error creating tag:"
-msgstr "Erreur à la création du tag :"
+msgstr "Erreur à la création de l'étiquette :"
-#: gitk:9363
+#: gitk:9415
msgid "Command:"
msgstr "Commande :"
-#: gitk:9371
+#: gitk:9423
msgid "Write"
msgstr "Écrire"
-#: gitk:9389
+#: gitk:9441
msgid "Error writing commit:"
msgstr "Erreur à l'ecriture du commit :"
-#: gitk:9416
+#: gitk:9468
msgid "Name:"
msgstr "Nom :"
-#: gitk:9439
+#: gitk:9491
msgid "Please specify a name for the new branch"
msgstr "Veuillez spécifier un nom pour la nouvelle branche"
-#: gitk:9444
+#: gitk:9496
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "La branche '%s' existe déjà. Écraser?"
-#: gitk:9511
+#: gitk:9563
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
"tout?"
-#: gitk:9516
+#: gitk:9568
msgid "Cherry-picking"
-msgstr "Cueillir (Cherry-picking)"
+msgstr "Picorer (Cherry-picking)"
-#: gitk:9525
+#: gitk:9577
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
"Please commit, reset or stash your changes and try again."
msgstr ""
-"La cueillette (cherry-pick) a échouée à cause de modifications locales du "
-"fichier '%s'.\n"
-"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
-"nouveau."
+"Le picorage (cherry-pick) a échouée à cause de modifications locales du fichier '%s'.\n"
+"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de nouveau."
-#: gitk:9531
+#: gitk:9583
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
msgstr ""
-"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une "
-"fusion.\n"
+"Le picorage (cherry-pick) a échouée à cause d'un conflit lors d'une fusion.\n"
"Souhaitez-vous exécuter git citool pour le résoudre ?"
-#: gitk:9547 gitk:9605
+#: gitk:9599 gitk:9657
msgid "No changes committed"
-msgstr "Aucun changement commité"
+msgstr "Aucune modification validée"
-#: gitk:9574
-#, fuzzy, tcl-format
+#: gitk:9626
+#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
-msgstr ""
-"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
-"tout?"
+msgstr "Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?"
-#: gitk:9579
-#, fuzzy
+#: gitk:9631
msgid "Reverting"
-msgstr "Réinitialisation"
+msgstr "Commit défait"
-#: gitk:9587
-#, fuzzy, tcl-format
+#: gitk:9639
+#, tcl-format
msgid ""
"Revert failed because of local changes to the following files:%s Please "
"commit, reset or stash your changes and try again."
-msgstr ""
-"La cueillette (cherry-pick) a échouée à cause de modifications locales du "
-"fichier '%s'.\n"
-"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
-"nouveau."
+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."
-#: gitk:9591
-#, fuzzy
+#: gitk:9643
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
msgstr ""
-"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une "
-"fusion.\n"
+"Échec en tentant de défaire à cause d'un conflit de fusion.\n"
"Souhaitez-vous exécuter git citool pour le résoudre ?"
-#: gitk:9634
+#: gitk:9686
msgid "Confirm reset"
msgstr "Confirmer la réinitialisation"
-#: gitk:9636
+#: gitk:9688
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Réinitialiser la branche %s à %s?"
-#: gitk:9638
+#: gitk:9690
msgid "Reset type:"
msgstr "Type de réinitialisation :"
-#: gitk:9641
+#: gitk:9693
msgid "Soft: Leave working tree and index untouched"
msgstr "Douce : Laisse le répertoire de travail et l'index intacts"
-#: gitk:9644
+#: gitk:9696
msgid "Mixed: Leave working tree untouched, reset index"
msgstr ""
"Hybride : Laisse le répertoire de travail dans son état courant, "
"réinitialise l'index"
-#: gitk:9647
+#: gitk:9699
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
msgstr ""
"Dure : Réinitialise le répertoire de travail et l'index\n"
-"(abandonne TOUS les changements locaux)"
+"(abandonne TOUTES les modifications locale)"
-#: gitk:9664
+#: gitk:9716
msgid "Resetting"
msgstr "Réinitialisation"
# Fixme: Récupération est-il vraiment une mauvaise traduction?
-#: gitk:9724
-#, fuzzy
+#: gitk:9776
msgid "Checking out"
-msgstr "Récupération"
+msgstr "Extraction"
-#: gitk:9777
+#: gitk:9829
msgid "Cannot delete the currently checked-out branch"
-msgstr "Impossible de supprimer la branche en cours"
+msgstr "Impossible de supprimer la branche extraite"
-#: gitk:9783
+#: gitk:9835
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@@ -1148,16 +1147,16 @@ msgstr ""
"Les commits de la branche %s ne sont dans aucune autre branche.\n"
"Voulez-vous vraiment supprimer cette branche %s ?"
-#: gitk:9814
+#: gitk:9866
#, tcl-format
msgid "Tags and heads: %s"
-msgstr "Tags et heads : %s"
+msgstr "Étiquettes et heads : %s"
-#: gitk:9829
+#: gitk:9883
msgid "Filter"
msgstr "Filtrer"
-#: gitk:10125
+#: gitk:10179
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -1166,223 +1165,222 @@ msgstr ""
"informations sur les branches et les tags précédents/suivants seront "
"incomplètes."
-#: gitk:11102
+#: gitk:11156
msgid "Tag"
-msgstr "Tag"
+msgstr "Étiquette"
-#: gitk:11106
+#: gitk:11160
msgid "Id"
msgstr "Id"
-#: gitk:11189
+#: gitk:11243
msgid "Gitk font chooser"
msgstr "Sélecteur de police de Gitk"
-#: gitk:11206
+#: gitk:11260
msgid "B"
msgstr "B"
-#: gitk:11209
+#: gitk:11263
msgid "I"
msgstr "I"
-#: gitk:11327
+#: gitk:11381
msgid "Commit list display options"
msgstr "Options d'affichage de la liste des commits"
-#: gitk:11330
+#: gitk:11384
msgid "Maximum graph width (lines)"
msgstr "Longueur maximum du graphe (lignes)"
# FIXME : Traduction standard de "pane"?
-#: gitk:11334
-#, fuzzy, no-tcl-format
+#: gitk:11388
+#, no-tcl-format
msgid "Maximum graph width (% of pane)"
-msgstr "Longueur maximum du graphe (% du panneau)"
+msgstr "Largeur maximum du graphe (% du panneau)"
-#: gitk:11337
+#: gitk:11391
msgid "Show local changes"
-msgstr "Montrer les changements locaux"
+msgstr "Montrer les modifications locales"
-#: gitk:11340
-#, fuzzy
+#: gitk:11394
msgid "Auto-select SHA1 (length)"
-msgstr "Sélection auto. du SHA1"
+msgstr "Sélection auto. du SHA1 (longueur)"
-#: gitk:11344
+#: gitk:11398
msgid "Hide remote refs"
msgstr "Cacher les refs distantes"
-#: gitk:11348
+#: gitk:11402
msgid "Diff display options"
msgstr "Options d'affichage des diff"
-#: gitk:11350
+#: gitk:11404
msgid "Tab spacing"
msgstr "Taille des tabulations"
-#: gitk:11353
-#, fuzzy
+#: gitk:11407
msgid "Display nearby tags/heads"
msgstr "Afficher les tags les plus proches"
-#: gitk:11356
+#: gitk:11410
msgid "Maximum # tags/heads to show"
-msgstr ""
+msgstr "Nombre maximum d'étiquettes/heads à afficher"
-#: gitk:11359
+#: gitk:11413
msgid "Limit diffs to listed paths"
msgstr "Limiter les différences aux chemins listés"
-#: gitk:11362
+#: gitk:11416
msgid "Support per-file encodings"
msgstr "Support pour un encodage des caractères par fichier"
-#: gitk:11368 gitk:11515
+#: gitk:11422 gitk:11569
msgid "External diff tool"
msgstr "Outil diff externe"
-#: gitk:11369
+#: gitk:11423
msgid "Choose..."
msgstr "Choisir..."
-#: gitk:11374
-#, fuzzy
+#: gitk:11428
msgid "General options"
-msgstr "Générer le patch"
+msgstr "Options générales"
-#: gitk:11377
+#: gitk:11431
msgid "Use themed widgets"
-msgstr ""
+msgstr "Utiliser des widgets en thème"
-#: gitk:11379
+#: gitk:11433
msgid "(change requires restart)"
-msgstr ""
+msgstr "(la modification nécessite un redémarrage)"
-#: gitk:11381
+#: gitk:11435
msgid "(currently unavailable)"
-msgstr ""
+msgstr "(non disponible actuellement)"
-#: gitk:11392
+#: gitk:11446
msgid "Colors: press to choose"
msgstr "Couleurs : cliquer pour choisir"
-#: gitk:11395
+#: gitk:11449
msgid "Interface"
-msgstr ""
+msgstr "Interface"
-#: gitk:11396
-#, fuzzy
+#: gitk:11450
msgid "interface"
-msgstr "Police de l'interface utilisateur"
+msgstr "interface"
-#: gitk:11399
+#: gitk:11453
msgid "Background"
msgstr "Arrière-plan"
-#: gitk:11400 gitk:11430
+#: gitk:11454 gitk:11484
msgid "background"
msgstr "arrière-plan"
-#: gitk:11403
+#: gitk:11457
msgid "Foreground"
msgstr "Premier plan"
-#: gitk:11404
+#: gitk:11458
msgid "foreground"
msgstr "premier plan"
-#: gitk:11407
+#: gitk:11461
msgid "Diff: old lines"
msgstr "Diff : anciennes lignes"
-#: gitk:11408
+#: gitk:11462
msgid "diff old lines"
msgstr "diff anciennes lignes"
-#: gitk:11412
+#: gitk:11466
msgid "Diff: new lines"
msgstr "Diff : nouvelles lignes"
-#: gitk:11413
+#: gitk:11467
msgid "diff new lines"
msgstr "diff nouvelles lignes"
-#: gitk:11417
+#: gitk:11471
msgid "Diff: hunk header"
msgstr "Diff : entête du hunk"
-#: gitk:11419
+#: gitk:11473
msgid "diff hunk header"
msgstr "diff : entête du hunk"
-#: gitk:11423
+#: gitk:11477
msgid "Marked line bg"
-msgstr "Arrière-plan de la ligne marquée"
+msgstr "Fond de la ligne marquée"
-#: gitk:11425
+#: gitk:11479
msgid "marked line background"
-msgstr "Arrière-plan de la ligne marquée"
+msgstr "Fond de la ligne marquée"
-#: gitk:11429
+#: gitk:11483
msgid "Select bg"
-msgstr "Sélectionner l'arrière-plan"
+msgstr "Sélectionner le fond"
-#: gitk:11438
+#: gitk:11492
msgid "Fonts: press to choose"
msgstr "Polices : cliquer pour choisir"
-#: gitk:11440
+#: gitk:11494
msgid "Main font"
msgstr "Police principale"
-#: gitk:11441
+#: gitk:11495
msgid "Diff display font"
msgstr "Police d'affichage des diff"
-#: gitk:11442
+#: gitk:11496
msgid "User interface font"
msgstr "Police de l'interface utilisateur"
-#: gitk:11464
+#: gitk:11518
msgid "Gitk preferences"
msgstr "Préférences de Gitk"
-#: gitk:11473
-#, fuzzy
+#: gitk:11527
msgid "General"
-msgstr "Générer"
+msgstr "Général"
-#: gitk:11474
+#: gitk:11528
msgid "Colors"
-msgstr ""
+msgstr "Couleurs"
-#: gitk:11475
+#: gitk:11529
msgid "Fonts"
-msgstr ""
+msgstr "Polices"
-#: gitk:11525
+#: gitk:11579
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk : choisir la couleur de %s"
-#: gitk:12242
+#: gitk:12092
+msgid ""
+"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
+" Gitk requires at least Tcl/Tk 8.4."
+msgstr ""
+"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n"
+" Gitk requiert Tcl/Tk version 8.4 ou supérieur."
+
+#: gitk:12302
msgid "Cannot find a git repository here."
msgstr "Impossible de trouver un dépôt git ici."
-#: gitk:12289
+#: gitk:12349
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier"
-#: gitk:12301
+#: gitk:12361
msgid "Bad arguments to gitk:"
msgstr "Arguments invalides pour gitk :"
-#: gitk:12405
-msgid "Command line"
-msgstr "Ligne de commande"
-
#~ msgid "SHA1 ID: "
#~ msgstr "ID SHA1 :"
@@ -1398,12 +1396,5 @@ msgstr "Ligne de commande"
#~ msgid "- stopping\n"
#~ msgstr "- arrêt en cours\n"
-#~ msgid ""
-#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
-#~ " Gitk requires at least Tcl/Tk 8.4."
-#~ msgstr ""
-#~ "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n"
-#~ " Gitk requiert Tcl/Tk version 8.4 ou supérieur."
-
#~ msgid "Cannot find the git directory \"%s\"."
#~ msgstr "Impossible de trouver le répertoire git \"%s\"."
generated by cgit v0.10.2-6-g49f6 at 2024-04-26 08:05:03 (GMT)