mirror of
https://github.com/git/git.git
synced 2024-06-18 23:39:20 +02:00
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui: git-gui: Fix diff parsing for lines starting with "--" or "++" git-gui: Fix string escaping in po2msg.sh git gui: show diffs with a minimum of 1 context line git-gui: update all remaining translations to French. git-gui: Update french translation
This commit is contained in:
Junio C Hamano
commit
1b118da8bd
|
|
@ -1932,7 +1932,7 @@ proc show_more_context {} {
|
|||
|
||||
proc show_less_context {} {
|
||||
global repo_config
|
||||
if {$repo_config(gui.diffcontext) >= 1} {
|
||||
if {$repo_config(gui.diffcontext) > 1} {
|
||||
incr repo_config(gui.diffcontext) -1
|
||||
reshow_diff
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {
|
|||
|
||||
lappend cmd -p
|
||||
lappend cmd --no-color
|
||||
if {$repo_config(gui.diffcontext) >= 0} {
|
||||
if {$repo_config(gui.diffcontext) >= 1} {
|
||||
lappend cmd "-U$repo_config(gui.diffcontext)"
|
||||
}
|
||||
if {$w eq $ui_index} {
|
||||
|
|
@ -192,6 +192,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {
|
|||
return
|
||||
}
|
||||
|
||||
set ::current_diff_inheader 1
|
||||
fconfigure $fd \
|
||||
-blocking 0 \
|
||||
-encoding binary \
|
||||
|
|
@ -207,18 +208,21 @@ proc read_diff {fd scroll_pos} {
|
|||
while {[gets $fd line] >= 0} {
|
||||
# -- Cleanup uninteresting diff header lines.
|
||||
#
|
||||
if { [string match {diff --git *} $line]
|
||||
|| [string match {diff --cc *} $line]
|
||||
|| [string match {diff --combined *} $line]
|
||||
|| [string match {--- *} $line]
|
||||
|| [string match {+++ *} $line]} {
|
||||
append current_diff_header $line "\n"
|
||||
continue
|
||||
if {$::current_diff_inheader} {
|
||||
if { [string match {diff --git *} $line]
|
||||
|| [string match {diff --cc *} $line]
|
||||
|| [string match {diff --combined *} $line]
|
||||
|| [string match {--- *} $line]
|
||||
|| [string match {+++ *} $line]} {
|
||||
append current_diff_header $line "\n"
|
||||
continue
|
||||
}
|
||||
}
|
||||
if {[string match {index *} $line]} continue
|
||||
if {$line eq {deleted file mode 120000}} {
|
||||
set line "deleted symlink"
|
||||
}
|
||||
set ::current_diff_inheader 0
|
||||
|
||||
# -- Automatically detect if this is a 3 way diff.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ proc do_options {} {
|
|||
{b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
|
||||
{b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
|
||||
{i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
|
||||
{i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
|
||||
{i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
|
||||
{i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
|
||||
{t gui.newbranchtemplate {mc "New Branch Name Template"}}
|
||||
} {
|
||||
|
|
|
|||
918
git-gui/po/fr.po
918
git-gui/po/fr.po
|
|
@ -1,50 +1,51 @@
|
|||
# translation of fr.po to French
|
||||
# translation of fr.po to Français
|
||||
# Translation of git-gui to French.
|
||||
# Copyright (C) 2008 Shawn Pearce, et al.
|
||||
# This file is distributed under the same license as the git package.
|
||||
#
|
||||
# Christian Couder <chriscool@tuxfamily.org>, 2008.
|
||||
# Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>, 2008.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: fr\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-03-14 07:18+0100\n"
|
||||
"PO-Revision-Date: 2008-04-04 22:05+0200\n"
|
||||
"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
|
||||
"Language-Team: French\n"
|
||||
"POT-Creation-Date: 2008-08-02 14:45-0700\n"
|
||||
"PO-Revision-Date: 2008-08-11 17:12-0400\n"
|
||||
"Last-Translator: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>\n"
|
||||
"Language-Team: Français <fr@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: KBabel 1.11.4\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
|
||||
#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
|
||||
#: git-gui.sh:763
|
||||
#: git-gui.sh:41 git-gui.sh:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798
|
||||
#: git-gui.sh:817
|
||||
msgid "git-gui: fatal error"
|
||||
msgstr "git-gui: erreur fatale"
|
||||
|
||||
#: git-gui.sh:593
|
||||
#: git-gui.sh:644
|
||||
#, tcl-format
|
||||
msgid "Invalid font specified in %s:"
|
||||
msgstr "Invalide fonte spécifiée dans %s :"
|
||||
msgstr "Police invalide spécifiée dans %s :"
|
||||
|
||||
#: git-gui.sh:620
|
||||
#: git-gui.sh:674
|
||||
msgid "Main Font"
|
||||
msgstr "Fonte principale"
|
||||
msgstr "Police principale"
|
||||
|
||||
#: git-gui.sh:621
|
||||
#: git-gui.sh:675
|
||||
msgid "Diff/Console Font"
|
||||
msgstr "Fonte diff/console"
|
||||
msgstr "Police diff/console"
|
||||
|
||||
#: git-gui.sh:635
|
||||
#: git-gui.sh:689
|
||||
msgid "Cannot find git in PATH."
|
||||
msgstr "Impossible de trouver git dans PATH."
|
||||
|
||||
#: git-gui.sh:662
|
||||
#: git-gui.sh:716
|
||||
msgid "Cannot parse Git version string:"
|
||||
msgstr "Impossible de parser la version de Git :"
|
||||
|
||||
#: git-gui.sh:680
|
||||
#: git-gui.sh:734
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"Git version cannot be determined.\n"
|
||||
|
|
@ -63,378 +64,381 @@ msgstr ""
|
|||
"\n"
|
||||
"Peut'on considérer que '%s' est en version 1.5.0 ?\n"
|
||||
|
||||
#: git-gui.sh:918
|
||||
#: git-gui.sh:972
|
||||
msgid "Git directory not found:"
|
||||
msgstr "Impossible de trouver le répertoire de Git :"
|
||||
msgstr "Impossible de trouver le répertoire git :"
|
||||
|
||||
#: git-gui.sh:925
|
||||
#: git-gui.sh:979
|
||||
msgid "Cannot move to top of working directory:"
|
||||
msgstr "Impossible d'aller à la racine du répertoire de travail :"
|
||||
|
||||
#: git-gui.sh:932
|
||||
#: git-gui.sh:986
|
||||
msgid "Cannot use funny .git directory:"
|
||||
msgstr "Impossible d'utiliser un drôle de répertoire git :"
|
||||
msgstr "Impossible d'utiliser le répertoire .git:"
|
||||
|
||||
#: git-gui.sh:937
|
||||
#: git-gui.sh:991
|
||||
msgid "No working directory"
|
||||
msgstr "Pas de répertoire de travail"
|
||||
msgstr "Aucun répertoire de travail"
|
||||
|
||||
#: git-gui.sh:1084 lib/checkout_op.tcl:283
|
||||
#: git-gui.sh:1138 lib/checkout_op.tcl:305
|
||||
msgid "Refreshing file status..."
|
||||
msgstr "Rafraichissement du status des fichiers..."
|
||||
|
||||
#: git-gui.sh:1149
|
||||
#: git-gui.sh:1194
|
||||
msgid "Scanning for modified files ..."
|
||||
msgstr "Recherche de fichiers modifiés..."
|
||||
|
||||
#: git-gui.sh:1324 lib/browser.tcl:246
|
||||
#: git-gui.sh:1369 lib/browser.tcl:246
|
||||
msgid "Ready."
|
||||
msgstr "Prêt."
|
||||
|
||||
#: git-gui.sh:1590
|
||||
#: git-gui.sh:1635
|
||||
msgid "Unmodified"
|
||||
msgstr "Non modifié"
|
||||
|
||||
#: git-gui.sh:1592
|
||||
#: git-gui.sh:1637
|
||||
msgid "Modified, not staged"
|
||||
msgstr "Modifié, non pré-commité"
|
||||
msgstr "Modifié, pas indexé"
|
||||
|
||||
#: git-gui.sh:1593 git-gui.sh:1598
|
||||
#: git-gui.sh:1638 git-gui.sh:1643
|
||||
msgid "Staged for commit"
|
||||
msgstr "Pré-commité"
|
||||
msgstr "Indexé"
|
||||
|
||||
#: git-gui.sh:1594 git-gui.sh:1599
|
||||
#: git-gui.sh:1639 git-gui.sh:1644
|
||||
msgid "Portions staged for commit"
|
||||
msgstr "En partie pré-commité"
|
||||
msgstr "Portions indexées"
|
||||
|
||||
#: git-gui.sh:1595 git-gui.sh:1600
|
||||
#: git-gui.sh:1640 git-gui.sh:1645
|
||||
msgid "Staged for commit, missing"
|
||||
msgstr "Pré-commité, manquant"
|
||||
msgstr "Indexés, manquant"
|
||||
|
||||
#: git-gui.sh:1597
|
||||
#: git-gui.sh:1642
|
||||
msgid "Untracked, not staged"
|
||||
msgstr "Non suivi, non pré-commité"
|
||||
msgstr "Non versionné, non indexé"
|
||||
|
||||
#: git-gui.sh:1602
|
||||
#: git-gui.sh:1647
|
||||
msgid "Missing"
|
||||
msgstr "Manquant"
|
||||
|
||||
#: git-gui.sh:1603
|
||||
#: git-gui.sh:1648
|
||||
msgid "Staged for removal"
|
||||
msgstr "Pré-commité pour suppression"
|
||||
msgstr "Indexé pour suppression"
|
||||
|
||||
#: git-gui.sh:1604
|
||||
#: git-gui.sh:1649
|
||||
msgid "Staged for removal, still present"
|
||||
msgstr "Pré-commité pour suppression, toujours présent"
|
||||
msgstr "Indexé pour suppression, toujours présent"
|
||||
|
||||
#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
|
||||
#: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654
|
||||
msgid "Requires merge resolution"
|
||||
msgstr "Nécessite la résolution d'une fusion"
|
||||
|
||||
#: git-gui.sh:1644
|
||||
#: git-gui.sh:1689
|
||||
msgid "Starting gitk... please wait..."
|
||||
msgstr "Lancement de gitk... merci de patienter..."
|
||||
msgstr "Lancement de gitk... un instant..."
|
||||
|
||||
#: git-gui.sh:1653
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"Unable to start gitk:\n"
|
||||
"\n"
|
||||
"%s does not exist"
|
||||
msgstr ""
|
||||
"Impossible de lancer gitk :\n"
|
||||
"\n"
|
||||
"%s inexistant"
|
||||
#: git-gui.sh:1698
|
||||
msgid "Couldn't find gitk in PATH"
|
||||
msgstr "Impossible de trouver gitk dans PATH."
|
||||
|
||||
#: git-gui.sh:1860 lib/choose_repository.tcl:36
|
||||
#: git-gui.sh:1948 lib/choose_repository.tcl:36
|
||||
msgid "Repository"
|
||||
msgstr "Référentiel"
|
||||
msgstr "Dépôt"
|
||||
|
||||
#: git-gui.sh:1861
|
||||
#: git-gui.sh:1949
|
||||
msgid "Edit"
|
||||
msgstr "Editer"
|
||||
msgstr "Edition"
|
||||
|
||||
#: git-gui.sh:1863 lib/choose_rev.tcl:561
|
||||
#: git-gui.sh:1951 lib/choose_rev.tcl:561
|
||||
msgid "Branch"
|
||||
msgstr "Branche"
|
||||
|
||||
#: git-gui.sh:1866 lib/choose_rev.tcl:548
|
||||
#: git-gui.sh:1954 lib/choose_rev.tcl:548
|
||||
msgid "Commit@@noun"
|
||||
msgstr "Commit"
|
||||
|
||||
#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
|
||||
#: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
|
||||
msgid "Merge"
|
||||
msgstr "Fusionner"
|
||||
|
||||
#: git-gui.sh:1870 lib/choose_rev.tcl:557
|
||||
#: git-gui.sh:1958 lib/choose_rev.tcl:557
|
||||
msgid "Remote"
|
||||
msgstr "Référentiel distant"
|
||||
msgstr "Dépôt distant"
|
||||
|
||||
#: git-gui.sh:1879
|
||||
#: git-gui.sh:1967
|
||||
msgid "Browse Current Branch's Files"
|
||||
msgstr "Visionner fichiers dans branche courante"
|
||||
msgstr "Naviguer dans la branche courante"
|
||||
|
||||
#: git-gui.sh:1883
|
||||
#: git-gui.sh:1971
|
||||
msgid "Browse Branch Files..."
|
||||
msgstr "Visionner fichiers de branche"
|
||||
msgstr "Naviguer dans la branche..."
|
||||
|
||||
#: git-gui.sh:1888
|
||||
#: git-gui.sh:1976
|
||||
msgid "Visualize Current Branch's History"
|
||||
msgstr "Visualiser historique branche courante"
|
||||
|
||||
#: git-gui.sh:1892
|
||||
#: git-gui.sh:1980
|
||||
msgid "Visualize All Branch History"
|
||||
msgstr "Visualiser historique toutes branches"
|
||||
msgstr "Voir l'historique de toutes les branches"
|
||||
|
||||
#: git-gui.sh:1899
|
||||
#: git-gui.sh:1987
|
||||
#, tcl-format
|
||||
msgid "Browse %s's Files"
|
||||
msgstr "Visionner fichiers de %s"
|
||||
msgstr "Naviguer l'arborescence de %s"
|
||||
|
||||
#: git-gui.sh:1901
|
||||
#: git-gui.sh:1989
|
||||
#, tcl-format
|
||||
msgid "Visualize %s's History"
|
||||
msgstr "Visualiser historique de %s"
|
||||
msgstr "Voir l'historique de la branche: %s"
|
||||
|
||||
#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
|
||||
#: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67
|
||||
msgid "Database Statistics"
|
||||
msgstr "Statistiques base de donnée"
|
||||
msgstr "Statistiques du dépôt"
|
||||
|
||||
#: git-gui.sh:1909 lib/database.tcl:34
|
||||
#: git-gui.sh:1997 lib/database.tcl:34
|
||||
msgid "Compress Database"
|
||||
msgstr "Comprimer base de donnée"
|
||||
msgstr "Comprimer le dépôt"
|
||||
|
||||
#: git-gui.sh:1912
|
||||
#: git-gui.sh:2000
|
||||
msgid "Verify Database"
|
||||
msgstr "Vérifier base de donnée"
|
||||
msgstr "Vérifier le dépôt"
|
||||
|
||||
#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
|
||||
#: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7
|
||||
#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
|
||||
msgid "Create Desktop Icon"
|
||||
msgstr "Créer icône sur bureau"
|
||||
|
||||
#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
|
||||
#: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
|
||||
msgid "Quit"
|
||||
msgstr "Quitter"
|
||||
|
||||
#: git-gui.sh:1939
|
||||
#: git-gui.sh:2031
|
||||
msgid "Undo"
|
||||
msgstr "Défaire"
|
||||
|
||||
#: git-gui.sh:1942
|
||||
#: git-gui.sh:2034
|
||||
msgid "Redo"
|
||||
msgstr "Refaire"
|
||||
|
||||
#: git-gui.sh:1946 git-gui.sh:2443
|
||||
#: git-gui.sh:2038 git-gui.sh:2545
|
||||
msgid "Cut"
|
||||
msgstr "Couper"
|
||||
|
||||
#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
|
||||
#: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715
|
||||
#: lib/console.tcl:69
|
||||
msgid "Copy"
|
||||
msgstr "Copier"
|
||||
|
||||
#: git-gui.sh:1952 git-gui.sh:2449
|
||||
#: git-gui.sh:2044 git-gui.sh:2551
|
||||
msgid "Paste"
|
||||
msgstr "Coller"
|
||||
|
||||
#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
|
||||
#: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26
|
||||
#: lib/remote_branch_delete.tcl:38
|
||||
msgid "Delete"
|
||||
msgstr "Supprimer"
|
||||
|
||||
#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
|
||||
#: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71
|
||||
msgid "Select All"
|
||||
msgstr "Tout sélectionner"
|
||||
|
||||
#: git-gui.sh:1968
|
||||
#: git-gui.sh:2060
|
||||
msgid "Create..."
|
||||
msgstr "Créer..."
|
||||
|
||||
#: git-gui.sh:1974
|
||||
#: git-gui.sh:2066
|
||||
msgid "Checkout..."
|
||||
msgstr "Emprunter... "
|
||||
msgstr "Charger (checkout)..."
|
||||
|
||||
#: git-gui.sh:1980
|
||||
#: git-gui.sh:2072
|
||||
msgid "Rename..."
|
||||
msgstr "Renommer..."
|
||||
|
||||
#: git-gui.sh:1985 git-gui.sh:2085
|
||||
#: git-gui.sh:2077 git-gui.sh:2187
|
||||
msgid "Delete..."
|
||||
msgstr "Supprimer..."
|
||||
|
||||
#: git-gui.sh:1990
|
||||
#: git-gui.sh:2082
|
||||
msgid "Reset..."
|
||||
msgstr "Réinitialiser..."
|
||||
|
||||
#: git-gui.sh:2002 git-gui.sh:2389
|
||||
#: git-gui.sh:2094 git-gui.sh:2491
|
||||
msgid "New Commit"
|
||||
msgstr "Nouveau commit"
|
||||
|
||||
#: git-gui.sh:2010 git-gui.sh:2396
|
||||
#: git-gui.sh:2102 git-gui.sh:2498
|
||||
msgid "Amend Last Commit"
|
||||
msgstr "Corriger dernier commit"
|
||||
|
||||
#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
|
||||
#: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99
|
||||
msgid "Rescan"
|
||||
msgstr "Resynchroniser"
|
||||
msgstr "Recharger modifs."
|
||||
|
||||
#: git-gui.sh:2025
|
||||
#: git-gui.sh:2117
|
||||
msgid "Stage To Commit"
|
||||
msgstr "Commiter un pré-commit"
|
||||
msgstr "Indexer"
|
||||
|
||||
#: git-gui.sh:2031
|
||||
#: git-gui.sh:2123
|
||||
msgid "Stage Changed Files To Commit"
|
||||
msgstr "Commiter fichiers modifiés dans pré-commit"
|
||||
msgstr "Indexer toutes modifications"
|
||||
|
||||
#: git-gui.sh:2037
|
||||
#: git-gui.sh:2129
|
||||
msgid "Unstage From Commit"
|
||||
msgstr "Commit vers pré-commit"
|
||||
msgstr "Désindexer"
|
||||
|
||||
#: git-gui.sh:2042 lib/index.tcl:395
|
||||
#: git-gui.sh:2134 lib/index.tcl:395
|
||||
msgid "Revert Changes"
|
||||
msgstr "Inverser modification"
|
||||
msgstr "Annuler les modifications (revert)"
|
||||
|
||||
#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
|
||||
msgid "Sign Off"
|
||||
msgstr "Se désinscrire"
|
||||
|
||||
#: git-gui.sh:2053 git-gui.sh:2372
|
||||
msgid "Commit@@verb"
|
||||
msgstr "Commiter"
|
||||
|
||||
#: git-gui.sh:2064
|
||||
msgid "Local Merge..."
|
||||
msgstr "Fusion locale..."
|
||||
|
||||
#: git-gui.sh:2069
|
||||
msgid "Abort Merge..."
|
||||
msgstr "Abandonner fusion..."
|
||||
|
||||
#: git-gui.sh:2081
|
||||
msgid "Push..."
|
||||
msgstr "Pousser..."
|
||||
|
||||
#: git-gui.sh:2092 lib/choose_repository.tcl:41
|
||||
msgid "Apple"
|
||||
msgstr "Pomme"
|
||||
|
||||
#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
|
||||
#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
|
||||
#, tcl-format
|
||||
msgid "About %s"
|
||||
msgstr "A propos de %s"
|
||||
|
||||
#: git-gui.sh:2099
|
||||
msgid "Preferences..."
|
||||
msgstr "Préférences..."
|
||||
|
||||
#: git-gui.sh:2107 git-gui.sh:2639
|
||||
msgid "Options..."
|
||||
msgstr "Options..."
|
||||
|
||||
#: git-gui.sh:2113 lib/choose_repository.tcl:47
|
||||
msgid "Help"
|
||||
msgstr "Aide"
|
||||
|
||||
#: git-gui.sh:2154
|
||||
msgid "Online Documentation"
|
||||
msgstr "Documentation en ligne"
|
||||
|
||||
#: git-gui.sh:2238
|
||||
#, tcl-format
|
||||
msgid "fatal: cannot stat path %s: No such file or directory"
|
||||
msgstr "erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire inexistant"
|
||||
|
||||
#: git-gui.sh:2271
|
||||
msgid "Current Branch:"
|
||||
msgstr "Branche courante :"
|
||||
|
||||
#: git-gui.sh:2292
|
||||
msgid "Staged Changes (Will Commit)"
|
||||
msgstr "Modifications pré-commitées"
|
||||
|
||||
#: git-gui.sh:2312
|
||||
msgid "Unstaged Changes"
|
||||
msgstr "Modifications non pré-commitées"
|
||||
|
||||
#: git-gui.sh:2362
|
||||
msgid "Stage Changed"
|
||||
msgstr "Pré-commit modifié"
|
||||
|
||||
#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
|
||||
msgid "Push"
|
||||
msgstr "Pousser"
|
||||
|
||||
#: git-gui.sh:2408
|
||||
msgid "Initial Commit Message:"
|
||||
msgstr "Message de commit initial :"
|
||||
|
||||
#: git-gui.sh:2409
|
||||
msgid "Amended Commit Message:"
|
||||
msgstr "Message de commit corrigé :"
|
||||
|
||||
#: git-gui.sh:2410
|
||||
msgid "Amended Initial Commit Message:"
|
||||
msgstr "Message de commit initial corrigé :"
|
||||
|
||||
#: git-gui.sh:2411
|
||||
msgid "Amended Merge Commit Message:"
|
||||
msgstr "Message de commit de fusion corrigé :"
|
||||
|
||||
#: git-gui.sh:2412
|
||||
msgid "Merge Commit Message:"
|
||||
msgstr "Message de commit de fusion :"
|
||||
|
||||
#: git-gui.sh:2413
|
||||
msgid "Commit Message:"
|
||||
msgstr "Message de commit :"
|
||||
|
||||
#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
|
||||
msgid "Copy All"
|
||||
msgstr "Copier tout"
|
||||
|
||||
#: git-gui.sh:2483 lib/blame.tcl:107
|
||||
msgid "File:"
|
||||
msgstr "Fichier :"
|
||||
|
||||
#: git-gui.sh:2589
|
||||
msgid "Apply/Reverse Hunk"
|
||||
msgstr "Appliquer/Inverser section"
|
||||
|
||||
#: git-gui.sh:2595
|
||||
#: git-gui.sh:2141 git-gui.sh:2702
|
||||
msgid "Show Less Context"
|
||||
msgstr "Montrer moins de contexte"
|
||||
|
||||
#: git-gui.sh:2602
|
||||
#: git-gui.sh:2145 git-gui.sh:2706
|
||||
msgid "Show More Context"
|
||||
msgstr "Montrer plus de contexte"
|
||||
|
||||
#: git-gui.sh:2610
|
||||
#: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
|
||||
msgid "Sign Off"
|
||||
msgstr "Signer"
|
||||
|
||||
#: git-gui.sh:2155 git-gui.sh:2474
|
||||
msgid "Commit@@verb"
|
||||
msgstr "Commiter"
|
||||
|
||||
#: git-gui.sh:2166
|
||||
msgid "Local Merge..."
|
||||
msgstr "Fusion locale..."
|
||||
|
||||
#: git-gui.sh:2171
|
||||
msgid "Abort Merge..."
|
||||
msgstr "Abandonner fusion..."
|
||||
|
||||
#: git-gui.sh:2183
|
||||
msgid "Push..."
|
||||
msgstr "Pousser..."
|
||||
|
||||
#: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
|
||||
#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
|
||||
#, tcl-format
|
||||
msgid "About %s"
|
||||
msgstr "À propos de %s"
|
||||
|
||||
#: git-gui.sh:2201
|
||||
msgid "Preferences..."
|
||||
msgstr "Préférences..."
|
||||
|
||||
#: git-gui.sh:2209 git-gui.sh:2740
|
||||
msgid "Options..."
|
||||
msgstr "Options..."
|
||||
|
||||
#: git-gui.sh:2215 lib/choose_repository.tcl:47
|
||||
msgid "Help"
|
||||
msgstr "Aide"
|
||||
|
||||
#: git-gui.sh:2256
|
||||
msgid "Online Documentation"
|
||||
msgstr "Documentation en ligne"
|
||||
|
||||
#: git-gui.sh:2340
|
||||
#, tcl-format
|
||||
msgid "fatal: cannot stat path %s: No such file or directory"
|
||||
msgstr ""
|
||||
"erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire "
|
||||
"inexistant"
|
||||
|
||||
#: git-gui.sh:2373
|
||||
msgid "Current Branch:"
|
||||
msgstr "Branche courante :"
|
||||
|
||||
#: git-gui.sh:2394
|
||||
msgid "Staged Changes (Will Commit)"
|
||||
msgstr "Modifs. indexées (pour commit)"
|
||||
|
||||
#: git-gui.sh:2414
|
||||
msgid "Unstaged Changes"
|
||||
msgstr "Modifs. non indexées"
|
||||
|
||||
#: git-gui.sh:2464
|
||||
msgid "Stage Changed"
|
||||
msgstr "Indexer modifs."
|
||||
|
||||
#: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182
|
||||
msgid "Push"
|
||||
msgstr "Pousser"
|
||||
|
||||
#: git-gui.sh:2510
|
||||
msgid "Initial Commit Message:"
|
||||
msgstr "Message de commit initial :"
|
||||
|
||||
#: git-gui.sh:2511
|
||||
msgid "Amended Commit Message:"
|
||||
msgstr "Message de commit corrigé :"
|
||||
|
||||
#: git-gui.sh:2512
|
||||
msgid "Amended Initial Commit Message:"
|
||||
msgstr "Message de commit initial corrigé :"
|
||||
|
||||
#: git-gui.sh:2513
|
||||
msgid "Amended Merge Commit Message:"
|
||||
msgstr "Message de commit de fusion corrigé :"
|
||||
|
||||
#: git-gui.sh:2514
|
||||
msgid "Merge Commit Message:"
|
||||
msgstr "Message de commit de fusion :"
|
||||
|
||||
#: git-gui.sh:2515
|
||||
msgid "Commit Message:"
|
||||
msgstr "Message de commit :"
|
||||
|
||||
#: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73
|
||||
msgid "Copy All"
|
||||
msgstr "Copier tout"
|
||||
|
||||
#: git-gui.sh:2585 lib/blame.tcl:100
|
||||
msgid "File:"
|
||||
msgstr "Fichier :"
|
||||
|
||||
#: git-gui.sh:2691
|
||||
msgid "Apply/Reverse Hunk"
|
||||
msgstr "Appliquer/Inverser section"
|
||||
|
||||
#: git-gui.sh:2696
|
||||
msgid "Apply/Reverse Line"
|
||||
msgstr "Appliquer/Inverser la ligne"
|
||||
|
||||
#: git-gui.sh:2711
|
||||
msgid "Refresh"
|
||||
msgstr "Rafraichir"
|
||||
|
||||
#: git-gui.sh:2631
|
||||
#: git-gui.sh:2732
|
||||
msgid "Decrease Font Size"
|
||||
msgstr "Réduire fonte"
|
||||
msgstr "Diminuer la police"
|
||||
|
||||
#: git-gui.sh:2635
|
||||
#: git-gui.sh:2736
|
||||
msgid "Increase Font Size"
|
||||
msgstr "Agrandir fonte"
|
||||
msgstr "Agrandir la police"
|
||||
|
||||
#: git-gui.sh:2646
|
||||
#: git-gui.sh:2747
|
||||
msgid "Unstage Hunk From Commit"
|
||||
msgstr "Enlever section pré-commitée"
|
||||
msgstr "Désindexer la section"
|
||||
|
||||
#: git-gui.sh:2648
|
||||
#: git-gui.sh:2748
|
||||
msgid "Unstage Line From Commit"
|
||||
msgstr "Désindexer la ligne"
|
||||
|
||||
#: git-gui.sh:2750
|
||||
msgid "Stage Hunk For Commit"
|
||||
msgstr "Pré-commiter section"
|
||||
msgstr "Indexer la section"
|
||||
|
||||
#: git-gui.sh:2667
|
||||
#: git-gui.sh:2751
|
||||
msgid "Stage Line For Commit"
|
||||
msgstr "Indexer la ligne"
|
||||
|
||||
#: git-gui.sh:2771
|
||||
msgid "Initializing..."
|
||||
msgstr "Initialisation..."
|
||||
|
||||
#: git-gui.sh:2762
|
||||
#: git-gui.sh:2876
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"Possible environment issues exist.\n"
|
||||
|
|
@ -451,7 +455,7 @@ msgstr ""
|
|||
"sous-processus de Git lancés par %s\n"
|
||||
"\n"
|
||||
|
||||
#: git-gui.sh:2792
|
||||
#: git-gui.sh:2906
|
||||
msgid ""
|
||||
"\n"
|
||||
"This is due to a known issue with the\n"
|
||||
|
|
@ -461,7 +465,7 @@ msgstr ""
|
|||
"Ceci est du à un problème connu avec\n"
|
||||
"le binaire Tcl distribué par Cygwin."
|
||||
|
||||
#: git-gui.sh:2797
|
||||
#: git-gui.sh:2911
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"\n"
|
||||
|
|
@ -482,78 +486,94 @@ msgstr ""
|
|||
msgid "git-gui - a graphical user interface for Git."
|
||||
msgstr "git-gui - une interface graphique utilisateur pour Git"
|
||||
|
||||
#: lib/blame.tcl:77
|
||||
#: lib/blame.tcl:70
|
||||
msgid "File Viewer"
|
||||
msgstr "Visionneur de fichier"
|
||||
|
||||
#: lib/blame.tcl:81
|
||||
#: lib/blame.tcl:74
|
||||
msgid "Commit:"
|
||||
msgstr "Commit :"
|
||||
|
||||
#: lib/blame.tcl:264
|
||||
#: lib/blame.tcl:257
|
||||
msgid "Copy Commit"
|
||||
msgstr "Copier commit"
|
||||
|
||||
#: lib/blame.tcl:384
|
||||
#: lib/blame.tcl:260
|
||||
msgid "Do Full Copy Detection"
|
||||
msgstr "Lancer la détection approfondie des copies"
|
||||
|
||||
#: lib/blame.tcl:388
|
||||
#, tcl-format
|
||||
msgid "Reading %s..."
|
||||
msgstr "Lecture de %s..."
|
||||
|
||||
#: lib/blame.tcl:488
|
||||
#: lib/blame.tcl:492
|
||||
msgid "Loading copy/move tracking annotations..."
|
||||
msgstr "Chargement des annotations de suivi des copies/déplacements..."
|
||||
|
||||
#: lib/blame.tcl:508
|
||||
#: lib/blame.tcl:512
|
||||
msgid "lines annotated"
|
||||
msgstr "lignes annotées"
|
||||
|
||||
#: lib/blame.tcl:689
|
||||
#: lib/blame.tcl:704
|
||||
msgid "Loading original location annotations..."
|
||||
msgstr "Chargement des annotations d'emplacement original"
|
||||
|
||||
#: lib/blame.tcl:692
|
||||
#: lib/blame.tcl:707
|
||||
msgid "Annotation complete."
|
||||
msgstr "Annotation terminée."
|
||||
|
||||
#: lib/blame.tcl:746
|
||||
#: lib/blame.tcl:737
|
||||
msgid "Busy"
|
||||
msgstr "Occupé"
|
||||
|
||||
#: lib/blame.tcl:738
|
||||
msgid "Annotation process is already running."
|
||||
msgstr "Annotation en cours d'exécution."
|
||||
|
||||
#: lib/blame.tcl:777
|
||||
msgid "Running thorough copy detection..."
|
||||
msgstr "Recherche de copie approfondie en cours..."
|
||||
|
||||
#: lib/blame.tcl:827
|
||||
msgid "Loading annotation..."
|
||||
msgstr "Chargement des annotations..."
|
||||
|
||||
#: lib/blame.tcl:802
|
||||
#: lib/blame.tcl:883
|
||||
msgid "Author:"
|
||||
msgstr "Auteur :"
|
||||
|
||||
#: lib/blame.tcl:806
|
||||
#: lib/blame.tcl:887
|
||||
msgid "Committer:"
|
||||
msgstr "Commiteur :"
|
||||
|
||||
#: lib/blame.tcl:811
|
||||
#: lib/blame.tcl:892
|
||||
msgid "Original File:"
|
||||
msgstr "Fichier original :"
|
||||
|
||||
#: lib/blame.tcl:925
|
||||
#: lib/blame.tcl:1006
|
||||
msgid "Originally By:"
|
||||
msgstr "A l'origine par :"
|
||||
|
||||
#: lib/blame.tcl:931
|
||||
#: lib/blame.tcl:1012
|
||||
msgid "In File:"
|
||||
msgstr "Dans le fichier :"
|
||||
|
||||
#: lib/blame.tcl:936
|
||||
#: lib/blame.tcl:1017
|
||||
msgid "Copied Or Moved Here By:"
|
||||
msgstr "Copié ou déplacé ici par :"
|
||||
|
||||
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
|
||||
msgid "Checkout Branch"
|
||||
msgstr "Emprunter branche"
|
||||
msgstr "Charger la branche (checkout)"
|
||||
|
||||
#: lib/branch_checkout.tcl:23
|
||||
msgid "Checkout"
|
||||
msgstr "Emprunter"
|
||||
msgstr "Charger (checkout)"
|
||||
|
||||
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
|
||||
#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
|
||||
#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
|
||||
#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:171
|
||||
#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
|
||||
msgid "Cancel"
|
||||
msgstr "Annuler"
|
||||
|
|
@ -562,17 +582,17 @@ msgstr "Annuler"
|
|||
msgid "Revision"
|
||||
msgstr "Révision"
|
||||
|
||||
#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
|
||||
#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244
|
||||
msgid "Options"
|
||||
msgstr "Options"
|
||||
|
||||
#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
|
||||
msgid "Fetch Tracking Branch"
|
||||
msgstr "Branche suivant récupération"
|
||||
msgstr "Récupérer la branche de suivi"
|
||||
|
||||
#: lib/branch_checkout.tcl:44
|
||||
msgid "Detach From Local Branch"
|
||||
msgstr "Détacher de branche locale"
|
||||
msgstr "Détacher de la branche locale"
|
||||
|
||||
#: lib/branch_create.tcl:22
|
||||
msgid "Create Branch"
|
||||
|
|
@ -600,7 +620,7 @@ msgstr "Trouver nom de branche de suivi"
|
|||
|
||||
#: lib/branch_create.tcl:66
|
||||
msgid "Starting Revision"
|
||||
msgstr "Début de révision"
|
||||
msgstr "Révision initiale"
|
||||
|
||||
#: lib/branch_create.tcl:72
|
||||
msgid "Update Existing Branch:"
|
||||
|
|
@ -612,28 +632,28 @@ msgstr "Non"
|
|||
|
||||
#: lib/branch_create.tcl:80
|
||||
msgid "Fast Forward Only"
|
||||
msgstr "Avance rapide seulement"
|
||||
msgstr "Mise-à-jour rectiligne seulement (fast-forward)"
|
||||
|
||||
#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
|
||||
#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
|
||||
msgid "Reset"
|
||||
msgstr "Réinitialiser"
|
||||
|
||||
#: lib/branch_create.tcl:97
|
||||
msgid "Checkout After Creation"
|
||||
msgstr "Emprunt après création"
|
||||
msgstr "Charger (checkout) après création"
|
||||
|
||||
#: lib/branch_create.tcl:131
|
||||
msgid "Please select a tracking branch."
|
||||
msgstr "Merci de choisir une branche de suivi"
|
||||
msgstr "Choisissez une branche de suivi"
|
||||
|
||||
#: lib/branch_create.tcl:140
|
||||
#, tcl-format
|
||||
msgid "Tracking branch %s is not a branch in the remote repository."
|
||||
msgstr "La branche de suivi %s n'est pas une branche dans le référentiel distant."
|
||||
msgstr "La branche de suivi %s n'est pas une branche dans le dépôt distant."
|
||||
|
||||
#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
|
||||
msgid "Please supply a branch name."
|
||||
msgstr "Merci de fournir un nom de branche."
|
||||
msgstr "Fournissez un nom de branche."
|
||||
|
||||
#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
|
||||
#, tcl-format
|
||||
|
|
@ -654,7 +674,7 @@ msgstr "Branches locales"
|
|||
|
||||
#: lib/branch_delete.tcl:52
|
||||
msgid "Delete Only If Merged Into"
|
||||
msgstr "Supprimer ssi fusion dedans"
|
||||
msgstr "Supprimer seulement si fusionnée dans:"
|
||||
|
||||
#: lib/branch_delete.tcl:54
|
||||
msgid "Always (Do not perform merge test.)"
|
||||
|
|
@ -704,7 +724,7 @@ msgstr "Nouveau nom :"
|
|||
msgid "Please select a branch to rename."
|
||||
msgstr "Merci de sélectionner une branche à renommer."
|
||||
|
||||
#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
|
||||
#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
|
||||
#, tcl-format
|
||||
msgid "Branch '%s' already exists."
|
||||
msgstr "La branche '%s' existe déjà."
|
||||
|
|
@ -712,7 +732,7 @@ msgstr "La branche '%s' existe déjà."
|
|||
#: lib/branch_rename.tcl:117
|
||||
#, tcl-format
|
||||
msgid "Failed to rename '%s'."
|
||||
msgstr "Le renommage de '%s' a échoué."
|
||||
msgstr "Échec pour renommer '%s'."
|
||||
|
||||
#: lib/browser.tcl:17
|
||||
msgid "Starting..."
|
||||
|
|
@ -733,34 +753,39 @@ msgstr "[Jusqu'au parent]"
|
|||
|
||||
#: lib/browser.tcl:267 lib/browser.tcl:273
|
||||
msgid "Browse Branch Files"
|
||||
msgstr "Visionner fichiers de branches"
|
||||
msgstr "Naviguer dans les fichiers de le branche"
|
||||
|
||||
#: lib/browser.tcl:278 lib/choose_repository.tcl:387
|
||||
#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
|
||||
#: lib/choose_repository.tcl:987
|
||||
#: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482
|
||||
#: lib/choose_repository.tcl:985
|
||||
msgid "Browse"
|
||||
msgstr "Visionner"
|
||||
msgstr "Naviguer"
|
||||
|
||||
#: lib/checkout_op.tcl:79
|
||||
#: lib/checkout_op.tcl:84
|
||||
#, tcl-format
|
||||
msgid "Fetching %s from %s"
|
||||
msgstr "Récupération de %s à partir de %s"
|
||||
|
||||
#: lib/checkout_op.tcl:127
|
||||
#: lib/checkout_op.tcl:132
|
||||
#, tcl-format
|
||||
msgid "fatal: Cannot resolve %s"
|
||||
msgstr "erreur fatale : Impossible de résoudre %s"
|
||||
|
||||
#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
|
||||
#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
|
||||
msgid "Close"
|
||||
msgstr "Fermer"
|
||||
|
||||
#: lib/checkout_op.tcl:169
|
||||
#: lib/checkout_op.tcl:174
|
||||
#, tcl-format
|
||||
msgid "Branch '%s' does not exist."
|
||||
msgstr "La branche '%s' n'existe pas."
|
||||
|
||||
#: lib/checkout_op.tcl:206
|
||||
#: lib/checkout_op.tcl:193
|
||||
#, tcl-format
|
||||
msgid "Failed to configure simplified git-pull for '%s'."
|
||||
msgstr "Échec de la configuration simplifiée de git-pull pour '%s'."
|
||||
|
||||
#: lib/checkout_op.tcl:228
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"Branch '%s' already exists.\n"
|
||||
|
|
@ -770,24 +795,24 @@ msgid ""
|
|||
msgstr ""
|
||||
"La branche '%s' existe déjà.\n"
|
||||
"\n"
|
||||
"Impossible d'avancer rapidement à %s.\n"
|
||||
"Impossible de faire une avance rapide (fast forward) vers %s.\n"
|
||||
"Une fusion est nécessaire."
|
||||
|
||||
#: lib/checkout_op.tcl:220
|
||||
#: lib/checkout_op.tcl:242
|
||||
#, tcl-format
|
||||
msgid "Merge strategy '%s' not supported."
|
||||
msgstr "La stratégie de fusion '%s' n'est pas supportée."
|
||||
|
||||
#: lib/checkout_op.tcl:239
|
||||
#: lib/checkout_op.tcl:261
|
||||
#, tcl-format
|
||||
msgid "Failed to update '%s'."
|
||||
msgstr "La mise à jour de '%s' a échouée."
|
||||
|
||||
#: lib/checkout_op.tcl:251
|
||||
#: lib/checkout_op.tcl:273
|
||||
msgid "Staging area (index) is already locked."
|
||||
msgstr "L'espace de pré-commit ('index' ou 'staging') est déjà vérouillé."
|
||||
msgstr "L'index (staging area) est déjà vérouillé"
|
||||
|
||||
#: lib/checkout_op.tcl:266
|
||||
#: lib/checkout_op.tcl:288
|
||||
msgid ""
|
||||
"Last scanned state does not match repository state.\n"
|
||||
"\n"
|
||||
|
|
@ -796,36 +821,39 @@ msgid ""
|
|||
"\n"
|
||||
"The rescan will be automatically started now.\n"
|
||||
msgstr ""
|
||||
"L'état lors de la dernière synchronisation ne correspond plus à l'état du référentiel.\n"
|
||||
"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
|
||||
"dépôt\n"
|
||||
"\n"
|
||||
"Un autre programme Git a modifié ce référentiel depuis la dernière synchronisation. Une resynchronisation doit être effectuée avant de pouvoir modifier la branche courante.\n"
|
||||
"Un autre programme Git a modifié ce dépôt depuis la dernière "
|
||||
"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
|
||||
"modifier la branche courante.\n"
|
||||
"\n"
|
||||
"Cela va être fait tout de suite automatiquement.\n"
|
||||
|
||||
#: lib/checkout_op.tcl:322
|
||||
#: lib/checkout_op.tcl:344
|
||||
#, tcl-format
|
||||
msgid "Updating working directory to '%s'..."
|
||||
msgstr "Mise à jour du répertoire courant avec '%s'..."
|
||||
|
||||
#: lib/checkout_op.tcl:323
|
||||
#: lib/checkout_op.tcl:345
|
||||
msgid "files checked out"
|
||||
msgstr "fichiers empruntés"
|
||||
msgstr "fichiers chargés"
|
||||
|
||||
#: lib/checkout_op.tcl:353
|
||||
#: lib/checkout_op.tcl:375
|
||||
#, tcl-format
|
||||
msgid "Aborted checkout of '%s' (file level merging is required)."
|
||||
msgstr "Emprunt de '%s' abandonné. (Il est nécessaire de fusionner des fichiers.)"
|
||||
msgstr "Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers)."
|
||||
|
||||
#: lib/checkout_op.tcl:354
|
||||
#: lib/checkout_op.tcl:376
|
||||
msgid "File level merge required."
|
||||
msgstr "Il est nécessaire de fusionner des fichiers."
|
||||
|
||||
#: lib/checkout_op.tcl:358
|
||||
#: lib/checkout_op.tcl:380
|
||||
#, tcl-format
|
||||
msgid "Staying on branch '%s'."
|
||||
msgstr "Le répertoire de travail reste sur la branche '%s'."
|
||||
|
||||
#: lib/checkout_op.tcl:429
|
||||
#: lib/checkout_op.tcl:451
|
||||
msgid ""
|
||||
"You are no longer on a local branch.\n"
|
||||
"\n"
|
||||
|
|
@ -837,30 +865,30 @@ msgstr ""
|
|||
"Si vous vouliez être sur une branche, créez en une maintenant en partant de "
|
||||
"'Cet emprunt détaché'."
|
||||
|
||||
#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
|
||||
#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
|
||||
#, tcl-format
|
||||
msgid "Checked out '%s'."
|
||||
msgstr "'%s' emprunté."
|
||||
msgstr "'%s' chargé."
|
||||
|
||||
#: lib/checkout_op.tcl:478
|
||||
#: lib/checkout_op.tcl:500
|
||||
#, tcl-format
|
||||
msgid "Resetting '%s' to '%s' will lose the following commits:"
|
||||
msgstr "Réinitialiser '%s' à '%s' va faire perdre les commits suivants :"
|
||||
|
||||
#: lib/checkout_op.tcl:500
|
||||
#: lib/checkout_op.tcl:522
|
||||
msgid "Recovering lost commits may not be easy."
|
||||
msgstr "Récupérer les commits perdus ne sera peut être pas facile."
|
||||
|
||||
#: lib/checkout_op.tcl:505
|
||||
#: lib/checkout_op.tcl:527
|
||||
#, tcl-format
|
||||
msgid "Reset '%s'?"
|
||||
msgstr "Réinitialiser '%s' ?"
|
||||
|
||||
#: lib/checkout_op.tcl:510 lib/merge.tcl:163
|
||||
#: lib/checkout_op.tcl:532 lib/merge.tcl:163
|
||||
msgid "Visualize"
|
||||
msgstr "Visualiser"
|
||||
|
||||
#: lib/checkout_op.tcl:578
|
||||
#: lib/checkout_op.tcl:600
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"Failed to set current branch.\n"
|
||||
|
|
@ -884,15 +912,15 @@ msgstr "Sélectionner"
|
|||
|
||||
#: lib/choose_font.tcl:53
|
||||
msgid "Font Family"
|
||||
msgstr "Famille de fonte"
|
||||
msgstr "Familles de polices"
|
||||
|
||||
#: lib/choose_font.tcl:74
|
||||
msgid "Font Size"
|
||||
msgstr "Taille de fonte"
|
||||
msgstr "Taille de police"
|
||||
|
||||
#: lib/choose_font.tcl:91
|
||||
msgid "Font Example"
|
||||
msgstr "Exemple de fonte"
|
||||
msgstr "Exemple de police"
|
||||
|
||||
#: lib/choose_font.tcl:103
|
||||
msgid ""
|
||||
|
|
@ -900,7 +928,7 @@ msgid ""
|
|||
"If you like this text, it can be your font."
|
||||
msgstr ""
|
||||
"C'est un texte d'exemple.\n"
|
||||
"Si vous aimez ce texte, vous pouvez choisir cette fonte."
|
||||
"Si vous aimez ce texte, vous pouvez choisir cette police"
|
||||
|
||||
#: lib/choose_repository.tcl:28
|
||||
msgid "Git Gui"
|
||||
|
|
@ -908,23 +936,23 @@ msgstr "Git Gui"
|
|||
|
||||
#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
|
||||
msgid "Create New Repository"
|
||||
msgstr "Créer nouveau référentiel"
|
||||
msgstr "Créer nouveau dépôt"
|
||||
|
||||
#: lib/choose_repository.tcl:87
|
||||
msgid "New..."
|
||||
msgstr "Nouveau..."
|
||||
|
||||
#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
|
||||
#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458
|
||||
msgid "Clone Existing Repository"
|
||||
msgstr "Cloner référentiel existant"
|
||||
msgstr "Cloner dépôt existant"
|
||||
|
||||
#: lib/choose_repository.tcl:100
|
||||
msgid "Clone..."
|
||||
msgstr "Cloner..."
|
||||
|
||||
#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
|
||||
#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974
|
||||
msgid "Open Existing Repository"
|
||||
msgstr "Ouvrir référentiel existant"
|
||||
msgstr "Ouvrir dépôt existant"
|
||||
|
||||
#: lib/choose_repository.tcl:113
|
||||
msgid "Open..."
|
||||
|
|
@ -932,202 +960,202 @@ msgstr "Ouvrir..."
|
|||
|
||||
#: lib/choose_repository.tcl:126
|
||||
msgid "Recent Repositories"
|
||||
msgstr "Référentiels récents"
|
||||
msgstr "Dépôt récemment utilisés"
|
||||
|
||||
#: lib/choose_repository.tcl:132
|
||||
msgid "Open Recent Repository:"
|
||||
msgstr "Ouvrir référentiel récent :"
|
||||
msgstr "Ouvrir dépôt récent :"
|
||||
|
||||
#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
|
||||
#: lib/choose_repository.tcl:310
|
||||
#, tcl-format
|
||||
msgid "Failed to create repository %s:"
|
||||
msgstr "La création du référentiel %s a échouée :"
|
||||
msgstr "La création du dépôt %s a échouée :"
|
||||
|
||||
#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
|
||||
#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476
|
||||
msgid "Directory:"
|
||||
msgstr "Répertoire :"
|
||||
|
||||
#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
|
||||
#: lib/choose_repository.tcl:1011
|
||||
#: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535
|
||||
#: lib/choose_repository.tcl:1007
|
||||
msgid "Git Repository"
|
||||
msgstr "Référentiel Git"
|
||||
msgstr "Dépôt Git"
|
||||
|
||||
#: lib/choose_repository.tcl:437
|
||||
#: lib/choose_repository.tcl:435
|
||||
#, tcl-format
|
||||
msgid "Directory %s already exists."
|
||||
msgstr "Le répertoire %s existe déjà."
|
||||
|
||||
#: lib/choose_repository.tcl:441
|
||||
#: lib/choose_repository.tcl:439
|
||||
#, tcl-format
|
||||
msgid "File %s already exists."
|
||||
msgstr "Le fichier %s existe déjà."
|
||||
|
||||
#: lib/choose_repository.tcl:455
|
||||
#: lib/choose_repository.tcl:453
|
||||
msgid "Clone"
|
||||
msgstr "Cloner"
|
||||
|
||||
#: lib/choose_repository.tcl:468
|
||||
#: lib/choose_repository.tcl:466
|
||||
msgid "URL:"
|
||||
msgstr "URL :"
|
||||
|
||||
#: lib/choose_repository.tcl:489
|
||||
#: lib/choose_repository.tcl:487
|
||||
msgid "Clone Type:"
|
||||
msgstr "Type de clonage :"
|
||||
|
||||
#: lib/choose_repository.tcl:495
|
||||
#: lib/choose_repository.tcl:493
|
||||
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
|
||||
msgstr "Standard (rapide, semi-redondant, liens durs)"
|
||||
|
||||
#: lib/choose_repository.tcl:501
|
||||
#: lib/choose_repository.tcl:499
|
||||
msgid "Full Copy (Slower, Redundant Backup)"
|
||||
msgstr "Copy complète (plus lent, sauvegarde redondante)"
|
||||
|
||||
#: lib/choose_repository.tcl:507
|
||||
#: lib/choose_repository.tcl:505
|
||||
msgid "Shared (Fastest, Not Recommended, No Backup)"
|
||||
msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)"
|
||||
|
||||
#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
|
||||
#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
|
||||
#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
|
||||
#: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588
|
||||
#: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804
|
||||
#: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021
|
||||
#, tcl-format
|
||||
msgid "Not a Git repository: %s"
|
||||
msgstr "'%s' n'est pas un référentiel Git."
|
||||
msgstr "'%s' n'est pas un dépôt Git."
|
||||
|
||||
#: lib/choose_repository.tcl:579
|
||||
#: lib/choose_repository.tcl:577
|
||||
msgid "Standard only available for local repository."
|
||||
msgstr "Standard n'est disponible que pour un référentiel local."
|
||||
msgstr "Standard n'est disponible que pour un dépôt local."
|
||||
|
||||
#: lib/choose_repository.tcl:583
|
||||
#: lib/choose_repository.tcl:581
|
||||
msgid "Shared only available for local repository."
|
||||
msgstr "Partagé n'est disponible que pour un référentiel local."
|
||||
msgstr "Partagé n'est disponible que pour un dépôt local."
|
||||
|
||||
#: lib/choose_repository.tcl:604
|
||||
#: lib/choose_repository.tcl:602
|
||||
#, tcl-format
|
||||
msgid "Location %s already exists."
|
||||
msgstr "L'emplacement %s existe déjà."
|
||||
|
||||
#: lib/choose_repository.tcl:615
|
||||
#: lib/choose_repository.tcl:613
|
||||
msgid "Failed to configure origin"
|
||||
msgstr "La configuration de l'origine a échouée."
|
||||
|
||||
#: lib/choose_repository.tcl:627
|
||||
#: lib/choose_repository.tcl:625
|
||||
msgid "Counting objects"
|
||||
msgstr "Comptage des objets"
|
||||
msgstr "Décompte des objets"
|
||||
|
||||
#: lib/choose_repository.tcl:628
|
||||
#: lib/choose_repository.tcl:626
|
||||
msgid "buckets"
|
||||
msgstr "paniers"
|
||||
|
||||
#: lib/choose_repository.tcl:652
|
||||
#: lib/choose_repository.tcl:650
|
||||
#, tcl-format
|
||||
msgid "Unable to copy objects/info/alternates: %s"
|
||||
msgstr "Impossible de copier 'objects/info/alternates' : %s"
|
||||
|
||||
#: lib/choose_repository.tcl:688
|
||||
#: lib/choose_repository.tcl:686
|
||||
#, tcl-format
|
||||
msgid "Nothing to clone from %s."
|
||||
msgstr "Il n'y a rien à cloner depuis %s."
|
||||
|
||||
#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
|
||||
#: lib/choose_repository.tcl:916
|
||||
#: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902
|
||||
#: lib/choose_repository.tcl:914
|
||||
msgid "The 'master' branch has not been initialized."
|
||||
msgstr "Cette branche 'master' n'a pas été initialisée."
|
||||
msgstr "La branche 'master' n'a pas été initialisée."
|
||||
|
||||
#: lib/choose_repository.tcl:703
|
||||
#: lib/choose_repository.tcl:701
|
||||
msgid "Hardlinks are unavailable. Falling back to copying."
|
||||
msgstr "Les liens durs ne sont pas disponibles. On se résoud à copier."
|
||||
msgstr "Les liens durs ne sont pas supportés. Une copie sera effectuée à la place."
|
||||
|
||||
#: lib/choose_repository.tcl:715
|
||||
#: lib/choose_repository.tcl:713
|
||||
#, tcl-format
|
||||
msgid "Cloning from %s"
|
||||
msgstr "Clonage depuis %s"
|
||||
|
||||
#: lib/choose_repository.tcl:746
|
||||
#: lib/choose_repository.tcl:744
|
||||
msgid "Copying objects"
|
||||
msgstr "Copie des objets"
|
||||
|
||||
#: lib/choose_repository.tcl:747
|
||||
#: lib/choose_repository.tcl:745
|
||||
msgid "KiB"
|
||||
msgstr "KiB"
|
||||
|
||||
#: lib/choose_repository.tcl:771
|
||||
#: lib/choose_repository.tcl:769
|
||||
#, tcl-format
|
||||
msgid "Unable to copy object: %s"
|
||||
msgstr "Impossible de copier l'objet : %s"
|
||||
|
||||
#: lib/choose_repository.tcl:781
|
||||
#: lib/choose_repository.tcl:779
|
||||
msgid "Linking objects"
|
||||
msgstr "Liaison des objets"
|
||||
|
||||
#: lib/choose_repository.tcl:782
|
||||
#: lib/choose_repository.tcl:780
|
||||
msgid "objects"
|
||||
msgstr "objets"
|
||||
|
||||
#: lib/choose_repository.tcl:790
|
||||
#: lib/choose_repository.tcl:788
|
||||
#, tcl-format
|
||||
msgid "Unable to hardlink object: %s"
|
||||
msgstr "Impossible créer un lien dur pour l'objet : %s"
|
||||
|
||||
#: lib/choose_repository.tcl:845
|
||||
#: lib/choose_repository.tcl:843
|
||||
msgid "Cannot fetch branches and objects. See console output for details."
|
||||
msgstr ""
|
||||
"Impossible de récupérer les branches et objets. Voir la sortie console pour "
|
||||
"plus de détails."
|
||||
|
||||
#: lib/choose_repository.tcl:856
|
||||
#: lib/choose_repository.tcl:854
|
||||
msgid "Cannot fetch tags. See console output for details."
|
||||
msgstr ""
|
||||
"Impossible de récupérer les marques. Voir la sortie console pour plus de "
|
||||
"détails."
|
||||
"Impossible de récupérer les marques (tags). Voir la sortie console pour plus "
|
||||
"de détails."
|
||||
|
||||
#: lib/choose_repository.tcl:880
|
||||
#: lib/choose_repository.tcl:878
|
||||
msgid "Cannot determine HEAD. See console output for details."
|
||||
msgstr "Impossible de déterminer HEAD. Voir la sortie console pour plus de détails."
|
||||
|
||||
#: lib/choose_repository.tcl:889
|
||||
#: lib/choose_repository.tcl:887
|
||||
#, tcl-format
|
||||
msgid "Unable to cleanup %s"
|
||||
msgstr "Impossible de nettoyer %s"
|
||||
|
||||
#: lib/choose_repository.tcl:895
|
||||
#: lib/choose_repository.tcl:893
|
||||
msgid "Clone failed."
|
||||
msgstr "Le clonage a échoué."
|
||||
|
||||
#: lib/choose_repository.tcl:902
|
||||
#: lib/choose_repository.tcl:900
|
||||
msgid "No default branch obtained."
|
||||
msgstr "Aucune branche par défaut n'a été obtenue."
|
||||
|
||||
#: lib/choose_repository.tcl:913
|
||||
#: lib/choose_repository.tcl:911
|
||||
#, tcl-format
|
||||
msgid "Cannot resolve %s as a commit."
|
||||
msgstr "Impossible de résoudre %s comme commit."
|
||||
|
||||
#: lib/choose_repository.tcl:925
|
||||
#: lib/choose_repository.tcl:923
|
||||
msgid "Creating working directory"
|
||||
msgstr "Création du répertoire de travail"
|
||||
|
||||
#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
|
||||
#: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127
|
||||
#: lib/index.tcl:193
|
||||
msgid "files"
|
||||
msgstr "fichiers"
|
||||
|
||||
#: lib/choose_repository.tcl:955
|
||||
#: lib/choose_repository.tcl:953
|
||||
msgid "Initial file checkout failed."
|
||||
msgstr "L'emprunt initial de fichier a échoué."
|
||||
msgstr "Chargement initial du fichier échoué."
|
||||
|
||||
#: lib/choose_repository.tcl:971
|
||||
#: lib/choose_repository.tcl:969
|
||||
msgid "Open"
|
||||
msgstr "Ouvrir"
|
||||
|
||||
#: lib/choose_repository.tcl:981
|
||||
#: lib/choose_repository.tcl:979
|
||||
msgid "Repository:"
|
||||
msgstr "Référentiel :"
|
||||
msgstr "Dépôt :"
|
||||
|
||||
#: lib/choose_repository.tcl:1031
|
||||
#: lib/choose_repository.tcl:1027
|
||||
#, tcl-format
|
||||
msgid "Failed to open repository %s:"
|
||||
msgstr "Impossible d'ouvrir le référentiel %s :"
|
||||
msgstr "Impossible d'ouvrir le dépôt %s :"
|
||||
|
||||
#: lib/choose_rev.tcl:53
|
||||
msgid "This Detached Checkout"
|
||||
|
|
@ -1143,11 +1171,11 @@ msgstr "Branche locale"
|
|||
|
||||
#: lib/choose_rev.tcl:79
|
||||
msgid "Tracking Branch"
|
||||
msgstr "Suivi de branche"
|
||||
msgstr "Branche de suivi"
|
||||
|
||||
#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
|
||||
msgid "Tag"
|
||||
msgstr "Marque"
|
||||
msgstr "Marque (tag)"
|
||||
|
||||
#: lib/choose_rev.tcl:317
|
||||
#, tcl-format
|
||||
|
|
@ -1164,7 +1192,7 @@ msgstr "L'expression de révision est vide."
|
|||
|
||||
#: lib/choose_rev.tcl:531
|
||||
msgid "Updated"
|
||||
msgstr "Misa à jour"
|
||||
msgstr "Mise-à-jour:"
|
||||
|
||||
#: lib/choose_rev.tcl:559
|
||||
msgid "URL"
|
||||
|
|
@ -1218,9 +1246,9 @@ msgid ""
|
|||
"The rescan will be automatically started now.\n"
|
||||
msgstr ""
|
||||
"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
|
||||
"référentiel.\n"
|
||||
"dépôt.\n"
|
||||
"\n"
|
||||
"Un autre programme Git a modifié ce référentiel depuis la dernière "
|
||||
"Un autre programme Git a modifié ce dépôt depuis la dernière "
|
||||
"synchronisation. Une resynshronisation doit être effectuée avant de pouvoir "
|
||||
"créer un nouveau commit.\n"
|
||||
"\n"
|
||||
|
|
@ -1258,7 +1286,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Pas de modification à commiter.\n"
|
||||
"\n"
|
||||
"Vous devez pré-commiter au moins 1 fichier avant de pouvoir commiter.\n"
|
||||
"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n"
|
||||
|
||||
#: lib/commit.tcl:183
|
||||
msgid ""
|
||||
|
|
@ -1285,19 +1313,19 @@ msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
|
|||
|
||||
#: lib/commit.tcl:221
|
||||
msgid "Calling pre-commit hook..."
|
||||
msgstr "Appel du programme externe d'avant commit..."
|
||||
msgstr "Lancement de l'action d'avant-commit..."
|
||||
|
||||
#: lib/commit.tcl:236
|
||||
msgid "Commit declined by pre-commit hook."
|
||||
msgstr "Commit refusé par le programme externe d'avant commit."
|
||||
msgstr "Commit refusé par l'action d'avant-commit."
|
||||
|
||||
#: lib/commit.tcl:259
|
||||
msgid "Calling commit-msg hook..."
|
||||
msgstr "Appel du programme externe de message de commit..."
|
||||
msgstr "Lancement de l'action \"message de commit\"..."
|
||||
|
||||
#: lib/commit.tcl:274
|
||||
msgid "Commit declined by commit-msg hook."
|
||||
msgstr "Commit refusé par le programme externe de message de commit."
|
||||
msgstr "Commit refusé par l'action \"message de commit\"."
|
||||
|
||||
#: lib/commit.tcl:287
|
||||
msgid "Committing changes..."
|
||||
|
|
@ -1406,7 +1434,7 @@ msgid ""
|
|||
"\n"
|
||||
"Compress the database now?"
|
||||
msgstr ""
|
||||
"Ce référentiel comprend actuellement environ %i objets ayant leur fichier "
|
||||
"Ce dépôt comprend actuellement environ %i objets ayant leur fichier "
|
||||
"particulier.\n"
|
||||
"\n"
|
||||
"Pour conserver une performance optimale, il est fortement recommandé de "
|
||||
|
|
@ -1420,7 +1448,7 @@ msgstr ""
|
|||
msgid "Invalid date from Git: %s"
|
||||
msgstr "Date invalide de Git : %s"
|
||||
|
||||
#: lib/diff.tcl:42
|
||||
#: lib/diff.tcl:44
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"No differences detected.\n"
|
||||
|
|
@ -1443,39 +1471,47 @@ msgstr ""
|
|||
"Une resynchronisation va être lancée automatiquement pour trouver d'autres "
|
||||
"fichiers qui pourraient se trouver dans le même état."
|
||||
|
||||
#: lib/diff.tcl:81
|
||||
#: lib/diff.tcl:83
|
||||
#, tcl-format
|
||||
msgid "Loading diff of %s..."
|
||||
msgstr "Chargement des différences de %s..."
|
||||
|
||||
#: lib/diff.tcl:114 lib/diff.tcl:184
|
||||
#: lib/diff.tcl:116 lib/diff.tcl:190
|
||||
#, tcl-format
|
||||
msgid "Unable to display %s"
|
||||
msgstr "Impossible d'afficher %s"
|
||||
|
||||
#: lib/diff.tcl:115
|
||||
#: lib/diff.tcl:117
|
||||
msgid "Error loading file:"
|
||||
msgstr "Erreur lors du chargement du fichier :"
|
||||
|
||||
#: lib/diff.tcl:122
|
||||
#: lib/diff.tcl:124
|
||||
msgid "Git Repository (subproject)"
|
||||
msgstr "Référentiel Git (sous projet)"
|
||||
msgstr "Dépôt Git (sous projet)"
|
||||
|
||||
#: lib/diff.tcl:134
|
||||
#: lib/diff.tcl:136
|
||||
msgid "* Binary file (not showing content)."
|
||||
msgstr "* Fichier binaire (pas d'apperçu du contenu)."
|
||||
|
||||
#: lib/diff.tcl:185
|
||||
#: lib/diff.tcl:191
|
||||
msgid "Error loading diff:"
|
||||
msgstr "Erreur lors du chargement des différences :"
|
||||
|
||||
#: lib/diff.tcl:303
|
||||
#: lib/diff.tcl:313
|
||||
msgid "Failed to unstage selected hunk."
|
||||
msgstr "La suppression dans le pré-commit de la section sélectionnée a échouée."
|
||||
msgstr "Échec lors de la désindexation de la section sélectionnée."
|
||||
|
||||
#: lib/diff.tcl:310
|
||||
#: lib/diff.tcl:320
|
||||
msgid "Failed to stage selected hunk."
|
||||
msgstr "Le pré-commit de la section sélectionnée a échoué."
|
||||
msgstr "Échec lors de l'indexation de la section."
|
||||
|
||||
#: lib/diff.tcl:386
|
||||
msgid "Failed to unstage selected line."
|
||||
msgstr "Échec lors de la désindexation de la ligne sélectionnée."
|
||||
|
||||
#: lib/diff.tcl:394
|
||||
msgid "Failed to stage selected line."
|
||||
msgstr "Échec lors de l'indexation de la ligne."
|
||||
|
||||
#: lib/error.tcl:20 lib/error.tcl:114
|
||||
msgid "error"
|
||||
|
|
@ -1491,17 +1527,19 @@ msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
|
|||
|
||||
#: lib/index.tcl:6
|
||||
msgid "Unable to unlock the index."
|
||||
msgstr "Impossible de dévérouiller le pré-commit."
|
||||
msgstr "Impossible de dévérouiller l'index."
|
||||
|
||||
#: lib/index.tcl:15
|
||||
msgid "Index Error"
|
||||
msgstr "Erreur de pré-commit"
|
||||
msgstr "Erreur de l'index"
|
||||
|
||||
#: lib/index.tcl:21
|
||||
msgid ""
|
||||
"Updating the Git index failed. A rescan will be automatically started to "
|
||||
"resynchronize git-gui."
|
||||
msgstr "Le pré-commit a échoué. Une resynchronisation va être lancée automatiquement."
|
||||
msgstr ""
|
||||
"Échec de la mise à jour de l'index. Une resynchronisation va être lancée "
|
||||
"automatiquement."
|
||||
|
||||
#: lib/index.tcl:27
|
||||
msgid "Continue"
|
||||
|
|
@ -1509,12 +1547,12 @@ msgstr "Continuer"
|
|||
|
||||
#: lib/index.tcl:31
|
||||
msgid "Unlock Index"
|
||||
msgstr "Dévérouiller le pré-commit"
|
||||
msgstr "Déverouiller l'index"
|
||||
|
||||
#: lib/index.tcl:282
|
||||
#, tcl-format
|
||||
msgid "Unstaging %s from commit"
|
||||
msgstr "Supprimer %s du commit"
|
||||
msgstr "Désindexation de: %s"
|
||||
|
||||
#: lib/index.tcl:313
|
||||
msgid "Ready to commit."
|
||||
|
|
@ -1523,23 +1561,23 @@ msgstr "Prêt à être commité."
|
|||
#: lib/index.tcl:326
|
||||
#, tcl-format
|
||||
msgid "Adding %s"
|
||||
msgstr "Ajouter %s"
|
||||
msgstr "Ajout de %s"
|
||||
|
||||
#: lib/index.tcl:381
|
||||
#, tcl-format
|
||||
msgid "Revert changes in file %s?"
|
||||
msgstr "Inverser les modifications dans le fichier %s ? "
|
||||
msgstr "Annuler les modifications dans le fichier %s ? "
|
||||
|
||||
#: lib/index.tcl:383
|
||||
#, tcl-format
|
||||
msgid "Revert changes in these %i files?"
|
||||
msgstr "Inverser les modifications dans ces %i fichiers ?"
|
||||
msgstr "Annuler les modifications dans ces %i fichiers ?"
|
||||
|
||||
#: lib/index.tcl:391
|
||||
msgid "Any unstaged changes will be permanently lost by the revert."
|
||||
msgstr ""
|
||||
"Toutes les modifications non pré-commitées seront définitivement perdues "
|
||||
"lors de l'inversion."
|
||||
"Toutes les modifications non-indexées seront définitivement perdues par "
|
||||
"l'annulation."
|
||||
|
||||
#: lib/index.tcl:394
|
||||
msgid "Do Nothing"
|
||||
|
|
@ -1551,7 +1589,7 @@ msgid ""
|
|||
"\n"
|
||||
"You must finish amending this commit before starting any type of merge.\n"
|
||||
msgstr ""
|
||||
"Impossible de fucionner pendant une correction.\n"
|
||||
"Impossible de fusionner pendant une correction.\n"
|
||||
"\n"
|
||||
"Vous devez finir de corriger ce commit avant de lancer une quelconque "
|
||||
"fusion.\n"
|
||||
|
|
@ -1566,9 +1604,9 @@ msgid ""
|
|||
"The rescan will be automatically started now.\n"
|
||||
msgstr ""
|
||||
"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
|
||||
"référentiel.\n"
|
||||
"dépôt.\n"
|
||||
"\n"
|
||||
"Un autre programme Git a modifié ce référentiel depuis la dernière "
|
||||
"Un autre programme Git a modifié ce dépôt depuis la dernière "
|
||||
"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
|
||||
"fusionner de nouveau.\n"
|
||||
"\n"
|
||||
|
|
@ -1588,8 +1626,8 @@ msgstr ""
|
|||
"\n"
|
||||
"Le fichier %s a des conflicts de fusion.\n"
|
||||
"\n"
|
||||
"Vous devez les résoudre, puis pré-commiter le fichier, et enfin commiter "
|
||||
"pour terminer la fusion courante. Seulementà ce moment là, il sera possible "
|
||||
"Vous devez les résoudre, puis indexer le fichier, et enfin commiter pour "
|
||||
"terminer la fusion courante. Seulement à ce moment là sera-t-il possible "
|
||||
"d'effectuer une nouvelle fusion.\n"
|
||||
|
||||
#: lib/merge.tcl:54
|
||||
|
|
@ -1685,11 +1723,11 @@ msgstr "Abandon"
|
|||
msgid "files reset"
|
||||
msgstr "fichiers réinitialisés"
|
||||
|
||||
#: lib/merge.tcl:265
|
||||
#: lib/merge.tcl:266
|
||||
msgid "Abort failed."
|
||||
msgstr "L'abandon a échoué."
|
||||
|
||||
#: lib/merge.tcl:267
|
||||
#: lib/merge.tcl:268
|
||||
msgid "Abort completed. Ready."
|
||||
msgstr "Abandon teminé. Prêt."
|
||||
|
||||
|
|
@ -1704,11 +1742,11 @@ msgstr "Sauvegarder"
|
|||
#: lib/option.tcl:109
|
||||
#, tcl-format
|
||||
msgid "%s Repository"
|
||||
msgstr "Référentiel de %s"
|
||||
msgstr "Dépôt: %s"
|
||||
|
||||
#: lib/option.tcl:110
|
||||
msgid "Global (All Repositories)"
|
||||
msgstr "Globales (tous les référentiels)"
|
||||
msgstr "Globales (tous les dépôts)"
|
||||
|
||||
#: lib/option.tcl:116
|
||||
msgid "User Name"
|
||||
|
|
@ -1736,56 +1774,76 @@ msgstr "Faire confiance aux dates de modification de fichiers "
|
|||
|
||||
#: lib/option.tcl:124
|
||||
msgid "Prune Tracking Branches During Fetch"
|
||||
msgstr "Nettoyer les branches de suivi pendant la récupération"
|
||||
msgstr "Purger les branches de suivi pendant la récupération"
|
||||
|
||||
#: lib/option.tcl:125
|
||||
msgid "Match Tracking Branches"
|
||||
msgstr "Faire correspondre les branches de suivi"
|
||||
|
||||
#: lib/option.tcl:126
|
||||
msgid "Blame Copy Only On Changed Files"
|
||||
msgstr "Annoter les copies seulement sur fichiers modifiés"
|
||||
|
||||
#: lib/option.tcl:127
|
||||
msgid "Minimum Letters To Blame Copy On"
|
||||
msgstr "Minimum de caratères pour annoter une copie"
|
||||
|
||||
#: lib/option.tcl:128
|
||||
msgid "Number of Diff Context Lines"
|
||||
msgstr "Nombre de lignes de contexte dans les diffs"
|
||||
|
||||
#: lib/option.tcl:127
|
||||
#: lib/option.tcl:129
|
||||
msgid "Commit Message Text Width"
|
||||
msgstr "Largeur du texte de message de commit"
|
||||
|
||||
#: lib/option.tcl:128
|
||||
#: lib/option.tcl:130
|
||||
msgid "New Branch Name Template"
|
||||
msgstr "Nouveau modèle de nom de branche"
|
||||
|
||||
#: lib/option.tcl:192
|
||||
#: lib/option.tcl:194
|
||||
msgid "Spelling Dictionary:"
|
||||
msgstr "Dictionnaire d'orthographe :"
|
||||
|
||||
#: lib/option.tcl:216
|
||||
#: lib/option.tcl:218
|
||||
msgid "Change Font"
|
||||
msgstr "Modifier les fontes"
|
||||
msgstr "Modifier les polices"
|
||||
|
||||
#: lib/option.tcl:220
|
||||
#: lib/option.tcl:222
|
||||
#, tcl-format
|
||||
msgid "Choose %s"
|
||||
msgstr "Choisir %s"
|
||||
|
||||
#: lib/option.tcl:226
|
||||
#: lib/option.tcl:228
|
||||
msgid "pt."
|
||||
msgstr "pt."
|
||||
|
||||
#: lib/option.tcl:240
|
||||
#: lib/option.tcl:242
|
||||
msgid "Preferences"
|
||||
msgstr "Préférences"
|
||||
|
||||
#: lib/option.tcl:275
|
||||
#: lib/option.tcl:277
|
||||
msgid "Failed to completely save options:"
|
||||
msgstr "La sauvegarde complète des options a échouée :"
|
||||
|
||||
#: lib/remote.tcl:165
|
||||
msgid "Prune from"
|
||||
msgstr "Purger de"
|
||||
|
||||
#: lib/remote.tcl:170
|
||||
msgid "Fetch from"
|
||||
msgstr "Récupérer de"
|
||||
|
||||
#: lib/remote.tcl:213
|
||||
msgid "Push to"
|
||||
msgstr "Pousser vers"
|
||||
|
||||
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
|
||||
msgid "Delete Remote Branch"
|
||||
msgstr "Supprimer branche distante"
|
||||
|
||||
#: lib/remote_branch_delete.tcl:47
|
||||
msgid "From Repository"
|
||||
msgstr "Référentiel"
|
||||
msgstr "Dépôt source"
|
||||
|
||||
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
|
||||
msgid "Remote:"
|
||||
|
|
@ -1856,25 +1914,13 @@ msgstr "Supprimer les branches de %s"
|
|||
|
||||
#: lib/remote_branch_delete.tcl:286
|
||||
msgid "No repository selected."
|
||||
msgstr "Aucun référentiel n'est sélectionné."
|
||||
msgstr "Aucun dépôt n'est sélectionné."
|
||||
|
||||
#: lib/remote_branch_delete.tcl:291
|
||||
#, tcl-format
|
||||
msgid "Scanning %s..."
|
||||
msgstr "Synchronisation de %s..."
|
||||
|
||||
#: lib/remote.tcl:165
|
||||
msgid "Prune from"
|
||||
msgstr "Nettoyer de"
|
||||
|
||||
#: lib/remote.tcl:170
|
||||
msgid "Fetch from"
|
||||
msgstr "Récupérer de"
|
||||
|
||||
#: lib/remote.tcl:213
|
||||
msgid "Push to"
|
||||
msgstr "Pousser vers"
|
||||
|
||||
#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
|
||||
msgid "Cannot write shortcut:"
|
||||
msgstr "Impossible d'écrire le raccourcis :"
|
||||
|
|
@ -1908,15 +1954,15 @@ msgstr "La vérification d'orthographe a échouée silentieusement au démarrage
|
|||
msgid "Unrecognized spell checker"
|
||||
msgstr "Vérificateur d'orthographe non reconnu"
|
||||
|
||||
#: lib/spellcheck.tcl:180
|
||||
#: lib/spellcheck.tcl:186
|
||||
msgid "No Suggestions"
|
||||
msgstr "Aucune suggestion"
|
||||
|
||||
#: lib/spellcheck.tcl:381
|
||||
#: lib/spellcheck.tcl:387
|
||||
msgid "Unexpected EOF from spell checker"
|
||||
msgstr "Fin de fichier innatendue envoyée par le vérificateur d'orthographe"
|
||||
msgstr "EOF inattendue envoyée par le vérificateur d'orthographe"
|
||||
|
||||
#: lib/spellcheck.tcl:385
|
||||
#: lib/spellcheck.tcl:391
|
||||
msgid "Spell Checker Failed"
|
||||
msgstr "Le vérificateur d'orthographe a échoué"
|
||||
|
||||
|
|
@ -1938,7 +1984,7 @@ msgstr "Récupération des dernières modifications de %s"
|
|||
#: lib/transport.tcl:18
|
||||
#, tcl-format
|
||||
msgid "remote prune %s"
|
||||
msgstr "nettoyer à distance %s"
|
||||
msgstr "purger à distance %s"
|
||||
|
||||
#: lib/transport.tcl:19
|
||||
#, tcl-format
|
||||
|
|
@ -1970,11 +2016,11 @@ msgstr "Branches source"
|
|||
|
||||
#: lib/transport.tcl:120
|
||||
msgid "Destination Repository"
|
||||
msgstr "Référentiel de destination"
|
||||
msgstr "Dépôt de destination"
|
||||
|
||||
#: lib/transport.tcl:158
|
||||
msgid "Transfer Options"
|
||||
msgstr "Transférer options"
|
||||
msgstr "Options de transfert"
|
||||
|
||||
#: lib/transport.tcl:160
|
||||
msgid "Force overwrite existing branch (may discard changes)"
|
||||
|
|
@ -1988,5 +2034,5 @@ msgstr "Utiliser des petits paquets (pour les connexions lentes)"
|
|||
|
||||
#: lib/transport.tcl:168
|
||||
msgid "Include tags"
|
||||
msgstr "Inclure les marques"
|
||||
msgstr "Inclure les marques (tags)"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ proc u2a {s} {
|
|||
foreach i [split $s ""] {
|
||||
scan $i %c c
|
||||
if {$c<128} {
|
||||
# escape '[', '\' and ']'
|
||||
if {$c == 0x5b || $c == 0x5d} {
|
||||
# escape '[', '\', '$' and ']'
|
||||
if {$c == 0x5b || $c == 0x5d || $c == 0x24} {
|
||||
append res "\\"
|
||||
}
|
||||
append res $i
|
||||
|
|
|
|||
Loading…
Reference in New Issue