diff options
-rw-r--r-- | git-gui/Makefile | 5 | ||||
-rw-r--r-- | git-gui/lib/choose_repository.tcl | 50 | ||||
-rw-r--r-- | git-gui/lib/diff.tcl | 2 | ||||
-rw-r--r-- | git-gui/lib/index.tcl | 4 | ||||
-rw-r--r-- | git-gui/po/de.po | 47 | ||||
-rw-r--r-- | git-gui/po/fr.po | 1875 | ||||
-rw-r--r-- | git-gui/po/glossary/de.po | 12 | ||||
-rw-r--r-- | git-gui/po/glossary/fr.po | 166 | ||||
-rw-r--r-- | git-gui/po/glossary/git-gui-glossary.pot | 6 | ||||
-rw-r--r-- | git-gui/po/glossary/git-gui-glossary.txt | 1 | ||||
-rw-r--r-- | git-gui/po/sv.po | 22 |
11 files changed, 2119 insertions, 71 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index c109eab137..1baf4b0861 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -110,7 +110,7 @@ TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH))) gg_libdir ?= $(sharedir)/git-gui/lib libdir_SQ = $(subst ','\'',$(gg_libdir)) -libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir))) +libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir_sed_in))) exedir = $(dir $(gitexecdir))share/git-gui/lib GITGUI_SCRIPT := $$0 @@ -119,11 +119,12 @@ GITGUI_MACOSXAPP := ifeq ($(uname_O),Cygwin) GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"` - gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)") + gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)") else ifeq ($(exedir),$(gg_libdir)) GITGUI_RELATIVE := 1 endif + gg_libdir_sed_in := $(gg_libdir) endif ifeq ($(uname_S),Darwin) ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y) diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl index 2bac50e149..86faf24cc8 100644 --- a/git-gui/lib/choose_repository.tcl +++ b/git-gui/lib/choose_repository.tcl @@ -290,11 +290,6 @@ method _write_local_path {args} { } method _git_init {} { - if {[file exists $local_path]} { - error_popup [mc "Location %s already exists." $local_path] - return 0 - } - if {[catch {file mkdir $local_path} err]} { error_popup [strcat \ [mc "Failed to create repository %s:" $local_path] \ @@ -417,41 +412,35 @@ method _new_local_path {} { if {$p eq {}} return set p [file normalize $p] - if {[file isdirectory $p]} { - foreach i [glob \ - -directory $p \ - -tails \ - -nocomplain \ - * .*] { - switch -- $i { - . continue - .. continue - default { - error_popup [mc "Directory %s already exists." $p] - return - } - } - } - if {[catch {file delete $p} err]} { - error_popup [strcat \ - [mc "Directory %s already exists." $p] \ - "\n\n$err"] - return - } - } elseif {[file exists $p]} { - error_popup [mc "File %s already exists." $p] + if {![_new_ok $p]} { return } set local_path $p } method _do_new2 {} { + if {![_new_ok $local_path]} { + return + } if {![_git_init $this]} { return } set done 1 } +proc _new_ok {p} { + if {[file isdirectory $p]} { + if {[_is_git [file join $p .git]]} { + error_popup [mc "Directory %s already exists." $p] + return 0 + } + } elseif {[file exists $p]} { + error_popup [mc "File %s already exists." $p] + return 0 + } + return 1 +} + ###################################################################### ## ## Clone Existing Repository @@ -607,6 +596,11 @@ method _do_clone2 {} { } } + if {[file exists $local_path]} { + error_popup [mc "Location %s already exists." $local_path] + return + } + if {![_git_init $this]} return set local_path [pwd] diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl index 18aba3eae3..d04f6dbde2 100644 --- a/git-gui/lib/diff.tcl +++ b/git-gui/lib/diff.tcl @@ -358,5 +358,7 @@ proc apply_hunk {x y} { display_file $current_diff_path $mi if {$o eq {_}} { clear_diff + } else { + set current_diff_path $current_diff_path } } diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl index a0b22f2945..30a244cc17 100644 --- a/git-gui/lib/index.tcl +++ b/git-gui/lib/index.tcl @@ -386,7 +386,9 @@ proc revert_helper {txt paths} { set reply [tk_dialog \ .confirm_revert \ "[appname] ([reponame])" \ - [mc "Any unstaged changes will be permanently lost by the revert."] \ + "$query + +[mc "Any unstaged changes will be permanently lost by the revert."]" \ question \ 1 \ [mc "Do Nothing"] \ diff --git a/git-gui/po/de.po b/git-gui/po/de.po index ac8ae0a205..2dfe07e06f 100644 --- a/git-gui/po/de.po +++ b/git-gui/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-24 10:36+0100\n" -"PO-Revision-Date: 2007-11-24 10:55+0100\n" +"PO-Revision-Date: 2008-01-15 20:33+0100\n" "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -272,7 +272,7 @@ msgstr "Neue Version" #: git-gui.sh:1973 git-gui.sh:2357 msgid "Amend Last Commit" -msgstr "Letzte Version nachbessern" +msgstr "Letzte nachbessern" #: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 msgid "Rescan" @@ -284,7 +284,7 @@ msgstr "Zum Eintragen bereitstellen" #: git-gui.sh:1994 msgid "Stage Changed Files To Commit" -msgstr "Geänderte Dateien zum Eintragen bereitstellen" +msgstr "Geänderte Dateien bereitstellen" #: git-gui.sh:2000 msgid "Unstage From Commit" @@ -292,7 +292,7 @@ msgstr "Aus der Bereitstellung herausnehmen" #: git-gui.sh:2005 lib/index.tcl:393 msgid "Revert Changes" -msgstr "Änderungen revidieren" +msgstr "Änderungen verwerfen" #: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 msgid "Sign Off" @@ -351,7 +351,7 @@ msgstr "Aktueller Zweig:" #: git-gui.sh:2255 msgid "Staged Changes (Will Commit)" -msgstr "Bereitgestellte Änderungen (zum Eintragen)" +msgstr "Bereitstellung (zum Eintragen)" #: git-gui.sh:2274 msgid "Unstaged Changes" @@ -403,7 +403,7 @@ msgstr "Aktualisieren" #: git-gui.sh:2566 msgid "Apply/Reverse Hunk" -msgstr "Änderung anwenden/umkehren" +msgstr "Kontext anwenden/umkehren" #: git-gui.sh:2572 msgid "Decrease Font Size" @@ -415,19 +415,19 @@ msgstr "Schriftgröße vergrößern" #: git-gui.sh:2581 msgid "Show Less Context" -msgstr "Weniger Kontext anzeigen" +msgstr "Weniger Zeilen anzeigen" #: git-gui.sh:2588 msgid "Show More Context" -msgstr "Mehr Kontext anzeigen" +msgstr "Mehr Zeilen anzeigen" #: git-gui.sh:2602 msgid "Unstage Hunk From Commit" -msgstr "Aus der Bereitstellung herausnehmen" +msgstr "Kontext aus Bereitstellung herausnehmen" #: git-gui.sh:2604 msgid "Stage Hunk For Commit" -msgstr "In die Bereitstellung hinzufügen" +msgstr "Kontext zur Bereitstellung hinzufügen" #: git-gui.sh:2623 msgid "Initializing..." @@ -914,11 +914,11 @@ msgstr "Neu..." #: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 msgid "Clone Existing Repository" -msgstr "Projektarchiv kopieren" +msgstr "Projektarchiv klonen" #: lib/choose_repository.tcl:99 msgid "Clone..." -msgstr "Kopieren..." +msgstr "Klonen..." #: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 msgid "Open Existing Repository" @@ -968,7 +968,7 @@ msgstr "Datei »%s« existiert bereits." #: lib/choose_repository.tcl:463 msgid "Clone" -msgstr "Kopieren" +msgstr "Klonen" #: lib/choose_repository.tcl:476 msgid "URL:" @@ -976,7 +976,7 @@ msgstr "URL:" #: lib/choose_repository.tcl:496 msgid "Clone Type:" -msgstr "Art der Kopie:" +msgstr "Art des Klonens:" #: lib/choose_repository.tcl:502 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" @@ -1025,7 +1025,7 @@ msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s" #: lib/choose_repository.tcl:690 #, tcl-format msgid "Nothing to clone from %s." -msgstr "Von »%s« konnte nichts kopiert werden." +msgstr "Von »%s« konnte nichts geklont werden." #: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 #: lib/choose_repository.tcl:918 @@ -1086,7 +1086,7 @@ msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden." #: lib/choose_repository.tcl:897 msgid "Clone failed." -msgstr "Kopieren fehlgeschlagen." +msgstr "Klonen fehlgeschlagen." #: lib/choose_repository.tcl:904 msgid "No default branch obtained." @@ -1440,11 +1440,11 @@ msgstr "Fehler beim Laden des Vergleichs:" #: lib/diff.tcl:302 msgid "Failed to unstage selected hunk." -msgstr "Fehler beim Herausnehmen der gewählten Dateien aus der Bereitstellung." +msgstr "Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung." #: lib/diff.tcl:309 msgid "Failed to stage selected hunk." -msgstr "Fehler beim Bereitstellen der gewählten Dateien." +msgstr "Fehler beim Bereitstellen des gewählten Kontexts." #: lib/error.tcl:12 lib/error.tcl:102 msgid "error" @@ -1494,17 +1494,16 @@ msgstr "»%s« hinzufügen..." #: lib/index.tcl:381 #, tcl-format msgid "Revert changes in file %s?" -msgstr "Änderungen in Datei »%s« revidieren?" +msgstr "Änderungen in Datei »%s« verwerfen?" #: lib/index.tcl:383 #, tcl-format msgid "Revert changes in these %i files?" -msgstr "Änderungen in den gewählten %i Dateien revidieren?" +msgstr "Änderungen in den gewählten %i Dateien verwerfen?" #: lib/index.tcl:389 msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Alle nicht bereitgestellten Änderungen werden beim Revidieren verloren gehen." +msgstr "Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen." #: lib/index.tcl:392 msgid "Do Nothing" @@ -1730,7 +1729,7 @@ msgstr "Optionen konnten nicht gespeichert werden:" #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 msgid "Delete Remote Branch" -msgstr "Zweig im anderen Projektarchiv löschen" +msgstr "Zweig aus anderem Projektarchiv löschen" #: lib/remote_branch_delete.tcl:47 msgid "From Repository" @@ -1852,7 +1851,7 @@ msgstr "Neue Änderungen von »%s« holen" #: lib/transport.tcl:18 #, tcl-format msgid "remote prune %s" -msgstr "Entfernen von »%s« im anderen Archiv" +msgstr "Entfernen von »%s« aus anderem Archiv" #: lib/transport.tcl:19 #, tcl-format diff --git a/git-gui/po/fr.po b/git-gui/po/fr.po new file mode 100644 index 0000000000..d389bdaca1 --- /dev/null +++ b/git-gui/po/fr.po @@ -0,0 +1,1875 @@ +# translation of fr.po to French +# 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. +msgid "" +msgstr "" +"Project-Id-Version: fr\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-11-24 10:36+0100\n" +"PO-Revision-Date: 2008-01-14 21:08+0100\n" +"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n" +"Language-Team: French\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:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 +#: git-gui.sh:733 +msgid "git-gui: fatal error" +msgstr "git-gui: erreur fatale" + +#: git-gui.sh:565 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Invalide fonte spécifiée dans %s :" + +#: git-gui.sh:590 +msgid "Main Font" +msgstr "Fonte principale" + +#: git-gui.sh:591 +msgid "Diff/Console Font" +msgstr "Fonte diff/console" + +#: git-gui.sh:605 +msgid "Cannot find git in PATH." +msgstr "Impossible de trouver git dans PATH." + +#: git-gui.sh:632 +msgid "Cannot parse Git version string:" +msgstr "Impossible de parser la version de Git :" + +#: git-gui.sh:650 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Impossible de déterminer la version de Git.\n" +"\n" +"%s affirme qu'il s'agit de la version '%s'.\n" +"\n" +"%s nécessite au moins Git 1.5.0.\n" +"\n" +"Peut'on considérer que '%s' est en version 1.5.0 ?\n" + +#: git-gui.sh:888 +msgid "Git directory not found:" +msgstr "Impossible de trouver le répertoire de Git :" + +#: git-gui.sh:895 +msgid "Cannot move to top of working directory:" +msgstr "Impossible d'aller à la racine du répertoire de travail :" + +#: git-gui.sh:902 +msgid "Cannot use funny .git directory:" +msgstr "Impossible d'utiliser un drôle de répertoire git :" + +#: git-gui.sh:907 +msgid "No working directory" +msgstr "Pas de répertoire de travail" + +#: git-gui.sh:1054 +msgid "Refreshing file status..." +msgstr "Rafraichissement du status des fichiers..." + +#: git-gui.sh:1119 +msgid "Scanning for modified files ..." +msgstr "Recherche de fichiers modifiés..." + +#: git-gui.sh:1294 lib/browser.tcl:245 +msgid "Ready." +msgstr "Prêt." + +#: git-gui.sh:1560 +msgid "Unmodified" +msgstr "Non modifié" + +#: git-gui.sh:1562 +msgid "Modified, not staged" +msgstr "Modifié, non pré-commité" + +#: git-gui.sh:1563 git-gui.sh:1568 +msgid "Staged for commit" +msgstr "Pré-commité" + +#: git-gui.sh:1564 git-gui.sh:1569 +msgid "Portions staged for commit" +msgstr "En partie pré-commité" + +#: git-gui.sh:1565 git-gui.sh:1570 +msgid "Staged for commit, missing" +msgstr "Pré-commité, manquant" + +#: git-gui.sh:1567 +msgid "Untracked, not staged" +msgstr "Non suivi, non pré-commité" + +#: git-gui.sh:1572 +msgid "Missing" +msgstr "Manquant" + +#: git-gui.sh:1573 +msgid "Staged for removal" +msgstr "Pré-commité pour suppression" + +#: git-gui.sh:1574 +msgid "Staged for removal, still present" +msgstr "Pré-commité pour suppression, toujours présent" + +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 +msgid "Requires merge resolution" +msgstr "Nécessite la résolution d'une fusion" + +#: git-gui.sh:1614 +msgid "Starting gitk... please wait..." +msgstr "Lancement de gitk... merci de patienter..." + +#: git-gui.sh:1623 +#, 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:1823 lib/choose_repository.tcl:35 +msgid "Repository" +msgstr "Référentiel" + +#: git-gui.sh:1824 +msgid "Edit" +msgstr "Editer" + +#: git-gui.sh:1826 lib/choose_rev.tcl:560 +msgid "Branch" +msgstr "Branche" + +#: git-gui.sh:1829 lib/choose_rev.tcl:547 +msgid "Commit@@noun" +msgstr "Commit" + +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Fusionner" + +#: git-gui.sh:1833 lib/choose_rev.tcl:556 +msgid "Remote" +msgstr "Référentiel distant" + +#: git-gui.sh:1842 +msgid "Browse Current Branch's Files" +msgstr "Visionner fichiers dans branche courante" + +#: git-gui.sh:1846 +msgid "Browse Branch Files..." +msgstr "Visionner fichiers de branche" + +#: git-gui.sh:1851 +msgid "Visualize Current Branch's History" +msgstr "Visualiser historique branche courante" + +#: git-gui.sh:1855 +msgid "Visualize All Branch History" +msgstr "Visualiser historique toutes branches" + +#: git-gui.sh:1862 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Visionner fichiers de %s" + +#: git-gui.sh:1864 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Visualiser historique de %s" + +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Statistiques base de donnée" + +#: git-gui.sh:1872 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Comprimer base de donnée" + +#: git-gui.sh:1875 +msgid "Verify Database" +msgstr "Vérifier base de donnée" + +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 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:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 +msgid "Quit" +msgstr "Quitter" + +#: git-gui.sh:1902 +msgid "Undo" +msgstr "Défaire" + +#: git-gui.sh:1905 +msgid "Redo" +msgstr "Refaire" + +#: git-gui.sh:1909 git-gui.sh:2403 +msgid "Cut" +msgstr "Couper" + +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 +#: lib/console.tcl:67 +msgid "Copy" +msgstr "Copier" + +#: git-gui.sh:1915 git-gui.sh:2409 +msgid "Paste" +msgstr "Coller" + +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Supprimer" + +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 +msgid "Select All" +msgstr "Tout sélectionner" + +#: git-gui.sh:1931 +msgid "Create..." +msgstr "Créer..." + +#: git-gui.sh:1937 +msgid "Checkout..." +msgstr "Emprunter... " + +#: git-gui.sh:1943 +msgid "Rename..." +msgstr "Renommer..." + +#: git-gui.sh:1948 git-gui.sh:2048 +msgid "Delete..." +msgstr "Supprimer..." + +#: git-gui.sh:1953 +msgid "Reset..." +msgstr "Réinitialiser..." + +#: git-gui.sh:1965 git-gui.sh:2350 +msgid "New Commit" +msgstr "Nouveau commit" + +#: git-gui.sh:1973 git-gui.sh:2357 +msgid "Amend Last Commit" +msgstr "Corriger dernier commit" + +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Resynchroniser" + +#: git-gui.sh:1988 +msgid "Stage To Commit" +msgstr "Commiter un pré-commit" + +#: git-gui.sh:1994 +msgid "Stage Changed Files To Commit" +msgstr "Commiter fichiers modifiés dans pré-commit" + +#: git-gui.sh:2000 +msgid "Unstage From Commit" +msgstr "Commit vers pré-commit" + +#: git-gui.sh:2005 lib/index.tcl:393 +msgid "Revert Changes" +msgstr "Inverser modification" + +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 +msgid "Sign Off" +msgstr "Se désinscrire" + +#: git-gui.sh:2016 git-gui.sh:2333 +msgid "Commit@@verb" +msgstr "Commiter" + +#: git-gui.sh:2027 +msgid "Local Merge..." +msgstr "Fusion locale..." + +#: git-gui.sh:2032 +msgid "Abort Merge..." +msgstr "Abandonner fusion..." + +#: git-gui.sh:2044 +msgid "Push..." +msgstr "Pousser..." + +#: git-gui.sh:2055 lib/choose_repository.tcl:40 +msgid "Apple" +msgstr "Pomme" + +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 +#, tcl-format +msgid "About %s" +msgstr "A propos de %s" + +#: git-gui.sh:2062 +msgid "Preferences..." +msgstr "Préférences..." + +#: git-gui.sh:2070 git-gui.sh:2595 +msgid "Options..." +msgstr "Options..." + +#: git-gui.sh:2076 lib/choose_repository.tcl:46 +msgid "Help" +msgstr "Aide" + +#: git-gui.sh:2117 +msgid "Online Documentation" +msgstr "Documentation en ligne" + +#: git-gui.sh:2201 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "fatale : pas d'infos sur le chemin %s : Fichier ou répertoire inexistant" + +#: git-gui.sh:2234 +msgid "Current Branch:" +msgstr "Branche courante :" + +#: git-gui.sh:2255 +msgid "Staged Changes (Will Commit)" +msgstr "Modifications pré-commitées" + +#: git-gui.sh:2274 +msgid "Unstaged Changes" +msgstr "Modifications non pré-commitées" + +#: git-gui.sh:2323 +msgid "Stage Changed" +msgstr "Pré-commit modifié" + +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 +msgid "Push" +msgstr "Pousser" + +#: git-gui.sh:2369 +msgid "Initial Commit Message:" +msgstr "Message de commit initial :" + +#: git-gui.sh:2370 +msgid "Amended Commit Message:" +msgstr "Message de commit corrigé :" + +#: git-gui.sh:2371 +msgid "Amended Initial Commit Message:" +msgstr "Message de commit initial corrigé :" + +#: git-gui.sh:2372 +msgid "Amended Merge Commit Message:" +msgstr "Message de commit de fusion corrigé :" + +#: git-gui.sh:2373 +msgid "Merge Commit Message:" +msgstr "Message de commit de fusion :" + +#: git-gui.sh:2374 +msgid "Commit Message:" +msgstr "Message de commit :" + +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 +msgid "Copy All" +msgstr "Copier tout" + +#: git-gui.sh:2443 lib/blame.tcl:104 +msgid "File:" +msgstr "Fichier :" + +#: git-gui.sh:2545 +msgid "Refresh" +msgstr "Rafraichir" + +#: git-gui.sh:2566 +msgid "Apply/Reverse Hunk" +msgstr "Appliquer/Inverser section" + +#: git-gui.sh:2572 +msgid "Decrease Font Size" +msgstr "Réduire fonte" + +#: git-gui.sh:2576 +msgid "Increase Font Size" +msgstr "Agrandir fonte" + +#: git-gui.sh:2581 +msgid "Show Less Context" +msgstr "Montrer moins de contexte" + +#: git-gui.sh:2588 +msgid "Show More Context" +msgstr "Montrer plus de contexte" + +#: git-gui.sh:2602 +msgid "Unstage Hunk From Commit" +msgstr "Enlever section pré-commitée" + +#: git-gui.sh:2604 +msgid "Stage Hunk For Commit" +msgstr "Pré-commiter section" + +#: git-gui.sh:2623 +msgid "Initializing..." +msgstr "Initialisation..." + +#: git-gui.sh:2718 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"Des problèmes d'environnement sont possibles.\n" +"\n" +"Les variables d'environnement suivantes seront\n" +"probablement ignorées par tous les\n" +"sous-processus de Git lancés par %s\n" +"\n" + +#: git-gui.sh:2748 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"Ceci est du à un problème connu avec\n" +"le binaire Tcl distribué par Cygwin." + +#: git-gui.sh:2753 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"Un bon remplacement pour %s\n" +"est de mettre les valeurs pour 'user.name' (nom\n" +"de l'utilisateur) et 'user.email' (addresse email\n" +"de l'utilisateur) dans votre fichier '~/.gitconfig'.\n" + +#: lib/about.tcl:25 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - une interface graphique utilisateur pour Git" + +#: lib/blame.tcl:77 +msgid "File Viewer" +msgstr "Visionneur de fichier" + +#: lib/blame.tcl:81 +msgid "Commit:" +msgstr "Commit :" + +#: lib/blame.tcl:249 +msgid "Copy Commit" +msgstr "Copier commit" + +#: lib/blame.tcl:369 +#, tcl-format +msgid "Reading %s..." +msgstr "Lecture de %s..." + +#: lib/blame.tcl:473 +msgid "Loading copy/move tracking annotations..." +msgstr "Chargement des annotations de suivi des copies/déplacements..." + +#: lib/blame.tcl:493 +msgid "lines annotated" +msgstr "lignes annotées" + +#: lib/blame.tcl:674 +msgid "Loading original location annotations..." +msgstr "Chargement des annotations d'emplacement original" + +#: lib/blame.tcl:677 +msgid "Annotation complete." +msgstr "Annotation terminée." + +#: lib/blame.tcl:731 +msgid "Loading annotation..." +msgstr "Chargement des annotations..." + +#: lib/blame.tcl:787 +msgid "Author:" +msgstr "Auteur :" + +#: lib/blame.tcl:791 +msgid "Committer:" +msgstr "Commiteur :" + +#: lib/blame.tcl:796 +msgid "Original File:" +msgstr "Fichier original :" + +#: lib/blame.tcl:910 +msgid "Originally By:" +msgstr "A l'origine par :" + +#: lib/blame.tcl:916 +msgid "In File:" +msgstr "Dans le fichier :" + +#: lib/blame.tcl:921 +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" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Emprunter" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 +msgid "Cancel" +msgstr "Annuler" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:286 +msgid "Revision" +msgstr "Révision" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202 +msgid "Options" +msgstr "Options" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Branche suivant récupération" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Détacher de branche locale" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Créer branche" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Créer nouvelle branche" + +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 +msgid "Create" +msgstr "Créer" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Nom de branche" + +#: lib/branch_create.tcl:43 +msgid "Name:" +msgstr "Nom :" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Trouver nom de branche de suivi" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Début de révision" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Mettre à jour branche existante :" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Non" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Avance rapide seulement" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 +msgid "Reset" +msgstr "Réinitialiser" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Emprunt après création" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Merci de choisir 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." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Merci de fournir un nom de branche." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "'%s' n'est pas un nom de branche acceptable." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Supprimer branche" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Supprimer branche locale" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Branches locales" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Supprimer ssi fusion dedans" + +#: lib/branch_delete.tcl:54 +msgid "Always (Do not perform merge test.)" +msgstr "Toujours (Ne pas faire de test de fusion.)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :" + +#: lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult. \n" +"\n" +" Delete the selected branches?" +msgstr "" +"Récupérer des branches supprimées est difficile.\n" +"\n" +"Supprimer les branches sélectionnées ?" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"La suppression des branches suivantes a échouée :\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Renommer branche" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Renommer" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Branche :" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Nouveau nom :" + +#: lib/branch_rename.tcl:75 +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 +#, tcl-format +msgid "Branch '%s' already exists." +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é." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Lancement..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "Visionneur de fichier" + +#: lib/browser.tcl:125 lib/browser.tcl:142 +#, tcl-format +msgid "Loading %s..." +msgstr "Chargement de %s..." + +#: lib/browser.tcl:186 +msgid "[Up To Parent]" +msgstr "[Jusqu'au parent]" + +#: lib/browser.tcl:266 lib/browser.tcl:272 +msgid "Browse Branch Files" +msgstr "Visionner fichiers de branches" + +#: lib/browser.tcl:277 lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 +#: lib/choose_repository.tcl:989 +msgid "Browse" +msgstr "Visionner" + +#: lib/checkout_op.tcl:79 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Récupération de %s à partir de %s" + +#: lib/checkout_op.tcl:127 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "Erreur fatale : Impossible de résoudre %s" + +#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31 +msgid "Close" +msgstr "Fermer" + +#: lib/checkout_op.tcl:169 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "La branche '%s' n'existe pas." + +#: lib/checkout_op.tcl:206 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"La branche '%s' existe déjà.\n" +"\n" +"Impossible d'avancer rapidement à %s.\n" +"Une fusion est nécessaire." + +#: lib/checkout_op.tcl:220 +#, 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 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "La mise à jour de '%s' a échouée." + +#: lib/checkout_op.tcl:251 +msgid "Staging area (index) is already locked." +msgstr "L'espace de pré-commit ('index' ou 'staging') est déjà vérouillé." + +#: lib/checkout_op.tcl:266 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\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" +"\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" +"\n" +"Cela va être fait tout de suite automatiquement.\n" + +#: lib/checkout_op.tcl:322 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Mise à jour du répertoire courant avec '%s'..." + +#: lib/checkout_op.tcl:353 +#, 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.)" + +#: lib/checkout_op.tcl:354 +msgid "File level merge required." +msgstr "Il est nécessaire de fusionner des fichiers." + +#: lib/checkout_op.tcl:358 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Le répertoire de travail reste sur la branche '%s'." + +#: lib/checkout_op.tcl:429 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Vous n'êtes plus ur une branche locale.\n" +"\n" +"Si vous vouliez être sur une branche, créez en une maintenant en p |