Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Fixes for Mac OS X TkAqua
  git-gui: Update Russian translation
  git-gui: run post-checkout hook after clone
  git-gui: Ensure consistent usage of mergetool.keepBackup
  git-gui: fix use of undeclared variable diff_empty_count
  git-gui (Win): make starting via "Git GUI Here" on .git/ possible
  git-gui (Win): make "Explore Working Copy" more robust
  git-gui: run post-checkout hook on checkout
  git-gui: When calling post-commit hook wrong variable was cleared.
  git-gui: use `git --html-path` to get the location of installed HTML docs
  git-gui: fix deleting from the context menu with empty selection
  git-gui: minor spelling fix and string factorisation.
  git-gui: various French translation fixes
  git-gui: Fix merge conflict display error when filename contains spaces
  git-gui: don't hide the Browse button when resizing the repo chooser
  Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
  git-gui: Support more git version notations.
  git-gui: Avoid an infinite rescan loop in handle_empty_diff.
  git-gui: Fix post-commit status with subject in non-locale encoding
This commit is contained in:
Junio C Hamano 2009-05-01 22:11:57 -07:00
commit a8816e7bab
22 changed files with 1273 additions and 676 deletions

View File

@ -105,8 +105,11 @@ endif
ifeq ($(uname_S),Darwin) ifeq ($(uname_S),Darwin)
TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
ifeq ($(shell expr "$(uname_R)" : '9\.'),2) ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
endif
endif endif
TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app) TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
endif endif

View File

@ -122,6 +122,7 @@ unset oguimsg
set _appname {Git Gui} set _appname {Git Gui}
set _gitdir {} set _gitdir {}
set _gitexec {} set _gitexec {}
set _githtmldir {}
set _reponame {} set _reponame {}
set _iscygwin {} set _iscygwin {}
set _search_path {} set _search_path {}
@ -168,6 +169,28 @@ proc gitexec {args} {
return [eval [list file join $_gitexec] $args] return [eval [list file join $_gitexec] $args]
} }
proc githtmldir {args} {
global _githtmldir
if {$_githtmldir eq {}} {
if {[catch {set _githtmldir [git --html-path]}]} {
# Git not installed or option not yet supported
return {}
}
if {[is_Cygwin]} {
set _githtmldir [exec cygpath \
--windows \
--absolute \
$_githtmldir]
} else {
set _githtmldir [file normalize $_githtmldir]
}
}
if {$args eq {}} {
return $_githtmldir
}
return [eval [list file join $_githtmldir] $args]
}
proc reponame {} { proc reponame {} {
return $::_reponame return $::_reponame
} }
@ -640,10 +663,13 @@ font create font_diffbold
font create font_diffitalic font create font_diffitalic
foreach class {Button Checkbutton Entry Label foreach class {Button Checkbutton Entry Label
Labelframe Listbox Menu Message Labelframe Listbox Message
Radiobutton Spinbox Text} { Radiobutton Spinbox Text} {
option add *$class.font font_ui option add *$class.font font_ui
} }
if {![is_MacOSX]} {
option add *Menu.font font_ui
}
unset class unset class
if {[is_Windows] || [is_MacOSX]} { if {[is_Windows] || [is_MacOSX]} {
@ -699,7 +725,7 @@ proc apply_config {} {
set default_config(branch.autosetupmerge) true set default_config(branch.autosetupmerge) true
set default_config(merge.tool) {} set default_config(merge.tool) {}
set default_config(merge.keepbackup) true set default_config(mergetool.keepbackup) true
set default_config(merge.diffstat) true set default_config(merge.diffstat) true
set default_config(merge.summary) false set default_config(merge.summary) false
set default_config(merge.verbosity) 2 set default_config(merge.verbosity) 2
@ -769,9 +795,9 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
set _real_git_version $_git_version set _real_git_version $_git_version
regsub -- {[\-\.]dirty$} $_git_version {} _git_version regsub -- {[\-\.]dirty$} $_git_version {} _git_version
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
regsub {\.rc[0-9]+$} $_git_version {} _git_version regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
regsub {\.GIT$} $_git_version {} _git_version regsub {\.GIT$} $_git_version {} _git_version
regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
catch {wm withdraw .} catch {wm withdraw .}
@ -1108,6 +1134,7 @@ set current_diff_path {}
set is_3way_diff 0 set is_3way_diff 0
set is_conflict_diff 0 set is_conflict_diff 0
set selected_commit_type new set selected_commit_type new
set diff_empty_count 0
set nullid "0000000000000000000000000000000000000000" set nullid "0000000000000000000000000000000000000000"
set nullid2 "0000000000000000000000000000000000000001" set nullid2 "0000000000000000000000000000000000000001"
@ -1924,7 +1951,7 @@ proc do_explore {} {
# freedesktop.org-conforming system is our best shot # freedesktop.org-conforming system is our best shot
set explorer "xdg-open" set explorer "xdg-open"
} }
eval exec $explorer [file dirname [gitdir]] & eval exec $explorer [list [file nativename [file dirname [gitdir]]]] &
} }
set is_quitting 0 set is_quitting 0
@ -2277,6 +2304,12 @@ set ui_comm {}
# -- Menu Bar # -- Menu Bar
# #
menu .mbar -tearoff 0 menu .mbar -tearoff 0
if {[is_MacOSX]} {
# -- Apple Menu (Mac OS X only)
#
.mbar add cascade -label Apple -menu .mbar.apple
menu .mbar.apple
}
.mbar add cascade -label [mc Repository] -menu .mbar.repository .mbar add cascade -label [mc Repository] -menu .mbar.repository
.mbar add cascade -label [mc Edit] -menu .mbar.edit .mbar add cascade -label [mc Edit] -menu .mbar.edit
if {[is_enabled branch]} { if {[is_enabled branch]} {
@ -2292,7 +2325,6 @@ if {[is_enabled transport]} {
if {[is_enabled multicommit] || [is_enabled singlecommit]} { if {[is_enabled multicommit] || [is_enabled singlecommit]} {
.mbar add cascade -label [mc Tools] -menu .mbar.tools .mbar add cascade -label [mc Tools] -menu .mbar.tools
} }
. configure -menu .mbar
# -- Repository Menu # -- Repository Menu
# #
@ -2545,19 +2577,7 @@ if {[is_enabled transport]} {
} }
if {[is_MacOSX]} { if {[is_MacOSX]} {
# -- Apple Menu (Mac OS X only) proc ::tk::mac::ShowPreferences {} {do_options}
#
.mbar add cascade -label Apple -menu .mbar.apple
menu .mbar.apple
.mbar.apple add command -label [mc "About %s" [appname]] \
-command do_about
.mbar.apple add separator
.mbar.apple add command \
-label [mc "Preferences..."] \
-command do_options \
-accelerator $M1T-,
bind . <$M1B-,> do_options
} else { } else {
# -- Edit Menu # -- Edit Menu
# #
@ -2585,17 +2605,23 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
.mbar add cascade -label [mc Help] -menu .mbar.help .mbar add cascade -label [mc Help] -menu .mbar.help
menu .mbar.help menu .mbar.help
if {![is_MacOSX]} { if {[is_MacOSX]} {
.mbar.apple add command -label [mc "About %s" [appname]] \
-command do_about
.mbar.apple add separator
} else {
.mbar.help add command -label [mc "About %s" [appname]] \ .mbar.help add command -label [mc "About %s" [appname]] \
-command do_about -command do_about
} }
. configure -menu .mbar
set doc_path [githtmldir]
if {$doc_path ne {}} {
set doc_path [file join $doc_path index.html]
set doc_path [file dirname [gitexec]] if {[is_Cygwin]} {
set doc_path [file join $doc_path Documentation index.html] set doc_path [exec cygpath --mixed $doc_path]
}
if {[is_Cygwin]} {
set doc_path [exec cygpath --mixed $doc_path]
} }
if {[file isfile $doc_path]} { if {[file isfile $doc_path]} {
@ -2944,7 +2970,7 @@ $ctxm add command \
-command {tk_textPaste $ui_comm} -command {tk_textPaste $ui_comm}
$ctxm add command \ $ctxm add command \
-label [mc Delete] \ -label [mc Delete] \
-command {$ui_comm delete sel.first sel.last} -command {catch {$ui_comm delete sel.first sel.last}}
$ctxm add separator $ctxm add separator
$ctxm add command \ $ctxm add command \
-label [mc "Select All"] \ -label [mc "Select All"] \

View File

@ -51,7 +51,7 @@ constructor dialog {} {
$w.check \ $w.check \
[mc "Delete Only If Merged Into"] \ [mc "Delete Only If Merged Into"] \
] ]
$w_check none [mc "Always (Do not perform merge test.)"] $w_check none [mc "Always (Do not perform merge checks)"]
pack $w.check -anchor nw -fill x -pady 5 -padx 5 pack $w.check -anchor nw -fill x -pady 5 -padx 5
foreach h [load_all_heads] { foreach h [load_all_heads] {
@ -112,7 +112,7 @@ method _delete {} {
} }
if {$to_delete eq {}} return if {$to_delete eq {}} return
if {$check_cmt eq {}} { if {$check_cmt eq {}} {
set msg [mc "Recovering deleted branches is difficult. \n\n Delete the selected branches?"] set msg [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]
if {[tk_messageBox \ if {[tk_messageBox \
-icon warning \ -icon warning \
-type yesno \ -type yesno \

View File

@ -9,6 +9,7 @@ field w_cons {}; # embedded console window object
field new_expr ; # expression the user saw/thinks this is field new_expr ; # expression the user saw/thinks this is
field new_hash ; # commit SHA-1 we are switching to field new_hash ; # commit SHA-1 we are switching to
field new_ref ; # ref we are updating/creating field new_ref ; # ref we are updating/creating
field old_hash ; # commit SHA-1 that was checked out when we started
field parent_w .; # window that started us field parent_w .; # window that started us
field merge_type none; # type of merge to apply to existing branch field merge_type none; # type of merge to apply to existing branch
@ -280,11 +281,11 @@ method _start_checkout {} {
# -- Our in memory state should match the repository. # -- Our in memory state should match the repository.
# #
repository_state curType curHEAD curMERGE_HEAD repository_state curType old_hash curMERGE_HEAD
if {[string match amend* $commit_type] if {[string match amend* $commit_type]
&& $curType eq {normal} && $curType eq {normal}
&& $curHEAD eq $HEAD} { && $old_hash eq $HEAD} {
} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} { } elseif {$commit_type ne $curType || $HEAD ne $old_hash} {
info_popup [mc "Last scanned state does not match repository state. info_popup [mc "Last scanned state does not match repository state.
Another Git program has modified this repository since the last scan. A rescan must be performed before the current branch can be changed. Another Git program has modified this repository since the last scan. A rescan must be performed before the current branch can be changed.
@ -297,7 +298,7 @@ The rescan will be automatically started now.
return return
} }
if {$curHEAD eq $new_hash} { if {$old_hash eq $new_hash} {
_after_readtree $this _after_readtree $this
} elseif {[is_config_true gui.trustmtime]} { } elseif {[is_config_true gui.trustmtime]} {
_readtree $this _readtree $this
@ -453,13 +454,47 @@ method _after_readtree {} {
If you wanted to be on a branch, create one now starting from 'This Detached Checkout'."] If you wanted to be on a branch, create one now starting from 'This Detached Checkout'."]
} }
# -- Run the post-checkout hook.
#
set fd_ph [githook_read post-checkout $old_hash $new_hash 1]
if {$fd_ph ne {}} {
global pch_error
set pch_error {}
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
fileevent $fd_ph readable [cb _postcheckout_wait $fd_ph]
} else {
_update_repo_state $this
}
}
method _postcheckout_wait {fd_ph} {
global pch_error
append pch_error [read $fd_ph]
fconfigure $fd_ph -blocking 1
if {[eof $fd_ph]} {
if {[catch {close $fd_ph}]} {
hook_failed_popup post-checkout $pch_error 0
}
unset pch_error
_update_repo_state $this
return
}
fconfigure $fd_ph -blocking 0
}
method _update_repo_state {} {
# -- Update our repository state. If we were previously in # -- Update our repository state. If we were previously in
# amend mode we need to toss the current buffer and do a # amend mode we need to toss the current buffer and do a
# full rescan to update our file lists. If we weren't in # full rescan to update our file lists. If we weren't in
# amend mode our file lists are accurate and we can avoid # amend mode our file lists are accurate and we can avoid
# the rescan. # the rescan.
# #
global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
global ui_comm
unlock_index unlock_index
set name [_name $this]
set selected_commit_type new set selected_commit_type new
if {[string match amend* $commit_type]} { if {[string match amend* $commit_type]} {
$ui_comm delete 0.0 end $ui_comm delete 0.0 end

View File

@ -398,6 +398,8 @@ method _do_new {} {
grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
pack $w_body.where -fill x pack $w_body.where -fill x
grid columnconfigure $w_body.where 1 -weight 1
trace add variable @local_path write [cb _write_local_path] trace add variable @local_path write [cb _write_local_path]
bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]] bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]]
update update
@ -964,7 +966,34 @@ method _readtree_wait {fd} {
return return
} }
set done 1 # -- Run the post-checkout hook.
#
set fd_ph [githook_read post-checkout [string repeat 0 40] \
[git rev-parse HEAD] 1]
if {$fd_ph ne {}} {
global pch_error
set pch_error {}
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
fileevent $fd_ph readable [cb _postcheckout_wait $fd_ph]
} else {
set done 1
}
}
method _postcheckout_wait {fd_ph} {
global pch_error
append pch_error [read $fd_ph]
fconfigure $fd_ph -blocking 1
if {[eof $fd_ph]} {
if {[catch {close $fd_ph}]} {
hook_failed_popup post-checkout $pch_error 0
}
unset pch_error
set done 1
return
}
fconfigure $fd_ph -blocking 0
} }
###################################################################### ######################################################################
@ -998,6 +1027,8 @@ method _do_open {} {
grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
pack $w_body.where -fill x pack $w_body.where -fill x
grid columnconfigure $w_body.where 1 -weight 1
trace add variable @local_path write [cb _write_local_path] trace add variable @local_path write [cb _write_local_path]
bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]] bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]]
update update

View File

@ -115,6 +115,23 @@ proc create_new_commit {} {
rescan ui_ready rescan ui_ready
} }
proc setup_commit_encoding {msg_wt {quiet 0}} {
global repo_config
if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
set enc utf-8
}
set use_enc [tcl_encoding $enc]
if {$use_enc ne {}} {
fconfigure $msg_wt -encoding $use_enc
} else {
if {!$quiet} {
error_popup [mc "warning: Tcl does not support encoding '%s'." $enc]
}
fconfigure $msg_wt -encoding utf-8
}
}
proc commit_tree {} { proc commit_tree {} {
global HEAD commit_type file_states ui_comm repo_config global HEAD commit_type file_states ui_comm repo_config
global pch_error global pch_error
@ -200,16 +217,7 @@ A good commit message has the following format:
set msg_p [gitdir GITGUI_EDITMSG] set msg_p [gitdir GITGUI_EDITMSG]
set msg_wt [open $msg_p w] set msg_wt [open $msg_p w]
fconfigure $msg_wt -translation lf fconfigure $msg_wt -translation lf
if {[catch {set enc $repo_config(i18n.commitencoding)}]} { setup_commit_encoding $msg_wt
set enc utf-8
}
set use_enc [tcl_encoding $enc]
if {$use_enc ne {}} {
fconfigure $msg_wt -encoding $use_enc
} else {
error_popup [mc "warning: Tcl does not support encoding '%s'." $enc]
fconfigure $msg_wt -encoding utf-8
}
puts $msg_wt $msg puts $msg_wt $msg
close $msg_wt close $msg_wt
@ -362,6 +370,7 @@ A rescan will be automatically started now.
append reflogm " ($commit_type)" append reflogm " ($commit_type)"
} }
set msg_fd [open $msg_p r] set msg_fd [open $msg_p r]
setup_commit_encoding $msg_fd 1
gets $msg_fd subject gets $msg_fd subject
close $msg_fd close $msg_fd
append reflogm {: } $subject append reflogm {: } $subject
@ -398,8 +407,8 @@ A rescan will be automatically started now.
# #
set fd_ph [githook_read post-commit] set fd_ph [githook_read post-commit]
if {$fd_ph ne {}} { if {$fd_ph ne {}} {
upvar #0 pch_error$cmt_id pc_err global pch_error
set pc_err {} set pch_error {}
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
fileevent $fd_ph readable \ fileevent $fd_ph readable \
[list commit_postcommit_wait $fd_ph $cmt_id] [list commit_postcommit_wait $fd_ph $cmt_id]
@ -461,7 +470,7 @@ A rescan will be automatically started now.
} }
proc commit_postcommit_wait {fd_ph cmt_id} { proc commit_postcommit_wait {fd_ph cmt_id} {
upvar #0 pch_error$cmt_id pch_error global pch_error
append pch_error [read $fd_ph] append pch_error [read $fd_ph]
fconfigure $fd_ph -blocking 1 fconfigure $fd_ph -blocking 1

View File

@ -51,11 +51,16 @@ proc force_diff_encoding {enc} {
proc handle_empty_diff {} { proc handle_empty_diff {} {
global current_diff_path file_states file_lists global current_diff_path file_states file_lists
global diff_empty_count
set path $current_diff_path set path $current_diff_path
set s $file_states($path) set s $file_states($path)
if {[lindex $s 0] ne {_M}} return if {[lindex $s 0] ne {_M}} return
# Prevent infinite rescan loops
incr diff_empty_count
if {$diff_empty_count > 1} return
info_popup [mc "No differences detected. info_popup [mc "No differences detected.
%s has no changes. %s has no changes.
@ -310,6 +315,7 @@ proc read_diff {fd cont_info} {
global ui_diff diff_active global ui_diff diff_active
global is_3way_diff is_conflict_diff current_diff_header global is_3way_diff is_conflict_diff current_diff_header
global current_diff_queue global current_diff_queue
global diff_empty_count
$ui_diff conf -state normal $ui_diff conf -state normal
while {[gets $fd line] >= 0} { while {[gets $fd line] >= 0} {
@ -415,7 +421,10 @@ proc read_diff {fd cont_info} {
if {[$ui_diff index end] eq {2.0}} { if {[$ui_diff index end] eq {2.0}} {
handle_empty_diff handle_empty_diff
} else {
set diff_empty_count 0
} }
set callback [lindex $cont_info 1] set callback [lindex $cont_info 1]
if {$callback ne {}} { if {$callback ne {}} {
eval $callback eval $callback

View File

@ -88,7 +88,7 @@ proc merge_load_stages {path cont} {
set merge_stages(3) {} set merge_stages(3) {}
set merge_stages_buf {} set merge_stages_buf {}
set merge_stages_fd [eval git_read ls-files -u -z -- $path] set merge_stages_fd [eval git_read ls-files -u -z -- {$path}]
fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary
fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont] fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont]
@ -382,7 +382,7 @@ proc merge_tool_finish {fd} {
delete_temp_files $mtool_tmpfiles delete_temp_files $mtool_tmpfiles
ui_status [mc "Merge tool failed."] ui_status [mc "Merge tool failed."]
} else { } else {
if {[is_config_true merge.keepbackup]} { if {[is_config_true mergetool.keepbackup]} {
file rename -force -- $backup "$mtool_target.orig" file rename -force -- $backup "$mtool_target.orig"
} }

View File

@ -213,9 +213,7 @@ method _delete {} {
-type yesno \ -type yesno \
-title [wm title $w] \ -title [wm title $w] \
-parent $w \ -parent $w \
-message [mc "Recovering deleted branches is difficult. -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} {
Delete the selected branches?"]] ne yes} {
return return
} }

View File

@ -54,7 +54,7 @@ proc do_cygwin_shortcut {} {
$argv0] $argv0]
win32_create_lnk $fn [list \ win32_create_lnk $fn [list \
$sh -c \ $sh -c \
"CHERE_INVOKING=1 source /etc/profile;[sq $me]" \ "CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \
] \ ] \
[file dirname [file normalize [gitdir]]] [file dirname [file normalize [gitdir]]]
} err]} { } err]} {

View File

@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {
} }
if {$ok} { if {$ok} {
set msg [mc "Tool completed succesfully: %s" $fullname] set msg [mc "Tool completed successfully: %s" $fullname]
} else { } else {
set msg [mc "Tool failed: %s" $fullname] set msg [mc "Tool failed: %s" $fullname]
} }

View File

@ -773,16 +773,6 @@ msgstr "Immer (ohne Zusammenführungstest)"
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:" msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
#: lib/branch_delete.tcl:115
msgid ""
"Recovering deleted branches is difficult. \n"
"\n"
" Delete the selected branches?"
msgstr ""
"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\n"
"\n"
"Gewählte Zweige jetzt löschen?"
#: lib/branch_delete.tcl:141 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""
@ -2506,7 +2496,7 @@ msgstr "Starten: %s"
#: lib/tools.tcl:149 #: lib/tools.tcl:149
#, tcl-format #, tcl-format
msgid "Tool completed succesfully: %s" msgid "Tool completed successfully: %s"
msgstr "Werkzeug erfolgreich abgeschlossen: %s" msgstr "Werkzeug erfolgreich abgeschlossen: %s"
#: lib/tools.tcl:151 #: lib/tools.tcl:151

View File

@ -62,7 +62,7 @@ msgstr ""
"\n" "\n"
"%s nécessite au moins Git 1.5.0.\n" "%s nécessite au moins Git 1.5.0.\n"
"\n" "\n"
"Peut'on considérer que '%s' est en version 1.5.0 ?\n" "Peut-on considérer que '%s' est en version 1.5.0 ?\n"
#: git-gui.sh:1062 #: git-gui.sh:1062
msgid "Git directory not found:" msgid "Git directory not found:"
@ -82,7 +82,7 @@ msgstr "Aucun répertoire de travail"
#: git-gui.sh:1247 lib/checkout_op.tcl:305 #: git-gui.sh:1247 lib/checkout_op.tcl:305
msgid "Refreshing file status..." msgid "Refreshing file status..."
msgstr "Rafraichissement du status des fichiers..." msgstr "Rafraîchissement du statut des fichiers..."
#: git-gui.sh:1303 #: git-gui.sh:1303
msgid "Scanning for modified files ..." msgid "Scanning for modified files ..."
@ -163,7 +163,7 @@ msgstr "Dépôt"
#: git-gui.sh:2281 #: git-gui.sh:2281
msgid "Edit" msgid "Edit"
msgstr "Edition" msgstr "Édition"
#: git-gui.sh:2283 lib/choose_rev.tcl:561 #: git-gui.sh:2283 lib/choose_rev.tcl:561
msgid "Branch" msgid "Branch"
@ -199,7 +199,7 @@ msgstr "Naviguer dans la branche..."
#: git-gui.sh:2316 #: git-gui.sh:2316
msgid "Visualize Current Branch's History" msgid "Visualize Current Branch's History"
msgstr "Visualiser historique branche courante" msgstr "Visualiser l'historique de la branche courante"
#: git-gui.sh:2320 #: git-gui.sh:2320
msgid "Visualize All Branch History" msgid "Visualize All Branch History"
@ -208,12 +208,12 @@ msgstr "Voir l'historique de toutes les branches"
#: git-gui.sh:2327 #: git-gui.sh:2327
#, tcl-format #, tcl-format
msgid "Browse %s's Files" msgid "Browse %s's Files"
msgstr "Naviguer l'arborescence de %s" msgstr "Parcourir l'arborescence de %s"
#: git-gui.sh:2329 #: git-gui.sh:2329
#, tcl-format #, tcl-format
msgid "Visualize %s's History" msgid "Visualize %s's History"
msgstr "Voir l'historique de la branche: %s" msgstr "Voir l'historique de la branche : %s"
#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 #: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
msgid "Database Statistics" msgid "Database Statistics"
@ -230,7 +230,7 @@ msgstr "Vérifier le dépôt"
#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 #: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
msgid "Create Desktop Icon" msgid "Create Desktop Icon"
msgstr "Créer icône sur bureau" msgstr "Créer une icône sur le bureau"
#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 #: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
msgid "Quit" msgid "Quit"
@ -320,7 +320,7 @@ msgstr "Désindexer"
#: git-gui.sh:2484 lib/index.tcl:410 #: git-gui.sh:2484 lib/index.tcl:410
msgid "Revert Changes" msgid "Revert Changes"
msgstr "Annuler les modifications (revert)" msgstr "Annuler les modifications"
#: git-gui.sh:2491 git-gui.sh:3069 #: git-gui.sh:2491 git-gui.sh:3069
msgid "Show Less Context" msgid "Show Less Context"
@ -382,7 +382,7 @@ msgstr "Documentation en ligne"
#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
msgid "Show SSH Key" msgid "Show SSH Key"
msgstr "Montrer clé SSH" msgstr "Montrer la clé SSH"
#: git-gui.sh:2707 #: git-gui.sh:2707
#, tcl-format #, tcl-format
@ -445,7 +445,7 @@ msgstr "Fichier :"
#: git-gui.sh:3078 #: git-gui.sh:3078
msgid "Refresh" msgid "Refresh"
msgstr "Rafraichir" msgstr "Rafraîchir"
#: git-gui.sh:3099 #: git-gui.sh:3099
msgid "Decrease Font Size" msgid "Decrease Font Size"
@ -457,7 +457,7 @@ msgstr "Agrandir la police"
#: git-gui.sh:3111 lib/blame.tcl:281 #: git-gui.sh:3111 lib/blame.tcl:281
msgid "Encoding" msgid "Encoding"
msgstr "Encodage" msgstr "Codage des caractères"
#: git-gui.sh:3122 #: git-gui.sh:3122
msgid "Apply/Reverse Hunk" msgid "Apply/Reverse Hunk"
@ -469,7 +469,7 @@ msgstr "Appliquer/Inverser la ligne"
#: git-gui.sh:3137 #: git-gui.sh:3137
msgid "Run Merge Tool" msgid "Run Merge Tool"
msgstr "Lancer outil de merge" msgstr "Lancer l'outil de fusion"
#: git-gui.sh:3142 #: git-gui.sh:3142
msgid "Use Remote Version" msgid "Use Remote Version"
@ -527,7 +527,7 @@ msgid ""
"Tcl binary distributed by Cygwin." "Tcl binary distributed by Cygwin."
msgstr "" msgstr ""
"\n" "\n"
"Ceci est du à un problème connu avec\n" "Ceci est dû à un problème connu avec\n"
"le binaire Tcl distribué par Cygwin." "le binaire Tcl distribué par Cygwin."
#: git-gui.sh:3336 #: git-gui.sh:3336
@ -630,11 +630,11 @@ msgstr "Fichier original :"
#: lib/blame.tcl:1021 #: lib/blame.tcl:1021
msgid "Cannot find HEAD commit:" msgid "Cannot find HEAD commit:"
msgstr "Impossible de trouver le commit HEAD:" msgstr "Impossible de trouver le commit HEAD :"
#: lib/blame.tcl:1076 #: lib/blame.tcl:1076
msgid "Cannot find parent commit:" msgid "Cannot find parent commit:"
msgstr "Impossible de trouver le commit parent:" msgstr "Impossible de trouver le commit parent :"
#: lib/blame.tcl:1091 #: lib/blame.tcl:1091
msgid "Unable to display parent" msgid "Unable to display parent"
@ -646,7 +646,7 @@ msgstr "Erreur lors du chargement des différences :"
#: lib/blame.tcl:1232 #: lib/blame.tcl:1232
msgid "Originally By:" msgid "Originally By:"
msgstr "A l'origine par :" msgstr "À l'origine par :"
#: lib/blame.tcl:1238 #: lib/blame.tcl:1238
msgid "In File:" msgid "In File:"
@ -691,11 +691,11 @@ msgstr "Détacher de la branche locale"
#: lib/branch_create.tcl:22 #: lib/branch_create.tcl:22
msgid "Create Branch" msgid "Create Branch"
msgstr "Créer branche" msgstr "Créer une branche"
#: lib/branch_create.tcl:27 #: lib/branch_create.tcl:27
msgid "Create New Branch" msgid "Create New Branch"
msgstr "Créer nouvelle branche" msgstr "Créer une nouvelle branche"
#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 #: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
msgid "Create" msgid "Create"
@ -719,7 +719,7 @@ msgstr "Révision initiale"
#: lib/branch_create.tcl:72 #: lib/branch_create.tcl:72
msgid "Update Existing Branch:" msgid "Update Existing Branch:"
msgstr "Mettre à jour branche existante :" msgstr "Mettre à jour une branche existante :"
#: lib/branch_create.tcl:75 #: lib/branch_create.tcl:75
msgid "No" msgid "No"
@ -727,7 +727,7 @@ msgstr "Non"
#: lib/branch_create.tcl:80 #: lib/branch_create.tcl:80
msgid "Fast Forward Only" msgid "Fast Forward Only"
msgstr "Mise-à-jour rectiligne seulement (fast-forward)" msgstr "Mise à jour rectiligne seulement (fast-forward)"
#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 #: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
msgid "Reset" msgid "Reset"
@ -769,7 +769,7 @@ msgstr "Branches locales"
#: lib/branch_delete.tcl:52 #: lib/branch_delete.tcl:52
msgid "Delete Only If Merged Into" msgid "Delete Only If Merged Into"
msgstr "Supprimer seulement si fusionnée dans:" msgstr "Supprimer seulement si fusionnée dans :"
#: lib/branch_delete.tcl:54 #: lib/branch_delete.tcl:54
msgid "Always (Do not perform merge test.)" msgid "Always (Do not perform merge test.)"
@ -780,23 +780,13 @@ msgstr "Toujours (Ne pas faire de test de fusion.)"
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %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 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""
"Failed to delete branches:\n" "Failed to delete branches:\n"
"%s" "%s"
msgstr "" msgstr ""
"La suppression des branches suivantes a échouée :\n" "La suppression des branches suivantes a échoué :\n"
"%s" "%s"
#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
@ -902,11 +892,11 @@ msgstr "La stratégie de fusion '%s' n'est pas supportée."
#: lib/checkout_op.tcl:261 #: lib/checkout_op.tcl:261
#, tcl-format #, tcl-format
msgid "Failed to update '%s'." msgid "Failed to update '%s'."
msgstr "La mise à jour de '%s' a échouée." msgstr "La mise à jour de '%s' a échoué."
#: lib/checkout_op.tcl:273 #: lib/checkout_op.tcl:273
msgid "Staging area (index) is already locked." msgid "Staging area (index) is already locked."
msgstr "L'index (staging area) est déjà vérouillé" msgstr "L'index (staging area) est déjà verrouillé."
#: lib/checkout_op.tcl:288 #: lib/checkout_op.tcl:288
msgid "" msgid ""
@ -918,7 +908,7 @@ msgid ""
"The rescan will be automatically started now.\n" "The rescan will be automatically started now.\n"
msgstr "" msgstr ""
"L'état lors de la dernière synchronisation ne correspond plus à l'état du " "L'état lors de la dernière synchronisation ne correspond plus à l'état du "
"dépôt\n" "dépôt.\n"
"\n" "\n"
"Un autre programme Git a modifié ce dépôt 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 " "synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
@ -956,9 +946,9 @@ msgid ""
"If you wanted to be on a branch, create one now starting from 'This Detached " "If you wanted to be on a branch, create one now starting from 'This Detached "
"Checkout'." "Checkout'."
msgstr "" msgstr ""
"Vous n'êtes plus ur une branche locale.\n" "Vous n'êtes plus sur une branche locale.\n"
"\n" "\n"
"Si vous vouliez être sur une branche, créez en une maintenant en partant de " "Si vous vouliez être sur une branche, créez-en une maintenant en partant de "
"'Cet emprunt détaché'." "'Cet emprunt détaché'."
#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472 #: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
@ -1000,7 +990,7 @@ msgstr ""
"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a " "mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a "
"échouée.\n" "échouée.\n"
"\n" "\n"
"Cela n'aurait pas du se produire. %s va abandonner et se terminer." "Cela n'aurait pas dû se produire. %s va abandonner et se terminer."
#: lib/choose_font.tcl:39 #: lib/choose_font.tcl:39
msgid "Select" msgid "Select"
@ -1023,8 +1013,8 @@ msgid ""
"This is example text.\n" "This is example text.\n"
"If you like this text, it can be your font." "If you like this text, it can be your font."
msgstr "" msgstr ""
"C'est un texte d'exemple.\n" "Ceci est un texte d'exemple.\n"
"Si vous aimez ce texte, vous pouvez choisir cette police" "Si vous aimez ce texte, vous pouvez choisir cette police."
#: lib/choose_repository.tcl:28 #: lib/choose_repository.tcl:28
msgid "Git Gui" msgid "Git Gui"
@ -1040,7 +1030,7 @@ msgstr "Nouveau..."
#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
msgid "Clone Existing Repository" msgid "Clone Existing Repository"
msgstr "Cloner dépôt existant" msgstr "Cloner un dépôt existant"
#: lib/choose_repository.tcl:106 #: lib/choose_repository.tcl:106
msgid "Clone..." msgid "Clone..."
@ -1048,7 +1038,7 @@ msgstr "Cloner..."
#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
msgid "Open Existing Repository" msgid "Open Existing Repository"
msgstr "Ouvrir dépôt existant" msgstr "Ouvrir un dépôt existant"
#: lib/choose_repository.tcl:119 #: lib/choose_repository.tcl:119
msgid "Open..." msgid "Open..."
@ -1056,17 +1046,17 @@ msgstr "Ouvrir..."
#: lib/choose_repository.tcl:132 #: lib/choose_repository.tcl:132
msgid "Recent Repositories" msgid "Recent Repositories"
msgstr "Dépôt récemment utilisés" msgstr "Dépôts récemment utilisés"
#: lib/choose_repository.tcl:138 #: lib/choose_repository.tcl:138
msgid "Open Recent Repository:" msgid "Open Recent Repository:"
msgstr "Ouvrir dépôt récent :" msgstr "Ouvrir un dépôt récent :"
#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 #: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
#: lib/choose_repository.tcl:316 #: lib/choose_repository.tcl:316
#, tcl-format #, tcl-format
msgid "Failed to create repository %s:" msgid "Failed to create repository %s:"
msgstr "La création du dépôt %s a échouée :" msgstr "La création du dépôt %s a échoué :"
#: lib/choose_repository.tcl:387 #: lib/choose_repository.tcl:387
msgid "Directory:" msgid "Directory:"
@ -1093,11 +1083,11 @@ msgstr "Cloner"
#: lib/choose_repository.tcl:473 #: lib/choose_repository.tcl:473
msgid "Source Location:" msgid "Source Location:"
msgstr "Emplacement source:" msgstr "Emplacement source :"
#: lib/choose_repository.tcl:484 #: lib/choose_repository.tcl:484
msgid "Target Directory:" msgid "Target Directory:"
msgstr "Répertoire cible:" msgstr "Répertoire cible :"
#: lib/choose_repository.tcl:496 #: lib/choose_repository.tcl:496
msgid "Clone Type:" msgid "Clone Type:"
@ -1137,7 +1127,7 @@ msgstr "L'emplacement %s existe déjà."
#: lib/choose_repository.tcl:622 #: lib/choose_repository.tcl:622
msgid "Failed to configure origin" msgid "Failed to configure origin"
msgstr "La configuration de l'origine a échouée." msgstr "La configuration de l'origine a échoué."
#: lib/choose_repository.tcl:634 #: lib/choose_repository.tcl:634
msgid "Counting objects" msgid "Counting objects"
@ -1242,7 +1232,7 @@ msgstr "fichiers"
#: lib/choose_repository.tcl:962 #: lib/choose_repository.tcl:962
msgid "Initial file checkout failed." msgid "Initial file checkout failed."
msgstr "Chargement initial du fichier échoué." msgstr "Le chargement initial du fichier a échoué."
#: lib/choose_repository.tcl:978 #: lib/choose_repository.tcl:978
msgid "Open" msgid "Open"
@ -1284,7 +1274,7 @@ msgstr "Révision invalide : %s"
#: lib/choose_rev.tcl:338 #: lib/choose_rev.tcl:338
msgid "No revision selected." msgid "No revision selected."
msgstr "Pas de révision selectionnée." msgstr "Pas de révision sélectionnée."
#: lib/choose_rev.tcl:346 #: lib/choose_rev.tcl:346
msgid "Revision expression is empty." msgid "Revision expression is empty."
@ -1292,7 +1282,7 @@ msgstr "L'expression de révision est vide."
#: lib/choose_rev.tcl:531 #: lib/choose_rev.tcl:531
msgid "Updated" msgid "Updated"
msgstr "Mise-à-jour:" msgstr "Mise à jour:"
#: lib/choose_rev.tcl:559 #: lib/choose_rev.tcl:559
msgid "URL" msgid "URL"
@ -1320,8 +1310,8 @@ msgid ""
msgstr "" msgstr ""
"Impossible de corriger pendant une fusion.\n" "Impossible de corriger pendant une fusion.\n"
"\n" "\n"
"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement " "Vous êtes actuellement au milieu d'une fusion qui n'a pas été complètement "
"terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous " "terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous "
"abandonnez la fusion courante.\n" "abandonnez la fusion courante.\n"
#: lib/commit.tcl:49 #: lib/commit.tcl:49
@ -1409,7 +1399,7 @@ msgstr ""
#: lib/commit.tcl:211 #: lib/commit.tcl:211
#, tcl-format #, tcl-format
msgid "warning: Tcl does not support encoding '%s'." msgid "warning: Tcl does not support encoding '%s'."
msgstr "attention : Tcl ne supporte pas l'encodage '%s'." msgstr "attention : Tcl ne supporte pas le codage '%s'."
#: lib/commit.tcl:227 #: lib/commit.tcl:227
msgid "Calling pre-commit hook..." msgid "Calling pre-commit hook..."
@ -1469,12 +1459,12 @@ msgstr "commit-tree a échoué :"
#: lib/commit.tcl:373 #: lib/commit.tcl:373
msgid "update-ref failed:" msgid "update-ref failed:"
msgstr "update-ref a échoué" msgstr "update-ref a échoué :"
#: lib/commit.tcl:461 #: lib/commit.tcl:461
#, tcl-format #, tcl-format
msgid "Created commit %s: %s" msgid "Created commit %s: %s"
msgstr "Commit créé %s : %s" msgstr "Commit %s créé : %s"
#: lib/console.tcl:59 #: lib/console.tcl:59
msgid "Working... please wait..." msgid "Working... please wait..."
@ -1581,24 +1571,24 @@ msgid ""
"LOCAL: deleted\n" "LOCAL: deleted\n"
"REMOTE:\n" "REMOTE:\n"
msgstr "" msgstr ""
"LOCAL: supprimé\n" "LOCAL : supprimé\n"
"DISTANT:\n" "DISTANT :\n"
#: lib/diff.tcl:125 #: lib/diff.tcl:125
msgid "" msgid ""
"REMOTE: deleted\n" "REMOTE: deleted\n"
"LOCAL:\n" "LOCAL:\n"
msgstr "" msgstr ""
"DISTANT: supprimé\n" "DISTANT : supprimé\n"
"LOCAL:\n" "LOCAL :\n"
#: lib/diff.tcl:132 #: lib/diff.tcl:132
msgid "LOCAL:\n" msgid "LOCAL:\n"
msgstr "LOCAL:\n" msgstr "LOCAL :\n"
#: lib/diff.tcl:135 #: lib/diff.tcl:135
msgid "REMOTE:\n" msgid "REMOTE:\n"
msgstr "DISTANT:\n" msgstr "DISTANT :\n"
#: lib/diff.tcl:197 lib/diff.tcl:296 #: lib/diff.tcl:197 lib/diff.tcl:296
#, tcl-format #, tcl-format
@ -1624,7 +1614,7 @@ msgid ""
"* Showing only first %d bytes.\n" "* Showing only first %d bytes.\n"
msgstr "" msgstr ""
"* Le fichier non suivi fait %d octets.\n" "* Le fichier non suivi fait %d octets.\n"
"* On montre seulement les premiers %d octets.\n" "* Seuls les %d premiers octets sont montrés.\n"
#: lib/diff.tcl:228 #: lib/diff.tcl:228
#, tcl-format #, tcl-format
@ -1635,7 +1625,7 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
"* Fichier suivi raccourcis ici de %s.\n" "* Fichier suivi raccourcis ici de %s.\n"
"* Pour voir le fichier entier, utiliser un éditeur externe.\n" "* Pour voir le fichier entier, utilisez un éditeur externe.\n"
#: lib/diff.tcl:436 #: lib/diff.tcl:436
msgid "Failed to unstage selected hunk." msgid "Failed to unstage selected hunk."
@ -1680,7 +1670,7 @@ msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
#: lib/index.tcl:6 #: lib/index.tcl:6
msgid "Unable to unlock the index." msgid "Unable to unlock the index."
msgstr "Impossible de dévérouiller l'index." msgstr "Impossible de déverrouiller l'index."
#: lib/index.tcl:15 #: lib/index.tcl:15
msgid "Index Error" msgid "Index Error"
@ -1700,12 +1690,12 @@ msgstr "Continuer"
#: lib/index.tcl:31 #: lib/index.tcl:31
msgid "Unlock Index" msgid "Unlock Index"
msgstr "Déverouiller l'index" msgstr "Déverrouiller l'index"
#: lib/index.tcl:287 #: lib/index.tcl:287
#, tcl-format #, tcl-format
msgid "Unstaging %s from commit" msgid "Unstaging %s from commit"
msgstr "Désindexation de: %s" msgstr "Désindexation de : %s"
#: lib/index.tcl:326 #: lib/index.tcl:326
msgid "Ready to commit." msgid "Ready to commit."
@ -1804,11 +1794,11 @@ msgid ""
msgstr "" msgstr ""
"Vous êtes au milieu d'une modification.\n" "Vous êtes au milieu d'une modification.\n"
"\n" "\n"
"Le fichier %s est modifié.\n" "Le fichier %s a été modifié.\n"
"\n" "\n"
"Vous devriez terminer le commit courant avant de lancer une fusion. En " "Vous devriez terminer le commit courant avant de lancer une fusion. En "
"faisait comme cela, vous éviterez de devoir éventuellement abandonner une " "faisait comme cela, vous éviterez de devoir éventuellement abandonner une "
"fusion ayant échouée.\n" "fusion ayant échoué.\n"
#: lib/merge.tcl:107 #: lib/merge.tcl:107
#, tcl-format #, tcl-format
@ -1826,7 +1816,7 @@ msgstr "La fusion s'est faite avec succès."
#: lib/merge.tcl:133 #: lib/merge.tcl:133
msgid "Merge failed. Conflict resolution is required." msgid "Merge failed. Conflict resolution is required."
msgstr "La fusion a echouée. Il est nécessaire de résoudre les conflicts." msgstr "La fusion a echoué. Il est nécessaire de résoudre les conflits."
#: lib/merge.tcl:158 #: lib/merge.tcl:158
#, tcl-format #, tcl-format
@ -1914,16 +1904,16 @@ msgid ""
"\n" "\n"
"This operation can be undone only by restarting the merge." "This operation can be undone only by restarting the merge."
msgstr "" msgstr ""
"Noter que le diff ne montre que les modifications en conflict.\n" "Noter que le diff ne montre que les modifications en conflit.\n"
"\n" "\n"
"%s sera écrasé.\n" "%s sera écrasé.\n"
"\n" "\n"
"Cette opération ne peut être défaite qu'en relançant la fusion." "Cette opération ne peut être inversée qu'en relançant la fusion."
#: lib/mergetool.tcl:45 #: lib/mergetool.tcl:45
#, tcl-format #, tcl-format
msgid "File %s seems to have unresolved conflicts, still stage?" msgid "File %s seems to have unresolved conflicts, still stage?"
msgstr "Le fichier %s semble avoir des conflicts non résolus, indéxer quand même ?" msgstr "Le fichier %s semble avoir des conflits non résolus, indexer quand même ?"
#: lib/mergetool.tcl:60 #: lib/mergetool.tcl:60
#, tcl-format #, tcl-format
@ -1932,11 +1922,11 @@ msgstr "Ajouter une résolution pour %s"
#: lib/mergetool.tcl:141 #: lib/mergetool.tcl:141
msgid "Cannot resolve deletion or link conflicts using a tool" msgid "Cannot resolve deletion or link conflicts using a tool"
msgstr "Impossible de résoudre la suppression ou de relier des conflicts en utilisant un outil" msgstr "Impossible de résoudre la suppression ou de relier des conflits en utilisant un outil"
#: lib/mergetool.tcl:146 #: lib/mergetool.tcl:146
msgid "Conflict file does not exist" msgid "Conflict file does not exist"
msgstr "Le fichier en conflict n'existe pas." msgstr "Le fichier en conflit n'existe pas."
#: lib/mergetool.tcl:264 #: lib/mergetool.tcl:264
#, tcl-format #, tcl-format
@ -1958,7 +1948,7 @@ msgid ""
"Error retrieving versions:\n" "Error retrieving versions:\n"
"%s" "%s"
msgstr "" msgstr ""
"Erreur lors de la récupération des versions:\n" "Erreur lors de la récupération des versions :\n"
"%s" "%s"
#: lib/mergetool.tcl:343 #: lib/mergetool.tcl:343
@ -1968,7 +1958,7 @@ msgid ""
"\n" "\n"
"%s" "%s"
msgstr "" msgstr ""
"Impossible de lancer l'outil de fusion:\n" "Impossible de lancer l'outil de fusion :\n"
"\n" "\n"
"%s" "%s"
@ -1983,12 +1973,12 @@ msgstr "L'outil de fusion a échoué."
#: lib/option.tcl:11 #: lib/option.tcl:11
#, tcl-format #, tcl-format
msgid "Invalid global encoding '%s'" msgid "Invalid global encoding '%s'"
msgstr "Encodage global invalide '%s'" msgstr "Codage global '%s' invalide"
#: lib/option.tcl:19 #: lib/option.tcl:19
#, tcl-format #, tcl-format
msgid "Invalid repo encoding '%s'" msgid "Invalid repo encoding '%s'"
msgstr "Encodage de dépôt invalide '%s'" msgstr "Codage de dépôt '%s' invalide"
#: lib/option.tcl:117 #: lib/option.tcl:117
msgid "Restore Defaults" msgid "Restore Defaults"
@ -2001,7 +1991,7 @@ msgstr "Sauvegarder"
#: lib/option.tcl:131 #: lib/option.tcl:131
#, tcl-format #, tcl-format
msgid "%s Repository" msgid "%s Repository"
msgstr "Dépôt: %s" msgstr "Dépôt : %s"
#: lib/option.tcl:132 #: lib/option.tcl:132
msgid "Global (All Repositories)" msgid "Global (All Repositories)"
@ -2069,7 +2059,7 @@ msgstr "Nouveau modèle de nom de branche"
#: lib/option.tcl:155 #: lib/option.tcl:155
msgid "Default File Contents Encoding" msgid "Default File Contents Encoding"
msgstr "Encodage du contenu des fichiers par défaut" msgstr "Codage du contenu des fichiers par défaut"
#: lib/option.tcl:203 #: lib/option.tcl:203
msgid "Change" msgid "Change"
@ -2098,11 +2088,11 @@ msgstr "Préférences"
#: lib/option.tcl:314 #: lib/option.tcl:314
msgid "Failed to completely save options:" msgid "Failed to completely save options:"
msgstr "La sauvegarde complète des options a échouée :" msgstr "La sauvegarde complète des options a échoué :"
#: lib/remote.tcl:163 #: lib/remote.tcl:163
msgid "Remove Remote" msgid "Remove Remote"
msgstr "Supprimer dépôt distant" msgstr "Supprimer un dépôt distant"
#: lib/remote.tcl:168 #: lib/remote.tcl:168
msgid "Prune from" msgid "Prune from"
@ -2118,11 +2108,11 @@ msgstr "Pousser vers"
#: lib/remote_add.tcl:19 #: lib/remote_add.tcl:19
msgid "Add Remote" msgid "Add Remote"
msgstr "Ajouter dépôt distant" msgstr "Ajouter un dépôt distant"
#: lib/remote_add.tcl:24 #: lib/remote_add.tcl:24
msgid "Add New Remote" msgid "Add New Remote"
msgstr "Ajouter nouveau dépôt distant" msgstr "Ajouter un nouveau dépôt distant"
#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 #: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
msgid "Add" msgid "Add"
@ -2134,7 +2124,7 @@ msgstr "Détails des dépôts distants"
#: lib/remote_add.tcl:50 #: lib/remote_add.tcl:50
msgid "Location:" msgid "Location:"
msgstr "Emplacement:" msgstr "Emplacement :"
#: lib/remote_add.tcl:62 #: lib/remote_add.tcl:62
msgid "Further Action" msgid "Further Action"
@ -2146,7 +2136,7 @@ msgstr "Récupérer immédiatement"
#: lib/remote_add.tcl:71 #: lib/remote_add.tcl:71
msgid "Initialize Remote Repository and Push" msgid "Initialize Remote Repository and Push"
msgstr "Initialiser dépôt distant et pousser" msgstr "Initialiser un dépôt distant et pousser"
#: lib/remote_add.tcl:77 #: lib/remote_add.tcl:77
msgid "Do Nothing Else Now" msgid "Do Nothing Else Now"
@ -2193,7 +2183,7 @@ msgstr "Mise en place de %s (à %s)"
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
msgid "Delete Branch Remotely" msgid "Delete Branch Remotely"
msgstr "Supprimer branche à distance" msgstr "Supprimer une branche à distance"
#: lib/remote_branch_delete.tcl:47 #: lib/remote_branch_delete.tcl:47
msgid "From Repository" msgid "From Repository"
@ -2244,8 +2234,8 @@ msgid ""
"One or more of the merge tests failed because you have not fetched the " "One or more of the merge tests failed because you have not fetched the "
"necessary commits. Try fetching from %s first." "necessary commits. Try fetching from %s first."
msgstr "" msgstr ""
"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas " "Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas "
"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord." "récupéré les commits nécessaires. Essayez de récupérer à partir de %s d'abord."
#: lib/remote_branch_delete.tcl:207 #: lib/remote_branch_delete.tcl:207
msgid "Please select one or more branches to delete." msgid "Please select one or more branches to delete."
@ -2257,14 +2247,14 @@ msgid ""
"\n" "\n"
"Delete the selected branches?" "Delete the selected branches?"
msgstr "" msgstr ""
"Récupérer des branches supprimées est difficile.\n" "Il est difficile de récupérer des branches supprimées.\n"
"\n" "\n"
"Souhaitez vous supprimer les branches sélectionnées ?" "Supprimer les branches sélectionnées ?"
#: lib/remote_branch_delete.tcl:226 #: lib/remote_branch_delete.tcl:226
#, tcl-format #, tcl-format
msgid "Deleting branches from %s" msgid "Deleting branches from %s"
msgstr "Supprimer les branches de %s" msgstr "Suppression des branches de %s"
#: lib/remote_branch_delete.tcl:286 #: lib/remote_branch_delete.tcl:286
msgid "No repository selected." msgid "No repository selected."
@ -2285,7 +2275,7 @@ msgstr "Suivant"
#: lib/search.tcl:24 #: lib/search.tcl:24
msgid "Prev" msgid "Prev"
msgstr "Précédant" msgstr "Précédent"
#: lib/search.tcl:25 #: lib/search.tcl:25
msgid "Case-Sensitive" msgid "Case-Sensitive"
@ -2293,7 +2283,7 @@ msgstr "Sensible à la casse"
#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
msgid "Cannot write shortcut:" msgid "Cannot write shortcut:"
msgstr "Impossible d'écrire le raccourcis :" msgstr "Impossible d'écrire le raccourci :"
#: lib/shortcut.tcl:136 #: lib/shortcut.tcl:136
msgid "Cannot write icon:" msgid "Cannot write icon:"
@ -2318,7 +2308,7 @@ msgstr "Réinitialisation du dictionnaire à %s."
#: lib/spellcheck.tcl:73 #: lib/spellcheck.tcl:73
msgid "Spell checker silently failed on startup" msgid "Spell checker silently failed on startup"
msgstr "La vérification d'orthographe a échouée silentieusement au démarrage" msgstr "La vérification d'orthographe a échoué silencieusement au démarrage"
#: lib/spellcheck.tcl:80 #: lib/spellcheck.tcl:80
msgid "Unrecognized spell checker" msgid "Unrecognized spell checker"
@ -2351,11 +2341,11 @@ msgstr "Générer une clé"
#: lib/sshkey.tcl:56 #: lib/sshkey.tcl:56
msgid "Copy To Clipboard" msgid "Copy To Clipboard"
msgstr "Copier dans le presse papier" msgstr "Copier dans le presse-papier"
#: lib/sshkey.tcl:70 #: lib/sshkey.tcl:70
msgid "Your OpenSSH Public Key" msgid "Your OpenSSH Public Key"
msgstr "Votre clé publique Open SSH" msgstr "Votre clé publique OpenSSH"
#: lib/sshkey.tcl:78 #: lib/sshkey.tcl:78
msgid "Generating..." msgid "Generating..."
@ -2368,7 +2358,7 @@ msgid ""
"\n" "\n"
"%s" "%s"
msgstr "" msgstr ""
"Impossible de lancer ssh-keygen:\n" "Impossible de lancer ssh-keygen :\n"
"\n" "\n"
"%s" "%s"
@ -2398,7 +2388,7 @@ msgstr "Lancer %s nécessite qu'un fichier soit sélectionné."
#: lib/tools.tcl:90 #: lib/tools.tcl:90
#, tcl-format #, tcl-format
msgid "Are you sure you want to run %s?" msgid "Are you sure you want to run %s?"
msgstr "Êtes vous sûr de vouloir lancer %s ?" msgstr "Êtes-vous sûr de vouloir lancer %s ?"
#: lib/tools.tcl:110 #: lib/tools.tcl:110
#, tcl-format #, tcl-format
@ -2412,7 +2402,7 @@ msgstr "Lancement de : %s"
#: lib/tools.tcl:149 #: lib/tools.tcl:149
#, tcl-format #, tcl-format
msgid "Tool completed succesfully: %s" msgid "Tool completed successfully: %s"
msgstr "L'outil a terminé avec succès : %s" msgstr "L'outil a terminé avec succès : %s"
#: lib/tools.tcl:151 #: lib/tools.tcl:151
@ -2422,11 +2412,11 @@ msgstr "L'outil a échoué : %s"
#: lib/tools_dlg.tcl:22 #: lib/tools_dlg.tcl:22
msgid "Add Tool" msgid "Add Tool"
msgstr "Ajouter outil" msgstr "Ajouter un outil"
#: lib/tools_dlg.tcl:28 #: lib/tools_dlg.tcl:28
msgid "Add New Tool Command" msgid "Add New Tool Command"
msgstr "Ajouter nouvelle commande d'outil" msgstr "Ajouter une nouvelle commande d'outil"
#: lib/tools_dlg.tcl:33 #: lib/tools_dlg.tcl:33
msgid "Add globally" msgid "Add globally"
@ -2438,7 +2428,7 @@ msgstr "Détails sur l'outil"
#: lib/tools_dlg.tcl:48 #: lib/tools_dlg.tcl:48
msgid "Use '/' separators to create a submenu tree:" msgid "Use '/' separators to create a submenu tree:"
msgstr "Utiliser les séparateurs '/' pour créer un arbre de sous menus :" msgstr "Utiliser les séparateurs '/' pour créer un arbre de sous-menus :"
#: lib/tools_dlg.tcl:61 #: lib/tools_dlg.tcl:61
msgid "Command:" msgid "Command:"
@ -2462,7 +2452,7 @@ msgstr "Ne pas montrer la fenêtre de sortie des commandes"
#: lib/tools_dlg.tcl:97 #: lib/tools_dlg.tcl:97
msgid "Run only if a diff is selected ($FILENAME not empty)" msgid "Run only if a diff is selected ($FILENAME not empty)"
msgstr "Lancer seulement si un diff est selectionné ($FILENAME non vide)" msgstr "Lancer seulement si un diff est sélectionné ($FILENAME non vide)"
#: lib/tools_dlg.tcl:121 #: lib/tools_dlg.tcl:121
msgid "Please supply a name for the tool." msgid "Please supply a name for the tool."
@ -2479,7 +2469,7 @@ msgid ""
"Could not add tool:\n" "Could not add tool:\n"
"%s" "%s"
msgstr "" msgstr ""
"Impossible d'ajouter l'outil:\n" "Impossible d'ajouter l'outil :\n"
"%s" "%s"
#: lib/tools_dlg.tcl:190 #: lib/tools_dlg.tcl:190

View File

@ -753,13 +753,6 @@ msgstr ""
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "" msgstr ""
#: lib/branch_delete.tcl:115
msgid ""
"Recovering deleted branches is difficult. \n"
"\n"
" Delete the selected branches?"
msgstr ""
#: lib/branch_delete.tcl:141 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""
@ -2220,7 +2213,7 @@ msgstr ""
#: lib/tools.tcl:149 #: lib/tools.tcl:149
#, tcl-format #, tcl-format
msgid "Tool completed succesfully: %s" msgid "Tool completed successfully: %s"
msgstr "" msgstr ""
#: lib/tools.tcl:151 #: lib/tools.tcl:151

View File

@ -776,16 +776,6 @@ msgstr "Mindig (Ne legyen merge teszt.)"
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:" msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
#: lib/branch_delete.tcl:115
msgid ""
"Recovering deleted branches is difficult. \n"
"\n"
" Delete the selected branches?"
msgstr ""
"A törölt branchek visszaállítása bonyolult. \n"
"\n"
" Biztosan törli a kiválasztott brancheket?"
#: lib/branch_delete.tcl:141 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""
@ -2399,7 +2389,7 @@ msgstr "Futtatás: %s..."
#: lib/tools.tcl:149 #: lib/tools.tcl:149
#, tcl-format #, tcl-format
msgid "Tool completed succesfully: %s" msgid "Tool completed successfully: %s"
msgstr "Az eszköz sikeresen befejeződött: %s" msgstr "Az eszköz sikeresen befejeződött: %s"
#: lib/tools.tcl:151 #: lib/tools.tcl:151

View File

@ -778,16 +778,6 @@ msgstr "Sempre (Non effettuare verifiche di fusione)."
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "I rami seguenti non sono stati fusi completamente in %s:" msgstr "I rami seguenti non sono stati fusi completamente in %s:"
#: lib/branch_delete.tcl:115
msgid ""
"Recovering deleted branches is difficult. \n"
"\n"
" Delete the selected branches?"
msgstr ""
"Ricomporre rami cancellati può essere complicato. \n"
"\n"
" Eliminare i rami selezionati?"
#: lib/branch_delete.tcl:141 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""
@ -2418,7 +2408,7 @@ msgstr "Eseguo: %s"
#: lib/tools.tcl:149 #: lib/tools.tcl:149
#, tcl-format #, tcl-format
msgid "Tool completed succesfully: %s" msgid "Tool completed successfully: %s"
msgstr "Il programma esterno è terminato con successo: %s" msgstr "Il programma esterno è terminato con successo: %s"
#: lib/tools.tcl:151 #: lib/tools.tcl:151

View File

@ -773,16 +773,6 @@ msgstr "無条件(マージテストしない)"
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "以下のブランチは %s に完全にマージされていません:" msgstr "以下のブランチは %s に完全にマージされていません:"
#: lib/branch_delete.tcl:115
msgid ""
"Recovering deleted branches is difficult. \n"
"\n"
" Delete the selected branches?"
msgstr ""
"ブランチを削除すると元に戻すのは困難です。 \n"
"\n"
" 選択したブランチを削除しますか?"
#: lib/branch_delete.tcl:141 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""
@ -2382,7 +2372,7 @@ msgstr "実行中: %s"
#: lib/tools.tcl:149 #: lib/tools.tcl:149
#, tcl-format #, tcl-format
msgid "Tool completed succesfully: %s" msgid "Tool completed successfully: %s"
msgstr "ツールが完了しました: %s" msgstr "ツールが完了しました: %s"
#: lib/tools.tcl:151 #: lib/tools.tcl:151

View File

@ -761,16 +761,6 @@ msgstr "Alltid (Ikke utfør sammenslåingstest.)"
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "Følgende grener er ikke fullstendig slått sammen med %s:" msgstr "Følgende grener er ikke fullstendig slått sammen med %s:"
#: lib/branch_delete.tcl:115
msgid ""
"Recovering deleted branches is difficult. \n"
"\n"
" Delete the selected branches?"
msgstr ""
"Gjenoppretting av fjernede grener er vanskelig. \n"
"\n"
" Fjern valgte grener?"
#: lib/branch_delete.tcl:141 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""
@ -2331,7 +2321,7 @@ msgstr "Kjører: %s"
#: lib/tools.tcl:149 #: lib/tools.tcl:149
#, tcl-format #, tcl-format
msgid "Tool completed succesfully: %s" msgid "Tool completed successfully: %s"
msgstr "Verktøyet ble fullført med suksess: %s" msgstr "Verktøyet ble fullført med suksess: %s"
#: lib/tools.tcl:151 #: lib/tools.tcl:151

File diff suppressed because it is too large Load Diff

View File

@ -780,16 +780,6 @@ msgstr "Alltid (utför inte sammanslagningstest)."
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "Följande grenar är inte till fullo sammanslagna med %s:" msgstr "Följande grenar är inte till fullo sammanslagna med %s:"
#: lib/branch_delete.tcl:115
msgid ""
"Recovering deleted branches is difficult. \n"
"\n"
" Delete the selected branches?"
msgstr ""
"Det är svårt att återställa borttagna grenar.\n"
"\n"
" Ta bort valda grenar?"
#: lib/branch_delete.tcl:141 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""
@ -2398,7 +2388,7 @@ msgstr "Exekverar: %s"
#: lib/tools.tcl:149 #: lib/tools.tcl:149
#, tcl-format #, tcl-format
msgid "Tool completed succesfully: %s" msgid "Tool completed successfully: %s"
msgstr "Verktyget avslutades framgångsrikt: %s" msgstr "Verktyget avslutades framgångsrikt: %s"
#: lib/tools.tcl:151 #: lib/tools.tcl:151

View File

@ -676,16 +676,6 @@ msgstr "总是合并 (不作合并测试.)"
msgid "The following branches are not completely merged into %s:" msgid "The following branches are not completely merged into %s:"
msgstr "下列分支没有完全被合并到 %s:" msgstr "下列分支没有完全被合并到 %s:"
#: lib/branch_delete.tcl:115
msgid ""
"Recovering deleted branches is difficult. \n"
"\n"
" Delete the selected branches?"
msgstr ""
"恢复被删除的分支非常困难.\n"
"\n"
"是否要删除所选分支?"
#: lib/branch_delete.tcl:141 #: lib/branch_delete.tcl:141
#, tcl-format #, tcl-format
msgid "" msgid ""

View File

@ -3,7 +3,12 @@
exec wish "$0" -- "$@" exec wish "$0" -- "$@"
if { $argc >=2 && [lindex $argv 0] == "--working-dir" } { if { $argc >=2 && [lindex $argv 0] == "--working-dir" } {
cd [lindex $argv 1] set workdir [lindex $argv 1]
cd $workdir
if {[lindex [file split $workdir] end] eq {.git}} {
# Workaround for Explorer right click "Git GUI Here" on .git/
cd ..
}
set argv [lrange $argv 2 end] set argv [lrange $argv 2 end]
incr argc -2 incr argc -2
} }