mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
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
commit
a8816e7bab
|
|
@ -105,8 +105,11 @@ endif
|
|||
|
||||
ifeq ($(uname_S),Darwin)
|
||||
TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
|
||||
ifeq ($(shell expr "$(uname_R)" : '9\.'),2)
|
||||
TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
|
||||
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.app
|
||||
ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
|
||||
TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
|
||||
endif
|
||||
endif
|
||||
TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -122,6 +122,7 @@ unset oguimsg
|
|||
set _appname {Git Gui}
|
||||
set _gitdir {}
|
||||
set _gitexec {}
|
||||
set _githtmldir {}
|
||||
set _reponame {}
|
||||
set _iscygwin {}
|
||||
set _search_path {}
|
||||
|
|
@ -168,6 +169,28 @@ proc 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 {} {
|
||||
return $::_reponame
|
||||
}
|
||||
|
|
@ -640,10 +663,13 @@ font create font_diffbold
|
|||
font create font_diffitalic
|
||||
|
||||
foreach class {Button Checkbutton Entry Label
|
||||
Labelframe Listbox Menu Message
|
||||
Labelframe Listbox Message
|
||||
Radiobutton Spinbox Text} {
|
||||
option add *$class.font font_ui
|
||||
}
|
||||
if {![is_MacOSX]} {
|
||||
option add *Menu.font font_ui
|
||||
}
|
||||
unset class
|
||||
|
||||
if {[is_Windows] || [is_MacOSX]} {
|
||||
|
|
@ -699,7 +725,7 @@ proc apply_config {} {
|
|||
|
||||
set default_config(branch.autosetupmerge) true
|
||||
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.summary) false
|
||||
set default_config(merge.verbosity) 2
|
||||
|
|
@ -769,9 +795,9 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
|
|||
set _real_git_version $_git_version
|
||||
regsub -- {[\-\.]dirty$} $_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 {\.[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]} {
|
||||
catch {wm withdraw .}
|
||||
|
|
@ -1108,6 +1134,7 @@ set current_diff_path {}
|
|||
set is_3way_diff 0
|
||||
set is_conflict_diff 0
|
||||
set selected_commit_type new
|
||||
set diff_empty_count 0
|
||||
|
||||
set nullid "0000000000000000000000000000000000000000"
|
||||
set nullid2 "0000000000000000000000000000000000000001"
|
||||
|
|
@ -1924,7 +1951,7 @@ proc do_explore {} {
|
|||
# freedesktop.org-conforming system is our best shot
|
||||
set explorer "xdg-open"
|
||||
}
|
||||
eval exec $explorer [file dirname [gitdir]] &
|
||||
eval exec $explorer [list [file nativename [file dirname [gitdir]]]] &
|
||||
}
|
||||
|
||||
set is_quitting 0
|
||||
|
|
@ -2277,6 +2304,12 @@ set ui_comm {}
|
|||
# -- Menu Bar
|
||||
#
|
||||
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 Edit] -menu .mbar.edit
|
||||
if {[is_enabled branch]} {
|
||||
|
|
@ -2292,7 +2325,6 @@ if {[is_enabled transport]} {
|
|||
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
|
||||
.mbar add cascade -label [mc Tools] -menu .mbar.tools
|
||||
}
|
||||
. configure -menu .mbar
|
||||
|
||||
# -- Repository Menu
|
||||
#
|
||||
|
|
@ -2545,19 +2577,7 @@ if {[is_enabled transport]} {
|
|||
}
|
||||
|
||||
if {[is_MacOSX]} {
|
||||
# -- Apple Menu (Mac OS X only)
|
||||
#
|
||||
.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
|
||||
proc ::tk::mac::ShowPreferences {} {do_options}
|
||||
} else {
|
||||
# -- Edit Menu
|
||||
#
|
||||
|
|
@ -2585,17 +2605,23 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
|
|||
.mbar add cascade -label [mc 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]] \
|
||||
-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]]
|
||||
set doc_path [file join $doc_path Documentation index.html]
|
||||
|
||||
if {[is_Cygwin]} {
|
||||
set doc_path [exec cygpath --mixed $doc_path]
|
||||
if {[is_Cygwin]} {
|
||||
set doc_path [exec cygpath --mixed $doc_path]
|
||||
}
|
||||
}
|
||||
|
||||
if {[file isfile $doc_path]} {
|
||||
|
|
@ -2944,7 +2970,7 @@ $ctxm add command \
|
|||
-command {tk_textPaste $ui_comm}
|
||||
$ctxm add command \
|
||||
-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 command \
|
||||
-label [mc "Select All"] \
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ constructor dialog {} {
|
|||
$w.check \
|
||||
[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
|
||||
|
||||
foreach h [load_all_heads] {
|
||||
|
|
@ -112,7 +112,7 @@ method _delete {} {
|
|||
}
|
||||
if {$to_delete eq {}} return
|
||||
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 \
|
||||
-icon warning \
|
||||
-type yesno \
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ field w_cons {}; # embedded console window object
|
|||
field new_expr ; # expression the user saw/thinks this is
|
||||
field new_hash ; # commit SHA-1 we are switching to
|
||||
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 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.
|
||||
#
|
||||
repository_state curType curHEAD curMERGE_HEAD
|
||||
repository_state curType old_hash curMERGE_HEAD
|
||||
if {[string match amend* $commit_type]
|
||||
&& $curType eq {normal}
|
||||
&& $curHEAD eq $HEAD} {
|
||||
} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
|
||||
&& $old_hash eq $HEAD} {
|
||||
} elseif {$commit_type ne $curType || $HEAD ne $old_hash} {
|
||||
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.
|
||||
|
|
@ -297,7 +298,7 @@ The rescan will be automatically started now.
|
|||
return
|
||||
}
|
||||
|
||||
if {$curHEAD eq $new_hash} {
|
||||
if {$old_hash eq $new_hash} {
|
||||
_after_readtree $this
|
||||
} elseif {[is_config_true gui.trustmtime]} {
|
||||
_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'."]
|
||||
}
|
||||
|
||||
# -- 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
|
||||
# amend mode we need to toss the current buffer and do a
|
||||
# full rescan to update our file lists. If we weren't in
|
||||
# amend mode our file lists are accurate and we can avoid
|
||||
# the rescan.
|
||||
#
|
||||
global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
|
||||
global ui_comm
|
||||
|
||||
unlock_index
|
||||
set name [_name $this]
|
||||
set selected_commit_type new
|
||||
if {[string match amend* $commit_type]} {
|
||||
$ui_comm delete 0.0 end
|
||||
|
|
|
|||
|
|
@ -398,6 +398,8 @@ method _do_new {} {
|
|||
grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
|
||||
pack $w_body.where -fill x
|
||||
|
||||
grid columnconfigure $w_body.where 1 -weight 1
|
||||
|
||||
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]]
|
||||
update
|
||||
|
|
@ -964,7 +966,34 @@ method _readtree_wait {fd} {
|
|||
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
|
||||
pack $w_body.where -fill x
|
||||
|
||||
grid columnconfigure $w_body.where 1 -weight 1
|
||||
|
||||
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]]
|
||||
update
|
||||
|
|
|
|||
|
|
@ -115,6 +115,23 @@ proc create_new_commit {} {
|
|||
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 {} {
|
||||
global HEAD commit_type file_states ui_comm repo_config
|
||||
global pch_error
|
||||
|
|
@ -200,16 +217,7 @@ A good commit message has the following format:
|
|||
set msg_p [gitdir GITGUI_EDITMSG]
|
||||
set msg_wt [open $msg_p w]
|
||||
fconfigure $msg_wt -translation lf
|
||||
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 {
|
||||
error_popup [mc "warning: Tcl does not support encoding '%s'." $enc]
|
||||
fconfigure $msg_wt -encoding utf-8
|
||||
}
|
||||
setup_commit_encoding $msg_wt
|
||||
puts $msg_wt $msg
|
||||
close $msg_wt
|
||||
|
||||
|
|
@ -362,6 +370,7 @@ A rescan will be automatically started now.
|
|||
append reflogm " ($commit_type)"
|
||||
}
|
||||
set msg_fd [open $msg_p r]
|
||||
setup_commit_encoding $msg_fd 1
|
||||
gets $msg_fd subject
|
||||
close $msg_fd
|
||||
append reflogm {: } $subject
|
||||
|
|
@ -398,8 +407,8 @@ A rescan will be automatically started now.
|
|||
#
|
||||
set fd_ph [githook_read post-commit]
|
||||
if {$fd_ph ne {}} {
|
||||
upvar #0 pch_error$cmt_id pc_err
|
||||
set pc_err {}
|
||||
global pch_error
|
||||
set pch_error {}
|
||||
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
|
||||
fileevent $fd_ph readable \
|
||||
[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} {
|
||||
upvar #0 pch_error$cmt_id pch_error
|
||||
global pch_error
|
||||
|
||||
append pch_error [read $fd_ph]
|
||||
fconfigure $fd_ph -blocking 1
|
||||
|
|
|
|||
|
|
@ -51,11 +51,16 @@ proc force_diff_encoding {enc} {
|
|||
|
||||
proc handle_empty_diff {} {
|
||||
global current_diff_path file_states file_lists
|
||||
global diff_empty_count
|
||||
|
||||
set path $current_diff_path
|
||||
set s $file_states($path)
|
||||
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.
|
||||
|
||||
%s has no changes.
|
||||
|
|
@ -310,6 +315,7 @@ proc read_diff {fd cont_info} {
|
|||
global ui_diff diff_active
|
||||
global is_3way_diff is_conflict_diff current_diff_header
|
||||
global current_diff_queue
|
||||
global diff_empty_count
|
||||
|
||||
$ui_diff conf -state normal
|
||||
while {[gets $fd line] >= 0} {
|
||||
|
|
@ -415,7 +421,10 @@ proc read_diff {fd cont_info} {
|
|||
|
||||
if {[$ui_diff index end] eq {2.0}} {
|
||||
handle_empty_diff
|
||||
} else {
|
||||
set diff_empty_count 0
|
||||
}
|
||||
|
||||
set callback [lindex $cont_info 1]
|
||||
if {$callback ne {}} {
|
||||
eval $callback
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ proc merge_load_stages {path cont} {
|
|||
set merge_stages(3) {}
|
||||
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
|
||||
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
|
||||
ui_status [mc "Merge tool failed."]
|
||||
} else {
|
||||
if {[is_config_true merge.keepbackup]} {
|
||||
if {[is_config_true mergetool.keepbackup]} {
|
||||
file rename -force -- $backup "$mtool_target.orig"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -213,9 +213,7 @@ method _delete {} {
|
|||
-type yesno \
|
||||
-title [wm title $w] \
|
||||
-parent $w \
|
||||
-message [mc "Recovering deleted branches is difficult.
|
||||
|
||||
Delete the selected branches?"]] ne yes} {
|
||||
-message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ proc do_cygwin_shortcut {} {
|
|||
$argv0]
|
||||
win32_create_lnk $fn [list \
|
||||
$sh -c \
|
||||
"CHERE_INVOKING=1 source /etc/profile;[sq $me]" \
|
||||
"CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \
|
||||
] \
|
||||
[file dirname [file normalize [gitdir]]]
|
||||
} err]} {
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {
|
|||
}
|
||||
|
||||
if {$ok} {
|
||||
set msg [mc "Tool completed succesfully: %s" $fullname]
|
||||
set msg [mc "Tool completed successfully: %s" $fullname]
|
||||
} else {
|
||||
set msg [mc "Tool failed: %s" $fullname]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -773,16 +773,6 @@ msgstr "Immer (ohne Zusammenführungstest)"
|
|||
msgid "The following branches are not completely merged into %s:"
|
||||
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
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
|
|
@ -2506,7 +2496,7 @@ msgstr "Starten: %s"
|
|||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr "Werkzeug erfolgreich abgeschlossen: %s"
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
|
|
|||
202
git-gui/po/fr.po
202
git-gui/po/fr.po
|
|
@ -62,7 +62,7 @@ msgstr ""
|
|||
"\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"
|
||||
"Peut-on considérer que '%s' est en version 1.5.0 ?\n"
|
||||
|
||||
#: git-gui.sh:1062
|
||||
msgid "Git directory not found:"
|
||||
|
|
@ -82,7 +82,7 @@ msgstr "Aucun répertoire de travail"
|
|||
|
||||
#: git-gui.sh:1247 lib/checkout_op.tcl:305
|
||||
msgid "Refreshing file status..."
|
||||
msgstr "Rafraichissement du status des fichiers..."
|
||||
msgstr "Rafraîchissement du statut des fichiers..."
|
||||
|
||||
#: git-gui.sh:1303
|
||||
msgid "Scanning for modified files ..."
|
||||
|
|
@ -163,7 +163,7 @@ msgstr "Dépôt"
|
|||
|
||||
#: git-gui.sh:2281
|
||||
msgid "Edit"
|
||||
msgstr "Edition"
|
||||
msgstr "Édition"
|
||||
|
||||
#: git-gui.sh:2283 lib/choose_rev.tcl:561
|
||||
msgid "Branch"
|
||||
|
|
@ -199,7 +199,7 @@ msgstr "Naviguer dans la branche..."
|
|||
|
||||
#: git-gui.sh:2316
|
||||
msgid "Visualize Current Branch's History"
|
||||
msgstr "Visualiser historique branche courante"
|
||||
msgstr "Visualiser l'historique de la branche courante"
|
||||
|
||||
#: git-gui.sh:2320
|
||||
msgid "Visualize All Branch History"
|
||||
|
|
@ -208,12 +208,12 @@ msgstr "Voir l'historique de toutes les branches"
|
|||
#: git-gui.sh:2327
|
||||
#, tcl-format
|
||||
msgid "Browse %s's Files"
|
||||
msgstr "Naviguer l'arborescence de %s"
|
||||
msgstr "Parcourir l'arborescence de %s"
|
||||
|
||||
#: git-gui.sh:2329
|
||||
#, tcl-format
|
||||
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
|
||||
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
|
||||
#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
|
||||
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
|
||||
msgid "Quit"
|
||||
|
|
@ -320,7 +320,7 @@ msgstr "Désindexer"
|
|||
|
||||
#: git-gui.sh:2484 lib/index.tcl:410
|
||||
msgid "Revert Changes"
|
||||
msgstr "Annuler les modifications (revert)"
|
||||
msgstr "Annuler les modifications"
|
||||
|
||||
#: git-gui.sh:2491 git-gui.sh:3069
|
||||
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
|
||||
msgid "Show SSH Key"
|
||||
msgstr "Montrer clé SSH"
|
||||
msgstr "Montrer la clé SSH"
|
||||
|
||||
#: git-gui.sh:2707
|
||||
#, tcl-format
|
||||
|
|
@ -445,7 +445,7 @@ msgstr "Fichier :"
|
|||
|
||||
#: git-gui.sh:3078
|
||||
msgid "Refresh"
|
||||
msgstr "Rafraichir"
|
||||
msgstr "Rafraîchir"
|
||||
|
||||
#: git-gui.sh:3099
|
||||
msgid "Decrease Font Size"
|
||||
|
|
@ -457,7 +457,7 @@ msgstr "Agrandir la police"
|
|||
|
||||
#: git-gui.sh:3111 lib/blame.tcl:281
|
||||
msgid "Encoding"
|
||||
msgstr "Encodage"
|
||||
msgstr "Codage des caractères"
|
||||
|
||||
#: git-gui.sh:3122
|
||||
msgid "Apply/Reverse Hunk"
|
||||
|
|
@ -469,7 +469,7 @@ msgstr "Appliquer/Inverser la ligne"
|
|||
|
||||
#: git-gui.sh:3137
|
||||
msgid "Run Merge Tool"
|
||||
msgstr "Lancer outil de merge"
|
||||
msgstr "Lancer l'outil de fusion"
|
||||
|
||||
#: git-gui.sh:3142
|
||||
msgid "Use Remote Version"
|
||||
|
|
@ -527,7 +527,7 @@ msgid ""
|
|||
"Tcl binary distributed by Cygwin."
|
||||
msgstr ""
|
||||
"\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."
|
||||
|
||||
#: git-gui.sh:3336
|
||||
|
|
@ -630,11 +630,11 @@ msgstr "Fichier original :"
|
|||
|
||||
#: lib/blame.tcl:1021
|
||||
msgid "Cannot find HEAD commit:"
|
||||
msgstr "Impossible de trouver le commit HEAD:"
|
||||
msgstr "Impossible de trouver le commit HEAD :"
|
||||
|
||||
#: lib/blame.tcl:1076
|
||||
msgid "Cannot find parent commit:"
|
||||
msgstr "Impossible de trouver le commit parent:"
|
||||
msgstr "Impossible de trouver le commit parent :"
|
||||
|
||||
#: lib/blame.tcl:1091
|
||||
msgid "Unable to display parent"
|
||||
|
|
@ -646,7 +646,7 @@ msgstr "Erreur lors du chargement des différences :"
|
|||
|
||||
#: lib/blame.tcl:1232
|
||||
msgid "Originally By:"
|
||||
msgstr "A l'origine par :"
|
||||
msgstr "À l'origine par :"
|
||||
|
||||
#: lib/blame.tcl:1238
|
||||
msgid "In File:"
|
||||
|
|
@ -691,11 +691,11 @@ msgstr "Détacher de la branche locale"
|
|||
|
||||
#: lib/branch_create.tcl:22
|
||||
msgid "Create Branch"
|
||||
msgstr "Créer branche"
|
||||
msgstr "Créer une branche"
|
||||
|
||||
#: lib/branch_create.tcl:27
|
||||
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
|
||||
msgid "Create"
|
||||
|
|
@ -719,7 +719,7 @@ msgstr "Révision initiale"
|
|||
|
||||
#: lib/branch_create.tcl:72
|
||||
msgid "Update Existing Branch:"
|
||||
msgstr "Mettre à jour branche existante :"
|
||||
msgstr "Mettre à jour une branche existante :"
|
||||
|
||||
#: lib/branch_create.tcl:75
|
||||
msgid "No"
|
||||
|
|
@ -727,7 +727,7 @@ msgstr "Non"
|
|||
|
||||
#: lib/branch_create.tcl:80
|
||||
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
|
||||
msgid "Reset"
|
||||
|
|
@ -769,7 +769,7 @@ msgstr "Branches locales"
|
|||
|
||||
#: lib/branch_delete.tcl:52
|
||||
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
|
||||
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:"
|
||||
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"
|
||||
"La suppression des branches suivantes a échoué :\n"
|
||||
"%s"
|
||||
|
||||
#: 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
|
||||
#, tcl-format
|
||||
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
|
||||
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
|
||||
msgid ""
|
||||
|
|
@ -918,7 +908,7 @@ msgid ""
|
|||
"The rescan will be automatically started now.\n"
|
||||
msgstr ""
|
||||
"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
|
||||
"dépôt\n"
|
||||
"dépôt.\n"
|
||||
"\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 "
|
||||
|
|
@ -956,9 +946,9 @@ msgid ""
|
|||
"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"
|
||||
"Vous n'êtes plus sur une branche locale.\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é'."
|
||||
|
||||
#: 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 "
|
||||
"échouée.\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
|
||||
msgid "Select"
|
||||
|
|
@ -1023,8 +1013,8 @@ msgid ""
|
|||
"This is example text.\n"
|
||||
"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 police"
|
||||
"Ceci est un texte d'exemple.\n"
|
||||
"Si vous aimez ce texte, vous pouvez choisir cette police."
|
||||
|
||||
#: lib/choose_repository.tcl:28
|
||||
msgid "Git Gui"
|
||||
|
|
@ -1040,7 +1030,7 @@ msgstr "Nouveau..."
|
|||
|
||||
#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
|
||||
msgid "Clone Existing Repository"
|
||||
msgstr "Cloner dépôt existant"
|
||||
msgstr "Cloner un dépôt existant"
|
||||
|
||||
#: lib/choose_repository.tcl:106
|
||||
msgid "Clone..."
|
||||
|
|
@ -1048,7 +1038,7 @@ msgstr "Cloner..."
|
|||
|
||||
#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
|
||||
msgid "Open Existing Repository"
|
||||
msgstr "Ouvrir dépôt existant"
|
||||
msgstr "Ouvrir un dépôt existant"
|
||||
|
||||
#: lib/choose_repository.tcl:119
|
||||
msgid "Open..."
|
||||
|
|
@ -1056,17 +1046,17 @@ msgstr "Ouvrir..."
|
|||
|
||||
#: lib/choose_repository.tcl:132
|
||||
msgid "Recent Repositories"
|
||||
msgstr "Dépôt récemment utilisés"
|
||||
msgstr "Dépôts récemment utilisés"
|
||||
|
||||
#: lib/choose_repository.tcl:138
|
||||
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:316
|
||||
#, tcl-format
|
||||
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
|
||||
msgid "Directory:"
|
||||
|
|
@ -1093,11 +1083,11 @@ msgstr "Cloner"
|
|||
|
||||
#: lib/choose_repository.tcl:473
|
||||
msgid "Source Location:"
|
||||
msgstr "Emplacement source:"
|
||||
msgstr "Emplacement source :"
|
||||
|
||||
#: lib/choose_repository.tcl:484
|
||||
msgid "Target Directory:"
|
||||
msgstr "Répertoire cible:"
|
||||
msgstr "Répertoire cible :"
|
||||
|
||||
#: lib/choose_repository.tcl:496
|
||||
msgid "Clone Type:"
|
||||
|
|
@ -1137,7 +1127,7 @@ msgstr "L'emplacement %s existe déjà."
|
|||
|
||||
#: lib/choose_repository.tcl:622
|
||||
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
|
||||
msgid "Counting objects"
|
||||
|
|
@ -1242,7 +1232,7 @@ msgstr "fichiers"
|
|||
|
||||
#: lib/choose_repository.tcl:962
|
||||
msgid "Initial file checkout failed."
|
||||
msgstr "Chargement initial du fichier échoué."
|
||||
msgstr "Le chargement initial du fichier a échoué."
|
||||
|
||||
#: lib/choose_repository.tcl:978
|
||||
msgid "Open"
|
||||
|
|
@ -1284,7 +1274,7 @@ msgstr "Révision invalide : %s"
|
|||
|
||||
#: lib/choose_rev.tcl:338
|
||||
msgid "No revision selected."
|
||||
msgstr "Pas de révision selectionnée."
|
||||
msgstr "Pas de révision sélectionnée."
|
||||
|
||||
#: lib/choose_rev.tcl:346
|
||||
msgid "Revision expression is empty."
|
||||
|
|
@ -1292,7 +1282,7 @@ msgstr "L'expression de révision est vide."
|
|||
|
||||
#: lib/choose_rev.tcl:531
|
||||
msgid "Updated"
|
||||
msgstr "Mise-à-jour:"
|
||||
msgstr "Mise à jour:"
|
||||
|
||||
#: lib/choose_rev.tcl:559
|
||||
msgid "URL"
|
||||
|
|
@ -1320,8 +1310,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Impossible de corriger pendant une fusion.\n"
|
||||
"\n"
|
||||
"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement "
|
||||
"terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous "
|
||||
"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édent sauf si vous "
|
||||
"abandonnez la fusion courante.\n"
|
||||
|
||||
#: lib/commit.tcl:49
|
||||
|
|
@ -1409,7 +1399,7 @@ msgstr ""
|
|||
#: lib/commit.tcl:211
|
||||
#, tcl-format
|
||||
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
|
||||
msgid "Calling pre-commit hook..."
|
||||
|
|
@ -1469,12 +1459,12 @@ msgstr "commit-tree a échoué :"
|
|||
|
||||
#: lib/commit.tcl:373
|
||||
msgid "update-ref failed:"
|
||||
msgstr "update-ref a échoué"
|
||||
msgstr "update-ref a échoué :"
|
||||
|
||||
#: lib/commit.tcl:461
|
||||
#, tcl-format
|
||||
msgid "Created commit %s: %s"
|
||||
msgstr "Commit créé %s : %s"
|
||||
msgstr "Commit %s créé : %s"
|
||||
|
||||
#: lib/console.tcl:59
|
||||
msgid "Working... please wait..."
|
||||
|
|
@ -1581,24 +1571,24 @@ msgid ""
|
|||
"LOCAL: deleted\n"
|
||||
"REMOTE:\n"
|
||||
msgstr ""
|
||||
"LOCAL: supprimé\n"
|
||||
"DISTANT:\n"
|
||||
"LOCAL : supprimé\n"
|
||||
"DISTANT :\n"
|
||||
|
||||
#: lib/diff.tcl:125
|
||||
msgid ""
|
||||
"REMOTE: deleted\n"
|
||||
"LOCAL:\n"
|
||||
msgstr ""
|
||||
"DISTANT: supprimé\n"
|
||||
"LOCAL:\n"
|
||||
"DISTANT : supprimé\n"
|
||||
"LOCAL :\n"
|
||||
|
||||
#: lib/diff.tcl:132
|
||||
msgid "LOCAL:\n"
|
||||
msgstr "LOCAL:\n"
|
||||
msgstr "LOCAL :\n"
|
||||
|
||||
#: lib/diff.tcl:135
|
||||
msgid "REMOTE:\n"
|
||||
msgstr "DISTANT:\n"
|
||||
msgstr "DISTANT :\n"
|
||||
|
||||
#: lib/diff.tcl:197 lib/diff.tcl:296
|
||||
#, tcl-format
|
||||
|
|
@ -1624,7 +1614,7 @@ msgid ""
|
|||
"* Showing only first %d bytes.\n"
|
||||
msgstr ""
|
||||
"* 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
|
||||
#, tcl-format
|
||||
|
|
@ -1635,7 +1625,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"\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
|
||||
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
|
||||
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
|
||||
msgid "Index Error"
|
||||
|
|
@ -1700,12 +1690,12 @@ msgstr "Continuer"
|
|||
|
||||
#: lib/index.tcl:31
|
||||
msgid "Unlock Index"
|
||||
msgstr "Déverouiller l'index"
|
||||
msgstr "Déverrouiller l'index"
|
||||
|
||||
#: lib/index.tcl:287
|
||||
#, tcl-format
|
||||
msgid "Unstaging %s from commit"
|
||||
msgstr "Désindexation de: %s"
|
||||
msgstr "Désindexation de : %s"
|
||||
|
||||
#: lib/index.tcl:326
|
||||
msgid "Ready to commit."
|
||||
|
|
@ -1804,11 +1794,11 @@ msgid ""
|
|||
msgstr ""
|
||||
"Vous êtes au milieu d'une modification.\n"
|
||||
"\n"
|
||||
"Le fichier %s est modifié.\n"
|
||||
"Le fichier %s a été modifié.\n"
|
||||
"\n"
|
||||
"Vous devriez terminer le commit courant avant de lancer une fusion. En "
|
||||
"faisait comme cela, vous éviterez de devoir éventuellement abandonner une "
|
||||
"fusion ayant échouée.\n"
|
||||
"fusion ayant échoué.\n"
|
||||
|
||||
#: lib/merge.tcl:107
|
||||
#, tcl-format
|
||||
|
|
@ -1826,7 +1816,7 @@ msgstr "La fusion s'est faite avec succès."
|
|||
|
||||
#: lib/merge.tcl:133
|
||||
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
|
||||
#, tcl-format
|
||||
|
|
@ -1914,16 +1904,16 @@ msgid ""
|
|||
"\n"
|
||||
"This operation can be undone only by restarting the merge."
|
||||
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"
|
||||
"%s sera écrasé.\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
|
||||
#, tcl-format
|
||||
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
|
||||
#, tcl-format
|
||||
|
|
@ -1932,11 +1922,11 @@ msgstr "Ajouter une résolution pour %s"
|
|||
|
||||
#: lib/mergetool.tcl:141
|
||||
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
|
||||
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
|
||||
#, tcl-format
|
||||
|
|
@ -1958,7 +1948,7 @@ msgid ""
|
|||
"Error retrieving versions:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Erreur lors de la récupération des versions:\n"
|
||||
"Erreur lors de la récupération des versions :\n"
|
||||
"%s"
|
||||
|
||||
#: lib/mergetool.tcl:343
|
||||
|
|
@ -1968,7 +1958,7 @@ msgid ""
|
|||
"\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Impossible de lancer l'outil de fusion:\n"
|
||||
"Impossible de lancer l'outil de fusion :\n"
|
||||
"\n"
|
||||
"%s"
|
||||
|
||||
|
|
@ -1983,12 +1973,12 @@ msgstr "L'outil de fusion a échoué."
|
|||
#: lib/option.tcl:11
|
||||
#, tcl-format
|
||||
msgid "Invalid global encoding '%s'"
|
||||
msgstr "Encodage global invalide '%s'"
|
||||
msgstr "Codage global '%s' invalide"
|
||||
|
||||
#: lib/option.tcl:19
|
||||
#, tcl-format
|
||||
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
|
||||
msgid "Restore Defaults"
|
||||
|
|
@ -2001,7 +1991,7 @@ msgstr "Sauvegarder"
|
|||
#: lib/option.tcl:131
|
||||
#, tcl-format
|
||||
msgid "%s Repository"
|
||||
msgstr "Dépôt: %s"
|
||||
msgstr "Dépôt : %s"
|
||||
|
||||
#: lib/option.tcl:132
|
||||
msgid "Global (All Repositories)"
|
||||
|
|
@ -2069,7 +2059,7 @@ msgstr "Nouveau modèle de nom de branche"
|
|||
|
||||
#: lib/option.tcl:155
|
||||
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
|
||||
msgid "Change"
|
||||
|
|
@ -2098,11 +2088,11 @@ msgstr "Préférences"
|
|||
|
||||
#: lib/option.tcl:314
|
||||
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
|
||||
msgid "Remove Remote"
|
||||
msgstr "Supprimer dépôt distant"
|
||||
msgstr "Supprimer un dépôt distant"
|
||||
|
||||
#: lib/remote.tcl:168
|
||||
msgid "Prune from"
|
||||
|
|
@ -2118,11 +2108,11 @@ msgstr "Pousser vers"
|
|||
|
||||
#: lib/remote_add.tcl:19
|
||||
msgid "Add Remote"
|
||||
msgstr "Ajouter dépôt distant"
|
||||
msgstr "Ajouter un dépôt distant"
|
||||
|
||||
#: lib/remote_add.tcl:24
|
||||
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
|
||||
msgid "Add"
|
||||
|
|
@ -2134,7 +2124,7 @@ msgstr "Détails des dépôts distants"
|
|||
|
||||
#: lib/remote_add.tcl:50
|
||||
msgid "Location:"
|
||||
msgstr "Emplacement:"
|
||||
msgstr "Emplacement :"
|
||||
|
||||
#: lib/remote_add.tcl:62
|
||||
msgid "Further Action"
|
||||
|
|
@ -2146,7 +2136,7 @@ msgstr "Récupérer immédiatement"
|
|||
|
||||
#: lib/remote_add.tcl:71
|
||||
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
|
||||
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
|
||||
msgid "Delete Branch Remotely"
|
||||
msgstr "Supprimer branche à distance"
|
||||
msgstr "Supprimer une branche à distance"
|
||||
|
||||
#: lib/remote_branch_delete.tcl:47
|
||||
msgid "From Repository"
|
||||
|
|
@ -2244,8 +2234,8 @@ msgid ""
|
|||
"One or more of the merge tests failed because you have not fetched the "
|
||||
"necessary commits. Try fetching from %s first."
|
||||
msgstr ""
|
||||
"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas "
|
||||
"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord."
|
||||
"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érer à partir de %s d'abord."
|
||||
|
||||
#: lib/remote_branch_delete.tcl:207
|
||||
msgid "Please select one or more branches to delete."
|
||||
|
|
@ -2257,14 +2247,14 @@ msgid ""
|
|||
"\n"
|
||||
"Delete the selected branches?"
|
||||
msgstr ""
|
||||
"Récupérer des branches supprimées est difficile.\n"
|
||||
"Il est difficile de récupérer des branches supprimées.\n"
|
||||
"\n"
|
||||
"Souhaitez vous supprimer les branches sélectionnées ?"
|
||||
"Supprimer les branches sélectionnées ?"
|
||||
|
||||
#: lib/remote_branch_delete.tcl:226
|
||||
#, tcl-format
|
||||
msgid "Deleting branches from %s"
|
||||
msgstr "Supprimer les branches de %s"
|
||||
msgstr "Suppression des branches de %s"
|
||||
|
||||
#: lib/remote_branch_delete.tcl:286
|
||||
msgid "No repository selected."
|
||||
|
|
@ -2285,7 +2275,7 @@ msgstr "Suivant"
|
|||
|
||||
#: lib/search.tcl:24
|
||||
msgid "Prev"
|
||||
msgstr "Précédant"
|
||||
msgstr "Précédent"
|
||||
|
||||
#: lib/search.tcl:25
|
||||
msgid "Case-Sensitive"
|
||||
|
|
@ -2293,7 +2283,7 @@ msgstr "Sensible à la casse"
|
|||
|
||||
#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
|
||||
msgid "Cannot write shortcut:"
|
||||
msgstr "Impossible d'écrire le raccourcis :"
|
||||
msgstr "Impossible d'écrire le raccourci :"
|
||||
|
||||
#: lib/shortcut.tcl:136
|
||||
msgid "Cannot write icon:"
|
||||
|
|
@ -2318,7 +2308,7 @@ msgstr "Réinitialisation du dictionnaire à %s."
|
|||
|
||||
#: lib/spellcheck.tcl:73
|
||||
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
|
||||
msgid "Unrecognized spell checker"
|
||||
|
|
@ -2351,11 +2341,11 @@ msgstr "Générer une clé"
|
|||
|
||||
#: lib/sshkey.tcl:56
|
||||
msgid "Copy To Clipboard"
|
||||
msgstr "Copier dans le presse papier"
|
||||
msgstr "Copier dans le presse-papier"
|
||||
|
||||
#: lib/sshkey.tcl:70
|
||||
msgid "Your OpenSSH Public Key"
|
||||
msgstr "Votre clé publique Open SSH"
|
||||
msgstr "Votre clé publique OpenSSH"
|
||||
|
||||
#: lib/sshkey.tcl:78
|
||||
msgid "Generating..."
|
||||
|
|
@ -2368,7 +2358,7 @@ msgid ""
|
|||
"\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Impossible de lancer ssh-keygen:\n"
|
||||
"Impossible de lancer ssh-keygen :\n"
|
||||
"\n"
|
||||
"%s"
|
||||
|
||||
|
|
@ -2398,7 +2388,7 @@ msgstr "Lancer %s nécessite qu'un fichier soit sélectionné."
|
|||
#: lib/tools.tcl:90
|
||||
#, tcl-format
|
||||
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
|
||||
#, tcl-format
|
||||
|
|
@ -2412,7 +2402,7 @@ msgstr "Lancement de : %s"
|
|||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr "L'outil a terminé avec succès : %s"
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
|
@ -2422,11 +2412,11 @@ msgstr "L'outil a échoué : %s"
|
|||
|
||||
#: lib/tools_dlg.tcl:22
|
||||
msgid "Add Tool"
|
||||
msgstr "Ajouter outil"
|
||||
msgstr "Ajouter un outil"
|
||||
|
||||
#: lib/tools_dlg.tcl:28
|
||||
msgid "Add New Tool Command"
|
||||
msgstr "Ajouter nouvelle commande d'outil"
|
||||
msgstr "Ajouter une nouvelle commande d'outil"
|
||||
|
||||
#: lib/tools_dlg.tcl:33
|
||||
msgid "Add globally"
|
||||
|
|
@ -2438,7 +2428,7 @@ msgstr "Détails sur l'outil"
|
|||
|
||||
#: lib/tools_dlg.tcl:48
|
||||
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
|
||||
msgid "Command:"
|
||||
|
|
@ -2462,7 +2452,7 @@ msgstr "Ne pas montrer la fenêtre de sortie des commandes"
|
|||
|
||||
#: lib/tools_dlg.tcl:97
|
||||
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
|
||||
msgid "Please supply a name for the tool."
|
||||
|
|
@ -2479,7 +2469,7 @@ msgid ""
|
|||
"Could not add tool:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Impossible d'ajouter l'outil:\n"
|
||||
"Impossible d'ajouter l'outil :\n"
|
||||
"%s"
|
||||
|
||||
#: lib/tools_dlg.tcl:190
|
||||
|
|
|
|||
|
|
@ -753,13 +753,6 @@ msgstr ""
|
|||
msgid "The following branches are not completely merged into %s:"
|
||||
msgstr ""
|
||||
|
||||
#: lib/branch_delete.tcl:115
|
||||
msgid ""
|
||||
"Recovering deleted branches is difficult. \n"
|
||||
"\n"
|
||||
" Delete the selected branches?"
|
||||
msgstr ""
|
||||
|
||||
#: lib/branch_delete.tcl:141
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
|
|
@ -2220,7 +2213,7 @@ msgstr ""
|
|||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr ""
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
|
|
|||
|
|
@ -776,16 +776,6 @@ msgstr "Mindig (Ne legyen merge teszt.)"
|
|||
msgid "The following branches are not completely merged into %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
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
|
|
@ -2399,7 +2389,7 @@ msgstr "Futtatás: %s..."
|
|||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr "Az eszköz sikeresen befejeződött: %s"
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
|
|
|||
|
|
@ -778,16 +778,6 @@ msgstr "Sempre (Non effettuare verifiche di fusione)."
|
|||
msgid "The following branches are not completely merged into %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
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
|
|
@ -2418,7 +2408,7 @@ msgstr "Eseguo: %s"
|
|||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr "Il programma esterno è terminato con successo: %s"
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
|
|
|||
|
|
@ -773,16 +773,6 @@ msgstr "無条件(マージテストしない)"
|
|||
msgid "The following branches are not completely merged into %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
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
|
|
@ -2382,7 +2372,7 @@ msgstr "実行中: %s"
|
|||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr "ツールが完了しました: %s"
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
|
|
|||
|
|
@ -761,16 +761,6 @@ msgstr "Alltid (Ikke utfør sammenslåingstest.)"
|
|||
msgid "The following branches are not completely merged into %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
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
|
|
@ -2331,7 +2321,7 @@ msgstr "Kjører: %s"
|
|||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr "Verktøyet ble fullført med suksess: %s"
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
|
|
|||
1428
git-gui/po/ru.po
1428
git-gui/po/ru.po
File diff suppressed because it is too large
Load diff
|
|
@ -780,16 +780,6 @@ msgstr "Alltid (utför inte sammanslagningstest)."
|
|||
msgid "The following branches are not completely merged into %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
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
|
|
@ -2398,7 +2388,7 @@ msgstr "Exekverar: %s"
|
|||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr "Verktyget avslutades framgångsrikt: %s"
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
|
|
|||
|
|
@ -676,16 +676,6 @@ msgstr "总是合并 (不作合并测试.)"
|
|||
msgid "The following branches are not completely merged into %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
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
|
|
|
|||
|
|
@ -3,7 +3,12 @@
|
|||
exec wish "$0" -- "$@"
|
||||
|
||||
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]
|
||||
incr argc -2
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue