summaryrefslogtreecommitdiff
path: root/po/fr.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/fr.po')
-rw-r--r--po/fr.po584
1 files changed, 297 insertions, 287 deletions
diff --git a/po/fr.po b/po/fr.po
index 747ee190f2..6b1f05c6b9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gitk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-15 14:37+1100\n"
+"POT-Creation-Date: 2015-05-17 14:32+1000\n"
"PO-Revision-Date: 2009-11-19 22:13+0100\n"
"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n"
"Language-Team: git@vger.kernel.org\n"
@@ -27,7 +27,7 @@ msgstr "Impossible de récupérer la liste des fichiers non fusionnés :"
msgid "Color words"
msgstr ""
-#: gitk:217 gitk:2381 gitk:8201 gitk:8234
+#: gitk:217 gitk:2381 gitk:8220 gitk:8253
msgid "Markup words"
msgstr ""
@@ -63,14 +63,18 @@ msgstr "Erreur à l'exécution de git log :"
msgid "Reading"
msgstr "Lecture en cours"
-#: gitk:496 gitk:4508
+#: gitk:496 gitk:4525
msgid "Reading commits..."
msgstr "Lecture des commits..."
-#: gitk:499 gitk:1637 gitk:4511
+#: gitk:499 gitk:1637 gitk:4528
msgid "No commits selected"
msgstr "Aucun commit sélectionné"
+#: gitk:1445 gitk:4045 gitk:12432
+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,16 +83,12 @@ 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:4315 gitk:9669 gitk:11241 gitk:11521
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:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
+#: gitk:11242 gitk:11522
msgid "Cancel"
msgstr "Annuler"
@@ -140,15 +140,15 @@ msgstr "Éditer la vue..."
msgid "Delete view"
msgstr "Supprimer la vue"
-#: gitk:2088
+#: gitk:2088 gitk:4043
msgid "All files"
msgstr "Tous les fichiers"
-#: gitk:2083 gitk:4050
+#: gitk:2083 gitk:4067
msgid "View"
msgstr "Vue"
-#: gitk:2093 gitk:2103 gitk:3009
+#: gitk:2093 gitk:2103 gitk:3012
msgid "About gitk"
msgstr "À propos de gitk"
@@ -160,7 +160,7 @@ msgstr "Raccourcis clavier"
msgid "Help"
msgstr "Aide"
-#: gitk:2185 gitk:8633
+#: gitk:2185 gitk:8652
msgid "SHA1 ID:"
msgstr "Id SHA1 :"
@@ -176,53 +176,53 @@ msgstr "Recherche"
msgid "commit"
msgstr "commit"
-#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
-#: gitk:6893
+#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
+#: gitk:6912
msgid "containing:"
msgstr "contient :"
-#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
+#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
msgid "touching paths:"
msgstr "chemins modifiés :"
-#: gitk:2303 gitk:4759
+#: gitk:2303 gitk:4777
msgid "adding/removing string:"
msgstr "ajoute/supprime la chaîne :"
-#: gitk:2304 gitk:4761
+#: gitk:2304 gitk:4779
msgid "changing lines matching:"
msgstr ""
-#: gitk:2313 gitk:2315 gitk:4748
+#: gitk:2313 gitk:2315 gitk:4766
msgid "Exact"
msgstr "Exact"
-#: gitk:2315 gitk:4836 gitk:6704
+#: gitk:2315 gitk:4854 gitk:6723
msgid "IgnCase"
msgstr "Ignorer la casse"
-#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
+#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
msgid "Regexp"
msgstr "Expression régulière"
-#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
+#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
msgid "All fields"
msgstr "Tous les champs"
-#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
+#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
msgid "Headline"
msgstr "Surligner"
-#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
+#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
msgid "Comments"
msgstr "Commentaires"
-#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
-#: gitk:8826
+#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
+#: gitk:8845
msgid "Author"
msgstr "Auteur"
-#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
+#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
msgid "Committer"
msgstr "Auteur du commit"
@@ -250,7 +250,7 @@ msgstr "Lignes de contexte"
msgid "Ignore space change"
msgstr "Ignorer les modifications d'espace"
-#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
+#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
msgid "Line diff"
msgstr ""
@@ -262,102 +262,110 @@ msgstr "Patch"
msgid "Tree"
msgstr "Arbre"
-#: gitk:2616 gitk:2636
+#: gitk:2617 gitk:2637
msgid "Diff this -> selected"
msgstr "Diff entre ceci et la sélection"
-#: gitk:2617 gitk:2637
+#: gitk:2618 gitk:2638
msgid "Diff selected -> this"
msgstr "Diff entre sélection et ceci"
-#: gitk:2618 gitk:2638
+#: gitk:2619 gitk:2639
msgid "Make patch"
msgstr "Créer patch"
-#: gitk:2619 gitk:9235
+#: gitk:2620 gitk:9254
msgid "Create tag"
msgstr "Créer tag"
-#: gitk:2620 gitk:9352
+#: gitk:2621 gitk:9371
msgid "Write commit to file"
msgstr "Écrire le commit dans un fichier"
-#: gitk:2621 gitk:9409
+#: gitk:2622 gitk:9428
msgid "Create new branch"
msgstr "Créer une nouvelle branche"
-#: gitk:2622
+#: gitk:2623
msgid "Cherry-pick this commit"
msgstr "Cueillir (cherry-pick) ce commit"
-#: gitk:2623
+#: gitk:2624
msgid "Reset HEAD branch to here"
msgstr "Réinitialiser la branche HEAD vers cet état"
-#: gitk:2624
+#: gitk:2625
msgid "Mark this commit"
msgstr "Marquer ce commit"
-#: gitk:2625
+#: gitk:2626
msgid "Return to mark"
msgstr "Retourner à la marque"
-#: gitk:2626
+#: gitk:2627
msgid "Find descendant of this and mark"
msgstr "Chercher le descendant de ceci et le marquer"
-#: gitk:2627
+#: gitk:2628
msgid "Compare with marked commit"
msgstr "Comparer avec le commit marqué"
-#: gitk:2628 gitk:2639
+#: gitk:2629 gitk:2640
#, fuzzy
msgid "Diff this -> marked commit"
msgstr "Diff entre ceci et la sélection"
-#: gitk:2629 gitk:2640
+#: gitk:2630 gitk:2641
#, fuzzy
msgid "Diff marked commit -> this"
msgstr "Diff entre sélection et ceci"
-#: gitk:2630
+#: gitk:2631
#, fuzzy
msgid "Revert this commit"
msgstr "Marquer ce commit"
-#: gitk:2646
+#: gitk:2647
msgid "Check out this branch"
msgstr "Récupérer cette branche"
-#: gitk:2647
+#: gitk:2648
msgid "Remove this branch"
msgstr "Supprimer cette branche"
-#: gitk:2654
+#: gitk:2649
+msgid "Copy branch name"
+msgstr ""
+
+#: gitk:2656
msgid "Highlight this too"
msgstr "Surligner également ceci"
-#: gitk:2655
+#: gitk:2657
msgid "Highlight this only"
msgstr "Surligner seulement ceci"
-#: gitk:2656
+#: gitk:2658
msgid "External diff"
msgstr "Diff externe"
-#: gitk:2657
+#: gitk:2659
msgid "Blame parent commit"
msgstr "Blâmer le commit parent"
-#: gitk:2664
+#: gitk:2660
+msgid "Copy path"
+msgstr ""
+
+#: gitk:2667
msgid "Show origin of this line"
msgstr "Montrer l'origine de cette ligne"
-#: gitk:2665
+#: gitk:2668
msgid "Run git gui blame on this line"
msgstr "Exécuter git gui blame sur cette ligne"
-#: gitk:3011
+#: gitk:3014
#, fuzzy
msgid ""
"\n"
@@ -375,317 +383,322 @@ msgstr ""
"Utilisation et redistribution soumises aux termes de la GNU General Public "
"License"
-#: gitk:3019 gitk:3085 gitk:9836
+#: gitk:3022 gitk:3089 gitk:9857
msgid "Close"
msgstr "Fermer"
-#: gitk:3040
+#: gitk:3043
msgid "Gitk key bindings"
msgstr "Raccourcis clavier de Gitk"
-#: gitk:3043
+#: gitk:3046
msgid "Gitk key bindings:"
msgstr "Raccourcis clavier de Gitk :"
-#: gitk:3045
+#: gitk:3048
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tQuitter"
-#: gitk:3046
+#: gitk:3049
#, fuzzy, tcl-format
msgid "<%s-W>\t\tClose window"
msgstr "<%s-F>\t\tRechercher"
-#: gitk:3047
+#: gitk:3050
msgid "<Home>\t\tMove to first commit"
msgstr "<Début>\t\tAller au premier commit"
-#: gitk:3048
+#: gitk:3051
msgid "<End>\t\tMove to last commit"
msgstr "<Fin>\t\tAller au dernier commit"
-#: gitk:3049
+#: gitk:3052
#, fuzzy
msgid "<Up>, p, k\tMove up one commit"
msgstr "<Haut>, p, i\t Aller au commit suivant"
-#: gitk:3050
+#: gitk:3053
#, fuzzy
msgid "<Down>, n, j\tMove down one commit"
msgstr "<Bas>, n, k\t Aller au commit précédent"
-#: gitk:3051
+#: gitk:3054
#, fuzzy
msgid "<Left>, z, h\tGo back in history list"
msgstr "<Gauche>, z, j\tReculer dans l'historique"
-#: gitk:3052
+#: gitk:3055
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Droite>, x, l\tAvancer dans l'historique"
-#: gitk:3053
+#: gitk:3056
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
msgstr ""
-#: gitk:3054
+#: gitk:3057
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
-#: gitk:3055
+#: gitk:3058
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
-#: gitk:3056
+#: gitk:3059
#, 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:3060
#, 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:3061
#, 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:3062
#, 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:3063
#, 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:3064
#, 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:3065
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:3066
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:3067
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff"
-#: gitk:3065
+#: gitk:3068
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tMonter d'une page dans la vue des diff"
-#: gitk:3066
+#: gitk:3069
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff"
-#: gitk:3067
+#: gitk:3070
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tMonter de 18 lignes dans la vue des diff"
-#: gitk:3068
+#: gitk:3071
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tDescendre de 18 lignes dans la vue des diff"
-#: gitk:3069
+#: gitk:3072
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tRechercher"
-#: gitk:3070
+#: gitk:3073
#, 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:3074
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\t\tAller au résultat de recherche suivant"
-#: gitk:3072
+#: gitk:3075
+#, fuzzy
+msgid "g\t\tGo to commit"
+msgstr "<Fin>\t\tAller au dernier commit"
+
+#: gitk:3076
msgid "/\t\tFocus the search box"
msgstr "/\t\tFocus sur la zone de recherche"
-#: gitk:3073
+#: gitk:3077
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tAller au résultat de recherche précédent"
-#: gitk:3074
+#: gitk:3078
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tAller au prochain fichier dans la vue des diff"
-#: gitk:3075
+#: gitk:3079
#, 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:3080
#, 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:3081
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\tAugmenter la taille de la police"
-#: gitk:3078
+#: gitk:3082
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tAugmenter la taille de la police"
-#: gitk:3079
+#: gitk:3083
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\tDiminuer la taille de la police"
-#: gitk:3080
+#: gitk:3084
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tDiminuer la taille de la police"
-#: gitk:3081
+#: gitk:3085
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tMise à jour"
-#: gitk:3546 gitk:3555
+#: gitk:3550 gitk:3559
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Erreur lors de la création du répertoire temporaire %s :"
-#: gitk:3568
+#: gitk:3572
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "Erreur en obtenant \"%s\" de %s:"
-#: gitk:3631
+#: gitk:3635
msgid "command failed:"
msgstr "échec de la commande :"
-#: gitk:3780
+#: gitk:3784
msgid "No such commit"
msgstr "Commit inexistant"
-#: gitk:3794
+#: gitk:3798
msgid "git gui blame: command failed:"
msgstr "git gui blame : échec de la commande :"
-#: gitk:3825
+#: gitk:3829
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Impossible de lire le head de la fusion : %s"
-#: gitk:3833
+#: gitk:3837
#, tcl-format
msgid "Error reading index: %s"
msgstr "Erreur à la lecture de l'index : %s"
-#: gitk:3858
+#: gitk:3862
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "Impossible de démarrer git blame : %s"
-#: gitk:3861 gitk:6735
+#: gitk:3865 gitk:6754
msgid "Searching"
msgstr "Recherche en cours"
-#: gitk:3893
+#: gitk:3897
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Erreur à l'exécution de git blame : %s"
-#: gitk:3921
+#: gitk:3925
#, 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:3939
msgid "External diff viewer failed:"
msgstr "Échec de l'outil externe de visualisation des diff"
-#: gitk:4053
+#: gitk:4070
msgid "Gitk view definition"
msgstr "Définition des vues de Gitk"
-#: gitk:4057
+#: gitk:4074
msgid "Remember this view"
msgstr "Se souvenir de cette vue"
-#: gitk:4058
+#: gitk:4075
msgid "References (space separated list):"
msgstr "Références (liste d'éléments séparés par des espaces) :"
-#: gitk:4059
+#: gitk:4076
msgid "Branches & tags:"
msgstr "Branches & tags :"
-#: gitk:4060
+#: gitk:4077
msgid "All refs"
msgstr "Toutes les références"
-#: gitk:4061
+#: gitk:4078
msgid "All (local) branches"
msgstr "Toutes les branches (locales)"
-#: gitk:4062
+#: gitk:4079
msgid "All tags"
msgstr "Tous les tags"
-#: gitk:4063
+#: gitk:4080
msgid "All remote-tracking branches"
msgstr "Toutes les branches de suivi à distance"
-#: gitk:4064
+#: gitk:4081
msgid "Commit Info (regular expressions):"
msgstr "Info sur les commits (expressions régulières) :"
-#: gitk:4065
+#: gitk:4082
msgid "Author:"
msgstr "Auteur :"
-#: gitk:4066
+#: gitk:4083
msgid "Committer:"
msgstr "Commiteur :"
-#: gitk:4067
+#: gitk:4084
msgid "Commit Message:"
msgstr "Message de commit :"
-#: gitk:4068
+#: gitk:4085
msgid "Matches all Commit Info criteria"
msgstr "Correspond à tous les critères d'Info sur les commits"
-#: gitk:4069
+#: gitk:4086
#, fuzzy
-msgid "Matches none Commit Info criteria"
+msgid "Matches no Commit Info criteria"
msgstr "Correspond à tous les critères d'Info sur les commits"
-#: gitk:4070
+#: gitk:4087
msgid "Changes to Files:"
msgstr "Changements des fichiers :"
-#: gitk:4071
+#: gitk:4088
msgid "Fixed String"
msgstr "Chaîne Figée"
-#: gitk:4072
+#: gitk:4089
msgid "Regular Expression"
msgstr "Expression Régulière"
-#: gitk:4073
+#: gitk:4090
msgid "Search string:"
msgstr "Recherche de la chaîne :"
-#: gitk:4074
+#: gitk:4091
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
@@ -693,204 +706,204 @@ msgstr ""
"Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
"2009 15:27:38\") :"
-#: gitk:4075
+#: gitk:4092
msgid "Since:"
msgstr "De :"
-#: gitk:4076
+#: gitk:4093
msgid "Until:"
msgstr "Jusqu'au :"
-#: gitk:4077
+#: gitk:4094
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:4095
msgid "Number to show:"
msgstr "Nombre à afficher :"
-#: gitk:4079
+#: gitk:4096
msgid "Number to skip:"
msgstr "Nombre à sauter :"
-#: gitk:4080
+#: gitk:4097
msgid "Miscellaneous options:"
msgstr "Options diverses :"
-#: gitk:4081
+#: gitk:4098
msgid "Strictly sort by date"
msgstr "Trier par date"
# FIXME : traduction de "branch sides"
-#: gitk:4082
+#: gitk:4099
#, fuzzy
msgid "Mark branch sides"
msgstr "Marquer les extrémités des branches"
-#: gitk:4083
+#: gitk:4100
msgid "Limit to first parent"
msgstr "Limiter au premier ancêtre"
-#: gitk:4084
+#: gitk:4101
msgid "Simple history"
msgstr "Historique simple"
-#: gitk:4085
+#: gitk:4102
msgid "Additional arguments to git log:"
msgstr "Arguments supplémentaires de git log :"
-#: gitk:4086
+#: gitk:4103
msgid "Enter files and directories to include, one per line:"
msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
-#: gitk:4087
+#: gitk:4104
msgid "Command to generate more commits to include:"
msgstr "Commande pour générer plus de commits à inclure :"
-#: gitk:4211
+#: gitk:4228
msgid "Gitk: edit view"
msgstr "Gitk : éditer la vue"
-#: gitk:4219
+#: gitk:4236
msgid "-- criteria for selecting revisions"
msgstr "-- critère pour la sélection des révisions"
-#: gitk:4224
+#: gitk:4241
#, fuzzy
msgid "View Name"
msgstr "Nom de la vue :"
-#: gitk:4299
+#: gitk:4316
msgid "Apply (F5)"
msgstr "Appliquer (F5)"
-#: gitk:4337
+#: gitk:4354
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:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
msgid "None"
msgstr "Aucun"
-#: gitk:5003 gitk:5008
+#: gitk:5021 gitk:5026
msgid "Descendant"
msgstr "Descendant"
-#: gitk:5004
+#: gitk:5022
msgid "Not descendant"
msgstr "Pas un descendant"
-#: gitk:5011 gitk:5016
+#: gitk:5029 gitk:5034
msgid "Ancestor"
msgstr "Ancêtre"
-#: gitk:5012
+#: gitk:5030
msgid "Not ancestor"
msgstr "Pas un ancêtre"
-#: gitk:5306
+#: gitk:5324
msgid "Local changes checked in to index but not committed"
msgstr "Modifications locales enregistrées dans l'index mais non commitées"
-#: gitk:5342
+#: gitk:5360
msgid "Local uncommitted changes, not checked in to index"
msgstr "Modifications locales non enregistrées dans l'index et non commitées"
-#: gitk:7115
+#: gitk:7134
msgid "and many more"
msgstr ""
-#: gitk:7118
+#: gitk:7137
msgid "many"
msgstr "nombreux"
-#: gitk:7309
+#: gitk:7328
msgid "Tags:"
msgstr "Tags :"
-#: gitk:7326 gitk:7332 gitk:8806
+#: gitk:7345 gitk:7351 gitk:8825
msgid "Parent"
msgstr "Parent"
-#: gitk:7337
+#: gitk:7356
msgid "Child"
msgstr "Enfant"
-#: gitk:7346
+#: gitk:7365
msgid "Branch"
msgstr "Branche"
-#: gitk:7349
+#: gitk:7368
msgid "Follows"
msgstr "Suit"
-#: gitk:7352
+#: gitk:7371
msgid "Precedes"
msgstr "Précède"
-#: gitk:7947
+#: gitk:7966
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Erreur lors de la récupération des diff : %s"
-#: gitk:8631
+#: gitk:8650
msgid "Goto:"
msgstr "Aller à :"
-#: gitk:8652
+#: gitk:8671
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Id SHA1 court %s est ambigu"
-#: gitk:8659
+#: gitk:8678
#, tcl-format
msgid "Revision %s is not known"
msgstr "Id SHA1 %s est inconnu"
-#: gitk:8669
+#: gitk:8688
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "Id SHA1 %s est inconnu"
-#: gitk:8671
+#: gitk:8690
#, 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:8832 gitk:8847
msgid "Date"
msgstr "Date"
-#: gitk:8816
+#: gitk:8835
msgid "Children"
msgstr "Enfants"
-#: gitk:8879
+#: gitk:8898
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Réinitialiser la branche %s vers cet état"
-#: gitk:8881
+#: gitk:8900
msgid "Detached head: can't reset"
msgstr "Head détaché : impossible de réinitialiser"
-#: gitk:8986 gitk:8992
+#: gitk:9005 gitk:9011
msgid "Skipping merge commit "
msgstr "Éviter le commit de la fusion "
-#: gitk:9001 gitk:9006
+#: gitk:9020 gitk:9025
msgid "Error getting patch ID for "
msgstr "Erreur à l'obtention de l'ID du patch pour "
-#: gitk:9002 gitk:9007
+#: gitk:9021 gitk:9026
msgid " - stopping\n"
msgstr " - arrêt en cours\n"
-#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
+#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
msgid "Commit "
msgstr "Commit "
-#: gitk:9016
+#: gitk:9035
msgid ""
" is the same patch as\n"
" "
@@ -898,7 +911,7 @@ msgstr ""
"est le même patch que \n"
" "
-#: gitk:9024
+#: gitk:9043
msgid ""
" differs from\n"
" "
@@ -906,138 +919,138 @@ msgstr ""
" diffère de\n"
" "
-#: gitk:9026
+#: gitk:9045
msgid ""
"Diff of commits:\n"
"\n"
msgstr ""
-#: gitk:9038 gitk:9047
+#: gitk:9057 gitk:9066
#, tcl-format
msgid " has %s children - stopping\n"
msgstr "a %s enfants - arrêt en cours\n"
-#: gitk:9066
+#: gitk:9085
#, fuzzy, tcl-format
msgid "Error writing commit to file: %s"
msgstr "Erreur à l'ecriture du commit :"
-#: gitk:9072
+#: gitk:9091
#, fuzzy, tcl-format
msgid "Error diffing commits: %s"
msgstr "Erreur à l'ecriture du commit :"
-#: gitk:9118
+#: gitk:9137
msgid "Top"
msgstr "Haut"
-#: gitk:9119
+#: gitk:9138
msgid "From"
msgstr "De"
-#: gitk:9124
+#: gitk:9143
msgid "To"
msgstr "À"
-#: gitk:9148
+#: gitk:9167
msgid "Generate patch"
msgstr "Générer le patch"
-#: gitk:9150
+#: gitk:9169
msgid "From:"
msgstr "De :"
-#: gitk:9159
+#: gitk:9178
msgid "To:"
msgstr "À :"
-#: gitk:9168
+#: gitk:9187
msgid "Reverse"
msgstr "Inverser"
-#: gitk:9170 gitk:9366
+#: gitk:9189 gitk:9385
msgid "Output file:"
msgstr "Fichier de sortie :"
-#: gitk:9176
+#: gitk:9195
msgid "Generate"
msgstr "Générer"
-#: gitk:9214
+#: gitk:9233
msgid "Error creating patch:"
msgstr "Erreur à la création du patch :"
-#: gitk:9237 gitk:9354 gitk:9411
+#: gitk:9256 gitk:9373 gitk:9430
msgid "ID:"
msgstr "ID :"
-#: gitk:9246
+#: gitk:9265
msgid "Tag name:"
msgstr "Nom du Tag :"
-#: gitk:9249
+#: gitk:9268
msgid "Tag message is optional"
msgstr ""
-#: gitk:9251
+#: gitk:9270
#, fuzzy
msgid "Tag message:"
msgstr "Nom du Tag :"
-#: gitk:9255 gitk:9420
+#: gitk:9274 gitk:9439
msgid "Create"
msgstr "Créer"
-#: gitk:9273
+#: gitk:9292
msgid "No tag name specified"
msgstr "Aucun nom de tag spécifié"
-#: gitk:9277
+#: gitk:9296
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Le tag \"%s\" existe déjà"
-#: gitk:9287
+#: gitk:9306
msgid "Error creating tag:"
msgstr "Erreur à la création du tag :"
-#: gitk:9363
+#: gitk:9382
msgid "Command:"
msgstr "Commande :"
-#: gitk:9371
+#: gitk:9390
msgid "Write"
msgstr "Écrire"
-#: gitk:9389
+#: gitk:9408
msgid "Error writing commit:"
msgstr "Erreur à l'ecriture du commit :"
-#: gitk:9416
+#: gitk:9435
msgid "Name:"
msgstr "Nom :"
-#: gitk:9439
+#: gitk:9458
msgid "Please specify a name for the new branch"
msgstr "Veuillez spécifier un nom pour la nouvelle branche"
-#: gitk:9444
+#: gitk:9463
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "La branche '%s' existe déjà. Écraser?"
-#: gitk:9511
+#: gitk:9530
#, 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:9535
msgid "Cherry-picking"
msgstr "Cueillir (Cherry-picking)"
-#: gitk:9525
+#: gitk:9544
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1048,7 +1061,7 @@ msgstr ""
"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
"nouveau."
-#: gitk:9531
+#: gitk:9550
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
@@ -1057,23 +1070,23 @@ msgstr ""
"fusion.\n"
"Souhaitez-vous exécuter git citool pour le résoudre ?"
-#: gitk:9547 gitk:9605
+#: gitk:9566 gitk:9624
msgid "No changes committed"
msgstr "Aucun changement commité"
-#: gitk:9574
+#: gitk:9593
#, fuzzy, 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?"
-#: gitk:9579
+#: gitk:9598
#, fuzzy
msgid "Reverting"
msgstr "Réinitialisation"
-#: gitk:9587
+#: gitk:9606
#, fuzzy, tcl-format
msgid ""
"Revert failed because of local changes to the following files:%s Please "
@@ -1084,7 +1097,7 @@ msgstr ""
"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
"nouveau."
-#: gitk:9591
+#: gitk:9610
#, fuzzy
msgid ""
"Revert failed because of merge conflict.\n"
@@ -1094,30 +1107,30 @@ msgstr ""
"fusion.\n"
"Souhaitez-vous exécuter git citool pour le résoudre ?"
-#: gitk:9634
+#: gitk:9653
msgid "Confirm reset"
msgstr "Confirmer la réinitialisation"
-#: gitk:9636
+#: gitk:9655
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Réinitialiser la branche %s à %s?"
-#: gitk:9638
+#: gitk:9657
msgid "Reset type:"
msgstr "Type de réinitialisation :"
-#: gitk:9641
+#: gitk:9660
msgid "Soft: Leave working tree and index untouched"
msgstr "Douce : Laisse le répertoire de travail et l'index intacts"
-#: gitk:9644
+#: gitk:9663
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:9666
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
@@ -1125,21 +1138,21 @@ msgstr ""
"Dure : Réinitialise le répertoire de travail et l'index\n"
"(abandonne TOUS les changements locaux)"
-#: gitk:9664
+#: gitk:9683
msgid "Resetting"
msgstr "Réinitialisation"
# Fixme: Récupération est-il vraiment une mauvaise traduction?
-#: gitk:9724
+#: gitk:9743
#, fuzzy
msgid "Checking out"
msgstr "Récupération"
-#: gitk:9777
+#: gitk:9796
msgid "Cannot delete the currently checked-out branch"
msgstr "Impossible de supprimer la branche en cours"
-#: gitk:9783
+#: gitk:9802
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@@ -1148,16 +1161,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:9833
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Tags et heads : %s"
-#: gitk:9829
+#: gitk:9850
msgid "Filter"
msgstr "Filtrer"
-#: gitk:10125
+#: gitk:10146
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -1166,223 +1179,227 @@ msgstr ""
"informations sur les branches et les tags précédents/suivants seront "
"incomplètes."
-#: gitk:11102
+#: gitk:11123
msgid "Tag"
msgstr "Tag"
-#: gitk:11106
+#: gitk:11127
msgid "Id"
msgstr "Id"
-#: gitk:11189
+#: gitk:11210
msgid "Gitk font chooser"
msgstr "Sélecteur de police de Gitk"
-#: gitk:11206
+#: gitk:11227
msgid "B"
msgstr "B"
-#: gitk:11209
+#: gitk:11230
msgid "I"
msgstr "I"
-#: gitk:11327
+#: gitk:11348
msgid "Commit list display options"
msgstr "Options d'affichage de la liste des commits"
-#: gitk:11330
+#: gitk:11351
msgid "Maximum graph width (lines)"
msgstr "Longueur maximum du graphe (lignes)"
# FIXME : Traduction standard de "pane"?
-#: gitk:11334
+#: gitk:11355
#, fuzzy, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Longueur maximum du graphe (% du panneau)"
-#: gitk:11337
+#: gitk:11358
msgid "Show local changes"
msgstr "Montrer les changements locaux"
-#: gitk:11340
+#: gitk:11361
#, fuzzy
msgid "Auto-select SHA1 (length)"
msgstr "Sélection auto. du SHA1"
-#: gitk:11344
+#: gitk:11365
msgid "Hide remote refs"
msgstr "Cacher les refs distantes"
-#: gitk:11348
+#: gitk:11369
msgid "Diff display options"
msgstr "Options d'affichage des diff"
-#: gitk:11350
+#: gitk:11371
msgid "Tab spacing"
msgstr "Taille des tabulations"
-#: gitk:11353
+#: gitk:11374
#, fuzzy
msgid "Display nearby tags/heads"
msgstr "Afficher les tags les plus proches"
-#: gitk:11356
+#: gitk:11377
msgid "Maximum # tags/heads to show"
msgstr ""
-#: gitk:11359
+#: gitk:11380
msgid "Limit diffs to listed paths"
msgstr "Limiter les différences aux chemins listés"
-#: gitk:11362
+#: gitk:11383
msgid "Support per-file encodings"
msgstr "Support pour un encodage des caractères par fichier"
-#: gitk:11368 gitk:11515
+#: gitk:11389 gitk:11536
msgid "External diff tool"
msgstr "Outil diff externe"
-#: gitk:11369
+#: gitk:11390
msgid "Choose..."
msgstr "Choisir..."
-#: gitk:11374
+#: gitk:11395
#, fuzzy
msgid "General options"
msgstr "Générer le patch"
-#: gitk:11377
+#: gitk:11398
msgid "Use themed widgets"
msgstr ""
-#: gitk:11379
+#: gitk:11400
msgid "(change requires restart)"
msgstr ""
-#: gitk:11381
+#: gitk:11402
msgid "(currently unavailable)"
msgstr ""
-#: gitk:11392
+#: gitk:11413
msgid "Colors: press to choose"
msgstr "Couleurs : cliquer pour choisir"
-#: gitk:11395
+#: gitk:11416
msgid "Interface"
msgstr ""
-#: gitk:11396
+#: gitk:11417
#, fuzzy
msgid "interface"
msgstr "Police de l'interface utilisateur"
-#: gitk:11399
+#: gitk:11420
msgid "Background"
msgstr "Arrière-plan"
-#: gitk:11400 gitk:11430
+#: gitk:11421 gitk:11451
msgid "background"
msgstr "arrière-plan"
-#: gitk:11403
+#: gitk:11424
msgid "Foreground"
msgstr "Premier plan"
-#: gitk:11404
+#: gitk:11425
msgid "foreground"
msgstr "premier plan"
-#: gitk:11407
+#: gitk:11428
msgid "Diff: old lines"
msgstr "Diff : anciennes lignes"
-#: gitk:11408
+#: gitk:11429
msgid "diff old lines"
msgstr "diff anciennes lignes"
-#: gitk:11412
+#: gitk:11433
msgid "Diff: new lines"
msgstr "Diff : nouvelles lignes"
-#: gitk:11413
+#: gitk:11434
msgid "diff new lines"
msgstr "diff nouvelles lignes"
-#: gitk:11417
+#: gitk:11438
msgid "Diff: hunk header"
msgstr "Diff : entête du hunk"
-#: gitk:11419
+#: gitk:11440
msgid "diff hunk header"
msgstr "diff : entête du hunk"
-#: gitk:11423
+#: gitk:11444
msgid "Marked line bg"
msgstr "Arrière-plan de la ligne marquée"
-#: gitk:11425
+#: gitk:11446
msgid "marked line background"
msgstr "Arrière-plan de la ligne marquée"
-#: gitk:11429
+#: gitk:11450
msgid "Select bg"
msgstr "Sélectionner l'arrière-plan"
-#: gitk:11438
+#: gitk:11459
msgid "Fonts: press to choose"
msgstr "Polices : cliquer pour choisir"
-#: gitk:11440
+#: gitk:11461
msgid "Main font"
msgstr "Police principale"
-#: gitk:11441
+#: gitk:11462
msgid "Diff display font"
msgstr "Police d'affichage des diff"
-#: gitk:11442
+#: gitk:11463
msgid "User interface font"
msgstr "Police de l'interface utilisateur"
-#: gitk:11464
+#: gitk:11485
msgid "Gitk preferences"
msgstr "Préférences de Gitk"
-#: gitk:11473
+#: gitk:11494
#, fuzzy
msgid "General"
msgstr "Générer"
-#: gitk:11474
+#: gitk:11495
msgid "Colors"
msgstr ""
-#: gitk:11475
+#: gitk:11496
msgid "Fonts"
msgstr ""
-#: gitk:11525
+#: gitk:11546
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk : choisir la couleur de %s"
-#: gitk:12242
+#: gitk:12059
+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:12269
msgid "Cannot find a git repository here."
msgstr "Impossible de trouver un dépôt git ici."
-#: gitk:12289
+#: gitk:12316
#, 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:12328
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 +1415,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 v1.2.3 (git 2.25.1) at 2024-12-21 11:24:57 +0000