From: Junio C Hamano Date: Sun, 7 Feb 2010 23:52:28 +0000 (-0800) Subject: Merge git://repo.or.cz/git-gui X-Git-Tag: v1.7.0-rc2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=refs%2Ftags%2Fv1.7.0-rc2;p=git.git Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: update french translation git-gui: update Japanese translation git-gui: fix shortcut for menu "Commit/Revert Changes" git-gui: Quote git path when starting another gui in a submodule git-gui: update Italian translation git-gui: Update Swedish translation (520t0f0u) git-gui: use themed tk widgets with Tk 8.5 git-gui: Update German translation (12 new or changed strings). git-gui: Update translation template git-gui: Remove unused icon file_parttick git-gui: use different icon for new and modified files in the index git-gui: set GIT_DIR and GIT_WORK_TREE after setup git-gui: update shortcut tools to use _gitworktree git-gui: handle bare repos correctly git-gui: handle non-standard worktree locations git-gui: Support applying a range of changes at once git-gui: Add a special diff popup menu for submodules git-gui: Use git diff --submodule when available --- 8051a030617cf7d083568cca223bdaa15052c33f diff --cc git-gui/git-gui.sh index 1fb3cbfc7,000000000..7d5451198 mode 100755,000000..100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@@ -1,3564 -1,0 +1,3751 @@@ +#!/bin/sh +# Tcl ignores the next line -*- tcl -*- \ + if test "z$*" = zversion \ + || test "z$*" = z--version; \ + then \ + echo 'git-gui version @@GITGUI_VERSION@@'; \ + exit; \ + fi; \ + argv0=$0; \ + exec wish "$argv0" -- "$@" + +set appvers {@@GITGUI_VERSION@@} +set copyright [encoding convertfrom utf-8 { +Copyright © 2006, 2007 Shawn Pearce, et. al. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}] + +###################################################################### +## +## Tcl/Tk sanity check + +if {[catch {package require Tcl 8.4} err] + || [catch {package require Tk 8.4} err] +} { + catch {wm withdraw .} + tk_messageBox \ + -icon error \ + -type ok \ + -title [mc "git-gui: fatal error"] \ + -message $err + exit 1 +} + +catch {rename send {}} ; # What an evil concept... + +###################################################################### +## +## locate our library + +set oguilib {@@GITGUI_LIBDIR@@} +set oguirel {@@GITGUI_RELATIVE@@} +if {$oguirel eq {1}} { + set oguilib [file dirname [file normalize $argv0]] + if {[file tail $oguilib] eq {git-core}} { + set oguilib [file dirname $oguilib] + } + set oguilib [file dirname $oguilib] + set oguilib [file join $oguilib share git-gui lib] + set oguimsg [file join $oguilib msgs] +} elseif {[string match @@* $oguirel]} { + set oguilib [file join [file dirname [file normalize $argv0]] lib] + set oguimsg [file join [file dirname [file normalize $argv0]] po] +} else { + set oguimsg [file join $oguilib msgs] +} +unset oguirel + +###################################################################### +## +## enable verbose loading? + +if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} { + unset _verbose + rename auto_load real__auto_load + proc auto_load {name args} { + puts stderr "auto_load $name" + return [uplevel 1 real__auto_load $name $args] + } + rename source real__source + proc source {name} { + puts stderr "source $name" + uplevel 1 real__source $name + } +} + +###################################################################### +## +## Internationalization (i18n) through msgcat and gettext. See +## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html + +package require msgcat + +proc _mc_trim {fmt} { + set cmk [string first @@ $fmt] + if {$cmk > 0} { + return [string range $fmt 0 [expr {$cmk - 1}]] + } + return $fmt +} + +proc mc {en_fmt args} { + set fmt [_mc_trim [::msgcat::mc $en_fmt]] + if {[catch {set msg [eval [list format $fmt] $args]} err]} { + set msg [eval [list format [_mc_trim $en_fmt]] $args] + } + return $msg +} + +proc strcat {args} { + return [join $args {}] +} + +::msgcat::mcload $oguimsg +unset oguimsg + +###################################################################### +## +## read only globals + +set _appname {Git Gui} +set _gitdir {} ++set _gitworktree {} ++set _isbare {} +set _gitexec {} +set _githtmldir {} +set _reponame {} +set _iscygwin {} +set _search_path {} + +set _trace [lsearch -exact $argv --trace] +if {$_trace >= 0} { + set argv [lreplace $argv $_trace $_trace] + set _trace 1 +} else { + set _trace 0 +} + +proc appname {} { + global _appname + return $_appname +} + +proc gitdir {args} { + global _gitdir + if {$args eq {}} { + return $_gitdir + } + return [eval [list file join $_gitdir] $args] +} + +proc gitexec {args} { + global _gitexec + if {$_gitexec eq {}} { + if {[catch {set _gitexec [git --exec-path]} err]} { + error "Git not installed?\n\n$err" + } + if {[is_Cygwin]} { + set _gitexec [exec cygpath \ + --windows \ + --absolute \ + $_gitexec] + } else { + set _gitexec [file normalize $_gitexec] + } + } + if {$args eq {}} { + return $_gitexec + } + 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 +} + +proc is_MacOSX {} { + if {[tk windowingsystem] eq {aqua}} { + return 1 + } + return 0 +} + +proc is_Windows {} { + if {$::tcl_platform(platform) eq {windows}} { + return 1 + } + return 0 +} + +proc is_Cygwin {} { + global _iscygwin + if {$_iscygwin eq {}} { + if {$::tcl_platform(platform) eq {windows}} { + if {[catch {set p [exec cygpath --windir]} err]} { + set _iscygwin 0 + } else { + set _iscygwin 1 + } + } else { + set _iscygwin 0 + } + } + return $_iscygwin +} + +proc is_enabled {option} { + global enabled_options + if {[catch {set on $enabled_options($option)}]} {return 0} + return $on +} + +proc enable_option {option} { + global enabled_options + set enabled_options($option) 1 +} + +proc disable_option {option} { + global enabled_options + set enabled_options($option) 0 +} + +###################################################################### +## +## config + +proc is_many_config {name} { + switch -glob -- $name { + gui.recentrepo - + remote.*.fetch - + remote.*.push + {return 1} + * + {return 0} + } +} + +proc is_config_true {name} { + global repo_config + if {[catch {set v $repo_config($name)}]} { + return 0 + } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} { + return 1 + } else { + return 0 + } +} + +proc get_config {name} { + global repo_config + if {[catch {set v $repo_config($name)}]} { + return {} + } else { + return $v + } +} + ++proc is_bare {} { ++ global _isbare ++ global _gitdir ++ global _gitworktree ++ ++ if {$_isbare eq {}} { ++ if {[catch { ++ set _bare [git rev-parse --is-bare-repository] ++ switch -- $_bare { ++ true { set _isbare 1 } ++ false { set _isbare 0} ++ default { throw } ++ } ++ }]} { ++ if {[is_config_true core.bare] ++ || ($_gitworktree eq {} ++ && [lindex [file split $_gitdir] end] ne {.git})} { ++ set _isbare 1 ++ } else { ++ set _isbare 0 ++ } ++ } ++ } ++ return $_isbare ++} ++ +###################################################################### +## +## handy utils + +proc _trace_exec {cmd} { + if {!$::_trace} return + set d {} + foreach v $cmd { + if {$d ne {}} { + append d { } + } + if {[regexp {[ \t\r\n'"$?*]} $v]} { + set v [sq $v] + } + append d $v + } + puts stderr $d +} + +proc _git_cmd {name} { + global _git_cmd_path + + if {[catch {set v $_git_cmd_path($name)}]} { + switch -- $name { + version - + --version - + --exec-path { return [list $::_git $name] } + } + + set p [gitexec git-$name$::_search_exe] + if {[file exists $p]} { + set v [list $p] + } elseif {[is_Windows] && [file exists [gitexec git-$name]]} { + # Try to determine what sort of magic will make + # git-$name go and do its thing, because native + # Tcl on Windows doesn't know it. + # + set p [gitexec git-$name] + set f [open $p r] + set s [gets $f] + close $f + + switch -glob -- [lindex $s 0] { + #!*sh { set i sh } + #!*perl { set i perl } + #!*python { set i python } + default { error "git-$name is not supported: $s" } + } + + upvar #0 _$i interp + if {![info exists interp]} { + set interp [_which $i] + } + if {$interp eq {}} { + error "git-$name requires $i (not in PATH)" + } + set v [concat [list $interp] [lrange $s 1 end] [list $p]] + } else { + # Assume it is builtin to git somehow and we + # aren't actually able to see a file for it. + # + set v [list $::_git $name] + } + set _git_cmd_path($name) $v + } + return $v +} + +proc _which {what args} { + global env _search_exe _search_path + + if {$_search_path eq {}} { + if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} { + set _search_path [split [exec cygpath \ + --windows \ + --path \ + --absolute \ + $env(PATH)] {;}] + set _search_exe .exe + } elseif {[is_Windows]} { + set gitguidir [file dirname [info script]] + regsub -all ";" $gitguidir "\\;" gitguidir + set env(PATH) "$gitguidir;$env(PATH)" + set _search_path [split $env(PATH) {;}] + set _search_exe .exe + } else { + set _search_path [split $env(PATH) :] + set _search_exe {} + } + } + + if {[is_Windows] && [lsearch -exact $args -script] >= 0} { + set suffix {} + } else { + set suffix $_search_exe + } + + foreach p $_search_path { + set p [file join $p $what$suffix] + if {[file exists $p]} { + return [file normalize $p] + } + } + return {} +} + +proc _lappend_nice {cmd_var} { + global _nice + upvar $cmd_var cmd + + if {![info exists _nice]} { + set _nice [_which nice] + } + if {$_nice ne {}} { + lappend cmd $_nice + } +} + +proc git {args} { + set opt [list] + + while {1} { + switch -- [lindex $args 0] { + --nice { + _lappend_nice opt + } + + default { + break + } + + } + + set args [lrange $args 1 end] + } + + set cmdp [_git_cmd [lindex $args 0]] + set args [lrange $args 1 end] + + _trace_exec [concat $opt $cmdp $args] + set result [eval exec $opt $cmdp $args] + if {$::_trace} { + puts stderr "< $result" + } + return $result +} + +proc _open_stdout_stderr {cmd} { + _trace_exec $cmd + if {[catch { + set fd [open [concat [list | ] $cmd] r] + } err]} { + if { [lindex $cmd end] eq {2>@1} + && $err eq {can not find channel named "1"} + } { + # Older versions of Tcl 8.4 don't have this 2>@1 IO + # redirect operator. Fallback to |& cat for those. + # The command was not actually started, so its safe + # to try to start it a second time. + # + set fd [open [concat \ + [list | ] \ + [lrange $cmd 0 end-1] \ + [list |& cat] \ + ] r] + } else { + error $err + } + } + fconfigure $fd -eofchar {} + return $fd +} + +proc git_read {args} { + set opt [list] + + while {1} { + switch -- [lindex $args 0] { + --nice { + _lappend_nice opt + } + + --stderr { + lappend args 2>@1 + } + + default { + break + } + + } + + set args [lrange $args 1 end] + } + + set cmdp [_git_cmd [lindex $args 0]] + set args [lrange $args 1 end] + + return [_open_stdout_stderr [concat $opt $cmdp $args]] +} + +proc git_write {args} { + set opt [list] + + while {1} { + switch -- [lindex $args 0] { + --nice { + _lappend_nice opt + } + + default { + break + } + + } + + set args [lrange $args 1 end] + } + + set cmdp [_git_cmd [lindex $args 0]] + set args [lrange $args 1 end] + + _trace_exec [concat $opt $cmdp $args] + return [open [concat [list | ] $opt $cmdp $args] w] +} + +proc githook_read {hook_name args} { + set pchook [gitdir hooks $hook_name] + lappend args 2>@1 + + # On Windows [file executable] might lie so we need to ask + # the shell if the hook is executable. Yes that's annoying. + # + if {[is_Windows]} { + upvar #0 _sh interp + if {![info exists interp]} { + set interp [_which sh] + } + if {$interp eq {}} { + error "hook execution requires sh (not in PATH)" + } + + set scr {if test -x "$1";then exec "$@";fi} + set sh_c [list $interp -c $scr $interp $pchook] + return [_open_stdout_stderr [concat $sh_c $args]] + } + + if {[file executable $pchook]} { + return [_open_stdout_stderr [concat [list $pchook] $args]] + } + + return {} +} + +proc kill_file_process {fd} { + set process [pid $fd] + + catch { + if {[is_Windows]} { + # Use a Cygwin-specific flag to allow killing + # native Windows processes + exec kill -f $process + } else { + exec kill $process + } + } +} + +proc gitattr {path attr default} { + if {[catch {set r [git check-attr $attr -- $path]}]} { + set r unspecified + } else { + set r [join [lrange [split $r :] 2 end] :] + regsub {^ } $r {} r + } + if {$r eq {unspecified}} { + return $default + } + return $r +} + +proc sq {value} { + regsub -all ' $value "'\\''" value + return "'$value'" +} + +proc load_current_branch {} { + global current_branch is_detached + + set fd [open [gitdir HEAD] r] + if {[gets $fd ref] < 1} { + set ref {} + } + close $fd + + set pfx {ref: refs/heads/} + set len [string length $pfx] + if {[string equal -length $len $pfx $ref]} { + # We're on a branch. It might not exist. But + # HEAD looks good enough to be a branch. + # + set current_branch [string range $ref $len end] + set is_detached 0 + } else { + # Assume this is a detached head. + # + set current_branch HEAD + set is_detached 1 + } +} + +auto_load tk_optionMenu +rename tk_optionMenu real__tkOptionMenu +proc tk_optionMenu {w varName args} { + set m [eval real__tkOptionMenu $w $varName $args] + $m configure -font font_ui + $w configure -font font_ui + return $m +} + +proc rmsel_tag {text} { + $text tag conf sel \ + -background [$text cget -background] \ + -foreground [$text cget -foreground] \ + -borderwidth 0 + $text tag conf in_sel -background lightgray + bind $text break + return $text +} + +set root_exists 0 +bind . { + bind . {} + set root_exists 1 +} + +if {[is_Windows]} { + wm iconbitmap . -default $oguilib/git-gui.ico + set ::tk::AlwaysShowSelection 1 + + # Spoof an X11 display for SSH + if {![info exists env(DISPLAY)]} { + set env(DISPLAY) :9999 + } +} else { + catch { + image create photo gitlogo -width 16 -height 16 + + gitlogo put #33CC33 -to 7 0 9 2 + gitlogo put #33CC33 -to 4 2 12 4 + gitlogo put #33CC33 -to 7 4 9 6 + gitlogo put #CC3333 -to 4 6 12 8 + gitlogo put gray26 -to 4 9 6 10 + gitlogo put gray26 -to 3 10 6 12 + gitlogo put gray26 -to 8 9 13 11 + gitlogo put gray26 -to 8 11 10 12 + gitlogo put gray26 -to 11 11 13 14 + gitlogo put gray26 -to 3 12 5 14 + gitlogo put gray26 -to 5 13 + gitlogo put gray26 -to 10 13 + gitlogo put gray26 -to 4 14 12 15 + gitlogo put gray26 -to 5 15 11 16 + gitlogo redither + + wm iconphoto . -default gitlogo + } +} + +###################################################################### +## +## config defaults + +set cursor_ptr arrow - font create font_diff -family Courier -size 10 +font create font_ui - catch { - label .dummy - eval font configure font_ui [font actual [.dummy cget -font]] - destroy .dummy ++if {[lsearch -exact [font names] TkDefaultFont] != -1} { ++ eval [linsert [font actual TkDefaultFont] 0 font configure font_ui] ++ eval [linsert [font actual TkFixedFont] 0 font create font_diff] ++} else { ++ font create font_diff -family Courier -size 10 ++ catch { ++ label .dummy ++ eval font configure font_ui [font actual [.dummy cget -font]] ++ destroy .dummy ++ } +} + +font create font_uiitalic +font create font_uibold +font create font_diffbold +font create font_diffitalic + +foreach class {Button Checkbutton Entry Label + Labelframe Listbox Message + Radiobutton Spinbox Text} { + option add *$class.font font_ui +} +if {![is_MacOSX]} { + option add *Menu.font font_ui ++ option add *Entry.borderWidth 1 startupFile ++ option add *Entry.relief sunken startupFile ++ option add *RadioButton.anchor w startupFile +} +unset class + +if {[is_Windows] || [is_MacOSX]} { + option add *Menu.tearOff 0 +} + +if {[is_MacOSX]} { + set M1B M1 + set M1T Cmd +} else { + set M1B Control + set M1T Ctrl +} + +proc bind_button3 {w cmd} { + bind $w $cmd + if {[is_MacOSX]} { + # Mac OS X sends Button-2 on right click through three-button mouse, + # or through trackpad right-clicking (two-finger touch + click). + bind $w $cmd + bind $w $cmd + } +} + +proc apply_config {} { + global repo_config font_descs + + foreach option $font_descs { + set name [lindex $option 0] + set font [lindex $option 1] + if {[catch { + set need_weight 1 + foreach {cn cv} $repo_config(gui.$name) { + if {$cn eq {-weight}} { + set need_weight 0 + } + font configure $font $cn $cv + } + if {$need_weight} { + font configure $font -weight normal + } + } err]} { + error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"] + } + foreach {cn cv} [font configure $font] { + font configure ${font}bold $cn $cv + font configure ${font}italic $cn $cv + } + font configure ${font}bold -weight bold + font configure ${font}italic -slant italic + } ++ ++ global use_ttk NS ++ set use_ttk 0 ++ set NS {} ++ if {$repo_config(gui.usettk)} { ++ set use_ttk [package vsatisfies [package provide Tk] 8.5] ++ if {$use_ttk} { ++ set NS ttk ++ bind [winfo class .] <> [list InitTheme] ++ pave_toplevel . ++ } ++ } +} + +set default_config(branch.autosetupmerge) true +set default_config(merge.tool) {} +set default_config(mergetool.keepbackup) true +set default_config(merge.diffstat) true +set default_config(merge.summary) false +set default_config(merge.verbosity) 2 +set default_config(user.name) {} +set default_config(user.email) {} + +set default_config(gui.encoding) [encoding system] +set default_config(gui.matchtrackingbranch) false +set default_config(gui.pruneduringfetch) false +set default_config(gui.trustmtime) false +set default_config(gui.fastcopyblame) false +set default_config(gui.copyblamethreshold) 40 +set default_config(gui.blamehistoryctx) 7 +set default_config(gui.diffcontext) 5 +set default_config(gui.commitmsgwidth) 75 +set default_config(gui.newbranchtemplate) {} +set default_config(gui.spellingdictionary) {} +set default_config(gui.fontui) [font configure font_ui] +set default_config(gui.fontdiff) [font configure font_diff] +# TODO: this option should be added to the git-config documentation +set default_config(gui.maxfilesdisplayed) 5000 ++set default_config(gui.usettk) 1 +set font_descs { + {fontui font_ui {mc "Main Font"}} + {fontdiff font_diff {mc "Diff/Console Font"}} +} + +###################################################################### +## +## find git + +set _git [_which git] +if {$_git eq {}} { + catch {wm withdraw .} + tk_messageBox \ + -icon error \ + -type ok \ + -title [mc "git-gui: fatal error"] \ + -message [mc "Cannot find git in PATH."] + exit 1 +} + +###################################################################### +## +## version check + +if {[catch {set _git_version [git --version]} err]} { + catch {wm withdraw .} + tk_messageBox \ + -icon error \ + -type ok \ + -title [mc "git-gui: fatal error"] \ + -message "Cannot determine Git version: + +$err + +[appname] requires Git 1.5.0 or later." + exit 1 +} +if {![regsub {^git version } $_git_version {} _git_version]} { + catch {wm withdraw .} + tk_messageBox \ + -icon error \ + -type ok \ + -title [mc "git-gui: fatal error"] \ + -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"] + exit 1 +} + +set _real_git_version $_git_version +regsub -- {[\-\.]dirty$} $_git_version {} _git_version +regsub {\.[0-9]+\.g[0-9a-f]+$} $_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 + +if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { + catch {wm withdraw .} + if {[tk_messageBox \ + -icon warning \ + -type yesno \ + -default no \ + -title "[appname]: warning" \ + -message [mc "Git version cannot be determined. + +%s claims it is version '%s'. + +%s requires at least Git 1.5.0 or later. + +Assume '%s' is version 1.5.0? +" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} { + set _git_version 1.5.0 + } else { + exit 1 + } +} +unset _real_git_version + +proc git-version {args} { + global _git_version + + switch [llength $args] { + 0 { + return $_git_version + } + + 2 { + set op [lindex $args 0] + set vr [lindex $args 1] + set cm [package vcompare $_git_version $vr] + return [expr $cm $op 0] + } + + 4 { + set type [lindex $args 0] + set name [lindex $args 1] + set parm [lindex $args 2] + set body [lindex $args 3] + + if {($type ne {proc} && $type ne {method})} { + error "Invalid arguments to git-version" + } + if {[llength $body] < 2 || [lindex $body end-1] ne {default}} { + error "Last arm of $type $name must be default" + } + + foreach {op vr cb} [lrange $body 0 end-2] { + if {[git-version $op $vr]} { + return [uplevel [list $type $name $parm $cb]] + } + } + + return [uplevel [list $type $name $parm [lindex $body end]]] + } + + default { + error "git-version >= x" + } + + } +} + +if {[git-version < 1.5]} { + catch {wm withdraw .} + tk_messageBox \ + -icon error \ + -type ok \ + -title [mc "git-gui: fatal error"] \ + -message "[appname] requires Git 1.5.0 or later. + +You are using [git-version]: + +[git --version]" + exit 1 +} + +###################################################################### +## +## configure our library + +set idx [file join $oguilib tclIndex] +if {[catch {set fd [open $idx r]} err]} { + catch {wm withdraw .} + tk_messageBox \ + -icon error \ + -type ok \ + -title [mc "git-gui: fatal error"] \ + -message $err + exit 1 +} +if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} { + set idx [list] + while {[gets $fd n] >= 0} { + if {$n ne {} && ![string match #* $n]} { + lappend idx $n + } + } +} else { + set idx {} +} +close $fd + +if {$idx ne {}} { + set loaded [list] + foreach p $idx { + if {[lsearch -exact $loaded $p] >= 0} continue + source [file join $oguilib $p] + lappend loaded $p + } + unset loaded p +} else { + set auto_path [concat [list $oguilib] $auto_path] +} +unset -nocomplain idx fd + +###################################################################### +## +## config file parsing + +git-version proc _parse_config {arr_name args} { + >= 1.5.3 { + upvar $arr_name arr + array unset arr + set buf {} + catch { + set fd_rc [eval \ + [list git_read config] \ + $args \ + [list --null --list]] + fconfigure $fd_rc -translation binary + set buf [read $fd_rc] + close $fd_rc + } + foreach line [split $buf "\0"] { + if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} { + if {[is_many_config $name]} { + lappend arr($name) $value + } else { + set arr($name) $value + } + } + } + } + default { + upvar $arr_name arr + array unset arr + catch { + set fd_rc [eval [list git_read config --list] $args] + while {[gets $fd_rc line] >= 0} { + if {[regexp {^([^=]+)=(.*)$} $line line name value]} { + if {[is_many_config $name]} { + lappend arr($name) $value + } else { + set arr($name) $value + } + } + } + close $fd_rc + } + } +} + +proc load_config {include_global} { + global repo_config global_config system_config default_config + + if {$include_global} { + _parse_config system_config --system + _parse_config global_config --global + } + _parse_config repo_config + + foreach name [array names default_config] { + if {[catch {set v $system_config($name)}]} { + set system_config($name) $default_config($name) + } + } + foreach name [array names system_config] { + if {[catch {set v $global_config($name)}]} { + set global_config($name) $system_config($name) + } + if {[catch {set v $repo_config($name)}]} { + set repo_config($name) $system_config($name) + } + } +} + +###################################################################### +## +## feature option selection + +if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} { + unset _junk +} else { + set subcommand gui +} +if {$subcommand eq {gui.sh}} { + set subcommand gui +} +if {$subcommand eq {gui} && [llength $argv] > 0} { + set subcommand [lindex $argv 0] + set argv [lrange $argv 1 end] +} + +enable_option multicommit +enable_option branch +enable_option transport +disable_option bare + +switch -- $subcommand { +browser - +blame { + enable_option bare + + disable_option multicommit + disable_option branch + disable_option transport +} +citool { + enable_option singlecommit + enable_option retcode + + disable_option multicommit + disable_option branch + disable_option transport + + while {[llength $argv] > 0} { + set a [lindex $argv 0] + switch -- $a { + --amend { + enable_option initialamend + } + --nocommit { + enable_option nocommit + enable_option nocommitmsg + } + --commitmsg { + disable_option nocommitmsg + } + default { + break + } + } + + set argv [lrange $argv 1 end] + } +} +} + +###################################################################### +## +## execution environment + +set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] + +# Suggest our implementation of askpass, if none is set +if {![info exists env(SSH_ASKPASS)]} { + set env(SSH_ASKPASS) [gitexec git-gui--askpass] +} + +###################################################################### +## +## repository setup + +set picked 0 +if {[catch { + set _gitdir $env(GIT_DIR) + set _prefix {} + }] + && [catch { + # beware that from the .git dir this sets _gitdir to . + # and _prefix to the empty string + set _gitdir [git rev-parse --git-dir] + set _prefix [git rev-parse --show-prefix] + } err]} { + load_config 1 + apply_config + choose_repository::pick + set picked 1 +} + +# we expand the _gitdir when it's just a single dot (i.e. when we're being +# run from the .git dir itself) lest the routines to find the worktree +# get confused +if {$_gitdir eq "."} { + set _gitdir [pwd] +} + +if {![file isdirectory $_gitdir] && [is_Cygwin]} { + catch {set _gitdir [exec cygpath --windows $_gitdir]} +} +if {![file isdirectory $_gitdir]} { + catch {wm withdraw .} + error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"] + exit 1 +} ++# _gitdir exists, so try loading the config ++load_config 0 ++apply_config ++# try to set work tree from environment, falling back to core.worktree ++if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} { ++ set _gitworktree [get_config core.worktree] ++} +if {$_prefix ne {}} { - regsub -all {[^/]+/} $_prefix ../ cdup ++ if {$_gitworktree eq {}} { ++ regsub -all {[^/]+/} $_prefix ../ cdup ++ } else { ++ set cdup $_gitworktree ++ } + if {[catch {cd $cdup} err]} { + catch {wm withdraw .} + error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"] + exit 1 + } ++ set _gitworktree [pwd] + unset cdup +} elseif {![is_enabled bare]} { - if {[lindex [file split $_gitdir] end] ne {.git}} { ++ if {[is_bare]} { + catch {wm withdraw .} - error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"] ++ error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"] + exit 1 + } - if {[catch {cd [file dirname $_gitdir]} err]} { ++ if {$_gitworktree eq {}} { ++ set _gitworktree [file dirname $_gitdir] ++ } ++ if {[catch {cd $_gitworktree} err]} { + catch {wm withdraw .} - error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"] ++ error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"] + exit 1 + } ++ set _gitworktree [pwd] +} +set _reponame [file split [file normalize $_gitdir]] +if {[lindex $_reponame end] eq {.git}} { + set _reponame [lindex $_reponame end-1] +} else { + set _reponame [lindex $_reponame end] +} + ++set env(GIT_DIR) $_gitdir ++set env(GIT_WORK_TREE) $_gitworktree ++ +###################################################################### +## +## global init + +set current_diff_path {} +set current_diff_side {} +set diff_actions [list] + +set HEAD {} +set PARENT {} +set MERGE_HEAD [list] +set commit_type {} +set empty_tree {} +set current_branch {} +set is_detached 0 +set current_diff_path {} +set is_3way_diff 0 +set is_submodule_diff 0 +set is_conflict_diff 0 +set selected_commit_type new +set diff_empty_count 0 + +set nullid "0000000000000000000000000000000000000000" +set nullid2 "0000000000000000000000000000000000000001" + +###################################################################### +## +## task management + +set rescan_active 0 +set diff_active 0 +set last_clicked {} + +set disable_on_lock [list] +set index_lock_type none + +proc lock_index {type} { + global index_lock_type disable_on_lock + + if {$index_lock_type eq {none}} { + set index_lock_type $type + foreach w $disable_on_lock { + uplevel #0 $w disabled + } + return 1 + } elseif {$index_lock_type eq "begin-$type"} { + set index_lock_type $type + return 1 + } + return 0 +} + +proc unlock_index {} { + global index_lock_type disable_on_lock + + set index_lock_type none + foreach w $disable_on_lock { + uplevel #0 $w normal + } +} + +###################################################################### +## +## status + +proc repository_state {ctvar hdvar mhvar} { + global current_branch + upvar $ctvar ct $hdvar hd $mhvar mh + + set mh [list] + + load_current_branch + if {[catch {set hd [git rev-parse --verify HEAD]}]} { + set hd {} + set ct initial + return + } + + set merge_head [gitdir MERGE_HEAD] + if {[file exists $merge_head]} { + set ct merge + set fd_mh [open $merge_head r] + while {[gets $fd_mh line] >= 0} { + lappend mh $line + } + close $fd_mh + return + } + + set ct normal +} + +proc PARENT {} { + global PARENT empty_tree + + set p [lindex $PARENT 0] + if {$p ne {}} { + return $p + } + if {$empty_tree eq {}} { + set empty_tree [git mktree << {}] + } + return $empty_tree +} + +proc force_amend {} { + global selected_commit_type + global HEAD PARENT MERGE_HEAD commit_type + + repository_state newType newHEAD newMERGE_HEAD + set HEAD $newHEAD + set PARENT $newHEAD + set MERGE_HEAD $newMERGE_HEAD + set commit_type $newType + + set selected_commit_type amend + do_select_commit_type +} + +proc rescan {after {honor_trustmtime 1}} { + global HEAD PARENT MERGE_HEAD commit_type + global ui_index ui_workdir ui_comm + global rescan_active file_states + global repo_config + + if {$rescan_active > 0 || ![lock_index read]} return + + repository_state newType newHEAD newMERGE_HEAD + if {[string match amend* $commit_type] + && $newType eq {normal} + && $newHEAD eq $HEAD} { + } else { + set HEAD $newHEAD + set PARENT $newHEAD + set MERGE_HEAD $newMERGE_HEAD + set commit_type $newType + } + + array unset file_states + + if {!$::GITGUI_BCK_exists && + (![$ui_comm edit modified] + || [string trim [$ui_comm get 0.0 end]] eq {})} { + if {[string match amend* $commit_type]} { + } elseif {[load_message GITGUI_MSG]} { + } elseif {[run_prepare_commit_msg_hook]} { + } elseif {[load_message MERGE_MSG]} { + } elseif {[load_message SQUASH_MSG]} { + } + $ui_comm edit reset + $ui_comm edit modified false + } + + if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} { + rescan_stage2 {} $after + } else { + set rescan_active 1 + ui_status [mc "Refreshing file status..."] + set fd_rf [git_read update-index \ + -q \ + --unmerged \ + --ignore-missing \ + --refresh \ + ] + fconfigure $fd_rf -blocking 0 -translation binary + fileevent $fd_rf readable \ + [list rescan_stage2 $fd_rf $after] + } +} + +if {[is_Cygwin]} { + set is_git_info_exclude {} + proc have_info_exclude {} { + global is_git_info_exclude + + if {$is_git_info_exclude eq {}} { + if {[catch {exec test -f [gitdir info exclude]}]} { + set is_git_info_exclude 0 + } else { + set is_git_info_exclude 1 + } + } + return $is_git_info_exclude + } +} else { + proc have_info_exclude {} { + return [file readable [gitdir info exclude]] + } +} + +proc rescan_stage2 {fd after} { + global rescan_active buf_rdi buf_rdf buf_rlo + + if {$fd ne {}} { + read $fd + if {![eof $fd]} return + close $fd + } + + set ls_others [list --exclude-per-directory=.gitignore] + if {[have_info_exclude]} { + lappend ls_others "--exclude-from=[gitdir info exclude]" + } + set user_exclude [get_config core.excludesfile] + if {$user_exclude ne {} && [file readable $user_exclude]} { + lappend ls_others "--exclude-from=$user_exclude" + } + + set buf_rdi {} + set buf_rdf {} + set buf_rlo {} + + set rescan_active 3 + ui_status [mc "Scanning for modified files ..."] + set fd_di [git_read diff-index --cached -z [PARENT]] + set fd_df [git_read diff-files -z] + set fd_lo [eval git_read ls-files --others -z $ls_others] + + fconfigure $fd_di -blocking 0 -translation binary -encoding binary + fconfigure $fd_df -blocking 0 -translation binary -encoding binary + fconfigure $fd_lo -blocking 0 -translation binary -encoding binary + fileevent $fd_di readable [list read_diff_index $fd_di $after] + fileevent $fd_df readable [list read_diff_files $fd_df $after] + fileevent $fd_lo readable [list read_ls_others $fd_lo $after] +} + +proc load_message {file} { + global ui_comm + + set f [gitdir $file] + if {[file isfile $f]} { + if {[catch {set fd [open $f r]}]} { + return 0 + } + fconfigure $fd -eofchar {} + set content [string trim [read $fd]] + close $fd + regsub -all -line {[ \r\t]+$} $content {} content + $ui_comm delete 0.0 end + $ui_comm insert end $content + return 1 + } + return 0 +} + +proc run_prepare_commit_msg_hook {} { + global pch_error + + # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui + # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an + # empty file but existant file. + + set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a] + + if {[file isfile [gitdir MERGE_MSG]]} { + set pcm_source "merge" + set fd_mm [open [gitdir MERGE_MSG] r] + puts -nonewline $fd_pcm [read $fd_mm] + close $fd_mm + } elseif {[file isfile [gitdir SQUASH_MSG]]} { + set pcm_source "squash" + set fd_sm [open [gitdir SQUASH_MSG] r] + puts -nonewline $fd_pcm [read $fd_sm] + close $fd_sm + } else { + set pcm_source "" + } + + close $fd_pcm + + set fd_ph [githook_read prepare-commit-msg \ + [gitdir PREPARE_COMMIT_MSG] $pcm_source] + if {$fd_ph eq {}} { + catch {file delete [gitdir PREPARE_COMMIT_MSG]} + return 0; + } + + ui_status [mc "Calling prepare-commit-msg hook..."] + set pch_error {} + + fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} + fileevent $fd_ph readable \ + [list prepare_commit_msg_hook_wait $fd_ph] + + return 1; +} + +proc prepare_commit_msg_hook_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}]} { + ui_status [mc "Commit declined by prepare-commit-msg hook."] + hook_failed_popup prepare-commit-msg $pch_error + catch {file delete [gitdir PREPARE_COMMIT_MSG]} + exit 1 + } else { + load_message PREPARE_COMMIT_MSG + } + set pch_error {} + catch {file delete [gitdir PREPARE_COMMIT_MSG]} + return + } + fconfigure $fd_ph -blocking 0 + catch {file delete [gitdir PREPARE_COMMIT_MSG]} +} + +proc read_diff_index {fd after} { + global buf_rdi + + append buf_rdi [read $fd] + set c 0 + set n [string length $buf_rdi] + while {$c < $n} { + set z1 [string first "\0" $buf_rdi $c] + if {$z1 == -1} break + incr z1 + set z2 [string first "\0" $buf_rdi $z1] + if {$z2 == -1} break + + incr c + set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }] + set p [string range $buf_rdi $z1 [expr {$z2 - 1}]] + merge_state \ + [encoding convertfrom $p] \ + [lindex $i 4]? \ + [list [lindex $i 0] [lindex $i 2]] \ + [list] + set c $z2 + incr c + } + if {$c < $n} { + set buf_rdi [string range $buf_rdi $c end] + } else { + set buf_rdi {} + } + + rescan_done $fd buf_rdi $after +} + +proc read_diff_files {fd after} { + global buf_rdf + + append buf_rdf [read $fd] + set c 0 + set n [string length $buf_rdf] + while {$c < $n} { + set z1 [string first "\0" $buf_rdf $c] + if {$z1 == -1} break + incr z1 + set z2 [string first "\0" $buf_rdf $z1] + if {$z2 == -1} break + + incr c + set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }] + set p [string range $buf_rdf $z1 [expr {$z2 - 1}]] + merge_state \ + [encoding convertfrom $p] \ + ?[lindex $i 4] \ + [list] \ + [list [lindex $i 0] [lindex $i 2]] + set c $z2 + incr c + } + if {$c < $n} { + set buf_rdf [string range $buf_rdf $c end] + } else { + set buf_rdf {} + } + + rescan_done $fd buf_rdf $after +} + +proc read_ls_others {fd after} { + global buf_rlo + + append buf_rlo [read $fd] + set pck [split $buf_rlo "\0"] + set buf_rlo [lindex $pck end] + foreach p [lrange $pck 0 end-1] { + set p [encoding convertfrom $p] + if {[string index $p end] eq {/}} { + set p [string range $p 0 end-1] + } + merge_state $p ?O + } + rescan_done $fd buf_rlo $after +} + +proc rescan_done {fd buf after} { + global rescan_active current_diff_path + global file_states repo_config + upvar $buf to_clear + + if {![eof $fd]} return + set to_clear {} + close $fd + if {[incr rescan_active -1] > 0} return + + prune_selection + unlock_index + display_all_files + if {$current_diff_path ne {}} { reshow_diff $after } + if {$current_diff_path eq {}} { select_first_diff $after } +} + +proc prune_selection {} { + global file_states selected_paths + + foreach path [array names selected_paths] { + if {[catch {set still_here $file_states($path)}]} { + unset selected_paths($path) + } + } +} + +###################################################################### +## +## ui helpers + +proc mapicon {w state path} { + global all_icons + + if {[catch {set r $all_icons($state$w)}]} { + puts "error: no icon for $w state={$state} $path" + return file_plain + } + return $r +} + +proc mapdesc {state path} { + global all_descs + + if {[catch {set r $all_descs($state)}]} { + puts "error: no desc for state={$state} $path" + return $state + } + return $r +} + +proc ui_status {msg} { + global main_status + if {[info exists main_status]} { + $main_status show $msg + } +} + +proc ui_ready {{test {}}} { + global main_status + if {[info exists main_status]} { + $main_status show [mc "Ready."] $test + } +} + +proc escape_path {path} { + regsub -all {\\} $path "\\\\" path + regsub -all "\n" $path "\\n" path + return $path +} + +proc short_path {path} { + return [escape_path [lindex [file split $path] end]] +} + +set next_icon_id 0 +set null_sha1 [string repeat 0 40] + +proc merge_state {path new_state {head_info {}} {index_info {}}} { + global file_states next_icon_id null_sha1 + + set s0 [string index $new_state 0] + set s1 [string index $new_state 1] + + if {[catch {set info $file_states($path)}]} { + set state __ + set icon n[incr next_icon_id] + } else { + set state [lindex $info 0] + set icon [lindex $info 1] + if {$head_info eq {}} {set head_info [lindex $info 2]} + if {$index_info eq {}} {set index_info [lindex $info 3]} + } + + if {$s0 eq {?}} {set s0 [string index $state 0]} \ + elseif {$s0 eq {_}} {set s0 _} + + if {$s1 eq {?}} {set s1 [string index $state 1]} \ + elseif {$s1 eq {_}} {set s1 _} + + if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} { + set head_info [list 0 $null_sha1] + } elseif {$s0 ne {_} && [string index $state 0] eq {_} + && $head_info eq {}} { + set head_info $index_info + } elseif {$s0 eq {_} && [string index $state 0] ne {_}} { + set index_info $head_info + set head_info {} + } + + set file_states($path) [list $s0$s1 $icon \ + $head_info $index_info \ + ] + return $state +} + +proc display_file_helper {w path icon_name old_m new_m} { + global file_lists + + if {$new_m eq {_}} { + set lno [lsearch -sorted -exact $file_lists($w) $path] + if {$lno >= 0} { + set file_lists($w) [lreplace $file_lists($w) $lno $lno] + incr lno + $w conf -state normal + $w delete $lno.0 [expr {$lno + 1}].0 + $w conf -state disabled + } + } elseif {$old_m eq {_} && $new_m ne {_}} { + lappend file_lists($w) $path + set file_lists($w) [lsort -unique $file_lists($w)] + set lno [lsearch -sorted -exact $file_lists($w) $path] + incr lno + $w conf -state normal + $w image create $lno.0 \ + -align center -padx 5 -pady 1 \ + -name $icon_name \ + -image [mapicon $w $new_m $path] + $w insert $lno.1 "[escape_path $path]\n" + $w conf -state disabled + } elseif {$old_m ne $new_m} { + $w conf -state normal + $w image conf $icon_name -image [mapicon $w $new_m $path] + $w conf -state disabled + } +} + +proc display_file {path state} { + global file_states selected_paths + global ui_index ui_workdir + + set old_m [merge_state $path $state] + set s $file_states($path) + set new_m [lindex $s 0] + set icon_name [lindex $s 1] + + set o [string index $old_m 0] + set n [string index $new_m 0] + if {$o eq {U}} { + set o _ + } + if {$n eq {U}} { + set n _ + } + display_file_helper $ui_index $path $icon_name $o $n + + if {[string index $old_m 0] eq {U}} { + set o U + } else { + set o [string index $old_m 1] + } + if {[string index $new_m 0] eq {U}} { + set n U + } else { + set n [string index $new_m 1] + } + display_file_helper $ui_workdir $path $icon_name $o $n + + if {$new_m eq {__}} { + unset file_states($path) + catch {unset selected_paths($path)} + } +} + +proc display_all_files_helper {w path icon_name m} { + global file_lists + + lappend file_lists($w) $path + set lno [expr {[lindex [split [$w index end] .] 0] - 1}] + $w image create end \ + -align center -padx 5 -pady 1 \ + -name $icon_name \ + -image [mapicon $w $m $path] + $w insert end "[escape_path $path]\n" +} + +set files_warning 0 +proc display_all_files {} { + global ui_index ui_workdir + global file_states file_lists + global last_clicked + global files_warning + + $ui_index conf -state normal + $ui_workdir conf -state normal + + $ui_index delete 0.0 end + $ui_workdir delete 0.0 end + set last_clicked {} + + set file_lists($ui_index) [list] + set file_lists($ui_workdir) [list] + + set to_display [lsort [array names file_states]] + set display_limit [get_config gui.maxfilesdisplayed] + if {[llength $to_display] > $display_limit} { + if {!$files_warning} { + # do not repeatedly warn: + set files_warning 1 + info_popup [mc "Displaying only %s of %s files." \ + $display_limit [llength $to_display]] + } + set to_display [lrange $to_display 0 [expr {$display_limit-1}]] + } + foreach path $to_display { + set s $file_states($path) + set m [lindex $s 0] + set icon_name [lindex $s 1] + + set s [string index $m 0] + if {$s ne {U} && $s ne {_}} { + display_all_files_helper $ui_index $path \ + $icon_name $s + } + + if {[string index $m 0] eq {U}} { + set s U + } else { + set s [string index $m 1] + } + if {$s ne {_}} { + display_all_files_helper $ui_workdir $path \ + $icon_name $s + } + } + + $ui_index conf -state disabled + $ui_workdir conf -state disabled +} + +###################################################################### +## +## icons + +set filemask { +#define mask_width 14 +#define mask_height 15 +static unsigned char mask_bits[] = { + 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, + 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, + 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; +} + +image create bitmap file_plain -background white -foreground black -data { +#define plain_width 14 +#define plain_height 15 +static unsigned char plain_bits[] = { + 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, + 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, + 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; +} -maskdata $filemask + +image create bitmap file_mod -background white -foreground blue -data { +#define mod_width 14 +#define mod_height 15 +static unsigned char mod_bits[] = { + 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, + 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, + 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; +} -maskdata $filemask + +image create bitmap file_fulltick -background white -foreground "#007000" -data { +#define file_fulltick_width 14 +#define file_fulltick_height 15 +static unsigned char file_fulltick_bits[] = { + 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, + 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, + 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; +} -maskdata $filemask + - image create bitmap file_parttick -background white -foreground "#005050" -data { - #define parttick_width 14 - #define parttick_height 15 - static unsigned char parttick_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, - 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10, - 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f}; - } -maskdata $filemask - +image create bitmap file_question -background white -foreground black -data { +#define file_question_width 14 +#define file_question_height 15 +static unsigned char file_question_bits[] = { + 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, + 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, + 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; +} -maskdata $filemask + +image create bitmap file_removed -background white -foreground red -data { +#define file_removed_width 14 +#define file_removed_height 15 +static unsigned char file_removed_bits[] = { + 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, + 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, + 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; +} -maskdata $filemask + +image create bitmap file_merge -background white -foreground blue -data { +#define file_merge_width 14 +#define file_merge_height 15 +static unsigned char file_merge_bits[] = { + 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, + 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, + 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; +} -maskdata $filemask + +image create bitmap file_statechange -background white -foreground green -data { +#define file_merge_width 14 +#define file_merge_height 15 +static unsigned char file_statechange_bits[] = { + 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10, + 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, + 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; +} -maskdata $filemask + +set ui_index .vpane.files.index.list +set ui_workdir .vpane.files.workdir.list + +set all_icons(_$ui_index) file_plain - set all_icons(A$ui_index) file_fulltick ++set all_icons(A$ui_index) file_plain +set all_icons(M$ui_index) file_fulltick +set all_icons(D$ui_index) file_removed +set all_icons(U$ui_index) file_merge +set all_icons(T$ui_index) file_statechange + +set all_icons(_$ui_workdir) file_plain +set all_icons(M$ui_workdir) file_mod +set all_icons(D$ui_workdir) file_question +set all_icons(U$ui_workdir) file_merge +set all_icons(O$ui_workdir) file_plain +set all_icons(T$ui_workdir) file_statechange + +set max_status_desc 0 +foreach i { + {__ {mc "Unmodified"}} + + {_M {mc "Modified, not staged"}} + {M_ {mc "Staged for commit"}} + {MM {mc "Portions staged for commit"}} + {MD {mc "Staged for commit, missing"}} + + {_T {mc "File type changed, not staged"}} + {T_ {mc "File type changed, staged"}} + + {_O {mc "Untracked, not staged"}} + {A_ {mc "Staged for commit"}} + {AM {mc "Portions staged for commit"}} + {AD {mc "Staged for commit, missing"}} + + {_D {mc "Missing"}} + {D_ {mc "Staged for removal"}} + {DO {mc "Staged for removal, still present"}} + + {_U {mc "Requires merge resolution"}} + {U_ {mc "Requires merge resolution"}} + {UU {mc "Requires merge resolution"}} + {UM {mc "Requires merge resolution"}} + {UD {mc "Requires merge resolution"}} + {UT {mc "Requires merge resolution"}} + } { + set text [eval [lindex $i 1]] + if {$max_status_desc < [string length $text]} { + set max_status_desc [string length $text] + } + set all_descs([lindex $i 0]) $text +} +unset i + +###################################################################### +## +## util + +proc scrollbar2many {list mode args} { + foreach w $list {eval $w $mode $args} +} + +proc many2scrollbar {list mode sb top bottom} { + $sb set $top $bottom + foreach w $list {$w $mode moveto $top} +} + +proc incr_font_size {font {amt 1}} { + set sz [font configure $font -size] + incr sz $amt + font configure $font -size $sz + font configure ${font}bold -size $sz + font configure ${font}italic -size $sz +} + +###################################################################### +## +## ui commands + +set starting_gitk_msg [mc "Starting gitk... please wait..."] + - proc do_gitk {revs} { ++proc do_gitk {revs {is_submodule false}} { ++ global current_diff_path file_states current_diff_side ui_index ++ global _gitdir _gitworktree ++ + # -- Always start gitk through whatever we were loaded with. This + # lets us bypass using shell process on Windows systems. + # + set exe [_which gitk -script] + set cmd [list [info nameofexecutable] $exe] + if {$exe eq {}} { + error_popup [mc "Couldn't find gitk in PATH"] + } else { + global env + - if {[info exists env(GIT_DIR)]} { - set old_GIT_DIR $env(GIT_DIR) ++ set pwd [pwd] ++ ++ if {!$is_submodule} { ++ if {![is_bare]} { ++ cd $_gitworktree ++ } + } else { - set old_GIT_DIR {} ++ cd $current_diff_path ++ if {$revs eq {--}} { ++ set s $file_states($current_diff_path) ++ set old_sha1 {} ++ set new_sha1 {} ++ switch -glob -- [lindex $s 0] { ++ M_ { set old_sha1 [lindex [lindex $s 2] 1] } ++ _M { set old_sha1 [lindex [lindex $s 3] 1] } ++ MM { ++ if {$current_diff_side eq $ui_index} { ++ set old_sha1 [lindex [lindex $s 2] 1] ++ set new_sha1 [lindex [lindex $s 3] 1] ++ } else { ++ set old_sha1 [lindex [lindex $s 3] 1] ++ } ++ } ++ } ++ set revs $old_sha1...$new_sha1 ++ } ++ # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones ++ # we've been using for the main repository, so unset them. ++ # TODO we could make life easier (start up faster?) for gitk ++ # by setting these to the appropriate values to allow gitk ++ # to skip the heuristics to find their proper value ++ unset env(GIT_DIR) ++ unset env(GIT_WORK_TREE) ++ } ++ eval exec $cmd $revs "--" "--" & ++ ++ set env(GIT_DIR) $_gitdir ++ set env(GIT_WORK_TREE) $_gitworktree ++ cd $pwd ++ ++ ui_status $::starting_gitk_msg ++ after 10000 { ++ ui_ready $starting_gitk_msg + } ++ } ++} ++ ++proc do_git_gui {} { ++ global current_diff_path ++ ++ # -- Always start git gui through whatever we were loaded with. This ++ # lets us bypass using shell process on Windows systems. ++ # ++ set exe [list [_which git]] ++ if {$exe eq {}} { ++ error_popup [mc "Couldn't find git gui in PATH"] ++ } else { ++ global env ++ global _gitdir _gitworktree ++ ++ # see note in do_gitk about unsetting these vars when ++ # running tools in a submodule ++ unset env(GIT_DIR) ++ unset env(GIT_WORK_TREE) + + set pwd [pwd] - cd [file dirname [gitdir]] - set env(GIT_DIR) [file tail [gitdir]] ++ cd $current_diff_path + - eval exec $cmd $revs "--" "--" & ++ eval exec $exe gui & + - if {$old_GIT_DIR eq {}} { - unset env(GIT_DIR) - } else { - set env(GIT_DIR) $old_GIT_DIR - } ++ set env(GIT_DIR) $_gitdir ++ set env(GIT_WORK_TREE) $_gitworktree + cd $pwd + + ui_status $::starting_gitk_msg + after 10000 { + ui_ready $starting_gitk_msg + } + } +} + +proc do_explore {} { ++ global _gitworktree + set explorer {} + if {[is_Cygwin] || [is_Windows]} { + set explorer "explorer.exe" + } elseif {[is_MacOSX]} { + set explorer "open" + } else { + # freedesktop.org-conforming system is our best shot + set explorer "xdg-open" + } - eval exec $explorer [list [file nativename [file dirname [gitdir]]]] & ++ eval exec $explorer $_gitworktree & +} + +set is_quitting 0 +set ret_code 1 + +proc terminate_me {win} { + global ret_code + if {$win ne {.}} return + exit $ret_code +} + +proc do_quit {{rc {1}}} { + global ui_comm is_quitting repo_config commit_type + global GITGUI_BCK_exists GITGUI_BCK_i + global ui_comm_spell - global ret_code ++ global ret_code use_ttk + + if {$is_quitting} return + set is_quitting 1 + + if {[winfo exists $ui_comm]} { + # -- Stash our current commit buffer. + # + set save [gitdir GITGUI_MSG] + if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { + file rename -force [gitdir GITGUI_BCK] $save + set GITGUI_BCK_exists 0 + } else { + set msg [string trim [$ui_comm get 0.0 end]] + regsub -all -line {[ \r\t]+$} $msg {} msg + if {(![string match amend* $commit_type] + || [$ui_comm edit modified]) + && $msg ne {}} { + catch { + set fd [open $save w] + puts -nonewline $fd $msg + close $fd + } + } else { + catch {file delete $save} + } + } + + # -- Cancel our spellchecker if its running. + # + if {[info exists ui_comm_spell]} { + $ui_comm_spell stop + } + + # -- Remove our editor backup, its not needed. + # + after cancel $GITGUI_BCK_i + if {$GITGUI_BCK_exists} { + catch {file delete [gitdir GITGUI_BCK]} + } + + # -- Stash our current window geometry into this repository. + # + set cfg_wmstate [wm state .] + if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} { + set rc_wmstate {} + } + if {$cfg_wmstate ne $rc_wmstate} { + catch {git config gui.wmstate $cfg_wmstate} + } + if {$cfg_wmstate eq {zoomed}} { + # on Windows wm geometry will lie about window + # position (but not size) when window is zoomed + # restore the window before querying wm geometry + wm state . normal + } + set cfg_geometry [list] + lappend cfg_geometry [wm geometry .] - lappend cfg_geometry [lindex [.vpane sash coord 0] 0] - lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1] ++ if {$use_ttk} { ++ lappend cfg_geometry [.vpane sashpos 0] ++ lappend cfg_geometry [.vpane.files sashpos 0] ++ } else { ++ lappend cfg_geometry [lindex [.vpane sash coord 0] 0] ++ lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1] ++ } + if {[catch {set rc_geometry $repo_config(gui.geometry)}]} { + set rc_geometry {} + } + if {$cfg_geometry ne $rc_geometry} { + catch {git config gui.geometry $cfg_geometry} + } + } + + set ret_code $rc + + # Briefly enable send again, working around Tk bug + # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997 + tk appname [appname] + + destroy . +} + +proc do_rescan {} { + rescan ui_ready +} + +proc ui_do_rescan {} { + rescan {force_first_diff ui_ready} +} + +proc do_commit {} { + commit_tree +} + +proc next_diff {{after {}}} { + global next_diff_p next_diff_w next_diff_i + show_diff $next_diff_p $next_diff_w {} {} $after +} + +proc find_anchor_pos {lst name} { + set lid [lsearch -sorted -exact $lst $name] + + if {$lid == -1} { + set lid 0 + foreach lname $lst { + if {$lname >= $name} break + incr lid + } + } + + return $lid +} + +proc find_file_from {flist idx delta path mmask} { + global file_states + + set len [llength $flist] + while {$idx >= 0 && $idx < $len} { + set name [lindex $flist $idx] + + if {$name ne $path && [info exists file_states($name)]} { + set state [lindex $file_states($name) 0] + + if {$mmask eq {} || [regexp $mmask $state]} { + return $idx + } + } + + incr idx $delta + } + + return {} +} + +proc find_next_diff {w path {lno {}} {mmask {}}} { + global next_diff_p next_diff_w next_diff_i + global file_lists ui_index ui_workdir + + set flist $file_lists($w) + if {$lno eq {}} { + set lno [find_anchor_pos $flist $path] + } else { + incr lno -1 + } + + if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} { + if {$w eq $ui_index} { + set mmask "^$mmask" + } else { + set mmask "$mmask\$" + } + } + + set idx [find_file_from $flist $lno 1 $path $mmask] + if {$idx eq {}} { + incr lno -1 + set idx [find_file_from $flist $lno -1 $path $mmask] + } + + if {$idx ne {}} { + set next_diff_w $w + set next_diff_p [lindex $flist $idx] + set next_diff_i [expr {$idx+1}] + return 1 + } else { + return 0 + } +} + +proc next_diff_after_action {w path {lno {}} {mmask {}}} { + global current_diff_path + + if {$path ne $current_diff_path} { + return {} + } elseif {[find_next_diff $w $path $lno $mmask]} { + return {next_diff;} + } else { + return {reshow_diff;} + } +} + +proc select_first_diff {after} { + global ui_workdir + + if {[find_next_diff $ui_workdir {} 1 {^_?U}] || + [find_next_diff $ui_workdir {} 1 {[^O]$}]} { + next_diff $after + } else { + uplevel #0 $after + } +} + +proc force_first_diff {after} { + global ui_workdir current_diff_path file_states + + if {[info exists file_states($current_diff_path)]} { + set state [lindex $file_states($current_diff_path) 0] + } else { + set state {OO} + } + + set reselect 0 + if {[string first {U} $state] >= 0} { + # Already a conflict, do nothing + } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} { + set reselect 1 + } elseif {[string index $state 1] ne {O}} { + # Already a diff & no conflicts, do nothing + } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} { + set reselect 1 + } + + if {$reselect} { + next_diff $after + } else { + uplevel #0 $after + } +} + +proc toggle_or_diff {w x y} { + global file_states file_lists current_diff_path ui_index ui_workdir + global last_clicked selected_paths + + set pos [split [$w index @$x,$y] .] + set lno [lindex $pos 0] + set col [lindex $pos 1] + set path [lindex $file_lists($w) [expr {$lno - 1}]] + if {$path eq {}} { + set last_clicked {} + return + } + + set last_clicked [list $w $lno] + array unset selected_paths + $ui_index tag remove in_sel 0.0 end + $ui_workdir tag remove in_sel 0.0 end + + # Determine the state of the file + if {[info exists file_states($path)]} { + set state [lindex $file_states($path) 0] + } else { + set state {__} + } + + # Restage the file, or simply show the diff + if {$col == 0 && $y > 1} { + # Conflicts need special handling + if {[string first {U} $state] >= 0} { + # $w must always be $ui_workdir, but... + if {$w ne $ui_workdir} { set lno {} } + merge_stage_workdir $path $lno + return + } + + if {[string index $state 1] eq {O}} { + set mmask {} + } else { + set mmask {[^O]} + } + + set after [next_diff_after_action $w $path $lno $mmask] + + if {$w eq $ui_index} { + update_indexinfo \ + "Unstaging [short_path $path] from commit" \ + [list $path] \ + [concat $after [list ui_ready]] + } elseif {$w eq $ui_workdir} { + update_index \ + "Adding [short_path $path]" \ + [list $path] \ + [concat $after [list ui_ready]] + } + } else { + show_diff $path $w $lno + } +} + +proc add_one_to_selection {w x y} { + global file_lists last_clicked selected_paths + + set lno [lindex [split [$w index @$x,$y] .] 0] + set path [lindex $file_lists($w) [expr {$lno - 1}]] + if {$path eq {}} { + set last_clicked {} + return + } + + if {$last_clicked ne {} + && [lindex $last_clicked 0] ne $w} { + array unset selected_paths + [lindex $last_clicked 0] tag remove in_sel 0.0 end + } + + set last_clicked [list $w $lno] + if {[catch {set in_sel $selected_paths($path)}]} { + set in_sel 0 + } + if {$in_sel} { + unset selected_paths($path) + $w tag remove in_sel $lno.0 [expr {$lno + 1}].0 + } else { + set selected_paths($path) 1 + $w tag add in_sel $lno.0 [expr {$lno + 1}].0 + } +} + +proc add_range_to_selection {w x y} { + global file_lists last_clicked selected_paths + + if {[lindex $last_clicked 0] ne $w} { + toggle_or_diff $w $x $y + return + } + + set lno [lindex [split [$w index @$x,$y] .] 0] + set lc [lindex $last_clicked 1] + if {$lc < $lno} { + set begin $lc + set end $lno + } else { + set begin $lno + set end $lc + } + + foreach path [lrange $file_lists($w) \ + [expr {$begin - 1}] \ + [expr {$end - 1}]] { + set selected_paths($path) 1 + } + $w tag add in_sel $begin.0 [expr {$end + 1}].0 +} + +proc show_more_context {} { + global repo_config + if {$repo_config(gui.diffcontext) < 99} { + incr repo_config(gui.diffcontext) + reshow_diff + } +} + +proc show_less_context {} { + global repo_config + if {$repo_config(gui.diffcontext) > 1} { + incr repo_config(gui.diffcontext) -1 + reshow_diff + } +} + +###################################################################### +## +## ui construction + - load_config 0 - apply_config +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]} { + .mbar add cascade -label [mc Branch] -menu .mbar.branch +} +if {[is_enabled multicommit] || [is_enabled singlecommit]} { + .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit +} +if {[is_enabled transport]} { + .mbar add cascade -label [mc Merge] -menu .mbar.merge + .mbar add cascade -label [mc Remote] -menu .mbar.remote +} +if {[is_enabled multicommit] || [is_enabled singlecommit]} { + .mbar add cascade -label [mc Tools] -menu .mbar.tools +} + +# -- Repository Menu +# +menu .mbar.repository + - .mbar.repository add command \ - -label [mc "Explore Working Copy"] \ - -command {do_explore} - .mbar.repository add separator ++if {![is_bare]} { ++ .mbar.repository add command \ ++ -label [mc "Explore Working Copy"] \ ++ -command {do_explore} ++ .mbar.repository add separator ++} + +.mbar.repository add command \ + -label [mc "Browse Current Branch's Files"] \ + -command {browser::new $current_branch} +set ui_browse_current [.mbar.repository index last] +.mbar.repository add command \ + -label [mc "Browse Branch Files..."] \ + -command browser_open::dialog +.mbar.repository add separator + +.mbar.repository add command \ + -label [mc "Visualize Current Branch's History"] \ + -command {do_gitk $current_branch} +set ui_visualize_current [.mbar.repository index last] +.mbar.repository add command \ + -label [mc "Visualize All Branch History"] \ + -command {do_gitk --all} +.mbar.repository add separator + +proc current_branch_write {args} { + global current_branch + .mbar.repository entryconf $::ui_browse_current \ + -label [mc "Browse %s's Files" $current_branch] + .mbar.repository entryconf $::ui_visualize_current \ + -label [mc "Visualize %s's History" $current_branch] +} +trace add variable current_branch write current_branch_write + +if {[is_enabled multicommit]} { + .mbar.repository add command -label [mc "Database Statistics"] \ + -command do_stats + + .mbar.repository add command -label [mc "Compress Database"] \ + -command do_gc + + .mbar.repository add command -label [mc "Verify Database"] \ + -command do_fsck_objects + + .mbar.repository add separator + + if {[is_Cygwin]} { + .mbar.repository add command \ + -label [mc "Create Desktop Icon"] \ + -command do_cygwin_shortcut + } elseif {[is_Windows]} { + .mbar.repository add command \ + -label [mc "Create Desktop Icon"] \ + -command do_windows_shortcut + } elseif {[is_MacOSX]} { + .mbar.repository add command \ + -label [mc "Create Desktop Icon"] \ + -command do_macosx_app + } +} + +if {[is_MacOSX]} { + proc ::tk::mac::Quit {args} { do_quit } +} else { + .mbar.repository add command -label [mc Quit] \ + -command do_quit \ + -accelerator $M1T-Q +} + +# -- Edit Menu +# +menu .mbar.edit +.mbar.edit add command -label [mc Undo] \ + -command {catch {[focus] edit undo}} \ + -accelerator $M1T-Z +.mbar.edit add command -label [mc Redo] \ + -command {catch {[focus] edit redo}} \ + -accelerator $M1T-Y +.mbar.edit add separator +.mbar.edit add command -label [mc Cut] \ + -command {catch {tk_textCut [focus]}} \ + -accelerator $M1T-X +.mbar.edit add command -label [mc Copy] \ + -command {catch {tk_textCopy [focus]}} \ + -accelerator $M1T-C +.mbar.edit add command -label [mc Paste] \ + -command {catch {tk_textPaste [focus]; [focus] see insert}} \ + -accelerator $M1T-V +.mbar.edit add command -label [mc Delete] \ + -command {catch {[focus] delete sel.first sel.last}} \ + -accelerator Del +.mbar.edit add separator +.mbar.edit add command -label [mc "Select All"] \ + -command {catch {[focus] tag add sel 0.0 end}} \ + -accelerator $M1T-A + +# -- Branch Menu +# +if {[is_enabled branch]} { + menu .mbar.branch + + .mbar.branch add command -label [mc "Create..."] \ + -command branch_create::dialog \ + -accelerator $M1T-N + lappend disable_on_lock [list .mbar.branch entryconf \ + [.mbar.branch index last] -state] + + .mbar.branch add command -label [mc "Checkout..."] \ + -command branch_checkout::dialog \ + -accelerator $M1T-O + lappend disable_on_lock [list .mbar.branch entryconf \ + [.mbar.branch index last] -state] + + .mbar.branch add command -label [mc "Rename..."] \ + -command branch_rename::dialog + lappend disable_on_lock [list .mbar.branch entryconf \ + [.mbar.branch index last] -state] + + .mbar.branch add command -label [mc "Delete..."] \ + -command branch_delete::dialog + lappend disable_on_lock [list .mbar.branch entryconf \ + [.mbar.branch index last] -state] + + .mbar.branch add command -label [mc "Reset..."] \ + -command merge::reset_hard + lappend disable_on_lock [list .mbar.branch entryconf \ + [.mbar.branch index last] -state] +} + +# -- Commit Menu +# +proc commit_btn_caption {} { + if {[is_enabled nocommit]} { + return [mc "Done"] + } else { + return [mc Commit@@verb] + } +} + +if {[is_enabled multicommit] || [is_enabled singlecommit]} { + menu .mbar.commit + + if {![is_enabled nocommit]} { + .mbar.commit add radiobutton \ + -label [mc "New Commit"] \ + -command do_select_commit_type \ + -variable selected_commit_type \ + -value new + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] + + .mbar.commit add radiobutton \ + -label [mc "Amend Last Commit"] \ + -command do_select_commit_type \ + -variable selected_commit_type \ + -value amend + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] + + .mbar.commit add separator + } + + .mbar.commit add command -label [mc Rescan] \ + -command ui_do_rescan \ + -accelerator F5 + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] + + .mbar.commit add command -label [mc "Stage To Commit"] \ + -command do_add_selection \ + -accelerator $M1T-T + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] + + .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \ + -command do_add_all \ + -accelerator $M1T-I + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] + + .mbar.commit add command -label [mc "Unstage From Commit"] \ + -command do_unstage_selection \ + -accelerator $M1T-U + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] + + .mbar.commit add command -label [mc "Revert Changes"] \ + -command do_revert_selection \ + -accelerator $M1T-J + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] + + .mbar.commit add separator + + .mbar.commit add command -label [mc "Show Less Context"] \ + -command show_less_context \ + -accelerator $M1T-\- + + .mbar.commit add command -label [mc "Show More Context"] \ + -command show_more_context \ + -accelerator $M1T-= + + .mbar.commit add separator + + if {![is_enabled nocommitmsg]} { + .mbar.commit add command -label [mc "Sign Off"] \ + -command do_signoff \ + -accelerator $M1T-S + } + + .mbar.commit add command -label [commit_btn_caption] \ + -command do_commit \ + -accelerator $M1T-Return + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] +} + +# -- Merge Menu +# +if {[is_enabled branch]} { + menu .mbar.merge + .mbar.merge add command -label [mc "Local Merge..."] \ + -command merge::dialog \ + -accelerator $M1T-M + lappend disable_on_lock \ + [list .mbar.merge entryconf [.mbar.merge index last] -state] + .mbar.merge add command -label [mc "Abort Merge..."] \ + -command merge::reset_hard + lappend disable_on_lock \ + [list .mbar.merge entryconf [.mbar.merge index last] -state] +} + +# -- Transport Menu +# +if {[is_enabled transport]} { + menu .mbar.remote + + .mbar.remote add command \ + -label [mc "Add..."] \ + -command remote_add::dialog \ + -accelerator $M1T-A + .mbar.remote add command \ + -label [mc "Push..."] \ + -command do_push_anywhere \ + -accelerator $M1T-P + .mbar.remote add command \ + -label [mc "Delete Branch..."] \ + -command remote_branch_delete::dialog +} + +if {[is_MacOSX]} { + proc ::tk::mac::ShowPreferences {} {do_options} +} else { + # -- Edit Menu + # + .mbar.edit add separator + .mbar.edit add command -label [mc "Options..."] \ + -command do_options +} + +# -- Tools Menu +# +if {[is_enabled multicommit] || [is_enabled singlecommit]} { + set tools_menubar .mbar.tools + menu $tools_menubar + $tools_menubar add separator + $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog + $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog + set tools_tailcnt 3 + if {[array names repo_config guitool.*.cmd] ne {}} { + tools_populate_all + } +} + +# -- Help Menu +# +.mbar add cascade -label [mc Help] -menu .mbar.help +menu .mbar.help + +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] + + if {[is_Cygwin]} { + set doc_path [exec cygpath --mixed $doc_path] + } +} + +if {[file isfile $doc_path]} { + set doc_url "file:$doc_path" +} else { + set doc_url {http://www.kernel.org/pub/software/scm/git/docs/} +} + +proc start_browser {url} { + git "web--browse" $url +} + +.mbar.help add command -label [mc "Online Documentation"] \ + -command [list start_browser $doc_url] + +.mbar.help add command -label [mc "Show SSH Key"] \ + -command do_ssh_key + +unset doc_path doc_url + +# -- Standard bindings +# +wm protocol . WM_DELETE_WINDOW do_quit +bind all <$M1B-Key-q> do_quit +bind all <$M1B-Key-Q> do_quit +bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} +bind all <$M1B-Key-W> {destroy [winfo toplevel %W]} + +set subcommand_args {} +proc usage {} { + puts stderr "usage: $::argv0 $::subcommand $::subcommand_args" + exit 1 +} + +proc normalize_relpath {path} { + set elements {} + foreach item [file split $path] { + if {$item eq {.}} continue + if {$item eq {..} && [llength $elements] > 0 + && [lindex $elements end] ne {..}} { + set elements [lrange $elements 0 end-1] + continue + } + lappend elements $item + } + return [eval file join $elements] +} + +# -- Not a normal commit type invocation? Do that instead! +# +switch -- $subcommand { +browser - +blame { + if {$subcommand eq "blame"} { + set subcommand_args {[--line=] rev? path} + } else { + set subcommand_args {rev? path} + } + if {$argv eq {}} usage + set head {} + set path {} + set jump_spec {} + set is_path 0 + foreach a $argv { + if {$is_path || [file exists $_prefix$a]} { + if {$path ne {}} usage + set path [normalize_relpath $_prefix$a] + break + } elseif {$a eq {--}} { + if {$path ne {}} { + if {$head ne {}} usage + set head $path + set path {} + } + set is_path 1 + } elseif {[regexp {^--line=(\d+)$} $a a lnum]} { + if {$jump_spec ne {} || $head ne {}} usage + set jump_spec [list $lnum] + } elseif {$head eq {}} { + if {$head ne {}} usage + set head $a + set is_path 1 + } else { + usage + } + } + unset is_path + + if {$head ne {} && $path eq {}} { + set path [normalize_relpath $_prefix$head] + set head {} + } + + if {$head eq {}} { + load_current_branch + } else { + if {[regexp {^[0-9a-f]{1,39}$} $head]} { + if {[catch { + set head [git rev-parse --verify $head] + } err]} { + puts stderr $err + exit 1 + } + } + set current_branch $head + } + + switch -- $subcommand { + browser { + if {$jump_spec ne {}} usage + if {$head eq {}} { + if {$path ne {} && [file isdirectory $path]} { + set head $current_branch + } else { + set head $path + set path {} + } + } + browser::new $head $path + } + blame { + if {$head eq {} && ![file exists $path]} { + puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path] + exit 1 + } + blame::new $head $path $jump_spec + } + } + return +} +citool - +gui { + if {[llength $argv] != 0} { + puts -nonewline stderr "usage: $argv0" + if {$subcommand ne {gui} + && [file tail $argv0] ne "git-$subcommand"} { + puts -nonewline stderr " $subcommand" + } + puts stderr {} + exit 1 + } + # fall through to setup UI for commits +} +default { + puts stderr "usage: $argv0 \[{blame|browser|citool}\]" + exit 1 +} +} + +# -- Branch Control +# - frame .branch \ - -borderwidth 1 \ - -relief sunken - label .branch.l1 \ ++${NS}::frame .branch ++if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken} ++${NS}::label .branch.l1 \ + -text [mc "Current Branch:"] \ + -anchor w \ + -justify left - label .branch.cb \ ++${NS}::label .branch.cb \ + -textvariable current_branch \ + -anchor w \ + -justify left +pack .branch.l1 -side left +pack .branch.cb -side left -fill x +pack .branch -side top -fill x + +# -- Main Window Layout +# - panedwindow .vpane -orient horizontal - panedwindow .vpane.files -orient vertical - .vpane add .vpane.files -sticky nsew -height 100 -width 200 ++${NS}::panedwindow .vpane -orient horizontal ++${NS}::panedwindow .vpane.files -orient vertical ++if {$use_ttk} { ++ .vpane add .vpane.files ++} else { ++ .vpane add .vpane.files -sticky nsew -height 100 -width 200 ++} +pack .vpane -anchor n -side top -fill both -expand 1 + +# -- Index File List +# - frame .vpane.files.index -height 100 -width 200 - label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \ ++${NS}::frame .vpane.files.index -height 100 -width 200 ++tlabel .vpane.files.index.title \ ++ -text [mc "Staged Changes (Will Commit)"] \ + -background lightgreen -foreground black +text $ui_index -background white -foreground black \ + -borderwidth 0 \ + -width 20 -height 10 \ + -wrap none \ + -cursor $cursor_ptr \ + -xscrollcommand {.vpane.files.index.sx set} \ + -yscrollcommand {.vpane.files.index.sy set} \ + -state disabled - scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview] - scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview] ++${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview] ++${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview] +pack .vpane.files.index.title -side top -fill x +pack .vpane.files.index.sx -side bottom -fill x +pack .vpane.files.index.sy -side right -fill y +pack $ui_index -side left -fill both -expand 1 + +# -- Working Directory File List +# - frame .vpane.files.workdir -height 100 -width 200 - label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \ ++${NS}::frame .vpane.files.workdir -height 100 -width 200 ++tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \ + -background lightsalmon -foreground black +text $ui_workdir -background white -foreground black \ + -borderwidth 0 \ + -width 20 -height 10 \ + -wrap none \ + -cursor $cursor_ptr \ + -xscrollcommand {.vpane.files.workdir.sx set} \ + -yscrollcommand {.vpane.files.workdir.sy set} \ + -state disabled - scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview] - scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview] ++${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview] ++${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview] +pack .vpane.files.workdir.title -side top -fill x +pack .vpane.files.workdir.sx -side bottom -fill x +pack .vpane.files.workdir.sy -side right -fill y +pack $ui_workdir -side left -fill both -expand 1 + - .vpane.files add .vpane.files.workdir -sticky nsew - .vpane.files add .vpane.files.index -sticky nsew ++.vpane.files add .vpane.files.workdir ++.vpane.files add .vpane.files.index ++if {!$use_ttk} { ++ .vpane.files paneconfigure .vpane.files.workdir -sticky news ++ .vpane.files paneconfigure .vpane.files.index -sticky news ++} + +foreach i [list $ui_index $ui_workdir] { + rmsel_tag $i + $i tag conf in_diff -background [$i tag cget in_sel -background] +} +unset i + +# -- Diff and Commit Area +# - frame .vpane.lower -height 300 -width 400 - frame .vpane.lower.commarea - frame .vpane.lower.diff -relief sunken -borderwidth 1 ++${NS}::frame .vpane.lower -height 300 -width 400 ++${NS}::frame .vpane.lower.commarea ++${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 +pack .vpane.lower.diff -fill both -expand 1 +pack .vpane.lower.commarea -side bottom -fill x - .vpane add .vpane.lower -sticky nsew ++.vpane add .vpane.lower ++if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew} + +# -- Commit Area Buttons +# - frame .vpane.lower.commarea.buttons - label .vpane.lower.commarea.buttons.l -text {} \ ++${NS}::frame .vpane.lower.commarea.buttons ++${NS}::label .vpane.lower.commarea.buttons.l -text {} \ + -anchor w \ + -justify left +pack .vpane.lower.commarea.buttons.l -side top -fill x +pack .vpane.lower.commarea.buttons -side left -fill y + - button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \ ++${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \ + -command ui_do_rescan +pack .vpane.lower.commarea.buttons.rescan -side top -fill x +lappend disable_on_lock \ + {.vpane.lower.commarea.buttons.rescan conf -state} + - button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \ ++${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \ + -command do_add_all +pack .vpane.lower.commarea.buttons.incall -side top -fill x +lappend disable_on_lock \ + {.vpane.lower.commarea.buttons.incall conf -state} + +if {![is_enabled nocommitmsg]} { - button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \ ++ ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \ + -command do_signoff + pack .vpane.lower.commarea.buttons.signoff -side top -fill x +} + - button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \ ++${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \ + -command do_commit +pack .vpane.lower.commarea.buttons.commit -side top -fill x +lappend disable_on_lock \ + {.vpane.lower.commarea.buttons.commit conf -state} + +if {![is_enabled nocommit]} { - button .vpane.lower.commarea.buttons.push -text [mc Push] \ ++ ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \ + -command do_push_anywhere + pack .vpane.lower.commarea.buttons.push -side top -fill x +} + +# -- Commit Message Buffer +# - frame .vpane.lower.commarea.buffer - frame .vpane.lower.commarea.buffer.header ++${NS}::frame .vpane.lower.commarea.buffer ++${NS}::frame .vpane.lower.commarea.buffer.header +set ui_comm .vpane.lower.commarea.buffer.t +set ui_coml .vpane.lower.commarea.buffer.header.l + +if {![is_enabled nocommit]} { - radiobutton .vpane.lower.commarea.buffer.header.new \ ++ ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \ + -text [mc "New Commit"] \ + -command do_select_commit_type \ + -variable selected_commit_type \ + -value new + lappend disable_on_lock \ + [list .vpane.lower.commarea.buffer.header.new conf -state] - radiobutton .vpane.lower.commarea.buffer.header.amend \ ++ ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \ + -text [mc "Amend Last Commit"] \ + -command do_select_commit_type \ + -variable selected_commit_type \ + -value amend + lappend disable_on_lock \ + [list .vpane.lower.commarea.buffer.header.amend conf -state] +} + - label $ui_coml \ ++${NS}::label $ui_coml \ + -anchor w \ + -justify left +proc trace_commit_type {varname args} { + global ui_coml commit_type + switch -glob -- $commit_type { + initial {set txt [mc "Initial Commit Message:"]} + amend {set txt [mc "Amended Commit Message:"]} + amend-initial {set txt [mc "Amended Initial Commit Message:"]} + amend-merge {set txt [mc "Amended Merge Commit Message:"]} + merge {set txt [mc "Merge Commit Message:"]} + * {set txt [mc "Commit Message:"]} + } + $ui_coml conf -text $txt +} +trace add variable commit_type write trace_commit_type +pack $ui_coml -side left -fill x + +if {![is_enabled nocommit]} { + pack .vpane.lower.commarea.buffer.header.amend -side right + pack .vpane.lower.commarea.buffer.header.new -side right +} + +text $ui_comm -background white -foreground black \ + -borderwidth 1 \ + -undo true \ + -maxundo 20 \ + -autoseparators true \ + -relief sunken \ + -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \ + -font font_diff \ + -yscrollcommand {.vpane.lower.commarea.buffer.sby set} - scrollbar .vpane.lower.commarea.buffer.sby \ ++${NS}::scrollbar .vpane.lower.commarea.buffer.sby \ + -command [list $ui_comm yview] +pack .vpane.lower.commarea.buffer.header -side top -fill x +pack .vpane.lower.commarea.buffer.sby -side right -fill y +pack $ui_comm -side left -fill y +pack .vpane.lower.commarea.buffer -side left -fill y + +# -- Commit Message Buffer Context Menu +# +set ctxm .vpane.lower.commarea.buffer.ctxm +menu $ctxm -tearoff 0 +$ctxm add command \ + -label [mc Cut] \ + -command {tk_textCut $ui_comm} +$ctxm add command \ + -label [mc Copy] \ + -command {tk_textCopy $ui_comm} +$ctxm add command \ + -label [mc Paste] \ + -command {tk_textPaste $ui_comm} +$ctxm add command \ + -label [mc Delete] \ + -command {catch {$ui_comm delete sel.first sel.last}} +$ctxm add separator +$ctxm add command \ + -label [mc "Select All"] \ + -command {focus $ui_comm;$ui_comm tag add sel 0.0 end} +$ctxm add command \ + -label [mc "Copy All"] \ + -command { + $ui_comm tag add sel 0.0 end + tk_textCopy $ui_comm + $ui_comm tag remove sel 0.0 end + } +$ctxm add separator +$ctxm add command \ + -label [mc "Sign Off"] \ + -command do_signoff +set ui_comm_ctxm $ctxm + +# -- Diff Header +# +proc trace_current_diff_path {varname args} { + global current_diff_path diff_actions file_states + if {$current_diff_path eq {}} { + set s {} + set f {} + set p {} + set o disabled + } else { + set p $current_diff_path + set s [mapdesc [lindex $file_states($p) 0] $p] + set f [mc "File:"] + set p [escape_path $p] + set o normal + } + + .vpane.lower.diff.header.status configure -text $s + .vpane.lower.diff.header.file configure -text $f + .vpane.lower.diff.header.path configure -text $p + foreach w $diff_actions { + uplevel #0 $w $o + } +} +trace add variable current_diff_path write trace_current_diff_path + - frame .vpane.lower.diff.header -background gold - label .vpane.lower.diff.header.status \ ++gold_frame .vpane.lower.diff.header ++tlabel .vpane.lower.diff.header.status \ + -background gold \ + -foreground black \ + -width $max_status_desc \ + -anchor w \ + -justify left - label .vpane.lower.diff.header.file \ ++tlabel .vpane.lower.diff.header.file \ + -background gold \ + -foreground black \ + -anchor w \ + -justify left - label .vpane.lower.diff.header.path \ ++tlabel .vpane.lower.diff.header.path \ + -background gold \ + -foreground black \ + -anchor w \ + -justify left +pack .vpane.lower.diff.header.status -side left +pack .vpane.lower.diff.header.file -side left +pack .vpane.lower.diff.header.path -fill x +set ctxm .vpane.lower.diff.header.ctxm +menu $ctxm -tearoff 0 +$ctxm add command \ + -label [mc Copy] \ + -command { + clipboard clear + clipboard append \ + -format STRING \ + -type STRING \ + -- $current_diff_path + } +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] +bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" + +# -- Diff Body +# - frame .vpane.lower.diff.body ++${NS}::frame .vpane.lower.diff.body +set ui_diff .vpane.lower.diff.body.t +text $ui_diff -background white -foreground black \ + -borderwidth 0 \ + -width 80 -height 5 -wrap none \ + -font font_diff \ + -xscrollcommand {.vpane.lower.diff.body.sbx set} \ + -yscrollcommand {.vpane.lower.diff.body.sby set} \ + -state disabled - scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ ++${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ + -command [list $ui_diff xview] - scrollbar .vpane.lower.diff.body.sby -orient vertical \ ++${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \ + -command [list $ui_diff yview] +pack .vpane.lower.diff.body.sbx -side bottom -fill x +pack .vpane.lower.diff.body.sby -side right -fill y +pack $ui_diff -side left -fill both -expand 1 +pack .vpane.lower.diff.header -side top -fill x +pack .vpane.lower.diff.body -side bottom -fill both -expand 1 + +$ui_diff tag conf d_cr -elide true +$ui_diff tag conf d_@ -foreground blue -font font_diffbold +$ui_diff tag conf d_+ -foreground {#00a000} +$ui_diff tag conf d_- -foreground red + +$ui_diff tag conf d_++ -foreground {#00a000} +$ui_diff tag conf d_-- -foreground red +$ui_diff tag conf d_+s \ + -foreground {#00a000} \ + -background {#e2effa} +$ui_diff tag conf d_-s \ + -foreground red \ + -background {#e2effa} +$ui_diff tag conf d_s+ \ + -foreground {#00a000} \ + -background ivory1 +$ui_diff tag conf d_s- \ + -foreground red \ + -background ivory1 + +$ui_diff tag conf d<<<<<<< \ + -foreground orange \ + -font font_diffbold +$ui_diff tag conf d======= \ + -foreground orange \ + -font font_diffbold +$ui_diff tag conf d>>>>>>> \ + -foreground orange \ + -font font_diffbold + +$ui_diff tag raise sel + +# -- Diff Body Context Menu +# + +proc create_common_diff_popup {ctxm} { - $ctxm add command \ - -label [mc "Show Less Context"] \ - -command show_less_context - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add command \ - -label [mc "Show More Context"] \ - -command show_more_context - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add separator + $ctxm add command \ + -label [mc Refresh] \ + -command reshow_diff + lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] + $ctxm add command \ + -label [mc Copy] \ + -command {tk_textCopy $ui_diff} + lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] + $ctxm add command \ + -label [mc "Select All"] \ + -command {focus $ui_diff;$ui_diff tag add sel 0.0 end} + lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] + $ctxm add command \ + -label [mc "Copy All"] \ + -command { + $ui_diff tag add sel 0.0 end + tk_textCopy $ui_diff + $ui_diff tag remove sel 0.0 end + } + lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] + $ctxm add separator + $ctxm add command \ + -label [mc "Decrease Font Size"] \ + -command {incr_font_size font_diff -1} + lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] + $ctxm add command \ + -label [mc "Increase Font Size"] \ + -command {incr_font_size font_diff 1} + lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] + $ctxm add separator + set emenu $ctxm.enc + menu $emenu + build_encoding_menu $emenu [list force_diff_encoding] + $ctxm add cascade \ + -label [mc "Encoding"] \ + -menu $emenu + lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] + $ctxm add separator + $ctxm add command -label [mc "Options..."] \ + -command do_options +} + +set ctxm .vpane.lower.diff.body.ctxm +menu $ctxm -tearoff 0 +$ctxm add command \ + -label [mc "Apply/Reverse Hunk"] \ + -command {apply_hunk $cursorX $cursorY} +set ui_diff_applyhunk [$ctxm index last] +lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] +$ctxm add command \ + -label [mc "Apply/Reverse Line"] \ - -command {apply_line $cursorX $cursorY; do_rescan} ++ -command {apply_range_or_line $cursorX $cursorY; do_rescan} +set ui_diff_applyline [$ctxm index last] +lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state] +$ctxm add separator ++$ctxm add command \ ++ -label [mc "Show Less Context"] \ ++ -command show_less_context ++lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] ++$ctxm add command \ ++ -label [mc "Show More Context"] \ ++ -command show_more_context ++lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] ++$ctxm add separator +create_common_diff_popup $ctxm + +set ctxmmg .vpane.lower.diff.body.ctxmmg +menu $ctxmmg -tearoff 0 +$ctxmmg add command \ + -label [mc "Run Merge Tool"] \ + -command {merge_resolve_tool} +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] +$ctxmmg add separator +$ctxmmg add command \ + -label [mc "Use Remote Version"] \ + -command {merge_resolve_one 3} +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] +$ctxmmg add command \ + -label [mc "Use Local Version"] \ + -command {merge_resolve_one 2} +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] +$ctxmmg add command \ + -label [mc "Revert To Base"] \ + -command {merge_resolve_one 1} +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] +$ctxmmg add separator ++$ctxmmg add command \ ++ -label [mc "Show Less Context"] \ ++ -command show_less_context ++lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] ++$ctxmmg add command \ ++ -label [mc "Show More Context"] \ ++ -command show_more_context ++lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] ++$ctxmmg add separator +create_common_diff_popup $ctxmmg + - proc popup_diff_menu {ctxm ctxmmg x y X Y} { ++set ctxmsm .vpane.lower.diff.body.ctxmsm ++menu $ctxmsm -tearoff 0 ++$ctxmsm add command \ ++ -label [mc "Visualize These Changes In The Submodule"] \ ++ -command {do_gitk -- true} ++lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] ++$ctxmsm add command \ ++ -label [mc "Visualize Current Branch History In The Submodule"] \ ++ -command {do_gitk {} true} ++lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] ++$ctxmsm add command \ ++ -label [mc "Visualize All Branch History In The Submodule"] \ ++ -command {do_gitk --all true} ++lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] ++$ctxmsm add separator ++$ctxmsm add command \ ++ -label [mc "Start git gui In The Submodule"] \ ++ -command {do_git_gui} ++lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] ++$ctxmsm add separator ++create_common_diff_popup $ctxmsm ++ ++proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} { + global current_diff_path file_states + set ::cursorX $x + set ::cursorY $y + if {[info exists file_states($current_diff_path)]} { + set state [lindex $file_states($current_diff_path) 0] + } else { + set state {__} + } + if {[string first {U} $state] >= 0} { + tk_popup $ctxmmg $X $Y ++ } elseif {$::is_submodule_diff} { ++ tk_popup $ctxmsm $X $Y + } else { ++ set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}] + if {$::ui_index eq $::current_diff_side} { + set l [mc "Unstage Hunk From Commit"] - set t [mc "Unstage Line From Commit"] ++ if {$has_range} { ++ set t [mc "Unstage Lines From Commit"] ++ } else { ++ set t [mc "Unstage Line From Commit"] ++ } + } else { + set l [mc "Stage Hunk For Commit"] - set t [mc "Stage Line For Commit"] ++ if {$has_range} { ++ set t [mc "Stage Lines For Commit"] ++ } else { ++ set t [mc "Stage Line For Commit"] ++ } + } - if {$::is_3way_diff || $::is_submodule_diff ++ if {$::is_3way_diff + || $current_diff_path eq {} + || {__} eq $state + || {_O} eq $state + || {_T} eq $state + || {T_} eq $state} { + set s disabled + } else { + set s normal + } + $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l + $ctxm entryconf $::ui_diff_applyline -state $s -label $t + tk_popup $ctxm $X $Y + } +} - bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg %x %y %X %Y] ++bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y] + +# -- Status Bar +# +set main_status [::status_bar::new .status] +pack .status -anchor w -side bottom -fill x +$main_status show [mc "Initializing..."] + +# -- Load geometry +# +catch { +set gm $repo_config(gui.geometry) +wm geometry . [lindex $gm 0] - .vpane sash place 0 \ - [lindex $gm 1] \ - [lindex [.vpane sash coord 0] 1] - .vpane.files sash place 0 \ - [lindex [.vpane.files sash coord 0] 0] \ - [lindex $gm 2] ++if {$use_ttk} { ++ .vpane sashpos 0 [lindex $gm 1] ++ .vpane.files sashpos 0 [lindex $gm 2] ++} else { ++ .vpane sash place 0 \ ++ [lindex $gm 1] \ ++ [lindex [.vpane sash coord 0] 1] ++ .vpane.files sash place 0 \ ++ [lindex [.vpane.files sash coord 0] 0] \ ++ [lindex $gm 2] ++} +unset gm +} + +# -- Load window state +# +catch { +set gws $repo_config(gui.wmstate) +wm state . $gws +unset gws +} + +# -- Key Bindings +# +bind $ui_comm <$M1B-Key-Return> {do_commit;break} +bind $ui_comm <$M1B-Key-t> {do_add_selection;break} +bind $ui_comm <$M1B-Key-T> {do_add_selection;break} +bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break} +bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break} +bind $ui_comm <$M1B-Key-j> {do_revert_selection;break} +bind $ui_comm <$M1B-Key-J> {do_revert_selection;break} +bind $ui_comm <$M1B-Key-i> {do_add_all;break} +bind $ui_comm <$M1B-Key-I> {do_add_all;break} +bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break} +bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break} +bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break} +bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break} +bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} +bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} +bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} +bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} +bind $ui_comm <$M1B-Key-minus> {show_less_context;break} +bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} +bind $ui_comm <$M1B-Key-equal> {show_more_context;break} +bind $ui_comm <$M1B-Key-plus> {show_more_context;break} +bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} + +bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} +bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} +bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break} +bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break} +bind $ui_diff <$M1B-Key-v> {break} +bind $ui_diff <$M1B-Key-V> {break} +bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break} +bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break} +bind $ui_diff {catch {%W yview scroll -1 units};break} +bind $ui_diff {catch {%W yview scroll 1 units};break} +bind $ui_diff {catch {%W xview scroll -1 units};break} +bind $ui_diff {catch {%W xview scroll 1 units};break} +bind $ui_diff {catch {%W yview scroll -1 units};break} +bind $ui_diff {catch {%W yview scroll 1 units};break} +bind $ui_diff {catch {%W xview scroll -1 units};break} +bind $ui_diff {catch {%W xview scroll 1 units};break} +bind $ui_diff {catch {%W yview scroll -1 pages};break} +bind $ui_diff {catch {%W yview scroll 1 pages};break} +bind $ui_diff {focus %W} + +if {[is_enabled branch]} { + bind . <$M1B-Key-n> branch_create::dialog + bind . <$M1B-Key-N> branch_create::dialog + bind . <$M1B-Key-o> branch_checkout::dialog + bind . <$M1B-Key-O> branch_checkout::dialog + bind . <$M1B-Key-m> merge::dialog + bind . <$M1B-Key-M> merge::dialog +} +if {[is_enabled transport]} { + bind . <$M1B-Key-p> do_push_anywhere + bind . <$M1B-Key-P> do_push_anywhere +} + +bind . ui_do_rescan +bind . <$M1B-Key-r> ui_do_rescan +bind . <$M1B-Key-R> ui_do_rescan +bind . <$M1B-Key-s> do_signoff +bind . <$M1B-Key-S> do_signoff +bind . <$M1B-Key-t> do_add_selection +bind . <$M1B-Key-T> do_add_selection ++bind . <$M1B-Key-j> do_revert_selection ++bind . <$M1B-Key-J> do_revert_selection +bind . <$M1B-Key-i> do_add_all +bind . <$M1B-Key-I> do_add_all +bind . <$M1B-Key-minus> {show_less_context;break} +bind . <$M1B-Key-KP_Subtract> {show_less_context;break} +bind . <$M1B-Key-equal> {show_more_context;break} +bind . <$M1B-Key-plus> {show_more_context;break} +bind . <$M1B-Key-KP_Add> {show_more_context;break} +bind . <$M1B-Key-Return> do_commit +foreach i [list $ui_index $ui_workdir] { + bind $i "toggle_or_diff $i %x %y; break" + bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break" + bind $i "add_range_to_selection $i %x %y; break" +} +unset i + +set file_lists($ui_index) [list] +set file_lists($ui_workdir) [list] + - wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]" ++wm title . "[appname] ([reponame]) [file normalize $_gitworktree]" +focus -force $ui_comm + +# -- Warn the user about environmental problems. Cygwin's Tcl +# does *not* pass its env array onto any processes it spawns. +# This means that git processes get none of our environment. +# +if {[is_Cygwin]} { + set ignored_env 0 + set suggest_user {} + set msg [mc "Possible environment issues exist. + +The following environment variables are probably +going to be ignored by any Git subprocess run +by %s: + +" [appname]] + foreach name [array names env] { + switch -regexp -- $name { + {^GIT_INDEX_FILE$} - + {^GIT_OBJECT_DIRECTORY$} - + {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} - + {^GIT_DIFF_OPTS$} - + {^GIT_EXTERNAL_DIFF$} - + {^GIT_PAGER$} - + {^GIT_TRACE$} - + {^GIT_CONFIG$} - + {^GIT_(AUTHOR|COMMITTER)_DATE$} { + append msg " - $name\n" + incr ignored_env + } + {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} { + append msg " - $name\n" + incr ignored_env + set suggest_user $name + } + } + } + if {$ignored_env > 0} { + append msg [mc " +This is due to a known issue with the +Tcl binary distributed by Cygwin."] + + if {$suggest_user ne {}} { + append msg [mc " + +A good replacement for %s +is placing values for the user.name and +user.email settings into your personal +~/.gitconfig file. +" $suggest_user] + } + warn_popup $msg + } + unset ignored_env msg suggest_user name +} + +# -- Only initialize complex UI if we are going to stay running. +# +if {[is_enabled transport]} { + load_all_remotes + + set n [.mbar.remote index end] + populate_remotes_menu + set n [expr {[.mbar.remote index end] - $n}] + if {$n > 0} { + if {[.mbar.remote type 0] eq "tearoff"} { incr n } + .mbar.remote insert $n separator + } + unset n +} + +if {[winfo exists $ui_comm]} { + set GITGUI_BCK_exists [load_message GITGUI_BCK] + + # -- If both our backup and message files exist use the + # newer of the two files to initialize the buffer. + # + if {$GITGUI_BCK_exists} { + set m [gitdir GITGUI_MSG] + if {[file isfile $m]} { + if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} { + catch {file delete [gitdir GITGUI_MSG]} + } else { + $ui_comm delete 0.0 end + $ui_comm edit reset + $ui_comm edit modified false + catch {file delete [gitdir GITGUI_BCK]} + set GITGUI_BCK_exists 0 + } + } + unset m + } + + proc backup_commit_buffer {} { + global ui_comm GITGUI_BCK_exists + + set m [$ui_comm edit modified] + if {$m || $GITGUI_BCK_exists} { + set msg [string trim [$ui_comm get 0.0 end]] + regsub -all -line {[ \r\t]+$} $msg {} msg + + if {$msg eq {}} { + if {$GITGUI_BCK_exists} { + catch {file delete [gitdir GITGUI_BCK]} + set GITGUI_BCK_exists 0 + } + } elseif {$m} { + catch { + set fd [open [gitdir GITGUI_BCK] w] + puts -nonewline $fd $msg + close $fd + set GITGUI_BCK_exists 1 + } + } + + $ui_comm edit modified false + } + + set ::GITGUI_BCK_i [after 2000 backup_commit_buffer] + } + + backup_commit_buffer + + # -- If the user has aspell available we can drive it + # in pipe mode to spellcheck the commit message. + # + set spell_cmd [list |] + set spell_dict [get_config gui.spellingdictionary] + lappend spell_cmd aspell + if {$spell_dict ne {}} { + lappend spell_cmd --master=$spell_dict + } + lappend spell_cmd --mode=none + lappend spell_cmd --encoding=utf-8 + lappend spell_cmd pipe + if {$spell_dict eq {none} + || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} { + bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y] + } else { + set ui_comm_spell [spellcheck::init \ + $spell_fd \ + $ui_comm \ + $ui_comm_ctxm \ + ] + } + unset -nocomplain spell_cmd spell_fd spell_err spell_dict +} + +lock_index begin-read +if {![winfo ismapped .]} { + wm deiconify . +} +after 1 { + if {[is_enabled initialamend]} { + force_amend + } else { + do_rescan + } + + if {[is_enabled nocommitmsg]} { + $ui_comm configure -state disabled -background gray + } +} +if {[is_enabled multicommit]} { + after 1000 hint_gc +} +if {[is_enabled retcode]} { + bind . {+terminate_me %W} +} +if {$picked && [is_config_true gui.autoexplore]} { + do_explore +} ++ ++# Local variables: ++# mode: tcl ++# indent-tabs-mode: t ++# tab-width: 4 ++# End: diff --cc git-gui/lib/about.tcl index 241ab892c,000000000..cfa50fca8 mode 100644,000000..100644 --- a/git-gui/lib/about.tcl +++ b/git-gui/lib/about.tcl @@@ -1,87 -1,0 +1,70 @@@ +# git-gui about git-gui dialog +# Copyright (C) 2006, 2007 Shawn Pearce + +proc do_about {} { + global appvers copyright oguilib + global tcl_patchLevel tk_patchLevel - global ui_comm_spell ++ global ui_comm_spell NS use_ttk + + set w .about_dialog - toplevel $w ++ Dialog $w + wm geometry $w "+[winfo rootx .]+[winfo rooty .]" + + pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10 - label $w.header -text [mc "About %s" [appname]] \ - -font font_uibold ++ ${NS}::label $w.header -text [mc "About %s" [appname]] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.close -text {Close} \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.close -text {Close} \ + -default active \ + -command [list destroy $w] + pack $w.buttons.close -side right + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - label $w.desc \ - -text "[mc "git-gui - a graphical user interface for Git."]\n$copyright" \ - -padx 5 -pady 5 \ - -justify left \ - -anchor w \ - -borderwidth 1 \ - -relief solid ++ paddedlabel $w.desc \ ++ -text "[mc "git-gui - a graphical user interface for Git."]\n$copyright" + pack $w.desc -side top -fill x -padx 5 -pady 5 + + set v {} + append v "git-gui version $appvers\n" + append v "[git version]\n" + append v "\n" + if {$tcl_patchLevel eq $tk_patchLevel} { + append v "Tcl/Tk version $tcl_patchLevel" + } else { + append v "Tcl version $tcl_patchLevel" + append v ", Tk version $tk_patchLevel" + } + if {[info exists ui_comm_spell] + && [$ui_comm_spell version] ne {}} { + append v "\n" + append v [$ui_comm_spell version] + } + + set d {} + append d "git wrapper: $::_git\n" + append d "git exec dir: [gitexec]\n" + append d "git-gui lib: $oguilib" + - label $w.vers \ - -text $v \ - -padx 5 -pady 5 \ - -justify left \ - -anchor w \ - -borderwidth 1 \ - -relief solid ++ paddedlabel $w.vers -text $v + pack $w.vers -side top -fill x -padx 5 -pady 5 + - label $w.dirs \ - -text $d \ - -padx 5 -pady 5 \ - -justify left \ - -anchor w \ - -borderwidth 1 \ - -relief solid ++ paddedlabel $w.dirs -text $d + pack $w.dirs -side top -fill x -padx 5 -pady 5 + + menu $w.ctxm -tearoff 0 + $w.ctxm add command \ + -label {Copy} \ + -command " + clipboard clear + clipboard append -format STRING -type STRING -- \[$w.vers cget -text\] + " + + bind $w "grab $w; focus $w.buttons.close" + bind $w "destroy $w" + bind $w "destroy $w" + bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w" + wm title $w "About [appname]" + tkwait window $w +} diff --cc git-gui/lib/blame.tcl index 8525b79aa,000000000..786b50b8c mode 100644,000000..100644 --- a/git-gui/lib/blame.tcl +++ b/git-gui/lib/blame.tcl @@@ -1,1315 -1,0 +1,1315 @@@ +# git-gui blame viewer +# Copyright (C) 2006, 2007 Shawn Pearce + +class blame { + +image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} + +# Persistant data (survives loads) +# +field history {}; # viewer history: {commit path} +field header ; # array commit,key -> header field + +# Tk UI control paths +# +field w ; # top window in this viewer +field w_back ; # our back button +field w_path ; # label showing the current file path +field w_columns ; # list of all column widgets in the viewer +field w_line ; # text column: all line numbers +field w_amov ; # text column: annotations + move tracking +field w_asim ; # text column: annotations (simple computation) +field w_file ; # text column: actual file data +field w_cviewer ; # pane showing commit message +field finder ; # find mini-dialog frame +field status ; # status mega-widget instance +field old_height ; # last known height of $w.file_pane + + +# Tk UI colors +# +variable active_color #c0edc5 +variable group_colors { + #d6d6d6 + #e1e1e1 + #ececec +} + +# Current blame data; cleared/reset on each load +# +field commit ; # input commit to blame +field path ; # input filename to view in $commit + +field current_fd {} ; # background process running +field highlight_line -1 ; # current line selected +field highlight_column {} ; # current commit column selected +field highlight_commit {} ; # sha1 of commit selected + +field total_lines 0 ; # total length of file +field blame_lines 0 ; # number of lines computed +field amov_data ; # list of {commit origfile origline} +field asim_data ; # list of {commit origfile origline} + +field r_commit ; # commit currently being parsed +field r_orig_line ; # original line number +field r_final_line ; # final line number +field r_line_count ; # lines in this region + +field tooltip_wm {} ; # Current tooltip toplevel, if open +field tooltip_t {} ; # Text widget in $tooltip_wm +field tooltip_timer {} ; # Current timer event for our tooltip +field tooltip_commit {} ; # Commit(s) in tooltip + +constructor new {i_commit i_path i_jump} { - global cursor_ptr M1B M1T have_tk85 ++ global cursor_ptr M1B M1T have_tk85 use_ttk NS + variable active_color + variable group_colors + + set commit $i_commit + set path $i_path + + make_toplevel top w + wm title $top [append "[appname] ([reponame]): " [mc "File Viewer"]] + + set font_w [font measure font_diff "0"] + - frame $w.header -background gold - label $w.header.commit_l \ ++ gold_frame $w.header ++ tlabel $w.header.commit_l \ + -text [mc "Commit:"] \ + -background gold \ + -foreground black \ + -anchor w \ + -justify left + set w_back $w.header.commit_b - label $w_back \ ++ tlabel $w_back \ + -image ::blame::img_back_arrow \ + -borderwidth 0 \ + -relief flat \ + -state disabled \ + -background gold \ + -foreground black \ + -activebackground gold + bind $w_back " + if {\[$w_back cget -state\] eq {normal}} { + [cb _history_menu] + } + " - label $w.header.commit \ ++ tlabel $w.header.commit \ + -textvariable @commit \ + -background gold \ + -foreground black \ + -anchor w \ + -justify left - label $w.header.path_l \ ++ tlabel $w.header.path_l \ + -text [mc "File:"] \ + -background gold \ + -foreground black \ + -anchor w \ + -justify left + set w_path $w.header.path - label $w_path \ ++ tlabel $w_path \ + -background gold \ + -foreground black \ + -anchor w \ + -justify left + pack $w.header.commit_l -side left + pack $w_back -side left + pack $w.header.commit -side left + pack $w_path -fill x -side right + pack $w.header.path_l -side right + + panedwindow $w.file_pane -orient vertical -borderwidth 0 -sashwidth 3 + frame $w.file_pane.out -relief flat -borderwidth 1 + frame $w.file_pane.cm -relief sunken -borderwidth 1 + $w.file_pane add $w.file_pane.out \ + -sticky nsew \ + -minsize 100 \ + -height 100 \ + -width 100 + $w.file_pane add $w.file_pane.cm \ + -sticky nsew \ + -minsize 25 \ + -height 25 \ + -width 100 + + set w_line $w.file_pane.out.linenumber_t + text $w_line \ + -takefocus 0 \ + -highlightthickness 0 \ + -padx 0 -pady 0 \ + -background white \ + -foreground black \ + -borderwidth 0 \ + -state disabled \ + -wrap none \ + -height 40 \ + -width 6 \ + -font font_diff + $w_line tag conf linenumber -justify right -rmargin 5 + + set w_amov $w.file_pane.out.amove_t + text $w_amov \ + -takefocus 0 \ + -highlightthickness 0 \ + -padx 0 -pady 0 \ + -background white \ + -foreground black \ + -borderwidth 0 \ + -state disabled \ + -wrap none \ + -height 40 \ + -width 5 \ + -font font_diff + $w_amov tag conf author_abbr -justify right -rmargin 5 + $w_amov tag conf curr_commit + $w_amov tag conf prior_commit -foreground blue -underline 1 + $w_amov tag bind prior_commit \ + \ + "[cb _load_commit $w_amov @amov_data @%x,%y];break" + + set w_asim $w.file_pane.out.asimple_t + text $w_asim \ + -takefocus 0 \ + -highlightthickness 0 \ + -padx 0 -pady 0 \ + -background white \ + -foreground black \ + -borderwidth 0 \ + -state disabled \ + -wrap none \ + -height 40 \ + -width 4 \ + -font font_diff + $w_asim tag conf author_abbr -justify right + $w_asim tag conf curr_commit + $w_asim tag conf prior_commit -foreground blue -underline 1 + $w_asim tag bind prior_commit \ + \ + "[cb _load_commit $w_asim @asim_data @%x,%y];break" + + set w_file $w.file_pane.out.file_t + text $w_file \ + -takefocus 0 \ + -highlightthickness 0 \ + -padx 0 -pady 0 \ + -background white \ + -foreground black \ + -borderwidth 0 \ + -state disabled \ + -wrap none \ + -height 40 \ + -width 80 \ + -xscrollcommand [list $w.file_pane.out.sbx set] \ + -font font_diff + if {$have_tk85} { + $w_file configure -inactiveselectbackground darkblue + } + $w_file tag conf found \ + -background yellow + + set w_columns [list $w_amov $w_asim $w_line $w_file] + - scrollbar $w.file_pane.out.sbx \ ++ ${NS}::scrollbar $w.file_pane.out.sbx \ + -orient h \ + -command [list $w_file xview] - scrollbar $w.file_pane.out.sby \ ++ ${NS}::scrollbar $w.file_pane.out.sby \ + -orient v \ + -command [list scrollbar2many $w_columns yview] + eval grid $w_columns $w.file_pane.out.sby -sticky nsew + grid conf \ + $w.file_pane.out.sbx \ + -column [expr {[llength $w_columns] - 1}] \ + -sticky we + grid columnconfigure \ + $w.file_pane.out \ + [expr {[llength $w_columns] - 1}] \ + -weight 1 + grid rowconfigure $w.file_pane.out 0 -weight 1 + + set finder [::searchbar::new \ + $w.file_pane.out.ff $w_file \ + -column [expr {[llength $w_columns] - 1}] \ + ] + + set w_cviewer $w.file_pane.cm.t + text $w_cviewer \ + -background white \ + -foreground black \ + -borderwidth 0 \ + -state disabled \ + -wrap none \ + -height 10 \ + -width 80 \ + -xscrollcommand [list $w.file_pane.cm.sbx set] \ + -yscrollcommand [list $w.file_pane.cm.sby set] \ + -font font_diff + $w_cviewer tag conf still_loading \ + -font font_uiitalic \ + -justify center + $w_cviewer tag conf header_key \ + -tabs {3c} \ + -background $active_color \ + -font font_uibold + $w_cviewer tag conf header_val \ + -background $active_color \ + -font font_ui + $w_cviewer tag raise sel - scrollbar $w.file_pane.cm.sbx \ ++ ${NS}::scrollbar $w.file_pane.cm.sbx \ + -orient h \ + -command [list $w_cviewer xview] - scrollbar $w.file_pane.cm.sby \ ++ ${NS}::scrollbar $w.file_pane.cm.sby \ + -orient v \ + -command [list $w_cviewer yview] + pack $w.file_pane.cm.sby -side right -fill y + pack $w.file_pane.cm.sbx -side bottom -fill x + pack $w_cviewer -expand 1 -fill both + + set status [::status_bar::new $w.status] + + menu $w.ctxm -tearoff 0 + $w.ctxm add command \ + -label [mc "Copy Commit"] \ + -command [cb _copycommit] + $w.ctxm add separator + $w.ctxm add command \ + -label [mc "Find Text..."] \ + -accelerator F7 \ + -command [list searchbar::show $finder] + menu $w.ctxm.enc + build_encoding_menu $w.ctxm.enc [cb _setencoding] + $w.ctxm add cascade \ + -label [mc "Encoding"] \ + -menu $w.ctxm.enc + $w.ctxm add command \ + -label [mc "Do Full Copy Detection"] \ + -command [cb _fullcopyblame] + $w.ctxm add separator + $w.ctxm add command \ + -label [mc "Show History Context"] \ + -command [cb _gitkcommit] + $w.ctxm add command \ + -label [mc "Blame Parent Commit"] \ + -command [cb _blameparent] + + foreach i $w_columns { + for {set g 0} {$g < [llength $group_colors]} {incr g} { + $i tag conf color$g -background [lindex $group_colors $g] + } + + if {$i eq $w_file} { + $w_file tag raise found + } + $i tag raise sel + + $i conf -cursor $cursor_ptr + $i conf -yscrollcommand \ + "[list ::searchbar::scrolled $finder] + [list many2scrollbar $w_columns yview $w.file_pane.out.sby]" + bind $i " + [cb _hide_tooltip] + [cb _click $i @%x,%y] + focus $i + " + bind $i [cb _show_tooltip $i @%x,%y] + bind $i [cb _hide_tooltip] + bind $i [cb _hide_tooltip] + bind_button3 $i " + [cb _hide_tooltip] + set cursorX %x + set cursorY %y + set cursorW %W + tk_popup $w.ctxm %X %Y + " + bind $i "[list focus $w_cviewer];break" + bind $i "[cb _focus_search $w_cviewer];break" + } + + foreach i [concat $w_columns $w_cviewer] { + bind $i {catch {%W yview scroll -1 units};break} + bind $i {catch {%W yview scroll 1 units};break} + bind $i {catch {%W xview scroll -1 units};break} + bind $i {catch {%W xview scroll 1 units};break} + bind $i {catch {%W yview scroll -1 units};break} + bind $i {catch {%W yview scroll 1 units};break} + bind $i {catch {%W xview scroll -1 units};break} + bind $i {catch {%W xview scroll 1 units};break} + bind $i {catch {%W yview scroll -1 pages};break} + bind $i {catch {%W yview scroll 1 pages};break} + } + + bind $w_cviewer "[cb _focus_search $w_file];break" + bind $w_cviewer "[list focus $w_file];break" + bind $w_cviewer [list focus $w_cviewer] + bind $w_file [cb _focus_search $w_file] + bind $top [list searchbar::show $finder] + bind $top [list searchbar::hide $finder] + bind $top [list searchbar::find_next $finder] + bind $top [list searchbar::find_prev $finder] + catch { bind $top [list searchbar::find_prev $finder] } + + grid configure $w.header -sticky ew + grid configure $w.file_pane -sticky nsew + grid configure $w.status -sticky ew + grid columnconfigure $top 0 -weight 1 + grid rowconfigure $top 0 -weight 0 + grid rowconfigure $top 1 -weight 1 + grid rowconfigure $top 2 -weight 0 + + set req_w [winfo reqwidth $top] + set req_h [winfo reqheight $top] + set scr_w [expr {[winfo screenwidth $top] - 40}] + set scr_h [expr {[winfo screenheight $top] - 120}] + set opt_w [expr {$font_w * (80 + 5*3 + 3)}] + if {$req_w < $opt_w} {set req_w $opt_w} + if {$req_w > $scr_w} {set req_w $scr_w} + set opt_h [expr {$req_w*4/3}] + if {$req_h < $scr_h} {set req_h $scr_h} + if {$req_h > $opt_h} {set req_h $opt_h} + set g "${req_w}x${req_h}" + wm geometry $top $g + update + + set old_height [winfo height $w.file_pane] + $w.file_pane sash place 0 \ + [lindex [$w.file_pane sash coord 0] 0] \ + [expr {int($old_height * 0.80)}] + bind $w.file_pane \ + "if {{$w.file_pane} eq {%W}} {[cb _resize %h]}" + + wm protocol $top WM_DELETE_WINDOW "destroy $top" + bind $top [cb _handle_destroy %W] + + _load $this $i_jump +} + +method _focus_search {win} { + if {[searchbar::visible $finder]} { + focus [searchbar::editor $finder] + } else { + focus $win + } +} + +method _handle_destroy {win} { + if {$win eq $w} { + _kill $this + delete_this + } +} + +method _kill {} { + if {$current_fd ne {}} { + kill_file_process $current_fd + catch {close $current_fd} + set current_fd {} + } +} + +method _load {jump} { + variable group_colors + + _hide_tooltip $this + + if {$total_lines != 0 || $current_fd ne {}} { + _kill $this + + foreach i $w_columns { + $i conf -state normal + $i delete 0.0 end + foreach g [$i tag names] { + if {[regexp {^g[0-9a-f]{40}$} $g]} { + $i tag delete $g + } + } + $i conf -state disabled + } + + $w_cviewer conf -state normal + $w_cviewer delete 0.0 end + $w_cviewer conf -state disabled + + set highlight_line -1 + set highlight_column {} + set highlight_commit {} + set total_lines 0 + } + + if {$history eq {}} { + $w_back conf -state disabled + } else { + $w_back conf -state normal + } + + # Index 0 is always empty. There is never line 0 as + # we use only 1 based lines, as that matches both with + # git-blame output and with Tk's text widget. + # + set amov_data [list [list]] + set asim_data [list [list]] + + $status show [mc "Reading %s..." "$commit:[escape_path $path]"] + $w_path conf -text [escape_path $path] + if {$commit eq {}} { + set fd [open $path r] + fconfigure $fd -eofchar {} + } else { + set fd [git_read cat-file blob "$commit:$path"] + } + fconfigure $fd \ + -blocking 0 \ + -translation lf \ + -encoding [get_path_encoding $path] + fileevent $fd readable [cb _read_file $fd $jump] + set current_fd $fd +} + +method _history_menu {} { + set m $w.backmenu + if {[winfo exists $m]} { + $m delete 0 end + } else { + menu $m -tearoff 0 + } + + for {set i [expr {[llength $history] - 1}] + } {$i >= 0} {incr i -1} { + set e [lindex $history $i] + set c [lindex $e 0] + set f [lindex $e 1] + + if {[regexp {^[0-9a-f]{40}$} $c]} { + set t [string range $c 0 8]... + } elseif {$c eq {}} { + set t {Working Directory} + } else { + set t $c + } + if {![catch {set summary $header($c,summary)}]} { + append t " $summary" + if {[string length $t] > 70} { + set t [string range $t 0 66]... + } + } + + $m add command -label $t -command [cb _goback $i] + } + set X [winfo rootx $w_back] + set Y [expr {[winfo rooty $w_back] + [winfo height $w_back]}] + tk_popup $m $X $Y +} + +method _goback {i} { + set dat [lindex $history $i] + set history [lrange $history 0 [expr {$i - 1}]] + set commit [lindex $dat 0] + set path [lindex $dat 1] + _load $this [lrange $dat 2 5] +} + +method _read_file {fd jump} { + if {$fd ne $current_fd} { + catch {close $fd} + return + } + + foreach i $w_columns {$i conf -state normal} + while {[gets $fd line] >= 0} { + regsub "\r\$" $line {} line + incr total_lines + lappend amov_data {} + lappend asim_data {} + + if {$total_lines > 1} { + foreach i $w_columns {$i insert end "\n"} + } + + $w_line insert end "$total_lines" linenumber + $w_file insert end "$line" + } + + set ln_wc [expr {[string length $total_lines] + 2}] + if {[$w_line cget -width] < $ln_wc} { + $w_line conf -width $ln_wc + } + + foreach i $w_columns {$i conf -state disabled} + + if {[eof $fd]} { + close $fd + + # If we don't force Tk to update the widgets *right now* + # none of our jump commands will cause a change in the UI. + # + update + + if {[llength $jump] == 1} { + set highlight_line [lindex $jump 0] + $w_file see "$highlight_line.0" + } elseif {[llength $jump] == 4} { + set highlight_column [lindex $jump 0] + set highlight_line [lindex $jump 1] + $w_file xview moveto [lindex $jump 2] + $w_file yview moveto [lindex $jump 3] + } + + _exec_blame $this $w_asim @asim_data \ + [list] \ + [mc "Loading copy/move tracking annotations..."] + } +} ifdeleted { catch {close $fd} } + +method _exec_blame {cur_w cur_d options cur_s} { + lappend options --incremental --encoding=utf-8 + if {$commit eq {}} { + lappend options --contents $path + } else { + lappend options $commit + } + lappend options -- $path + set fd [eval git_read --nice blame $options] + fconfigure $fd -blocking 0 -translation lf -encoding utf-8 + fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d] + set current_fd $fd + set blame_lines 0 + + $status start \ + $cur_s \ + [mc "lines annotated"] +} + +method _read_blame {fd cur_w cur_d} { + upvar #0 $cur_d line_data + variable group_colors + + if {$fd ne $current_fd} { + catch {close $fd} + return + } + + $cur_w conf -state normal + while {[gets $fd line] >= 0} { + if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \ + cmit original_line final_line line_count]} { + set r_commit $cmit + set r_orig_line $original_line + set r_final_line $final_line + set r_line_count $line_count + } elseif {[string match {filename *} $line]} { + set file [string range $line 9 end] + set n $r_line_count + set lno $r_final_line + set oln $r_orig_line + set cmit $r_commit + + if {[regexp {^0{40}$} $cmit]} { + set commit_abbr work + set commit_type curr_commit + } elseif {$cmit eq $commit} { + set commit_abbr this + set commit_type curr_commit + } else { + set commit_type prior_commit + set commit_abbr [string range $cmit 0 3] + } + + set author_abbr {} + set a_name {} + catch {set a_name $header($cmit,author)} + while {$a_name ne {}} { + if {$author_abbr ne {} + && [string index $a_name 0] eq {'}} { + regsub {^'[^']+'\s+} $a_name {} a_name + } + if {![regexp {^([[:upper:]])} $a_name _a]} break + append author_abbr $_a + unset _a + if {![regsub \ + {^[[:upper:]][^\s]*\s+} \ + $a_name {} a_name ]} break + } + if {$author_abbr eq {}} { + set author_abbr { |} + } else { + set author_abbr [string range $author_abbr 0 3] + } + unset a_name + + set first_lno $lno + while { + $first_lno > 1 + && $cmit eq [lindex $line_data [expr {$first_lno - 1}] 0] + && $file eq [lindex $line_data [expr {$first_lno - 1}] 1] + } { + incr first_lno -1 + } + + set color {} + if {$first_lno < $lno} { + foreach g [$w_file tag names $first_lno.0] { + if {[regexp {^color[0-9]+$} $g]} { + set color $g + break + } + } + } else { + set i [lsort [concat \ + [$w_file tag names "[expr {$first_lno - 1}].0"] \ + [$w_file tag names "[expr {$lno + $n}].0"] \ + ]] + for {set g 0} {$g < [llength $group_colors]} {incr g} { + if {[lsearch -sorted -exact $i color$g] == -1} { + set color color$g + break + } + } + } + if {$color eq {}} { + set color color0 + } + + while {$n > 0} { + set lno_e "$lno.0 lineend + 1c" + if {[lindex $line_data $lno] ne {}} { + set g [lindex $line_data $lno 0] + foreach i $w_columns { + $i tag remove g$g $lno.0 $lno_e + } + } + lset line_data $lno [list $cmit $file $oln] + + $cur_w delete $lno.0 "$lno.0 lineend" + if {$lno == $first_lno} { + $cur_w insert $lno.0 $commit_abbr $commit_type + } elseif {$lno == [expr {$first_lno + 1}]} { + $cur_w insert $lno.0 $author_abbr author_abbr + } else { + $cur_w insert $lno.0 { |} + } + + foreach i $w_columns { + if {$cur_w eq $w_amov} { + for {set g 0} \ + {$g < [llength $group_colors]} \ + {incr g} { + $i tag remove color$g $lno.0 $lno_e + } + $i tag add $color $lno.0 $lno_e + } + $i tag add g$cmit $lno.0 $lno_e + } + + if {$highlight_column eq $cur_w} { + if {$highlight_line == -1 + && [lindex [$w_file yview] 0] == 0} { + $w_file see $lno.0 + set highlight_line $lno + } + if {$highlight_line == $lno} { + _showcommit $this $cur_w $lno + } + } + + incr n -1 + incr lno + incr oln + incr blame_lines + } + + while { + $cmit eq [lindex $line_data $lno 0] + && $file eq [lindex $line_data $lno 1] + } { + $cur_w delete $lno.0 "$lno.0 lineend" + + if {$lno == $first_lno} { + $cur_w insert $lno.0 $commit_abbr $commit_type + } elseif {$lno == [expr {$first_lno + 1}]} { + $cur_w insert $lno.0 $author_abbr author_abbr + } else { + $cur_w insert $lno.0 { |} + } + + if {$cur_w eq $w_amov} { + foreach i $w_columns { + for {set g 0} \ + {$g < [llength $group_colors]} \ + {incr g} { + $i tag remove color$g $lno.0 $lno_e + } + $i tag add $color $lno.0 $lno_e + } + } + + incr lno + } + + } elseif {[regexp {^([a-z-]+) (.*)$} $line line key data]} { + set header($r_commit,$key) $data + } + } + $cur_w conf -state disabled + + if {[eof $fd]} { + close $fd + if {$cur_w eq $w_asim} { + # Switches for original location detection + set threshold [get_config gui.copyblamethreshold] + set original_options [list "-C$threshold"] + + if {![is_config_true gui.fastcopyblame]} { + # thorough copy search; insert before the threshold + set original_options [linsert $original_options 0 -C] + } + if {[git-version >= 1.5.3]} { + lappend original_options -w ; # ignore indentation changes + } + + _exec_blame $this $w_amov @amov_data \ + $original_options \ + [mc "Loading original location annotations..."] + } else { + set current_fd {} + $status stop [mc "Annotation complete."] + } + } else { + $status update $blame_lines $total_lines + } +} ifdeleted { catch {close $fd} } + +method _find_commit_bound {data_list start_idx delta} { + upvar #0 $data_list line_data + set pos $start_idx + set limit [expr {[llength $line_data] - 1}] + set base_commit [lindex $line_data $pos 0] + + while {$pos > 0 && $pos < $limit} { + set new_pos [expr {$pos + $delta}] + if {[lindex $line_data $new_pos 0] ne $base_commit} { + return $pos + } + + set pos $new_pos + } + + return $pos +} + +method _fullcopyblame {} { + if {$current_fd ne {}} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [mc "Busy"] \ + -message [mc "Annotation process is already running."] + + return + } + + # Switches for original location detection + set threshold [get_config gui.copyblamethreshold] + set original_options [list -C -C "-C$threshold"] + + if {[git-version >= 1.5.3]} { + lappend original_options -w ; # ignore indentation changes + } + + # Find the line range + set pos @$::cursorX,$::cursorY + set lno [lindex [split [$::cursorW index $pos] .] 0] + set min_amov_lno [_find_commit_bound $this @amov_data $lno -1] + set max_amov_lno [_find_commit_bound $this @amov_data $lno 1] + set min_asim_lno [_find_commit_bound $this @asim_data $lno -1] + set max_asim_lno [_find_commit_bound $this @asim_data $lno 1] + + if {$min_asim_lno < $min_amov_lno} { + set min_amov_lno $min_asim_lno + } + + if {$max_asim_lno > $max_amov_lno} { + set max_amov_lno $max_asim_lno + } + + lappend original_options -L "$min_amov_lno,$max_amov_lno" + + # Clear lines + for {set i $min_amov_lno} {$i <= $max_amov_lno} {incr i} { + lset amov_data $i [list ] + } + + # Start the back-end process + _exec_blame $this $w_amov @amov_data \ + $original_options \ + [mc "Running thorough copy detection..."] +} + +method _click {cur_w pos} { + set lno [lindex [split [$cur_w index $pos] .] 0] + _showcommit $this $cur_w $lno +} + +method _setencoding {enc} { + force_path_encoding $path $enc + _load $this [list \ + $highlight_column \ + $highlight_line \ + [lindex [$w_file xview] 0] \ + [lindex [$w_file yview] 0] \ + ] +} + +method _load_commit {cur_w cur_d pos} { + upvar #0 $cur_d line_data + set lno [lindex [split [$cur_w index $pos] .] 0] + set dat [lindex $line_data $lno] + if {$dat ne {}} { + _load_new_commit $this \ + [lindex $dat 0] \ + [lindex $dat 1] \ + [list [lindex $dat 2]] + } +} + +method _load_new_commit {new_commit new_path jump} { + lappend history [list \ + $commit $path \ + $highlight_column \ + $highlight_line \ + [lindex [$w_file xview] 0] \ + [lindex [$w_file yview] 0] \ + ] + + set commit $new_commit + set path $new_path + _load $this $jump +} + +method _showcommit {cur_w lno} { + global repo_config + variable active_color + + if {$highlight_commit ne {}} { + foreach i $w_columns { + $i tag conf g$highlight_commit -background {} + $i tag lower g$highlight_commit + } + } + + if {$cur_w eq $w_asim} { + set dat [lindex $asim_data $lno] + set highlight_column $w_asim + } else { + set dat [lindex $amov_data $lno] + set highlight_column $w_amov + } + + $w_cviewer conf -state normal + $w_cviewer delete 0.0 end + + if {$dat eq {}} { + set cmit {} + $w_cviewer insert end [mc "Loading annotation..."] still_loading + } else { + set cmit [lindex $dat 0] + set file [lindex $dat 1] + + foreach i $w_columns { + $i tag conf g$cmit -background $active_color + $i tag raise g$cmit + if {$i eq $w_file} { + $w_file tag raise found + } + $i tag raise sel + } + + set author_name {} + set author_email {} + set author_time {} + catch {set author_name $header($cmit,author)} + catch {set author_email $header($cmit,author-mail)} + catch {set author_time [format_date $header($cmit,author-time)]} + + set committer_name {} + set committer_email {} + set committer_time {} + catch {set committer_name $header($cmit,committer)} + catch {set committer_email $header($cmit,committer-mail)} + catch {set committer_time [format_date $header($cmit,committer-time)]} + + if {[catch {set msg $header($cmit,message)}]} { + set msg {} + catch { + set fd [git_read cat-file commit $cmit] + fconfigure $fd -encoding binary -translation lf + # By default commits are assumed to be in utf-8 + set enc utf-8 + while {[gets $fd line] > 0} { + if {[string match {encoding *} $line]} { + set enc [string tolower [string range $line 9 end]] + } + } + set msg [read $fd] + close $fd + + set enc [tcl_encoding $enc] + if {$enc ne {}} { + set msg [encoding convertfrom $enc $msg] + } + set msg [string trim $msg] + } + set header($cmit,message) $msg + } + + $w_cviewer insert end "commit $cmit\n" header_key + $w_cviewer insert end [strcat [mc "Author:"] "\t"] header_key + $w_cviewer insert end "$author_name $author_email" header_val + $w_cviewer insert end " $author_time\n" header_val + + $w_cviewer insert end [strcat [mc "Committer:"] "\t"] header_key + $w_cviewer insert end "$committer_name $committer_email" header_val + $w_cviewer insert end " $committer_time\n" header_val + + if {$file ne $path} { + $w_cviewer insert end [strcat [mc "Original File:"] "\t"] header_key + $w_cviewer insert end "[escape_path $file]\n" header_val + } + + $w_cviewer insert end "\n$msg" + } + $w_cviewer conf -state disabled + + set highlight_line $lno + set highlight_commit $cmit + + if {[lsearch -exact $tooltip_commit $highlight_commit] != -1} { + _hide_tooltip $this + } +} + +method _get_click_amov_info {} { + set pos @$::cursorX,$::cursorY + set lno [lindex [split [$::cursorW index $pos] .] 0] + return [lindex $amov_data $lno] +} + +method _copycommit {} { + set dat [_get_click_amov_info $this] + if {$dat ne {}} { + clipboard clear + clipboard append \ + -format STRING \ + -type STRING \ + -- [lindex $dat 0] + } +} + +method _format_offset_date {base offset} { + set exval [expr {$base + $offset*24*60*60}] + return [clock format $exval -format {%Y-%m-%d}] +} + +method _gitkcommit {} { + global nullid + + set dat [_get_click_amov_info $this] + if {$dat ne {}} { + set cmit [lindex $dat 0] + + # If the line belongs to the working copy, use HEAD instead + if {$cmit eq $nullid} { + if {[catch {set cmit [git rev-parse --verify HEAD]} err]} { + error_popup [strcat [mc "Cannot find HEAD commit:"] "\n\n$err"] + return; + } + } + + set radius [get_config gui.blamehistoryctx] + set cmdline [list --select-commit=$cmit] + + if {$radius > 0} { + set author_time {} + set committer_time {} + + catch {set author_time $header($cmit,author-time)} + catch {set committer_time $header($cmit,committer-time)} + + if {$committer_time eq {}} { + set committer_time $author_time + } + + set after_time [_format_offset_date $this $committer_time [expr {-$radius}]] + set before_time [_format_offset_date $this $committer_time $radius] + + lappend cmdline --after=$after_time --before=$before_time + } + + lappend cmdline $cmit + + set base_rev "HEAD" + if {$commit ne {}} { + set base_rev $commit + } + + if {$base_rev ne $cmit} { + lappend cmdline $base_rev + } + + do_gitk $cmdline + } +} + +method _blameparent {} { + global nullid + + set dat [_get_click_amov_info $this] + if {$dat ne {}} { + set cmit [lindex $dat 0] + set new_path [lindex $dat 1] + + # Allow using Blame Parent on lines modified in the working copy + if {$cmit eq $nullid} { + set parent_ref "HEAD" + } else { + set parent_ref "$cmit^" + } + if {[catch {set cparent [git rev-parse --verify $parent_ref]} err]} { + error_popup [strcat [mc "Cannot find parent commit:"] "\n\n$err"] + return; + } + + _kill $this + + # Generate a diff between the commit and its parent, + # and use the hunks to update the line number. + # Request zero context to simplify calculations. + if {$cmit eq $nullid} { + set diffcmd [list diff-index --unified=0 $cparent -- $new_path] + } else { + set diffcmd [list diff-tree --unified=0 $cparent $cmit -- $new_path] + } + if {[catch {set fd [eval git_read $diffcmd]} err]} { + $status stop [mc "Unable to display parent"] + error_popup [strcat [mc "Error loading diff:"] "\n\n$err"] + return + } + + set r_orig_line [lindex $dat 2] + + fconfigure $fd \ + -blocking 0 \ + -encoding binary \ + -translation binary + fileevent $fd readable [cb _read_diff_load_commit \ + $fd $cparent $new_path $r_orig_line] + set current_fd $fd + } +} + +method _read_diff_load_commit {fd cparent new_path tline} { + if {$fd ne $current_fd} { + catch {close $fd} + return + } + + while {[gets $fd line] >= 0} { + if {[regexp {^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@} $line line \ + old_line osz old_size new_line nsz new_size]} { + + if {$osz eq {}} { set old_size 1 } + if {$nsz eq {}} { set new_size 1 } + + if {$new_line <= $tline} { + if {[expr {$new_line + $new_size}] > $tline} { + # Target line within the hunk + set line_shift [expr { + ($new_size-$old_size)*($tline-$new_line)/$new_size + }] + } else { + set line_shift [expr {$new_size-$old_size}] + } + + set r_orig_line [expr {$r_orig_line - $line_shift}] + } + } + } + + if {[eof $fd]} { + close $fd; + set current_fd {} + + _load_new_commit $this \ + $cparent \ + $new_path \ + [list $r_orig_line] + } +} ifdeleted { catch {close $fd} } + +method _show_tooltip {cur_w pos} { + if {$tooltip_wm ne {}} { + _open_tooltip $this $cur_w + } elseif {$tooltip_timer eq {}} { + set tooltip_timer [after 1000 [cb _open_tooltip $cur_w]] + } +} + +method _open_tooltip {cur_w} { + set tooltip_timer {} + set pos_x [winfo pointerx $cur_w] + set pos_y [winfo pointery $cur_w] + if {[winfo containing $pos_x $pos_y] ne $cur_w} { + _hide_tooltip $this + return + } + + if {$tooltip_wm ne "$cur_w.tooltip"} { + _hide_tooltip $this + + set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1] + wm overrideredirect $tooltip_wm 1 + wm transient $tooltip_wm [winfo toplevel $cur_w] + set tooltip_t $tooltip_wm.label + text $tooltip_t \ + -takefocus 0 \ + -highlightthickness 0 \ + -relief flat \ + -borderwidth 0 \ + -wrap none \ + -background lightyellow \ + -foreground black + $tooltip_t tag conf section_header -font font_uibold + pack $tooltip_t + } else { + $tooltip_t conf -state normal + $tooltip_t delete 0.0 end + } + + set pos @[join [list \ + [expr {$pos_x - [winfo rootx $cur_w]}] \ + [expr {$pos_y - [winfo rooty $cur_w]}]] ,] + set lno [lindex [split [$cur_w index $pos] .] 0] + if {$cur_w eq $w_amov} { + set dat [lindex $amov_data $lno] + set org {} + } else { + set dat [lindex $asim_data $lno] + set org [lindex $amov_data $lno] + } + + if {$dat eq {}} { + _hide_tooltip $this + return + } + + set cmit [lindex $dat 0] + set tooltip_commit [list $cmit] + + set author_name {} + set summary {} + set author_time {} + catch {set author_name $header($cmit,author)} + catch {set summary $header($cmit,summary)} + catch {set author_time [format_date $header($cmit,author-time)]} + + $tooltip_t insert end "commit $cmit\n" + $tooltip_t insert end "$author_name $author_time\n" + $tooltip_t insert end "$summary" + + if {$org ne {} && [lindex $org 0] ne $cmit} { + set save [$tooltip_t get 0.0 end] + $tooltip_t delete 0.0 end + + set cmit [lindex $org 0] + set file [lindex $org 1] + lappend tooltip_commit $cmit + + set author_name {} + set summary {} + set author_time {} + catch {set author_name $header($cmit,author)} + catch {set summary $header($cmit,summary)} + catch {set author_time [format_date $header($cmit,author-time)]} + + $tooltip_t insert end [strcat [mc "Originally By:"] "\n"] section_header + $tooltip_t insert end "commit $cmit\n" + $tooltip_t insert end "$author_name $author_time\n" + $tooltip_t insert end "$summary\n" + + if {$file ne $path} { + $tooltip_t insert end [strcat [mc "In File:"] " "] section_header + $tooltip_t insert end "$file\n" + } + + $tooltip_t insert end "\n" + $tooltip_t insert end [strcat [mc "Copied Or Moved Here By:"] "\n"] section_header + $tooltip_t insert end $save + } + + $tooltip_t conf -state disabled + _position_tooltip $this + + # On MacOS raising a window causes it to acquire focus. + # Tk 8.5 on MacOS seems to properly support wm transient, + # so we can safely counter the effect there. + if {$::have_tk85 && [is_MacOSX]} { + update + if {$w eq {}} { + raise . + } else { + raise $w + } + } +} + +method _position_tooltip {} { + set max_h [lindex [split [$tooltip_t index end] .] 0] + set max_w 0 + for {set i 1} {$i <= $max_h} {incr i} { + set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1] + if {$c > $max_w} {set max_w $c} + } + $tooltip_t conf -width $max_w -height $max_h + + set req_w [winfo reqwidth $tooltip_t] + set req_h [winfo reqheight $tooltip_t] + set pos_x [expr {[winfo pointerx .] + 5}] + set pos_y [expr {[winfo pointery .] + 10}] + + set g "${req_w}x${req_h}" + if {$pos_x >= 0} {append g +} + append g $pos_x + if {$pos_y >= 0} {append g +} + append g $pos_y + + wm geometry $tooltip_wm $g + if {![is_MacOSX]} { + raise $tooltip_wm + } +} + +method _hide_tooltip {} { + if {$tooltip_wm ne {}} { + destroy $tooltip_wm + set tooltip_wm {} + set tooltip_commit {} + } + if {$tooltip_timer ne {}} { + after cancel $tooltip_timer + set tooltip_timer {} + } +} + +method _resize {new_height} { + set diff [expr {$new_height - $old_height}] + if {$diff == 0} return + + set my [expr {[winfo height $w.file_pane] - 25}] + set o [$w.file_pane sash coord 0] + set ox [lindex $o 0] + set oy [expr {[lindex $o 1] + $diff}] + if {$oy < 0} {set oy 0} + if {$oy > $my} {set oy $my} + $w.file_pane sash place 0 $ox $oy + + set old_height $new_height +} + +} diff --cc git-gui/lib/branch_checkout.tcl index 6603703ea,000000000..2e459a829 mode 100644,000000..100644 --- a/git-gui/lib/branch_checkout.tcl +++ b/git-gui/lib/branch_checkout.tcl @@@ -1,89 -1,0 +1,93 @@@ +# git-gui branch checkout support +# Copyright (C) 2007 Shawn Pearce + +class branch_checkout { + +field w ; # widget path +field w_rev ; # mega-widget to pick the initial revision + +field opt_fetch 1; # refetch tracking branch if used? +field opt_detach 0; # force a detached head case? + +constructor dialog {} { - make_toplevel top w ++ global use_ttk NS ++ make_dialog top w ++ wm withdraw $w + wm title $top [append "[appname] ([reponame]): " [mc "Checkout Branch"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + } + - label $w.header -text [mc "Checkout Branch"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Checkout Branch"] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.create -text [mc Checkout] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.create -text [mc Checkout] \ + -default active \ + -command [cb _checkout] + pack $w.buttons.create -side right - button $w.buttons.cancel -text [mc Cancel] \ ++ ${NS}::button $w.buttons.cancel -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + + set w_rev [::choose_rev::new $w.rev [mc Revision]] + $w_rev bind_listbox [cb _checkout] + pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 + - labelframe $w.options -text [mc Options] ++ ${NS}::labelframe $w.options -text [mc Options] + - checkbutton $w.options.fetch \ ++ ${NS}::checkbutton $w.options.fetch \ + -text [mc "Fetch Tracking Branch"] \ + -variable @opt_fetch + pack $w.options.fetch -anchor nw + - checkbutton $w.options.detach \ ++ ${NS}::checkbutton $w.options.detach \ + -text [mc "Detach From Local Branch"] \ + -variable @opt_detach + pack $w.options.detach -anchor nw + + pack $w.options -anchor nw -fill x -pady 5 -padx 5 + + bind $w [cb _visible] + bind $w [list destroy $w] + bind $w [cb _checkout]\;break ++ wm deiconify $w + tkwait window $w +} + +method _checkout {} { + set spec [$w_rev get_tracking_branch] + if {$spec ne {} && $opt_fetch} { + set new {} + } elseif {[catch {set new [$w_rev commit_or_die]}]} { + return + } + + if {$opt_detach} { + set ref {} + } else { + set ref [$w_rev get_local_branch] + } + + set co [::checkout_op::new [$w_rev get] $new $ref] + $co parent $w + $co enable_checkout 1 + if {$spec ne {} && $opt_fetch} { + $co enable_fetch $spec + } + + if {[$co run]} { + destroy $w + } else { + $w_rev focus_filter + } +} + +method _visible {} { + grab $w + $w_rev focus_filter +} + +} diff --cc git-gui/lib/branch_create.tcl index 3817771b9,000000000..4bb907705 mode 100644,000000..100644 --- a/git-gui/lib/branch_create.tcl +++ b/git-gui/lib/branch_create.tcl @@@ -1,223 -1,0 +1,224 @@@ +# git-gui branch create support +# Copyright (C) 2006, 2007 Shawn Pearce + +class branch_create { + +field w ; # widget path +field w_rev ; # mega-widget to pick the initial revision +field w_name ; # new branch name widget + +field name {}; # name of the branch the user has chosen +field name_type user; # type of branch name to use + +field opt_merge ff; # type of merge to apply to existing branch +field opt_checkout 1; # automatically checkout the new branch? +field opt_fetch 1; # refetch tracking branch if used? +field reset_ok 0; # did the user agree to reset? + +constructor dialog {} { - global repo_config ++ global repo_config use_ttk NS + - make_toplevel top w ++ make_dialog top w ++ wm withdraw $w + wm title $top [append "[appname] ([reponame]): " [mc "Create Branch"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + } + - label $w.header -text [mc "Create New Branch"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Create New Branch"] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.create -text [mc Create] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.create -text [mc Create] \ + -default active \ + -command [cb _create] + pack $w.buttons.create -side right - button $w.buttons.cancel -text [mc Cancel] \ ++ ${NS}::button $w.buttons.cancel -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - labelframe $w.desc -text [mc "Branch Name"] - radiobutton $w.desc.name_r \ - -anchor w \ ++ ${NS}::labelframe $w.desc -text [mc "Branch Name"] ++ ${NS}::radiobutton $w.desc.name_r \ + -text [mc "Name:"] \ + -value user \ + -variable @name_type ++ if {!$use_ttk} {$w.desc.name_r configure -anchor w} + set w_name $w.desc.name_t - entry $w_name \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w_name \ + -width 40 \ + -textvariable @name \ + -validate key \ + -validatecommand [cb _validate %d %S] + grid $w.desc.name_r $w_name -sticky we -padx {0 5} + - radiobutton $w.desc.match_r \ - -anchor w \ ++ ${NS}::radiobutton $w.desc.match_r \ + -text [mc "Match Tracking Branch Name"] \ + -value match \ + -variable @name_type ++ if {!$use_ttk} {$w.desc.match_r configure -anchor w} + grid $w.desc.match_r -sticky we -padx {0 5} -columnspan 2 + + grid columnconfigure $w.desc 1 -weight 1 + pack $w.desc -anchor nw -fill x -pady 5 -padx 5 + + set w_rev [::choose_rev::new $w.rev [mc "Starting Revision"]] + pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 + - labelframe $w.options -text [mc Options] ++ ${NS}::labelframe $w.options -text [mc Options] + - frame $w.options.merge - label $w.options.merge.l -text [mc "Update Existing Branch:"] ++ ${NS}::frame $w.options.merge ++ ${NS}::label $w.options.merge.l -text [mc "Update Existing Branch:"] + pack $w.options.merge.l -side left - radiobutton $w.options.merge.no \ ++ ${NS}::radiobutton $w.options.merge.no \ + -text [mc No] \ + -value none \ + -variable @opt_merge + pack $w.options.merge.no -side left - radiobutton $w.options.merge.ff \ ++ ${NS}::radiobutton $w.options.merge.ff \ + -text [mc "Fast Forward Only"] \ + -value ff \ + -variable @opt_merge + pack $w.options.merge.ff -side left - radiobutton $w.options.merge.reset \ ++ ${NS}::radiobutton $w.options.merge.reset \ + -text [mc Reset] \ + -value reset \ + -variable @opt_merge + pack $w.options.merge.reset -side left + pack $w.options.merge -anchor nw + - checkbutton $w.options.fetch \ ++ ${NS}::checkbutton $w.options.fetch \ + -text [mc "Fetch Tracking Branch"] \ + -variable @opt_fetch + pack $w.options.fetch -anchor nw + - checkbutton $w.options.checkout \ ++ ${NS}::checkbutton $w.options.checkout \ + -text [mc "Checkout After Creation"] \ + -variable @opt_checkout + pack $w.options.checkout -anchor nw + pack $w.options -anchor nw -fill x -pady 5 -padx 5 + + trace add variable @name_type write [cb _select] + + set name $repo_config(gui.newbranchtemplate) + if {[is_config_true gui.matchtrackingbranch]} { + set name_type match + } + + bind $w [cb _visible] + bind $w [list destroy $w] + bind $w [cb _create]\;break ++ wm deiconify $w + tkwait window $w +} + +method _create {} { + global repo_config + global M1B + + set spec [$w_rev get_tracking_branch] + switch -- $name_type { + user { + set newbranch $name + } + match { + if {$spec eq {}} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Please select a tracking branch."] + return + } + if {![regsub ^refs/heads/ [lindex $spec 2] {} newbranch]} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Tracking branch %s is not a branch in the remote repository." [$w get]] + return + } + } + } + + if {$newbranch eq {} + || $newbranch eq $repo_config(gui.newbranchtemplate)} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Please supply a branch name."] + focus $w_name + return + } + + if {[catch {git check-ref-format "heads/$newbranch"}]} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "'%s' is not an acceptable branch name." $newbranch] + focus $w_name + return + } + + if {$spec ne {} && $opt_fetch} { + set new {} + } elseif {[catch {set new [$w_rev commit_or_die]}]} { + return + } + + set co [::checkout_op::new \ + [$w_rev get] \ + $new \ + refs/heads/$newbranch] + $co parent $w + $co enable_create 1 + $co enable_merge $opt_merge + $co enable_checkout $opt_checkout + if {$spec ne {} && $opt_fetch} { + $co enable_fetch $spec + } + if {$spec ne {}} { + $co remote_source $spec + } + + if {[$co run]} { + destroy $w + } else { + focus $w_name + } +} + +method _validate {d S} { + if {$d == 1} { + if {[regexp {[~^:?*\[\0- ]} $S]} { + return 0 + } + if {[string length $S] > 0} { + set name_type user + } + } + return 1 +} + +method _select {args} { + if {$name_type eq {match}} { + $w_rev pick_tracking_branch + } +} + +method _visible {} { + grab $w + if {$name_type eq {user}} { + $w_name icursor end + focus $w_name + } +} + +} diff --cc git-gui/lib/branch_delete.tcl index 20d5e4230,000000000..867938ec6 mode 100644,000000..100644 --- a/git-gui/lib/branch_delete.tcl +++ b/git-gui/lib/branch_delete.tcl @@@ -1,147 -1,0 +1,147 @@@ +# git-gui branch delete support +# Copyright (C) 2007 Shawn Pearce + +class branch_delete { + +field w ; # widget path +field w_heads ; # listbox of local head names +field w_check ; # revision picker for merge test +field w_delete ; # delete button + +constructor dialog {} { - global current_branch ++ global current_branch use_ttk NS + - make_toplevel top w ++ make_dialog top w ++ wm withdraw $w + wm title $top [append "[appname] ([reponame]): " [mc "Delete Branch"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + } + - label $w.header -text [mc "Delete Local Branch"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Delete Local Branch"] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons ++ ${NS}::frame $w.buttons + set w_delete $w.buttons.delete - button $w_delete \ ++ ${NS}::button $w_delete \ + -text [mc Delete] \ + -default active \ + -state disabled \ + -command [cb _delete] + pack $w_delete -side right - button $w.buttons.cancel \ ++ ${NS}::button $w.buttons.cancel \ + -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - labelframe $w.list -text [mc "Local Branches"] ++ ${NS}::labelframe $w.list -text [mc "Local Branches"] + set w_heads $w.list.l - listbox $w_heads \ ++ slistbox $w_heads \ + -height 10 \ + -width 70 \ + -selectmode extended \ - -exportselection false \ - -yscrollcommand [list $w.list.sby set] - scrollbar $w.list.sby -command [list $w.list.l yview] - pack $w.list.sby -side right -fill y ++ -exportselection false + pack $w.list.l -side left -fill both -expand 1 + pack $w.list -fill both -expand 1 -pady 5 -padx 5 + + set w_check [choose_rev::new \ + $w.check \ + [mc "Delete Only If Merged Into"] \ + ] + $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] { + if {$h ne $current_branch} { + $w_heads insert end $h + } + } + + bind $w_heads <> [cb _select] + bind $w " + grab $w + focus $w + " + bind $w [list destroy $w] + bind $w [cb _delete]\;break ++ wm deiconify $w + tkwait window $w +} + +method _select {} { + if {[$w_heads curselection] eq {}} { + $w_delete configure -state disabled + } else { + $w_delete configure -state normal + } +} + +method _delete {} { + if {[catch {set check_cmt [$w_check commit_or_die]}]} { + return + } + + set to_delete [list] + set not_merged [list] + foreach i [$w_heads curselection] { + set b [$w_heads get $i] + if {[catch { + set o [git rev-parse --verify "refs/heads/$b"] + }]} continue + if {$check_cmt ne {}} { + if {[catch {set m [git merge-base $o $check_cmt]}]} continue + if {$o ne $m} { + lappend not_merged $b + continue + } + } + lappend to_delete [list $b $o] + } + if {$not_merged ne {}} { + set msg "[mc "The following branches are not completely merged into %s:" [$w_check get]] + + - [join $not_merged "\n - "]" + tk_messageBox \ + -icon info \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message $msg + } + if {$to_delete eq {}} return + if {$check_cmt eq {}} { + set msg [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"] + if {[tk_messageBox \ + -icon warning \ + -type yesno \ + -title [wm title $w] \ + -parent $w \ + -message $msg] ne yes} { + return + } + } + + set failed {} + foreach i $to_delete { + set b [lindex $i 0] + set o [lindex $i 1] + if {[catch {git branch -D $b} err]} { + append failed " - $b: $err\n" + } + } + + if {$failed ne {}} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Failed to delete branches:\n%s" $failed] + } + + destroy $w +} + +} diff --cc git-gui/lib/branch_rename.tcl index 166538808,000000000..63988773b mode 100644,000000..100644 --- a/git-gui/lib/branch_rename.tcl +++ b/git-gui/lib/branch_rename.tcl @@@ -1,128 -1,0 +1,134 @@@ +# git-gui branch rename support +# Copyright (C) 2007 Shawn Pearce + +class branch_rename { + +field w +field oldname +field newname + +constructor dialog {} { - global current_branch ++ global current_branch use_ttk NS + - make_toplevel top w ++ make_dialog top w ++ wm withdraw $w + wm title $top [append "[appname] ([reponame]): " [mc "Rename Branch"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + } + + set oldname $current_branch + set newname [get_config gui.newbranchtemplate] + - label $w.header -text [mc "Rename Branch"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Rename Branch"]\ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.rename -text [mc Rename] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.rename -text [mc Rename] \ + -default active \ + -command [cb _rename] + pack $w.buttons.rename -side right - button $w.buttons.cancel -text [mc Cancel] \ ++ ${NS}::button $w.buttons.cancel -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - frame $w.rename - label $w.rename.oldname_l -text [mc "Branch:"] - eval tk_optionMenu $w.rename.oldname_m @oldname [load_all_heads] ++ ${NS}::frame $w.rename ++ ${NS}::label $w.rename.oldname_l -text [mc "Branch:"] ++ if {$use_ttk} { ++ ttk::combobox $w.rename.oldname_m -textvariable @oldname \ ++ -values [load_all_heads] -state readonly ++ } else { ++ eval tk_optionMenu $w.rename.oldname_m @oldname [load_all_heads] ++ } + - label $w.rename.newname_l -text [mc "New Name:"] - entry $w.rename.newname_t \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::label $w.rename.newname_l -text [mc "New Name:"] ++ ${NS}::entry $w.rename.newname_t \ + -width 40 \ + -textvariable @newname \ + -validate key \ + -validatecommand { + if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0} + return 1 + } + + grid $w.rename.oldname_l $w.rename.oldname_m -sticky w -padx {0 5} + grid $w.rename.newname_l $w.rename.newname_t -sticky we -padx {0 5} + grid columnconfigure $w.rename 1 -weight 1 + pack $w.rename -anchor nw -fill x -pady 5 -padx 5 + + bind $w [cb _rename] + bind $w [list destroy $w] + bind $w " + grab $w + $w.rename.newname_t icursor end + focus $w.rename.newname_t + " ++ wm deiconify $w + tkwait window $w +} + +method _rename {} { + global current_branch + + if {$oldname eq {}} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Please select a branch to rename."] + focus $w.rename.oldname_m + return + } + if {$newname eq {} + || $newname eq [get_config gui.newbranchtemplate]} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Please supply a branch name."] + focus $w.rename.newname_t + return + } + if {![catch {git show-ref --verify -- "refs/heads/$newname"}]} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Branch '%s' already exists." $newname] + focus $w.rename.newname_t + return + } + if {[catch {git check-ref-format "heads/$newname"}]} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "'%s' is not an acceptable branch name." $newname] + focus $w.rename.newname_t + return + } + + if {[catch {git branch -m $oldname $newname} err]} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [strcat [mc "Failed to rename '%s'." $oldname] "\n\n$err"] + return + } + + if {$current_branch eq $oldname} { + set current_branch $newname + } + + destroy $w +} + +} diff --cc git-gui/lib/browser.tcl index 0410cc68d,000000000..c2415729e mode 100644,000000..100644 --- a/git-gui/lib/browser.tcl +++ b/git-gui/lib/browser.tcl @@@ -1,311 -1,0 +1,316 @@@ +# git-gui tree browser +# Copyright (C) 2006, 2007 Shawn Pearce + +class browser { + +image create photo ::browser::img_parent -data {R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=} +image create photo ::browser::img_rblob -data {R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=} +image create photo ::browser::img_xblob -data {R0lGODlhEAAQAIYAAPwCBFRWVFxaXNza3OTi3Nze3Ly2tJyanPz+/Ozq7GxubNzSxMzOzMTGxHRybDQyNLy+vHRydHx6fKSipISChIyKjGxqbERCRCwuLLy6vGRiZExKTCQiJAwKDLSytLy2rJSSlHx+fDw6PKyqrBQWFPTu5Ozm3LyulLS2tCQmJAQCBPTq3Ozi1MSynCwqLAQGBOTazOzizOzezLyqjBweHNzSvOzaxKyurHRuZNzOtLymhDw+PIyCdOzWvOTOpLyidNzKtOTStLyifMTCtMS+rLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAEChYeGg4oCAwQFjgYBBwGKggEECJkICQoIkwADCwwNDY2mDA4Lng8QDhESsLARExQVDhYXGBkWExIaGw8cHR4SCQQfFQ8eFgUgIQEiwiMSBMYfGB4atwEXDyQd0wQlJicPKAHoFyIpJCoeDgMrLC0YKBsX6i4kL+4OMDEyZijr5oLGNxUqUCioEcPGDAwjPNyI6MEDChQjcOSwsUDHgw07RIgI4KCkAgs8cvTw8eOBogAxQtXIASTISiEuBwUYMoRIixYnZggpUgTDywdIkWJIitRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} +image create photo ::browser::img_tree -data {R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=} +image create photo ::browser::img_symlink -data {R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} +image create photo ::browser::img_unknown -data {R0lGODlhEAAQAIUAAPwCBFxaXIyKjNTW1Nze3LS2tJyanER2RGS+VPz+/PTu5GxqbPz69BQ6BCxeLFSqRPT29HRydMzOzDQyNERmPKSypCRWHIyKhERCRDyGPKz2nESiLBxGHCyCHGxubPz6/PTy7Ozi1Ly2rKSipOzm3LyqlKSWhCRyFOzizLymhNTKtNzOvOzaxOTStPz27OzWvOTOpLSupLyedMS+rMS6pMSulLyqjLymfLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAamQIAQECgajcOkYEBoDgoBQyAJOCCuiENCsWBIh9aGw9F4HCARiXciRDQoBUnlYRlcIgsMG5CxXAgMGhscBRAEBRd7AB0eBBoIgxUfICEiikSPgyMMIAokJZcBkBybJgomIaBJAZoMpyCmqkMBFCcVCrgKKAwpoSorKqchKCwtvasIFBIhLiYvLzDHsxQNMcMKLDAwMqEz3jQ1NTY3ONyrE+jp6hN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} + +field w +field browser_commit +field browser_path +field browser_files {} +field browser_status [mc "Starting..."] +field browser_stack {} +field browser_busy 1 + +field ls_buf {}; # Buffered record output from ls-tree + +constructor new {commit {path {}}} { - global cursor_ptr M1B - make_toplevel top w ++ global cursor_ptr M1B use_ttk NS ++ make_dialog top w ++ wm withdraw $top + wm title $top [append "[appname] ([reponame]): " [mc "File Browser"]] + + set browser_commit $commit + set browser_path $browser_commit:$path + - label $w.path \ ++ ${NS}::label $w.path \ + -textvariable @browser_path \ + -anchor w \ + -justify left \ - -borderwidth 1 \ - -relief sunken \ + -font font_uibold ++ if {!$use_ttk} { $w.path configure -borderwidth 1 -relief sunken} + pack $w.path -anchor w -side top -fill x + - frame $w.list ++ ${NS}::frame $w.list + set w_list $w.list.l + text $w_list -background white -foreground black \ + -borderwidth 0 \ + -cursor $cursor_ptr \ + -state disabled \ + -wrap none \ + -height 20 \ + -width 70 \ + -xscrollcommand [list $w.list.sbx set] \ + -yscrollcommand [list $w.list.sby set] + rmsel_tag $w_list - scrollbar $w.list.sbx -orient h -command [list $w_list xview] - scrollbar $w.list.sby -orient v -command [list $w_list yview] ++ ${NS}::scrollbar $w.list.sbx -orient h -command [list $w_list xview] ++ ${NS}::scrollbar $w.list.sby -orient v -command [list $w_list yview] + pack $w.list.sbx -side bottom -fill x + pack $w.list.sby -side right -fill y + pack $w_list -side left -fill both -expand 1 + pack $w.list -side top -fill both -expand 1 + - label $w.status \ ++ ${NS}::label $w.status \ + -textvariable @browser_status \ + -anchor w \ - -justify left \ - -borderwidth 1 \ - -relief sunken ++ -justify left ++ if {!$use_ttk} { $w.status configure -borderwidth 1 -relief sunken} + pack $w.status -anchor w -side bottom -fill x + + bind $w_list "[cb _click 0 @%x,%y];break" + bind $w_list "[cb _click 1 @%x,%y];break" + bind $w_list <$M1B-Up> "[cb _parent] ;break" + bind $w_list <$M1B-Left> "[cb _parent] ;break" + bind $w_list "[cb _move -1] ;break" + bind $w_list "[cb _move 1] ;break" + bind $w_list <$M1B-Right> "[cb _enter] ;break" + bind $w_list "[cb _enter] ;break" + bind $w_list "[cb _page -1] ;break" + bind $w_list "[cb _page 1] ;break" + bind $w_list break + bind $w_list break + + bind $w_list [list focus $w_list] ++ wm deiconify $top + set w $w_list + if {$path ne {}} { + _ls $this $browser_commit:$path $path + } else { + _ls $this $browser_commit $path + } + return $this +} + +method _move {dir} { + if {$browser_busy} return + set lno [lindex [split [$w index in_sel.first] .] 0] + incr lno $dir + if {[lindex $browser_files [expr {$lno - 1}]] ne {}} { + $w tag remove in_sel 0.0 end + $w tag add in_sel $lno.0 [expr {$lno + 1}].0 + $w see $lno.0 + } +} + +method _page {dir} { + if {$browser_busy} return + $w yview scroll $dir pages + set lno [expr {int( + [lindex [$w yview] 0] + * [llength $browser_files] + + 1)}] + if {[lindex $browser_files [expr {$lno - 1}]] ne {}} { + $w tag remove in_sel 0.0 end + $w tag add in_sel $lno.0 [expr {$lno + 1}].0 + $w see $lno.0 + } +} + +method _parent {} { + if {$browser_busy} return + set info [lindex $browser_files 0] + if {[lindex $info 0] eq {parent}} { + set parent [lindex $browser_stack end-1] + set browser_stack [lrange $browser_stack 0 end-2] + if {$browser_stack eq {}} { + regsub {:.*$} $browser_path {:} browser_path + } else { + regsub {/[^/]+$} $browser_path {} browser_path + } + set browser_status [mc "Loading %s..." $browser_path] + _ls $this [lindex $parent 0] [lindex $parent 1] + } +} + +method _enter {} { + if {$browser_busy} return + set lno [lindex [split [$w index in_sel.first] .] 0] + set info [lindex $browser_files [expr {$lno - 1}]] + if {$info ne {}} { + switch -- [lindex $info 0] { + parent { + _parent $this + } + tree { + set name [lindex $info 2] + set escn [escape_path $name] + set browser_status [mc "Loading %s..." $escn] + append browser_path $escn + _ls $this [lindex $info 1] $name + } + blob { + set name [lindex $info 2] + set p {} + foreach n $browser_stack { + append p [lindex $n 1] + } + append p $name + blame::new $browser_commit $p {} + } + } + } +} + +method _click {was_double_click pos} { + if {$browser_busy} return + set lno [lindex [split [$w index $pos] .] 0] + focus $w + + if {[lindex $browser_files [expr {$lno - 1}]] ne {}} { + $w tag remove in_sel 0.0 end + $w tag add in_sel $lno.0 [expr {$lno + 1}].0 + if {$was_double_click} { + _enter $this + } + } +} + +method _ls {tree_id {name {}}} { + set ls_buf {} + set browser_files {} + set browser_busy 1 + + $w conf -state normal + $w tag remove in_sel 0.0 end + $w delete 0.0 end + if {$browser_stack ne {}} { + $w image create end \ + -align center -padx 5 -pady 1 \ + -name icon0 \ + -image ::browser::img_parent + $w insert end [mc "\[Up To Parent\]"] + lappend browser_files parent + } + lappend browser_stack [list $tree_id $name] + $w conf -state disabled + + set fd [git_read ls-tree -z $tree_id] + fconfigure $fd -blocking 0 -translation binary -encoding binary + fileevent $fd readable [cb _read $fd] +} + +method _read {fd} { + append ls_buf [read $fd] + set pck [split $ls_buf "\0"] + set ls_buf [lindex $pck end] + + set n [llength $browser_files] + $w conf -state normal + foreach p [lrange $pck 0 end-1] { + set tab [string first "\t" $p] + if {$tab == -1} continue + + set info [split [string range $p 0 [expr {$tab - 1}]] { }] + set path [string range $p [expr {$tab + 1}] end] + set type [lindex $info 1] + set object [lindex $info 2] + + switch -- $type { + blob { + scan [lindex $info 0] %o mode + if {$mode == 0120000} { + set image ::browser::img_symlink + } elseif {($mode & 0100) != 0} { + set image ::browser::img_xblob + } else { + set image ::browser::img_rblob + } + } + tree { + set image ::browser::img_tree + append path / + } + default { + set image ::browser::img_unknown + } + } + + if {$n > 0} {$w insert end "\n"} + $w image create end \ + -align center -padx 5 -pady 1 \ + -name icon[incr n] \ + -image $image + $w insert end [escape_path $path] + lappend browser_files [list $type $object $path] + } + $w conf -state disabled + + if {[eof $fd]} { + close $fd + set browser_status [mc "Ready."] + set browser_busy 0 + set ls_buf {} + if {$n > 0} { + $w tag add in_sel 1.0 2.0 + focus -force $w + } + } +} ifdeleted { + catch {close $fd} +} + +} + +class browser_open { + +field w ; # widget path +field w_rev ; # mega-widget to pick the initial revision + +constructor dialog {} { - make_toplevel top w ++ global use_ttk NS ++ make_dialog top w ++ wm withdraw $top + wm title $top [append "[appname] ([reponame]): " [mc "Browse Branch Files"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" ++ wm transient $top . + } + - label $w.header \ ++ ${NS}::label $w.header \ + -text [mc "Browse Branch Files"] \ - -font font_uibold ++ -font font_uibold \ ++ -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.browse -text [mc Browse] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.browse -text [mc Browse] \ + -default active \ + -command [cb _open] + pack $w.buttons.browse -side right - button $w.buttons.cancel -text [mc Cancel] \ ++ ${NS}::button $w.buttons.cancel -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + + set w_rev [::choose_rev::new $w.rev [mc Revision]] + $w_rev bind_listbox [cb _open] + pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 + + bind $w [cb _visible] + bind $w [list destroy $w] + bind $w [cb _open]\;break ++ wm deiconify $top + tkwait window $w +} + +method _open {} { + if {[catch {$w_rev commit_or_die} err]} { + return + } + set name [$w_rev get] + destroy $w + browser::new $name +} + +method _visible {} { + grab $w + $w_rev focus_filter +} + +} diff --cc git-gui/lib/choose_font.tcl index 56443b042,000000000..ebe50bd7d mode 100644,000000..100644 --- a/git-gui/lib/choose_font.tcl +++ b/git-gui/lib/choose_font.tcl @@@ -1,168 -1,0 +1,171 @@@ +# git-gui font chooser +# Copyright (C) 2007 Shawn Pearce + +class choose_font { + +field w +field w_family ; # UI widget of all known family names +field w_example ; # Example to showcase the chosen font + +field f_family ; # Currently chosen family name +field f_size ; # Currently chosen point size + +field v_family ; # Name of global variable for family +field v_size ; # Name of global variable for size + +variable all_families [list] ; # All fonts known to Tk + +constructor pick {path title a_family a_size} { + variable all_families ++ global use_ttk NS + + set v_family $a_family + set v_size $a_size + + upvar #0 $v_family pv_family + upvar #0 $v_size pv_size + + set f_family $pv_family + set f_size $pv_size + - make_toplevel top w ++ make_dialog top w ++ wm withdraw $top + wm title $top "[appname] ([reponame]): $title" + wm geometry $top "+[winfo rootx $path]+[winfo rooty $path]" + - label $w.header -text $title -font font_uibold ++ ${NS}::label $w.header -text $title -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.select \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.select \ + -text [mc Select] \ + -default active \ + -command [cb _select] - button $w.buttons.cancel \ ++ ${NS}::button $w.buttons.cancel \ + -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.select -side right + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - frame $w.inner ++ ${NS}::frame $w.inner + - frame $w.inner.family - label $w.inner.family.l \ ++ ${NS}::frame $w.inner.family ++ ${NS}::label $w.inner.family.l \ + -text [mc "Font Family"] \ + -anchor w + set w_family $w.inner.family.v + text $w_family \ + -background white \ + -foreground black \ + -borderwidth 1 \ + -relief sunken \ + -cursor $::cursor_ptr \ + -wrap none \ + -width 30 \ + -height 10 \ + -yscrollcommand [list $w.inner.family.sby set] + rmsel_tag $w_family - scrollbar $w.inner.family.sby -command [list $w_family yview] ++ ${NS}::scrollbar $w.inner.family.sby -command [list $w_family yview] + pack $w.inner.family.l -side top -fill x + pack $w.inner.family.sby -side right -fill y + pack $w_family -fill both -expand 1 + - frame $w.inner.size - label $w.inner.size.l \ ++ ${NS}::frame $w.inner.size ++ ${NS}::label $w.inner.size.l \ + -text [mc "Font Size"] \ + -anchor w - spinbox $w.inner.size.v \ ++ tspinbox $w.inner.size.v \ + -textvariable @f_size \ + -from 2 -to 80 -increment 1 \ + -width 3 + bind $w.inner.size.v {%W selection range 0 end} + pack $w.inner.size.l -fill x -side top + pack $w.inner.size.v -fill x -padx 2 + + grid configure $w.inner.family $w.inner.size -sticky nsew + grid rowconfigure $w.inner 0 -weight 1 + grid columnconfigure $w.inner 0 -weight 1 + pack $w.inner -fill both -expand 1 -padx 5 -pady 5 + - frame $w.example - label $w.example.l \ ++ ${NS}::frame $w.example ++ ${NS}::label $w.example.l \ + -text [mc "Font Example"] \ + -anchor w + set w_example $w.example.t + text $w_example \ + -background white \ + -foreground black \ + -borderwidth 1 \ + -relief sunken \ + -height 3 \ + -width 40 + rmsel_tag $w_example + $w_example tag conf example -justify center + $w_example insert end [mc "This is example text.\nIf you like this text, it can be your font."] example + $w_example conf -state disabled + pack $w.example.l -fill x + pack $w_example -fill x + pack $w.example -fill x -padx 5 + + if {$all_families eq {}} { + set all_families [lsort [font families]] + } + + $w_family tag conf pick + $w_family tag bind pick [cb _pick_family %x %y]\;break + foreach f $all_families { + set sel [list pick] + if {$f eq $f_family} { + lappend sel in_sel + } + $w_family insert end "$f\n" $sel + } + $w_family conf -state disabled + _update $this + + trace add variable @f_size write [cb _update] + bind $w [list destroy $w] + bind $w [cb _select]\;break + bind $w " + grab $w + focus $w + " ++ wm deiconify $w + tkwait window $w +} + +method _select {} { + upvar #0 $v_family pv_family + upvar #0 $v_size pv_size + + set pv_family $f_family + set pv_size $f_size + + destroy $w +} + +method _pick_family {x y} { + variable all_families + + set i [lindex [split [$w_family index @$x,$y] .] 0] + set n [lindex $all_families [expr {$i - 1}]] + if {$n ne {}} { + $w_family tag remove in_sel 0.0 end + $w_family tag add in_sel $i.0 [expr {$i + 1}].0 + set f_family $n + _update $this + } +} + +method _update {args} { + variable all_families + + set i [lsearch -exact $all_families $f_family] + if {$i < 0} return + + $w_example tag conf example -font [list $f_family $f_size] + $w_family see [expr {$i + 1}].0 +} + +} diff --cc git-gui/lib/choose_repository.tcl index 3f8f3030f,000000000..64f06748b mode 100644,000000..100644 --- a/git-gui/lib/choose_repository.tcl +++ b/git-gui/lib/choose_repository.tcl @@@ -1,1083 -1,0 +1,1077 @@@ +# git-gui Git repository chooser +# Copyright (C) 2007 Shawn Pearce + +class choose_repository { + +field top +field w +field w_body ; # Widget holding the center content +field w_next ; # Next button +field w_quit ; # Quit button +field o_cons ; # Console object (if active) +field w_types ; # List of type buttons in clone +field w_recentlist ; # Listbox containing recent repositories +field w_localpath ; # Entry widget bound to local_path + +field done 0 ; # Finished picking the repository? +field local_path {} ; # Where this repository is locally +field origin_url {} ; # Where we are cloning from +field origin_name origin ; # What we shall call 'origin' +field clone_type hardlink ; # Type of clone to construct +field readtree_err ; # Error output from read-tree (if any) +field sorted_recent ; # recent repositories (sorted) + +constructor pick {} { - global M1T M1B ++ global M1T M1B use_ttk NS + - make_toplevel top w ++ make_dialog top w + wm title $top [mc "Git Gui"] + + if {$top eq {.}} { + menu $w.mbar -tearoff 0 + $top configure -menu $w.mbar + + set m_repo $w.mbar.repository + $w.mbar add cascade \ + -label [mc Repository] \ + -menu $m_repo + menu $m_repo + + if {[is_MacOSX]} { + $w.mbar add cascade -label Apple -menu .mbar.apple + menu $w.mbar.apple + $w.mbar.apple add command \ + -label [mc "About %s" [appname]] \ + -command do_about + $w.mbar.apple add command \ + -label [mc "Show SSH Key"] \ + -command do_ssh_key + } else { + $w.mbar add cascade -label [mc Help] -menu $w.mbar.help + menu $w.mbar.help + $w.mbar.help add command \ + -label [mc "About %s" [appname]] \ + -command do_about + $w.mbar.help add command \ + -label [mc "Show SSH Key"] \ + -command do_ssh_key + } + + wm protocol $top WM_DELETE_WINDOW exit + bind $top <$M1B-q> exit + bind $top <$M1B-Q> exit + bind $top exit + } else { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + bind $top [list destroy $top] + set m_repo {} + } + + pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10 + + set w_body $w.body + set opts $w_body.options - frame $w_body ++ ${NS}::frame $w_body + text $opts \ + -cursor $::cursor_ptr \ + -relief flat \ - -background [$w_body cget -background] \ ++ -background [get_bg_color $w_body] \ + -wrap none \ + -spacing1 5 \ + -width 50 \ + -height 3 + pack $opts -anchor w -fill x + + $opts tag conf link_new -foreground blue -underline 1 + $opts tag bind link_new <1> [cb _next new] + $opts insert end [mc "Create New Repository"] link_new + $opts insert end "\n" + if {$m_repo ne {}} { + $m_repo add command \ + -command [cb _next new] \ + -accelerator $M1T-N \ + -label [mc "New..."] + bind $top <$M1B-n> [cb _next new] + bind $top <$M1B-N> [cb _next new] + } + + $opts tag conf link_clone -foreground blue -underline 1 + $opts tag bind link_clone <1> [cb _next clone] + $opts insert end [mc "Clone Existing Repository"] link_clone + $opts insert end "\n" + if {$m_repo ne {}} { + $m_repo add command \ + -command [cb _next clone] \ + -accelerator $M1T-C \ + -label [mc "Clone..."] + bind $top <$M1B-c> [cb _next clone] + bind $top <$M1B-C> [cb _next clone] + } + + $opts tag conf link_open -foreground blue -underline 1 + $opts tag bind link_open <1> [cb _next open] + $opts insert end [mc "Open Existing Repository"] link_open + $opts insert end "\n" + if {$m_repo ne {}} { + $m_repo add command \ + -command [cb _next open] \ + -accelerator $M1T-O \ + -label [mc "Open..."] + bind $top <$M1B-o> [cb _next open] + bind $top <$M1B-O> [cb _next open] + } + + $opts conf -state disabled + + set sorted_recent [_get_recentrepos] + if {[llength $sorted_recent] > 0} { + if {$m_repo ne {}} { + $m_repo add separator + $m_repo add command \ + -state disabled \ + -label [mc "Recent Repositories"] + } + - label $w_body.space - label $w_body.recentlabel \ ++ ${NS}::label $w_body.space ++ ${NS}::label $w_body.recentlabel \ + -anchor w \ + -text [mc "Open Recent Repository:"] + set w_recentlist $w_body.recentlist + text $w_recentlist \ + -cursor $::cursor_ptr \ + -relief flat \ - -background [$w_body.recentlabel cget -background] \ ++ -background [get_bg_color $w_body.recentlabel] \ + -wrap none \ + -width 50 \ + -height 10 + $w_recentlist tag conf link \ + -foreground blue \ + -underline 1 + set home $::env(HOME) + if {[is_Cygwin]} { + set home [exec cygpath --windows --absolute $home] + } + set home "[file normalize $home]/" + set hlen [string length $home] + foreach p $sorted_recent { + set path $p + if {[string equal -length $hlen $home $p]} { + set p "~/[string range $p $hlen end]" + } + regsub -all "\n" $p "\\n" p + $w_recentlist insert end $p link + $w_recentlist insert end "\n" + + if {$m_repo ne {}} { + $m_repo add command \ + -command [cb _open_recent_path $path] \ + -label " $p" + } + } + $w_recentlist conf -state disabled + $w_recentlist tag bind link <1> [cb _open_recent %x,%y] + pack $w_body.space -anchor w -fill x + pack $w_body.recentlabel -anchor w -fill x + pack $w_recentlist -anchor w -fill x + } + pack $w_body -fill x -padx 10 -pady 10 + - frame $w.buttons ++ ${NS}::frame $w.buttons + set w_next $w.buttons.next + set w_quit $w.buttons.quit - button $w_quit \ ++ ${NS}::button $w_quit \ + -text [mc "Quit"] \ + -command exit + pack $w_quit -side right -padx 5 + pack $w.buttons -side bottom -fill x -padx 10 -pady 10 + + if {$m_repo ne {}} { + $m_repo add separator + $m_repo add command \ + -label [mc Quit] \ + -command exit \ + -accelerator $M1T-Q + } + + bind $top [cb _invoke_next] + bind $top " + [cb _center] + grab $top + focus $top + bind $top {} + " + wm deiconify $top + tkwait variable @done + ++ grab release $top + if {$top eq {.}} { + eval destroy [winfo children $top] + } +} + +proc _home {} { + if {[catch {set h $::env(HOME)}] + || ![file isdirectory $h]} { + set h . + } + return $h +} + +method _center {} { + set nx [winfo reqwidth $top] + set ny [winfo reqheight $top] + set rx [expr {([winfo screenwidth $top] - $nx) / 3}] + set ry [expr {([winfo screenheight $top] - $ny) / 3}] + wm geometry $top [format {+%d+%d} $rx $ry] +} + +method _invoke_next {} { + if {[winfo exists $w_next]} { + uplevel #0 [$w_next cget -command] + } +} + +proc _get_recentrepos {} { + set recent [list] + foreach p [get_config gui.recentrepo] { + if {[_is_git [file join $p .git]]} { + lappend recent $p + } else { + _unset_recentrepo $p + } + } + return [lsort $recent] +} + +proc _unset_recentrepo {p} { + regsub -all -- {([()\[\]{}\.^$+*?\\])} $p {\\\1} p + git config --global --unset gui.recentrepo "^$p\$" + load_config 1 +} + +proc _append_recentrepos {path} { + set path [file normalize $path] + set recent [get_config gui.recentrepo] + + if {[lindex $recent end] eq $path} { + return + } + + set i [lsearch $recent $path] + if {$i >= 0} { + _unset_recentrepo $path + set recent [lreplace $recent $i $i] + } + + lappend recent $path + git config --global --add gui.recentrepo $path + load_config 1 + + while {[llength $recent] > 10} { + _unset_recentrepo [lindex $recent 0] + set recent [lrange $recent 1 end] + } +} + +method _open_recent {xy} { + set id [lindex [split [$w_recentlist index @$xy] .] 0] + set local_path [lindex $sorted_recent [expr {$id - 1}]] + _do_open2 $this +} + +method _open_recent_path {p} { + set local_path $p + _do_open2 $this +} + +method _next {action} { ++ global NS + destroy $w_body + if {![winfo exists $w_next]} { - button $w_next -default active ++ ${NS}::button $w_next -default active + pack $w_next -side right -padx 5 -before $w_quit + } + _do_$action $this +} + +method _write_local_path {args} { + if {$local_path eq {}} { + $w_next conf -state disabled + } else { + $w_next conf -state normal + } +} + +method _git_init {} { + if {[catch {file mkdir $local_path} err]} { + error_popup [strcat \ + [mc "Failed to create repository %s:" $local_path] \ + "\n\n$err"] + return 0 + } + + if {[catch {cd $local_path} err]} { + error_popup [strcat \ + [mc "Failed to create repository %s:" $local_path] \ + "\n\n$err"] + return 0 + } + + if {[catch {git init} err]} { + error_popup [strcat \ + [mc "Failed to create repository %s:" $local_path] \ + "\n\n$err"] + return 0 + } + + _append_recentrepos [pwd] + set ::_gitdir .git + set ::_prefix {} + return 1 +} + +proc _is_git {path} { + if {[file exists [file join $path HEAD]] + && [file exists [file join $path objects]] + && [file exists [file join $path config]]} { + return 1 + } + if {[is_Cygwin]} { + if {[file exists [file join $path HEAD]] + && [file exists [file join $path objects.lnk]] + && [file exists [file join $path config.lnk]]} { + return 1 + } + } + return 0 +} + +proc _objdir {path} { + set objdir [file join $path .git objects] + if {[file isdirectory $objdir]} { + return $objdir + } + + set objdir [file join $path objects] + if {[file isdirectory $objdir]} { + return $objdir + } + + if {[is_Cygwin]} { + set objdir [file join $path .git objects.lnk] + if {[file isfile $objdir]} { + return [win32_read_lnk $objdir] + } + + set objdir [file join $path objects.lnk] + if {[file isfile $objdir]} { + return [win32_read_lnk $objdir] + } + } + + return {} +} + +###################################################################### +## +## Create New Repository + +method _do_new {} { ++ global use_ttk NS + $w_next conf \ + -state disabled \ + -command [cb _do_new2] \ + -text [mc "Create"] + - frame $w_body - label $w_body.h \ - -font font_uibold \ ++ ${NS}::frame $w_body ++ ${NS}::label $w_body.h \ ++ -font font_uibold -anchor center \ + -text [mc "Create New Repository"] + pack $w_body.h -side top -fill x -pady 10 + pack $w_body -fill x -padx 10 + - frame $w_body.where - label $w_body.where.l -text [mc "Directory:"] - entry $w_body.where.t \ ++ ${NS}::frame $w_body.where ++ ${NS}::label $w_body.where.l -text [mc "Directory:"] ++ ${NS}::entry $w_body.where.t \ + -textvariable @local_path \ - -borderwidth 1 \ - -relief sunken \ + -width 50 - button $w_body.where.b \ ++ ${NS}::button $w_body.where.b \ + -text [mc "Browse"] \ + -command [cb _new_local_path] + set w_localpath $w_body.where.t + + 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 [list trace remove variable @local_path write [cb _write_local_path]] + update + focus $w_body.where.t +} + +method _new_local_path {} { + if {$local_path ne {}} { + set p [file dirname $local_path] + } else { + set p [_home] + } + + set p [tk_chooseDirectory \ + -initialdir $p \ + -parent $top \ + -title [mc "Git Repository"] \ + -mustexist false] + if {$p eq {}} return + + set p [file normalize $p] + if {![_new_ok $p]} { + return + } + set local_path $p + $w_localpath icursor end +} + +method _do_new2 {} { + if {![_new_ok $local_path]} { + return + } + if {![_git_init $this]} { + return + } + set done 1 +} + +proc _new_ok {p} { + if {[file isdirectory $p]} { + if {[_is_git [file join $p .git]]} { + error_popup [mc "Directory %s already exists." $p] + return 0 + } + } elseif {[file exists $p]} { + error_popup [mc "File %s already exists." $p] + return 0 + } + return 1 +} + +###################################################################### +## +## Clone Existing Repository + +method _do_clone {} { ++ global use_ttk NS + $w_next conf \ + -state disabled \ + -command [cb _do_clone2] \ + -text [mc "Clone"] + - frame $w_body - label $w_body.h \ - -font font_uibold \ ++ ${NS}::frame $w_body ++ ${NS}::label $w_body.h \ ++ -font font_uibold -anchor center \ + -text [mc "Clone Existing Repository"] + pack $w_body.h -side top -fill x -pady 10 + pack $w_body -fill x -padx 10 + + set args $w_body.args - frame $w_body.args ++ ${NS}::frame $w_body.args + pack $args -fill both + - label $args.origin_l -text [mc "Source Location:"] - entry $args.origin_t \ ++ ${NS}::label $args.origin_l -text [mc "Source Location:"] ++ ${NS}::entry $args.origin_t \ + -textvariable @origin_url \ - -borderwidth 1 \ - -relief sunken \ + -width 50 - button $args.origin_b \ ++ ${NS}::button $args.origin_b \ + -text [mc "Browse"] \ + -command [cb _open_origin] + grid $args.origin_l $args.origin_t $args.origin_b -sticky ew + - label $args.where_l -text [mc "Target Directory:"] - entry $args.where_t \ ++ ${NS}::label $args.where_l -text [mc "Target Directory:"] ++ ${NS}::entry $args.where_t \ + -textvariable @local_path \ - -borderwidth 1 \ - -relief sunken \ + -width 50 - button $args.where_b \ ++ ${NS}::button $args.where_b \ + -text [mc "Browse"] \ + -command [cb _new_local_path] + grid $args.where_l $args.where_t $args.where_b -sticky ew + set w_localpath $args.where_t + - label $args.type_l -text [mc "Clone Type:"] - frame $args.type_f ++ ${NS}::label $args.type_l -text [mc "Clone Type:"] ++ ${NS}::frame $args.type_f + set w_types [list] - lappend w_types [radiobutton $args.type_f.hardlink \ ++ lappend w_types [${NS}::radiobutton $args.type_f.hardlink \ + -state disabled \ - -anchor w \ + -text [mc "Standard (Fast, Semi-Redundant, Hardlinks)"] \ + -variable @clone_type \ + -value hardlink] - lappend w_types [radiobutton $args.type_f.full \ ++ lappend w_types [${NS}::radiobutton $args.type_f.full \ + -state disabled \ - -anchor w \ + -text [mc "Full Copy (Slower, Redundant Backup)"] \ + -variable @clone_type \ + -value full] - lappend w_types [radiobutton $args.type_f.shared \ ++ lappend w_types [${NS}::radiobutton $args.type_f.shared \ + -state disabled \ - -anchor w \ + -text [mc "Shared (Fastest, Not Recommended, No Backup)"] \ + -variable @clone_type \ + -value shared] + foreach r $w_types { + pack $r -anchor w + } + grid $args.type_l $args.type_f -sticky new + + grid columnconfigure $args 1 -weight 1 + + trace add variable @local_path write [cb _update_clone] + trace add variable @origin_url write [cb _update_clone] + bind $w_body.h " + [list trace remove variable @local_path write [cb _update_clone]] + [list trace remove variable @origin_url write [cb _update_clone]] + " + update + focus $args.origin_t +} + +method _open_origin {} { + if {$origin_url ne {} && [file isdirectory $origin_url]} { + set p $origin_url + } else { + set p [_home] + } + + set p [tk_chooseDirectory \ + -initialdir $p \ + -parent $top \ + -title [mc "Git Repository"] \ + -mustexist true] + if {$p eq {}} return + + set p [file normalize $p] + if {![_is_git [file join $p .git]] && ![_is_git $p]} { + error_popup [mc "Not a Git repository: %s" [file tail $p]] + return + } + set origin_url $p +} + +method _update_clone {args} { + if {$local_path ne {} && $origin_url ne {}} { + $w_next conf -state normal + } else { + $w_next conf -state disabled + } + + if {$origin_url ne {} && + ( [_is_git [file join $origin_url .git]] + || [_is_git $origin_url])} { + set e normal + if {[[lindex $w_types 0] cget -state] eq {disabled}} { + set clone_type hardlink + } + } else { + set e disabled + set clone_type full + } + + foreach r $w_types { + $r conf -state $e + } +} + +method _do_clone2 {} { + if {[file isdirectory $origin_url]} { + set origin_url [file normalize $origin_url] + } + + if {$clone_type eq {hardlink} && ![file isdirectory $origin_url]} { + error_popup [mc "Standard only available for local repository."] + return + } + if {$clone_type eq {shared} && ![file isdirectory $origin_url]} { + error_popup [mc "Shared only available for local repository."] + return + } + + if {$clone_type eq {hardlink} || $clone_type eq {shared}} { + set objdir [_objdir $origin_url] + if {$objdir eq {}} { + error_popup [mc "Not a Git repository: %s" [file tail $origin_url]] + return + } + } + + set giturl $origin_url + if {[is_Cygwin] && [file isdirectory $giturl]} { + set giturl [exec cygpath --unix --absolute $giturl] + if {$clone_type eq {shared}} { + set objdir [exec cygpath --unix --absolute $objdir] + } + } + + if {[file exists $local_path]} { + error_popup [mc "Location %s already exists." $local_path] + return + } + + if {![_git_init $this]} return + set local_path [pwd] + + if {[catch { + git config remote.$origin_name.url $giturl + git config remote.$origin_name.fetch +refs/heads/*:refs/remotes/$origin_name/* + } err]} { + error_popup [strcat [mc "Failed to configure origin"] "\n\n$err"] + return + } + + destroy $w_body $w_next + + switch -exact -- $clone_type { + hardlink { + set o_cons [status_bar::two_line $w_body] + pack $w_body -fill x -padx 10 -pady 10 + + $o_cons start \ + [mc "Counting objects"] \ + [mc "buckets"] + update + + if {[file exists [file join $objdir info alternates]]} { + set pwd [pwd] + if {[catch { + file mkdir [gitdir objects info] + set f_in [open [file join $objdir info alternates] r] + set f_cp [open [gitdir objects info alternates] w] + fconfigure $f_in -translation binary -encoding binary + fconfigure $f_cp -translation binary -encoding binary + cd $objdir + while {[gets $f_in line] >= 0} { + if {[is_Cygwin]} { + puts $f_cp [exec cygpath --unix --absolute $line] + } else { + puts $f_cp [file normalize $line] + } + } + close $f_in + close $f_cp + cd $pwd + } err]} { + catch {cd $pwd} + _clone_failed $this [mc "Unable to copy objects/info/alternates: %s" $err] + return + } + } + + set tolink [list] + set buckets [glob \ + -tails \ + -nocomplain \ + -directory [file join $objdir] ??] + set bcnt [expr {[llength $buckets] + 2}] + set bcur 1 + $o_cons update $bcur $bcnt + update + + file mkdir [file join .git objects pack] + foreach i [glob -tails -nocomplain \ + -directory [file join $objdir pack] *] { + lappend tolink [file join pack $i] + } + $o_cons update [incr bcur] $bcnt + update + + foreach i $buckets { + file mkdir [file join .git objects $i] + foreach j [glob -tails -nocomplain \ + -directory [file join $objdir $i] *] { + lappend tolink [file join $i $j] + } + $o_cons update [incr bcur] $bcnt + update + } + $o_cons stop + + if {$tolink eq {}} { + info_popup [strcat \ + [mc "Nothing to clone from %s." $origin_url] \ + "\n" \ + [mc "The 'master' branch has not been initialized."] \ + ] + destroy $w_body + set done 1 + return + } + + set i [lindex $tolink 0] + if {[catch { + file link -hard \ + [file join .git objects $i] \ + [file join $objdir $i] + } err]} { + info_popup [mc "Hardlinks are unavailable. Falling back to copying."] + set i [_copy_files $this $objdir $tolink] + } else { + set i [_link_files $this $objdir [lrange $tolink 1 end]] + } + if {!$i} return + + destroy $w_body + } + full { + set o_cons [console::embed \ + $w_body \ + [mc "Cloning from %s" $origin_url]] + pack $w_body -fill both -expand 1 -padx 10 + $o_cons exec \ + [list git fetch --no-tags -k $origin_name] \ + [cb _do_clone_tags] + } + shared { + set fd [open [gitdir objects info alternates] w] + fconfigure $fd -translation binary + puts $fd $objdir + close $fd + } + } + + if {$clone_type eq {hardlink} || $clone_type eq {shared}} { + if {![_clone_refs $this]} return + set pwd [pwd] + if {[catch { + cd $origin_url + set HEAD [git rev-parse --verify HEAD^0] + } err]} { + _clone_failed $this [mc "Not a Git repository: %s" [file tail $origin_url]] + return 0 + } + cd $pwd + _do_clone_checkout $this $HEAD + } +} + +method _copy_files {objdir tocopy} { + $o_cons start \ + [mc "Copying objects"] \ + [mc "KiB"] + set tot 0 + set cmp 0 + foreach p $tocopy { + incr tot [file size [file join $objdir $p]] + } + foreach p $tocopy { + if {[catch { + set f_in [open [file join $objdir $p] r] + set f_cp [open [file join .git objects $p] w] + fconfigure $f_in -translation binary -encoding binary + fconfigure $f_cp -translation binary -encoding binary + + while {![eof $f_in]} { + incr cmp [fcopy $f_in $f_cp -size 16384] + $o_cons update \ + [expr {$cmp / 1024}] \ + [expr {$tot / 1024}] + update + } + + close $f_in + close $f_cp + } err]} { + _clone_failed $this [mc "Unable to copy object: %s" $err] + return 0 + } + } + return 1 +} + +method _link_files {objdir tolink} { + set total [llength $tolink] + $o_cons start \ + [mc "Linking objects"] \ + [mc "objects"] + for {set i 0} {$i < $total} {} { + set p [lindex $tolink $i] + if {[catch { + file link -hard \ + [file join .git objects $p] \ + [file join $objdir $p] + } err]} { + _clone_failed $this [mc "Unable to hardlink object: %s" $err] + return 0 + } + + incr i + if {$i % 5 == 0} { + $o_cons update $i $total + update + } + } + return 1 +} + +method _clone_refs {} { + set pwd [pwd] + if {[catch {cd $origin_url} err]} { + error_popup [mc "Not a Git repository: %s" [file tail $origin_url]] + return 0 + } + set fd_in [git_read for-each-ref \ + --tcl \ + {--format=list %(refname) %(objectname) %(*objectname)}] + cd $pwd + + set fd [open [gitdir packed-refs] w] + fconfigure $fd -translation binary + puts $fd "# pack-refs with: peeled" + while {[gets $fd_in line] >= 0} { + set line [eval $line] + set refn [lindex $line 0] + set robj [lindex $line 1] + set tobj [lindex $line 2] + + if {[regsub ^refs/heads/ $refn \ + "refs/remotes/$origin_name/" refn]} { + puts $fd "$robj $refn" + } elseif {[string match refs/tags/* $refn]} { + puts $fd "$robj $refn" + if {$tobj ne {}} { + puts $fd "^$tobj" + } + } + } + close $fd_in + close $fd + return 1 +} + +method _do_clone_tags {ok} { + if {$ok} { + $o_cons exec \ + [list git fetch --tags -k $origin_name] \ + [cb _do_clone_HEAD] + } else { + $o_cons done $ok + _clone_failed $this [mc "Cannot fetch branches and objects. See console output for details."] + } +} + +method _do_clone_HEAD {ok} { + if {$ok} { + $o_cons exec \ + [list git fetch $origin_name HEAD] \ + [cb _do_clone_full_end] + } else { + $o_cons done $ok + _clone_failed $this [mc "Cannot fetch tags. See console output for details."] + } +} + +method _do_clone_full_end {ok} { + $o_cons done $ok + + if {$ok} { + destroy $w_body + + set HEAD {} + if {[file exists [gitdir FETCH_HEAD]]} { + set fd [open [gitdir FETCH_HEAD] r] + while {[gets $fd line] >= 0} { + if {[regexp "^(.{40})\t\t" $line line HEAD]} { + break + } + } + close $fd + } + + catch {git pack-refs} + _do_clone_checkout $this $HEAD + } else { + _clone_failed $this [mc "Cannot determine HEAD. See console output for details."] + } +} + +method _clone_failed {{why {}}} { + if {[catch {file delete -force $local_path} err]} { + set why [strcat \ + $why \ + "\n\n" \ + [mc "Unable to cleanup %s" $local_path] \ + "\n\n" \ + $err] + } + if {$why ne {}} { + update + error_popup [strcat [mc "Clone failed."] "\n" $why] + } +} + +method _do_clone_checkout {HEAD} { + if {$HEAD eq {}} { + info_popup [strcat \ + [mc "No default branch obtained."] \ + "\n" \ + [mc "The 'master' branch has not been initialized."] \ + ] + set done 1 + return + } + if {[catch { + git update-ref HEAD $HEAD^0 + } err]} { + info_popup [strcat \ + [mc "Cannot resolve %s as a commit." $HEAD^0] \ + "\n $err" \ + "\n" \ + [mc "The 'master' branch has not been initialized."] \ + ] + set done 1 + return + } + + set o_cons [status_bar::two_line $w_body] + pack $w_body -fill x -padx 10 -pady 10 + $o_cons start \ + [mc "Creating working directory"] \ + [mc "files"] + + set readtree_err {} + set fd [git_read --stderr read-tree \ + -m \ + -u \ + -v \ + HEAD \ + HEAD \ + ] + fconfigure $fd -blocking 0 -translation binary + fileevent $fd readable [cb _readtree_wait $fd] +} + +method _readtree_wait {fd} { + set buf [read $fd] + $o_cons update_meter $buf + append readtree_err $buf + + fconfigure $fd -blocking 1 + if {![eof $fd]} { + fconfigure $fd -blocking 0 + return + } + + if {[catch {close $fd}]} { + set err $readtree_err + regsub {^fatal: } $err {} err + error_popup [strcat \ + [mc "Initial file checkout failed."] \ + "\n\n$err"] + return + } + + # -- 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 +} + +###################################################################### +## +## Open Existing Repository + +method _do_open {} { ++ global NS + $w_next conf \ + -state disabled \ + -command [cb _do_open2] \ + -text [mc "Open"] + - frame $w_body - label $w_body.h \ - -font font_uibold \ ++ ${NS}::frame $w_body ++ ${NS}::label $w_body.h \ ++ -font font_uibold -anchor center \ + -text [mc "Open Existing Repository"] + pack $w_body.h -side top -fill x -pady 10 + pack $w_body -fill x -padx 10 + - frame $w_body.where - label $w_body.where.l -text [mc "Repository:"] - entry $w_body.where.t \ ++ ${NS}::frame $w_body.where ++ ${NS}::label $w_body.where.l -text [mc "Repository:"] ++ ${NS}::entry $w_body.where.t \ + -textvariable @local_path \ - -borderwidth 1 \ - -relief sunken \ + -width 50 - button $w_body.where.b \ ++ ${NS}::button $w_body.where.b \ + -text [mc "Browse"] \ + -command [cb _open_local_path] + + 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 [list trace remove variable @local_path write [cb _write_local_path]] + update + focus $w_body.where.t +} + +method _open_local_path {} { + if {$local_path ne {}} { + set p $local_path + } else { + set p [_home] + } + + set p [tk_chooseDirectory \ + -initialdir $p \ + -parent $top \ + -title [mc "Git Repository"] \ + -mustexist true] + if {$p eq {}} return + + set p [file normalize $p] + if {![_is_git [file join $p .git]]} { + error_popup [mc "Not a Git repository: %s" [file tail $p]] + return + } + set local_path $p +} + +method _do_open2 {} { + if {![_is_git [file join $local_path .git]]} { + error_popup [mc "Not a Git repository: %s" [file tail $local_path]] + return + } + + if {[catch {cd $local_path} err]} { + error_popup [strcat \ + [mc "Failed to open repository %s:" $local_path] \ + "\n\n$err"] + return + } + + _append_recentrepos [pwd] + set ::_gitdir .git + set ::_prefix {} + set done 1 +} + +} diff --cc git-gui/lib/choose_rev.tcl index c8821c146,000000000..c12d5e169 mode 100644,000000..100644 --- a/git-gui/lib/choose_rev.tcl +++ b/git-gui/lib/choose_rev.tcl @@@ -1,628 -1,0 +1,633 @@@ +# git-gui revision chooser +# Copyright (C) 2006, 2007 Shawn Pearce + +class choose_rev { + +image create photo ::choose_rev::img_find -data {R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} + +field w ; # our megawidget path +field w_list ; # list of currently filtered specs +field w_filter ; # filter entry for $w_list + +field c_expr {}; # current revision expression - field filter ; # current filter string ++field filter ""; # current filter string +field revtype head; # type of revision chosen +field cur_specs [list]; # list of specs for $revtype +field spec_head ; # list of all head specs +field spec_trck ; # list of all tracking branch specs +field spec_tag ; # list of all tag specs +field tip_data ; # array of tip commit info by refname +field log_last ; # array of reflog date by refname + +field tooltip_wm {} ; # Current tooltip toplevel, if open +field tooltip_t {} ; # Text widget in $tooltip_wm +field tooltip_timer {} ; # Current timer event for our tooltip + +proc new {path {title {}}} { + return [_new $path 0 $title] +} + +proc new_unmerged {path {title {}}} { + return [_new $path 1 $title] +} + +constructor _new {path unmerged_only title} { - global current_branch is_detached ++ global current_branch is_detached use_ttk NS + + if {![info exists ::all_remotes]} { + load_all_remotes + } + + set w $path + + if {$title ne {}} { - labelframe $w -text $title ++ ${NS}::labelframe $w -text $title + } else { - frame $w ++ ${NS}::frame $w + } + bind $w [cb _delete %W] + + if {$is_detached} { - radiobutton $w.detachedhead_r \ - -anchor w \ ++ ${NS}::radiobutton $w.detachedhead_r \ + -text [mc "This Detached Checkout"] \ + -value HEAD \ + -variable @revtype ++ if {!$use_ttk} {$w.detachedhead_r configure -anchor w} + grid $w.detachedhead_r -sticky we -padx {0 5} -columnspan 2 + } + - radiobutton $w.expr_r \ ++ ${NS}::radiobutton $w.expr_r \ + -text [mc "Revision Expression:"] \ + -value expr \ + -variable @revtype - entry $w.expr_t \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w.expr_t \ + -width 50 \ + -textvariable @c_expr \ + -validate key \ + -validatecommand [cb _validate %d %S] + grid $w.expr_r $w.expr_t -sticky we -padx {0 5} + - frame $w.types - radiobutton $w.types.head_r \ ++ ${NS}::frame $w.types ++ ${NS}::radiobutton $w.types.head_r \ + -text [mc "Local Branch"] \ + -value head \ + -variable @revtype + pack $w.types.head_r -side left - radiobutton $w.types.trck_r \ ++ ${NS}::radiobutton $w.types.trck_r \ + -text [mc "Tracking Branch"] \ + -value trck \ + -variable @revtype + pack $w.types.trck_r -side left - radiobutton $w.types.tag_r \ ++ ${NS}::radiobutton $w.types.tag_r \ + -text [mc "Tag"] \ + -value tag \ + -variable @revtype + pack $w.types.tag_r -side left + set w_filter $w.types.filter - entry $w_filter \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w_filter \ + -width 12 \ + -textvariable @filter \ + -validate key \ + -validatecommand [cb _filter %P] + pack $w_filter -side right - pack [label $w.types.filter_icon \ ++ pack [${NS}::label $w.types.filter_icon \ + -image ::choose_rev::img_find \ + ] -side right + grid $w.types -sticky we -padx {0 5} -columnspan 2 + - frame $w.list ++ if {$use_ttk} { ++ ttk::frame $w.list -style SListbox.TFrame -padding 2 ++ } else { ++ frame $w.list ++ } + set w_list $w.list.l + listbox $w_list \ + -font font_diff \ + -width 50 \ + -height 10 \ + -selectmode browse \ + -exportselection false \ + -xscrollcommand [cb _sb_set $w.list.sbx h] \ + -yscrollcommand [cb _sb_set $w.list.sby v] ++ if {$use_ttk} { ++ $w_list configure -relief flat -highlightthickness 0 -borderwidth 0 ++ } + pack $w_list -fill both -expand 1 + grid $w.list -sticky nswe -padx {20 5} -columnspan 2 + bind $w_list [cb _show_tooltip @%x,%y] + bind $w_list [cb _hide_tooltip] + bind $w_list [cb _hide_tooltip] + bind $w_list [cb _hide_tooltip] + + grid columnconfigure $w 1 -weight 1 + if {$is_detached} { + grid rowconfigure $w 3 -weight 1 + } else { + grid rowconfigure $w 2 -weight 1 + } + + trace add variable @revtype write [cb _select] + bind $w_filter [list focus $w_list]\;break + bind $w_filter [list focus $w_list] + + set fmt list + append fmt { %(refname)} + append fmt { [list} + append fmt { %(objecttype)} + append fmt { %(objectname)} + append fmt { [concat %(taggername) %(authorname)]} + append fmt { [reformat_date [concat %(taggerdate) %(authordate)]]} + append fmt { %(subject)} + append fmt {] [list} + append fmt { %(*objecttype)} + append fmt { %(*objectname)} + append fmt { %(*authorname)} + append fmt { [reformat_date %(*authordate)]} + append fmt { %(*subject)} + append fmt {]} + set all_refn [list] + set fr_fd [git_read for-each-ref \ + --tcl \ + --sort=-taggerdate \ + --format=$fmt \ + refs/heads \ + refs/remotes \ + refs/tags \ + ] + fconfigure $fr_fd -translation lf -encoding utf-8 + while {[gets $fr_fd line] > 0} { + set line [eval $line] + if {[lindex $line 1 0] eq {tag}} { + if {[lindex $line 2 0] eq {commit}} { + set sha1 [lindex $line 2 1] + } else { + continue + } + } elseif {[lindex $line 1 0] eq {commit}} { + set sha1 [lindex $line 1 1] + } else { + continue + } + set refn [lindex $line 0] + set tip_data($refn) [lrange $line 1 end] + lappend cmt_refn($sha1) $refn + lappend all_refn $refn + } + close $fr_fd + + if {$unmerged_only} { + set fr_fd [git_read rev-list --all ^$::HEAD] + while {[gets $fr_fd sha1] > 0} { + if {[catch {set rlst $cmt_refn($sha1)}]} continue + foreach refn $rlst { + set inc($refn) 1 + } + } + close $fr_fd + } else { + foreach refn $all_refn { + set inc($refn) 1 + } + } + + set spec_head [list] + foreach name [load_all_heads] { + set refn refs/heads/$name + if {[info exists inc($refn)]} { + lappend spec_head [list $name $refn] + } + } + + set spec_trck [list] + foreach spec [all_tracking_branches] { + set refn [lindex $spec 0] + if {[info exists inc($refn)]} { + regsub ^refs/(heads|remotes)/ $refn {} name + lappend spec_trck [concat $name $spec] + } + } + + set spec_tag [list] + foreach name [load_all_tags] { + set refn refs/tags/$name + if {[info exists inc($refn)]} { + lappend spec_tag [list $name $refn] + } + } + + if {$is_detached} { set revtype HEAD + } elseif {[llength $spec_head] > 0} { set revtype head + } elseif {[llength $spec_trck] > 0} { set revtype trck + } elseif {[llength $spec_tag ] > 0} { set revtype tag + } else { set revtype expr + } + + if {$revtype eq {head} && $current_branch ne {}} { + set i 0 + foreach spec $spec_head { + if {[lindex $spec 0] eq $current_branch} { + $w_list selection clear 0 end + $w_list selection set $i + break + } + incr i + } + } + + return $this +} + +method none {text} { ++ global NS use_ttk + if {![winfo exists $w.none_r]} { - radiobutton $w.none_r \ - -anchor w \ ++ ${NS}::radiobutton $w.none_r \ + -value none \ + -variable @revtype ++ if {!$use_ttk} {$w.none_r configure -anchor w} + grid $w.none_r -sticky we -padx {0 5} -columnspan 2 + } + $w.none_r configure -text $text +} + +method get {} { + switch -- $revtype { + head - + trck - + tag { + set i [$w_list curselection] + if {$i ne {}} { + return [lindex $cur_specs $i 0] + } else { + return {} + } + } + + HEAD { return HEAD } + expr { return $c_expr } + none { return {} } + default { error "unknown type of revision" } + } +} + +method pick_tracking_branch {} { + set revtype trck +} + +method focus_filter {} { + if {[$w_filter cget -state] eq {normal}} { + focus $w_filter + } +} + +method bind_listbox {event script} { + bind $w_list $event $script +} + +method get_local_branch {} { + if {$revtype eq {head}} { + return [_expr $this] + } else { + return {} + } +} + +method get_tracking_branch {} { + set i [$w_list curselection] + if {$i eq {} || $revtype ne {trck}} { + return {} + } + return [lrange [lindex $cur_specs $i] 1 end] +} + +method get_commit {} { + set e [_expr $this] + if {$e eq {}} { + return {} + } + return [git rev-parse --verify "$e^0"] +} + +method commit_or_die {} { + if {[catch {set new [get_commit $this]} err]} { + + # Cleanup the not-so-friendly error from rev-parse. + # + regsub {^fatal:\s*} $err {} err + if {$err eq {Needed a single revision}} { + set err {} + } + + set top [winfo toplevel $w] + set msg [strcat [mc "Invalid revision: %s" [get $this]] "\n\n$err"] + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $top] \ + -parent $top \ + -message $msg + error $msg + } + return $new +} + +method _expr {} { + switch -- $revtype { + head - + trck - + tag { + set i [$w_list curselection] + if {$i ne {}} { + return [lindex $cur_specs $i 1] + } else { + error [mc "No revision selected."] + } + } + + expr { + if {$c_expr ne {}} { + return $c_expr + } else { + error [mc "Revision expression is empty."] + } + } + HEAD { return HEAD } + none { return {} } + default { error "unknown type of revision" } + } +} + +method _validate {d S} { + if {$d == 1} { + if {[regexp {\s} $S]} { + return 0 + } + if {[string length $S] > 0} { + set revtype expr + } + } + return 1 +} + +method _filter {P} { + if {[regexp {\s} $P]} { + return 0 + } + _rebuild $this $P + return 1 +} + +method _select {args} { + _rebuild $this $filter + focus_filter $this +} + +method _rebuild {pat} { + set ste normal + switch -- $revtype { + head { set new $spec_head } + trck { set new $spec_trck } + tag { set new $spec_tag } + expr - + HEAD - + none { + set new [list] + set ste disabled + } + } + + if {[$w_list cget -state] eq {disabled}} { + $w_list configure -state normal + } + $w_list delete 0 end + + if {$pat ne {}} { + set pat *${pat}* + } + set cur_specs [list] + foreach spec $new { + set txt [lindex $spec 0] + if {$pat eq {} || [string match $pat $txt]} { + lappend cur_specs $spec + $w_list insert end $txt + } + } + if {$cur_specs ne {}} { + $w_list selection clear 0 end + $w_list selection set 0 + } + + if {[$w_filter cget -state] ne $ste} { + $w_list configure -state $ste + $w_filter configure -state $ste + } +} + +method _delete {current} { + if {$current eq $w} { + delete_this + } +} + +method _sb_set {sb orient first last} { ++ global NS + set old_focus [focus -lastfor $w] + + if {$first == 0 && $last == 1} { + if {[winfo exists $sb]} { + destroy $sb + if {$old_focus ne {}} { + update + focus $old_focus + } + } + return + } + + if {![winfo exists $sb]} { + if {$orient eq {h}} { - scrollbar $sb -orient h -command [list $w_list xview] ++ ${NS}::scrollbar $sb -orient h -command [list $w_list xview] + pack $sb -fill x -side bottom -before $w_list + } else { - scrollbar $sb -orient v -command [list $w_list yview] ++ ${NS}::scrollbar $sb -orient v -command [list $w_list yview] + pack $sb -fill y -side right -before $w_list + } + if {$old_focus ne {}} { + update + focus $old_focus + } + } + + catch {$sb set $first $last} +} + +method _show_tooltip {pos} { + if {$tooltip_wm ne {}} { + _open_tooltip $this + } elseif {$tooltip_timer eq {}} { + set tooltip_timer [after 1000 [cb _open_tooltip]] + } +} + +method _open_tooltip {} { + global remote_url + + set tooltip_timer {} + set pos_x [winfo pointerx $w_list] + set pos_y [winfo pointery $w_list] + if {[winfo containing $pos_x $pos_y] ne $w_list} { + _hide_tooltip $this + return + } + + set pos @[join [list \ + [expr {$pos_x - [winfo rootx $w_list]}] \ + [expr {$pos_y - [winfo rooty $w_list]}]] ,] + set lno [$w_list index $pos] + if {$lno eq {}} { + _hide_tooltip $this + return + } + + set spec [lindex $cur_specs $lno] + set refn [lindex $spec 1] + if {$refn eq {}} { + _hide_tooltip $this + return + } + + if {$tooltip_wm eq {}} { + set tooltip_wm [toplevel $w_list.tooltip -borderwidth 1] + wm overrideredirect $tooltip_wm 1 + wm transient $tooltip_wm [winfo toplevel $w_list] + set tooltip_t $tooltip_wm.label + text $tooltip_t \ + -takefocus 0 \ + -highlightthickness 0 \ + -relief flat \ + -borderwidth 0 \ + -wrap none \ + -background lightyellow \ + -foreground black + $tooltip_t tag conf section_header -font font_uibold + bind $tooltip_wm [cb _hide_tooltip] + pack $tooltip_t + } else { + $tooltip_t conf -state normal + $tooltip_t delete 0.0 end + } + + set data $tip_data($refn) + if {[lindex $data 0 0] eq {tag}} { + set tag [lindex $data 0] + if {[lindex $data 1 0] eq {commit}} { + set cmit [lindex $data 1] + } else { + set cmit {} + } + } elseif {[lindex $data 0 0] eq {commit}} { + set tag {} + set cmit [lindex $data 0] + } + + $tooltip_t insert end [lindex $spec 0] + set last [_reflog_last $this [lindex $spec 1]] + if {$last ne {}} { + $tooltip_t insert end "\n" + $tooltip_t insert end [mc "Updated"] + $tooltip_t insert end " $last" + } + $tooltip_t insert end "\n" + + if {$tag ne {}} { + $tooltip_t insert end "\n" + $tooltip_t insert end [mc "Tag"] section_header + $tooltip_t insert end " [lindex $tag 1]\n" + $tooltip_t insert end [lindex $tag 2] + $tooltip_t insert end " ([lindex $tag 3])\n" + $tooltip_t insert end [lindex $tag 4] + $tooltip_t insert end "\n" + } + + if {$cmit ne {}} { + $tooltip_t insert end "\n" + $tooltip_t insert end [mc "Commit@@noun"] section_header + $tooltip_t insert end " [lindex $cmit 1]\n" + $tooltip_t insert end [lindex $cmit 2] + $tooltip_t insert end " ([lindex $cmit 3])\n" + $tooltip_t insert end [lindex $cmit 4] + } + + if {[llength $spec] > 2} { + $tooltip_t insert end "\n" + $tooltip_t insert end [mc "Remote"] section_header + $tooltip_t insert end " [lindex $spec 2]\n" + $tooltip_t insert end [mc "URL"] + $tooltip_t insert end " $remote_url([lindex $spec 2])\n" + $tooltip_t insert end [mc "Branch"] + $tooltip_t insert end " [lindex $spec 3]" + } + + $tooltip_t conf -state disabled + _position_tooltip $this +} + +method _reflog_last {name} { + if {[info exists reflog_last($name)]} { + return reflog_last($name) + } + + set last {} + if {[catch {set last [file mtime [gitdir $name]]}] + && ![catch {set g [open [gitdir logs $name] r]}]} { + fconfigure $g -translation binary + while {[gets $g line] >= 0} { + if {[regexp {> ([1-9][0-9]*) } $line line when]} { + set last $when + } + } + close $g + } + + if {$last ne {}} { + set last [format_date $last] + } + set reflog_last($name) $last + return $last +} + +method _position_tooltip {} { + set max_h [lindex [split [$tooltip_t index end] .] 0] + set max_w 0 + for {set i 1} {$i <= $max_h} {incr i} { + set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1] + if {$c > $max_w} {set max_w $c} + } + $tooltip_t conf -width $max_w -height $max_h + + set req_w [winfo reqwidth $tooltip_t] + set req_h [winfo reqheight $tooltip_t] + set pos_x [expr {[winfo pointerx .] + 5}] + set pos_y [expr {[winfo pointery .] + 10}] + + set g "${req_w}x${req_h}" + if {$pos_x >= 0} {append g +} + append g $pos_x + if {$pos_y >= 0} {append g +} + append g $pos_y + + wm geometry $tooltip_wm $g + raise $tooltip_wm +} + +method _hide_tooltip {} { + if {$tooltip_wm ne {}} { + destroy $tooltip_wm + set tooltip_wm {} + } + if {$tooltip_timer ne {}} { + after cancel $tooltip_timer + set tooltip_timer {} + } +} + +} diff --cc git-gui/lib/class.tcl index dc2141192,000000000..c27b71476 mode 100644,000000..100644 --- a/git-gui/lib/class.tcl +++ b/git-gui/lib/class.tcl @@@ -1,186 -1,0 +1,193 @@@ +# git-gui simple class/object fake-alike +# Copyright (C) 2007 Shawn Pearce + +proc class {class body} { + if {[namespace exists $class]} { + error "class $class already declared" + } + namespace eval $class " + variable __nextid 0 + variable __sealed 0 + variable __field_list {} + variable __field_array + + proc cb {name args} { + upvar this this + concat \[list ${class}::\$name \$this\] \$args + } + " + namespace eval $class $body +} + +proc field {name args} { + set class [uplevel {namespace current}] + variable ${class}::__sealed + variable ${class}::__field_array + + switch [llength $args] { + 0 { set new [list $name] } + 1 { set new [list $name [lindex $args 0]] } + default { error "wrong # args: field name value?" } + } + + if {$__sealed} { + error "class $class is sealed (cannot add new fields)" + } + + if {[catch {set old $__field_array($name)}]} { + variable ${class}::__field_list + lappend __field_list $new + set __field_array($name) 1 + } else { + error "field $name already declared" + } +} + +proc constructor {name params body} { + set class [uplevel {namespace current}] + set ${class}::__sealed 1 + variable ${class}::__field_list + set mbodyc {} + + append mbodyc {set this } $class + append mbodyc {::__o[incr } $class {::__nextid]::__d} \; + append mbodyc {create_this } $class \; + append mbodyc {set __this [namespace qualifiers $this]} \; + + if {$__field_list ne {}} { + append mbodyc {upvar #0} + foreach n $__field_list { + set n [lindex $n 0] + append mbodyc { ${__this}::} $n { } $n + regsub -all @$n\\M $body "\${__this}::$n" body + } + append mbodyc \; + foreach n $__field_list { + if {[llength $n] == 2} { + append mbodyc \ + {set } [lindex $n 0] { } [list [lindex $n 1]] \; + } + } + } + append mbodyc $body + namespace eval $class [list proc $name $params $mbodyc] +} + +proc method {name params body {deleted {}} {del_body {}}} { + set class [uplevel {namespace current}] + set ${class}::__sealed 1 + variable ${class}::__field_list + set params [linsert $params 0 this] + set mbodyc {} + + append mbodyc {set __this [namespace qualifiers $this]} \; + + switch $deleted { + {} {} + ifdeleted { + append mbodyc {if {![namespace exists $__this]} } + append mbodyc \{ $del_body \; return \} \; + } + default { + error "wrong # args: method name args body (ifdeleted body)?" + } + } + + set decl {} + foreach n $__field_list { + set n [lindex $n 0] + if {[regexp -- $n\\M $body]} { + if { [regexp -all -- $n\\M $body] == 1 + && [regexp -all -- \\\$$n\\M $body] == 1 + && [regexp -all -- \\\$$n\\( $body] == 0} { + regsub -all \ + \\\$$n\\M $body \ + "\[set \${__this}::$n\]" body + } else { + append decl { ${__this}::} $n { } $n + regsub -all @$n\\M $body "\${__this}::$n" body + } + } + } + if {$decl ne {}} { + append mbodyc {upvar #0} $decl \; + } + append mbodyc $body + namespace eval $class [list proc $name $params $mbodyc] +} + +proc create_this {class} { + upvar this this + namespace eval [namespace qualifiers $this] [list proc \ + [namespace tail $this] \ + [list name args] \ + "eval \[list ${class}::\$name $this\] \$args" \ + ] +} + +proc delete_this {{t {}}} { + if {$t eq {}} { + upvar this this + set t $this + } + set t [namespace qualifiers $t] + if {[namespace exists $t]} {namespace delete $t} +} + ++proc make_dialog {t w args} { ++ upvar $t top $w pfx this this ++ global use_ttk ++ uplevel [linsert $args 0 make_toplevel $t $w] ++ pave_toplevel $pfx ++} ++ +proc make_toplevel {t w args} { + upvar $t top $w pfx this this + + if {[llength $args] % 2} { + error "make_toplevel topvar winvar {options}" + } + set autodelete 1 + foreach {name value} $args { + switch -exact -- $name { + -autodelete {set autodelete $value} + default {error "unsupported option $name"} + } + } + + if {$::root_exists || [winfo ismapped .]} { + regsub -all {::} $this {__} w + set top .$w + set pfx $top + toplevel $top + set ::root_exists 1 + } else { + set top . + set pfx {} + } + + if {$autodelete} { + wm protocol $top WM_DELETE_WINDOW " + [list delete_this $this] + [list destroy $top] + " + } +} + + +## auto_mkindex support for class/constructor/method +## +auto_mkindex_parser::command class {name body} { + variable parser + variable contextStack + set contextStack [linsert $contextStack 0 $name] + $parser eval [list _%@namespace eval $name] $body + set contextStack [lrange $contextStack 1 end] +} +auto_mkindex_parser::command constructor {name args} { + variable index + variable scriptFile + append index [list set auto_index([fullname $name])] \ + [format { [list source [file join $dir %s]]} \ + [file split $scriptFile]] "\n" +} diff --cc git-gui/lib/console.tcl index c112464ec,000000000..1f3248ffd mode 100644,000000..100644 --- a/git-gui/lib/console.tcl +++ b/git-gui/lib/console.tcl @@@ -1,222 -1,0 +1,223 @@@ +# git-gui console support +# Copyright (C) 2006, 2007 Shawn Pearce + +class console { + +field t_short +field t_long +field w +field w_t +field console_cr +field is_toplevel 1; # are we our own window? + +constructor new {short_title long_title} { + set t_short $short_title + set t_long $long_title + _init $this + return $this +} + +constructor embed {path title} { + set t_short {} + set t_long $title + set w $path + set is_toplevel 0 + _init $this + return $this +} + +method _init {} { - global M1B ++ global M1B use_ttk NS + + if {$is_toplevel} { - make_toplevel top w -autodelete 0 ++ make_dialog top w -autodelete 0 + wm title $top "[appname] ([reponame]): $t_short" + } else { - frame $w ++ ${NS}::frame $w + } + + set console_cr 1.0 + set w_t $w.m.t + - frame $w.m - label $w.m.l1 \ ++ ${NS}::frame $w.m ++ ${NS}::label $w.m.l1 \ + -textvariable @t_long \ + -anchor w \ + -justify left \ + -font font_uibold + text $w_t \ + -background white \ + -foreground black \ + -borderwidth 1 \ + -relief sunken \ + -width 80 -height 10 \ + -wrap none \ + -font font_diff \ + -state disabled \ + -xscrollcommand [cb _sb_set $w.m.sbx h] \ + -yscrollcommand [cb _sb_set $w.m.sby v] + label $w.m.s -text [mc "Working... please wait..."] \ + -anchor w \ + -justify left \ + -font font_uibold + pack $w.m.l1 -side top -fill x + pack $w.m.s -side bottom -fill x + pack $w_t -side left -fill both -expand 1 + pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10 + + menu $w.ctxm -tearoff 0 + $w.ctxm add command -label [mc "Copy"] \ + -command "tk_textCopy $w_t" + $w.ctxm add command -label [mc "Select All"] \ + -command "focus $w_t;$w_t tag add sel 0.0 end" + $w.ctxm add command -label [mc "Copy All"] \ + -command " + $w_t tag add sel 0.0 end + tk_textCopy $w_t + $w_t tag remove sel 0.0 end + " + + if {$is_toplevel} { - button $w.ok -text [mc "Close"] \ ++ ${NS}::button $w.ok -text [mc "Close"] \ + -state disabled \ + -command [list destroy $w] + pack $w.ok -side bottom -anchor e -pady 10 -padx 10 + bind $w [list focus $w] + } + + bind_button3 $w_t "tk_popup $w.ctxm %X %Y" + bind $w_t <$M1B-Key-a> "$w_t tag add sel 0.0 end;break" + bind $w_t <$M1B-Key-A> "$w_t tag add sel 0.0 end;break" +} + +method exec {cmd {after {}}} { + if {[lindex $cmd 0] eq {git}} { + set fd_f [eval git_read --stderr [lrange $cmd 1 end]] + } else { + lappend cmd 2>@1 + set fd_f [_open_stdout_stderr $cmd] + } + fconfigure $fd_f -blocking 0 -translation binary + fileevent $fd_f readable [cb _read $fd_f $after] +} + +method _read {fd after} { + set buf [read $fd] + if {$buf ne {}} { + if {![winfo exists $w_t]} {_init $this} + $w_t conf -state normal + set c 0 + set n [string length $buf] + while {$c < $n} { + set cr [string first "\r" $buf $c] + set lf [string first "\n" $buf $c] + if {$cr < 0} {set cr [expr {$n + 1}]} + if {$lf < 0} {set lf [expr {$n + 1}]} + + if {$lf < $cr} { + $w_t insert end [string range $buf $c $lf] + set console_cr [$w_t index {end -1c}] + set c $lf + incr c + } else { + $w_t delete $console_cr end + $w_t insert end "\n" + $w_t insert end [string range $buf $c [expr {$cr - 1}]] + set c $cr + incr c + } + } + $w_t conf -state disabled + $w_t see end + } + + fconfigure $fd -blocking 1 + if {[eof $fd]} { + if {[catch {close $fd}]} { + set ok 0 + } else { + set ok 1 + } + if {$after ne {}} { + uplevel #0 $after $ok + } else { + done $this $ok + } + return + } + fconfigure $fd -blocking 0 +} + +method chain {cmdlist {ok 1}} { + if {$ok} { + if {[llength $cmdlist] == 0} { + done $this $ok + return + } + + set cmd [lindex $cmdlist 0] + set cmdlist [lrange $cmdlist 1 end] + + if {[lindex $cmd 0] eq {exec}} { + exec $this \ + [lrange $cmd 1 end] \ + [cb chain $cmdlist] + } else { + uplevel #0 $cmd [cb chain $cmdlist] + } + } else { + done $this $ok + } +} + +method insert {txt} { + if {![winfo exists $w_t]} {_init $this} + $w_t conf -state normal + $w_t insert end "$txt\n" + set console_cr [$w_t index {end -1c}] + $w_t conf -state disabled +} + +method done {ok} { + if {$ok} { + if {[winfo exists $w.m.s]} { + bind $w.m.s [list delete_this $this] + $w.m.s conf -background green -foreground black \ + -text [mc "Success"] + if {$is_toplevel} { + $w.ok conf -state normal + focus $w.ok + } + } else { + delete_this + } + } else { + if {![winfo exists $w.m.s]} { + _init $this + } + bind $w.m.s [list delete_this $this] + $w.m.s conf -background red -foreground black \ + -text [mc "Error: Command Failed"] + if {$is_toplevel} { + $w.ok conf -state normal + focus $w.ok + } + } +} + +method _sb_set {sb orient first last} { ++ global NS + if {![winfo exists $sb]} { + if {$first == $last || ($first == 0 && $last == 1)} return + if {$orient eq {h}} { - scrollbar $sb -orient h -command [list $w_t xview] ++ ${NS}::scrollbar $sb -orient h -command [list $w_t xview] + pack $sb -fill x -side bottom -before $w_t + } else { - scrollbar $sb -orient v -command [list $w_t yview] ++ ${NS}::scrollbar $sb -orient v -command [list $w_t yview] + pack $sb -fill y -side right -before $w_t + } + } + $sb set $first $last +} + +} diff --cc git-gui/lib/database.tcl index d4e0bed0b,000000000..1f187ed28 mode 100644,000000..100644 --- a/git-gui/lib/database.tcl +++ b/git-gui/lib/database.tcl @@@ -1,115 -1,0 +1,115 @@@ +# git-gui object database management support +# Copyright (C) 2006, 2007 Shawn Pearce + +proc do_stats {} { ++ global use_ttk NS + set fd [git_read count-objects -v] + while {[gets $fd line] > 0} { + if {[regexp {^([^:]+): (\d+)$} $line _ name value]} { + set stats($name) $value + } + } + close $fd + + set packed_sz 0 + foreach p [glob -directory [gitdir objects pack] \ + -type f \ + -nocomplain -- *] { + incr packed_sz [file size $p] + } + if {$packed_sz > 0} { + set stats(size-pack) [expr {$packed_sz / 1024}] + } + + set w .stats_view - toplevel $w ++ Dialog $w ++ wm withdraw $w + wm geometry $w "+[winfo rootx .]+[winfo rooty .]" + - label $w.header -text [mc "Database Statistics"] - pack $w.header -side top -fill x - - frame $w.buttons -border 1 - button $w.buttons.close -text [mc Close] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.close -text [mc Close] \ + -default active \ + -command [list destroy $w] - button $w.buttons.gc -text [mc "Compress Database"] \ ++ ${NS}::button $w.buttons.gc -text [mc "Compress Database"] \ + -default normal \ + -command "destroy $w;do_gc" + pack $w.buttons.close -side right + pack $w.buttons.gc -side left + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - frame $w.stat -borderwidth 1 -relief solid ++ ${NS}::labelframe $w.stat -text [mc "Database Statistics"] + foreach s { + {count {mc "Number of loose objects"}} + {size {mc "Disk space used by loose objects"} { KiB}} + {in-pack {mc "Number of packed objects"}} + {packs {mc "Number of packs"}} + {size-pack {mc "Disk space used by packed objects"} { KiB}} + {prune-packable {mc "Packed objects waiting for pruning"}} + {garbage {mc "Garbage files"}} + } { + set name [lindex $s 0] + set label [eval [lindex $s 1]] + if {[catch {set value $stats($name)}]} continue + if {[llength $s] > 2} { + set value "$value[lindex $s 2]" + } + - label $w.stat.l_$name -text "$label:" -anchor w - label $w.stat.v_$name -text $value -anchor w ++ ${NS}::label $w.stat.l_$name -text "$label:" -anchor w ++ ${NS}::label $w.stat.v_$name -text $value -anchor w + grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5} + } + pack $w.stat -pady 10 -padx 10 + + bind $w "grab $w; focus $w.buttons.close" + bind $w [list destroy $w] + bind $w [list destroy $w] + wm title $w [append "[appname] ([reponame]): " [mc "Database Statistics"]] ++ wm deiconify $w + tkwait window $w +} + +proc do_gc {} { + set w [console::new {gc} [mc "Compressing the object database"]] + console::chain $w { + {exec git pack-refs --prune} + {exec git reflog expire --all} + {exec git repack -a -d -l} + {exec git rerere gc} + } +} + +proc do_fsck_objects {} { + set w [console::new {fsck-objects} \ + [mc "Verifying the object database with fsck-objects"]] + set cmd [list git fsck-objects] + lappend cmd --full + lappend cmd --cache + lappend cmd --strict + console::exec $w $cmd +} + +proc hint_gc {} { + set ndirs 1 + set limit 8 + if {[is_Windows]} { + set ndirs 4 + set limit 1 + } + + set count [llength [glob \ + -nocomplain \ + -- \ + [gitdir objects 4\[0-[expr {$ndirs-1}]\]/*]]] + + if {$count >= $limit * $ndirs} { + set objects_current [expr {$count * 256/$ndirs}] + if {[ask_popup \ + [mc "This repository currently has approximately %i loose objects. + +To maintain optimal performance it is strongly recommended that you compress the database. + +Compress the database now?" $objects_current]] eq yes} { + do_gc + } + } +} diff --cc git-gui/lib/diff.tcl index 066755b86,000000000..ec8c11eeb mode 100644,000000..100644 --- a/git-gui/lib/diff.tcl +++ b/git-gui/lib/diff.tcl @@@ -1,681 -1,0 +1,730 @@@ +# git-gui diff viewer +# Copyright (C) 2006, 2007 Shawn Pearce + +proc clear_diff {} { + global ui_diff current_diff_path current_diff_header + global ui_index ui_workdir + + $ui_diff conf -state normal + $ui_diff delete 0.0 end + $ui_diff conf -state disabled + + set current_diff_path {} + set current_diff_header {} + + $ui_index tag remove in_diff 0.0 end + $ui_workdir tag remove in_diff 0.0 end +} + +proc reshow_diff {{after {}}} { + global file_states file_lists + global current_diff_path current_diff_side + global ui_diff + + set p $current_diff_path + if {$p eq {}} { + # No diff is being shown. + } elseif {$current_diff_side eq {}} { + clear_diff + } elseif {[catch {set s $file_states($p)}] + || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} { + + if {[find_next_diff $current_diff_side $p {} {[^O]}]} { + next_diff $after + } else { + clear_diff + } + } else { + set save_pos [lindex [$ui_diff yview] 0] + show_diff $p $current_diff_side {} $save_pos $after + } +} + +proc force_diff_encoding {enc} { + global current_diff_path + + if {$current_diff_path ne {}} { + force_path_encoding $current_diff_path $enc + reshow_diff + } +} + +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. + +The modification date of this file was updated by another application, but the content within the file was not changed. + +A rescan will be automatically started to find other files which may have the same state." [short_path $path]] + + clear_diff + display_file $path __ + rescan ui_ready 0 +} + +proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { + global file_states file_lists + global is_3way_diff is_conflict_diff diff_active repo_config + global ui_diff ui_index ui_workdir + global current_diff_path current_diff_side current_diff_header + global current_diff_queue + + if {$diff_active || ![lock_index read]} return + + clear_diff + if {$lno == {}} { + set lno [lsearch -sorted -exact $file_lists($w) $path] + if {$lno >= 0} { + incr lno + } + } + if {$lno >= 1} { + $w tag add in_diff $lno.0 [expr {$lno + 1}].0 + $w see $lno.0 + } + + set s $file_states($path) + set m [lindex $s 0] + set is_conflict_diff 0 + set current_diff_path $path + set current_diff_side $w + set current_diff_queue {} + ui_status [mc "Loading diff of %s..." [escape_path $path]] + + set cont_info [list $scroll_pos $callback] + + if {[string first {U} $m] >= 0} { + merge_load_stages $path [list show_unmerged_diff $cont_info] + } elseif {$m eq {_O}} { + show_other_diff $path $w $m $cont_info + } else { + start_show_diff $cont_info + } +} + +proc show_unmerged_diff {cont_info} { + global current_diff_path current_diff_side + global merge_stages ui_diff is_conflict_diff + global current_diff_queue + + if {$merge_stages(2) eq {}} { + set is_conflict_diff 1 + lappend current_diff_queue \ + [list [mc "LOCAL: deleted\nREMOTE:\n"] d======= \ + [list ":1:$current_diff_path" ":3:$current_diff_path"]] + } elseif {$merge_stages(3) eq {}} { + set is_conflict_diff 1 + lappend current_diff_queue \ + [list [mc "REMOTE: deleted\nLOCAL:\n"] d======= \ + [list ":1:$current_diff_path" ":2:$current_diff_path"]] + } elseif {[lindex $merge_stages(1) 0] eq {120000} + || [lindex $merge_stages(2) 0] eq {120000} + || [lindex $merge_stages(3) 0] eq {120000}} { + set is_conflict_diff 1 + lappend current_diff_queue \ + [list [mc "LOCAL:\n"] d======= \ + [list ":1:$current_diff_path" ":2:$current_diff_path"]] + lappend current_diff_queue \ + [list [mc "REMOTE:\n"] d======= \ + [list ":1:$current_diff_path" ":3:$current_diff_path"]] + } else { + start_show_diff $cont_info + return + } + + advance_diff_queue $cont_info +} + +proc advance_diff_queue {cont_info} { + global current_diff_queue ui_diff + + set item [lindex $current_diff_queue 0] + set current_diff_queue [lrange $current_diff_queue 1 end] + + $ui_diff conf -state normal + $ui_diff insert end [lindex $item 0] [lindex $item 1] + $ui_diff conf -state disabled + + start_show_diff $cont_info [lindex $item 2] +} + +proc show_other_diff {path w m cont_info} { + global file_states file_lists + global is_3way_diff diff_active repo_config + global ui_diff ui_index ui_workdir + global current_diff_path current_diff_side current_diff_header + + # - Git won't give us the diff, there's nothing to compare to! + # + if {$m eq {_O}} { + set max_sz 100000 + set type unknown + if {[catch { + set type [file type $path] + switch -- $type { + directory { + set type submodule + set content {} + set sz 0 + } + link { + set content [file readlink $path] + set sz [string length $content] + } + file { + set fd [open $path r] + fconfigure $fd \ + -eofchar {} \ + -encoding [get_path_encoding $path] + set content [read $fd $max_sz] + close $fd + set sz [file size $path] + } + default { + error "'$type' not supported" + } + } + } err ]} { + set diff_active 0 + unlock_index + ui_status [mc "Unable to display %s" [escape_path $path]] + error_popup [strcat [mc "Error loading file:"] "\n\n$err"] + return + } + $ui_diff conf -state normal + if {$type eq {submodule}} { + $ui_diff insert end [append \ + "* " \ + [mc "Git Repository (subproject)"] \ + "\n"] d_@ + } elseif {![catch {set type [exec file $path]}]} { + set n [string length $path] + if {[string equal -length $n $path $type]} { + set type [string range $type $n end] + regsub {^:?\s*} $type {} type + } + $ui_diff insert end "* $type\n" d_@ + } + if {[string first "\0" $content] != -1} { + $ui_diff insert end \ + [mc "* Binary file (not showing content)."] \ + d_@ + } else { + if {$sz > $max_sz} { + $ui_diff insert end [mc \ +"* Untracked file is %d bytes. +* Showing only first %d bytes. +" $sz $max_sz] d_@ + } + $ui_diff insert end $content + if {$sz > $max_sz} { + $ui_diff insert end [mc " +* Untracked file clipped here by %s. +* To see the entire file, use an external editor. +" [appname]] d_@ + } + } + $ui_diff conf -state disabled + set diff_active 0 + unlock_index + set scroll_pos [lindex $cont_info 0] + if {$scroll_pos ne {}} { + update + $ui_diff yview moveto $scroll_pos + } + ui_ready + set callback [lindex $cont_info 1] + if {$callback ne {}} { + eval $callback + } + return + } +} + +proc start_show_diff {cont_info {add_opts {}}} { + global file_states file_lists + global is_3way_diff is_submodule_diff diff_active repo_config + global ui_diff ui_index ui_workdir + global current_diff_path current_diff_side current_diff_header + + set path $current_diff_path + set w $current_diff_side + + set s $file_states($path) + set m [lindex $s 0] + set is_3way_diff 0 + set is_submodule_diff 0 + set diff_active 1 + set current_diff_header {} + + set cmd [list] + if {$w eq $ui_index} { + lappend cmd diff-index + lappend cmd --cached + } elseif {$w eq $ui_workdir} { + if {[string first {U} $m] >= 0} { + lappend cmd diff + } else { + lappend cmd diff-files + } + } + ++ if {[string match {160000 *} [lindex $s 2]] ++ || [string match {160000 *} [lindex $s 3]]} { ++ set is_submodule_diff 1 ++ ++ if {[git-version >= "1.6.6"]} { ++ lappend cmd --submodule ++ } ++ } ++ + lappend cmd -p + lappend cmd --no-color + if {$repo_config(gui.diffcontext) >= 1} { + lappend cmd "-U$repo_config(gui.diffcontext)" + } + if {$w eq $ui_index} { + lappend cmd [PARENT] + } + if {$add_opts ne {}} { + eval lappend cmd $add_opts + } else { + lappend cmd -- + lappend cmd $path + } + - if {[string match {160000 *} [lindex $s 2]] - || [string match {160000 *} [lindex $s 3]]} { - set is_submodule_diff 1 ++ if {$is_submodule_diff && [git-version < "1.6.6"]} { + if {$w eq $ui_index} { + set cmd [list submodule summary --cached -- $path] + } else { + set cmd [list submodule summary --files -- $path] + } + } + + if {[catch {set fd [eval git_read --nice $cmd]} err]} { + set diff_active 0 + unlock_index + ui_status [mc "Unable to display %s" [escape_path $path]] + error_popup [strcat [mc "Error loading diff:"] "\n\n$err"] + return + } + + set ::current_diff_inheader 1 + fconfigure $fd \ + -blocking 0 \ + -encoding [get_path_encoding $path] \ + -translation lf + fileevent $fd readable [list read_diff $fd $cont_info] +} + +proc read_diff {fd cont_info} { + global ui_diff diff_active is_submodule_diff + 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} { + # -- Cleanup uninteresting diff header lines. + # + if {$::current_diff_inheader} { + if { [string match {diff --git *} $line] + || [string match {diff --cc *} $line] + || [string match {diff --combined *} $line] + || [string match {--- *} $line] + || [string match {+++ *} $line]} { + append current_diff_header $line "\n" + continue + } + } + if {[string match {index *} $line]} continue + if {$line eq {deleted file mode 120000}} { + set line "deleted symlink" + } + set ::current_diff_inheader 0 + + # -- Automatically detect if this is a 3 way diff. + # + if {[string match {@@@ *} $line]} {set is_3way_diff 1} + + if {[string match {mode *} $line] + || [string match {new file *} $line] + || [regexp {^(old|new) mode *} $line] + || [string match {deleted file *} $line] + || [string match {deleted symlink} $line] + || [string match {Binary files * and * differ} $line] + || $line eq {\ No newline at end of file} + || [regexp {^\* Unmerged path } $line]} { + set tags {} + } elseif {$is_3way_diff} { + set op [string range $line 0 1] + switch -- $op { + { } {set tags {}} + {@@} {set tags d_@} + { +} {set tags d_s+} + { -} {set tags d_s-} + {+ } {set tags d_+s} + {- } {set tags d_-s} + {--} {set tags d_--} + {++} { + if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} { + set is_conflict_diff 1 + set line [string replace $line 0 1 { }] + set tags d$op + } else { + set tags d_++ + } + } + default { + puts "error: Unhandled 3 way diff marker: {$op}" + set tags {} + } + } + } elseif {$is_submodule_diff} { + if {$line == ""} continue - if {[regexp {^\* } $line]} { ++ if {[regexp {^Submodule } $line]} { ++ set tags d_@ ++ } elseif {[regexp {^\* } $line]} { + set line [string replace $line 0 1 {Submodule }] + set tags d_@ + } else { + set op [string range $line 0 2] + switch -- $op { + { <} {set tags d_-} + { >} {set tags d_+} + { W} {set tags {}} + default { + puts "error: Unhandled submodule diff marker: {$op}" + set tags {} + } + } + } + } else { + set op [string index $line 0] + switch -- $op { + { } {set tags {}} + {@} {set tags d_@} + {-} {set tags d_-} + {+} { + if {[regexp {^\+([<>]{7} |={7})} $line _g op]} { + set is_conflict_diff 1 + set tags d$op + } else { + set tags d_+ + } + } + default { + puts "error: Unhandled 2 way diff marker: {$op}" + set tags {} + } + } + } + $ui_diff insert end $line $tags + if {[string index $line end] eq "\r"} { + $ui_diff tag add d_cr {end - 2c} + } + $ui_diff insert end "\n" $tags + } + $ui_diff conf -state disabled + + if {[eof $fd]} { + close $fd + + if {$current_diff_queue ne {}} { + advance_diff_queue $cont_info + return + } + + set diff_active 0 + unlock_index + set scroll_pos [lindex $cont_info 0] + if {$scroll_pos ne {}} { + update + $ui_diff yview moveto $scroll_pos + } + ui_ready + + 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 + } + } +} + +proc apply_hunk {x y} { + global current_diff_path current_diff_header current_diff_side + global ui_diff ui_index file_states + + if {$current_diff_path eq {} || $current_diff_header eq {}} return + if {![lock_index apply_hunk]} return + + set apply_cmd {apply --cached --whitespace=nowarn} + set mi [lindex $file_states($current_diff_path) 0] + if {$current_diff_side eq $ui_index} { + set failed_msg [mc "Failed to unstage selected hunk."] + lappend apply_cmd --reverse + if {[string index $mi 0] ne {M}} { + unlock_index + return + } + } else { + set failed_msg [mc "Failed to stage selected hunk."] + if {[string index $mi 1] ne {M}} { + unlock_index + return + } + } + + set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0] + set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0] + if {$s_lno eq {}} { + unlock_index + return + } + + set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end] + if {$e_lno eq {}} { + set e_lno end + } + + if {[catch { + set enc [get_path_encoding $current_diff_path] + set p [eval git_write $apply_cmd] + fconfigure $p -translation binary -encoding $enc + puts -nonewline $p $current_diff_header + puts -nonewline $p [$ui_diff get $s_lno $e_lno] + close $p} err]} { + error_popup [append $failed_msg "\n\n$err"] + unlock_index + return + } + + $ui_diff conf -state normal + $ui_diff delete $s_lno $e_lno + $ui_diff conf -state disabled + + if {[$ui_diff get 1.0 end] eq "\n"} { + set o _ + } else { + set o ? + } + + if {$current_diff_side eq $ui_index} { + set mi ${o}M + } elseif {[string index $mi 0] eq {_}} { + set mi M$o + } else { + set mi ?$o + } + unlock_index + display_file $current_diff_path $mi + # This should trigger shift to the next changed file + if {$o eq {_}} { + reshow_diff + } +} + - proc apply_line {x y} { ++proc apply_range_or_line {x y} { + global current_diff_path current_diff_header current_diff_side + global ui_diff ui_index file_states + ++ set selected [$ui_diff tag nextrange sel 0.0] ++ ++ if {$selected == {}} { ++ set first [$ui_diff index "@$x,$y"] ++ set last $first ++ } else { ++ set first [lindex $selected 0] ++ set last [lindex $selected 1] ++ } ++ ++ set first_l [$ui_diff index "$first linestart"] ++ set last_l [$ui_diff index "$last lineend"] ++ + if {$current_diff_path eq {} || $current_diff_header eq {}} return + if {![lock_index apply_hunk]} return + + set apply_cmd {apply --cached --whitespace=nowarn} + set mi [lindex $file_states($current_diff_path) 0] + if {$current_diff_side eq $ui_index} { + set failed_msg [mc "Failed to unstage selected line."] + set to_context {+} + lappend apply_cmd --reverse + if {[string index $mi 0] ne {M}} { + unlock_index + return + } + } else { + set failed_msg [mc "Failed to stage selected line."] + set to_context {-} + if {[string index $mi 1] ne {M}} { + unlock_index + return + } + } + - set the_l [$ui_diff index @$x,$y] ++ set wholepatch {} + - # operate only on change lines - set c1 [$ui_diff get "$the_l linestart"] - if {$c1 ne {+} && $c1 ne {-}} { - unlock_index - return - } - set sign $c1 - - set i_l [$ui_diff search -backwards -regexp ^@@ $the_l 0.0] - if {$i_l eq {}} { - unlock_index - return - } - # $i_l is now at the beginning of a line ++ while {$first_l < $last_l} { ++ set i_l [$ui_diff search -backwards -regexp ^@@ $first_l 0.0] ++ if {$i_l eq {}} { ++ # If there's not a @@ above, then the selected range ++ # must have come before the first_l @@ ++ set i_l [$ui_diff search -regexp ^@@ $first_l $last_l] ++ } ++ if {$i_l eq {}} { ++ unlock_index ++ return ++ } ++ # $i_l is now at the beginning of a line + - # pick start line number from hunk header - set hh [$ui_diff get $i_l "$i_l + 1 lines"] - set hh [lindex [split $hh ,] 0] - set hln [lindex [split $hh -] 1] ++ # pick start line number from hunk header ++ set hh [$ui_diff get $i_l "$i_l + 1 lines"] ++ set hh [lindex [split $hh ,] 0] ++ set hln [lindex [split $hh -] 1] + - # There is a special situation to take care of. Consider this hunk: - # - # @@ -10,4 +10,4 @@ - # context before - # -old 1 - # -old 2 - # +new 1 - # +new 2 - # context after - # - # We used to keep the context lines in the order they appear in the - # hunk. But then it is not possible to correctly stage only - # "-old 1" and "+new 1" - it would result in this staged text: - # - # context before - # old 2 - # new 1 - # context after - # - # (By symmetry it is not possible to *un*stage "old 2" and "new 2".) - # - # We resolve the problem by introducing an asymmetry, namely, when - # a "+" line is *staged*, it is moved in front of the context lines - # that are generated from the "-" lines that are immediately before - # the "+" block. That is, we construct this patch: - # - # @@ -10,4 +10,5 @@ - # context before - # +new 1 - # old 1 - # old 2 - # context after - # - # But we do *not* treat "-" lines that are *un*staged in a special - # way. - # - # With this asymmetry it is possible to stage the change - # "old 1" -> "new 1" directly, and to stage the change - # "old 2" -> "new 2" by first staging the entire hunk and - # then unstaging the change "old 1" -> "new 1". - - # This is non-empty if and only if we are _staging_ changes; - # then it accumulates the consecutive "-" lines (after converting - # them to context lines) in order to be moved after the "+" change - # line. - set pre_context {} - - set n 0 - set i_l [$ui_diff index "$i_l + 1 lines"] - set patch {} - while {[$ui_diff compare $i_l < "end - 1 chars"] && - [$ui_diff get $i_l "$i_l + 2 chars"] ne {@@}} { - set next_l [$ui_diff index "$i_l + 1 lines"] - set c1 [$ui_diff get $i_l] - if {[$ui_diff compare $i_l <= $the_l] && - [$ui_diff compare $the_l < $next_l]} { - # the line to stage/unstage - set ln [$ui_diff get $i_l $next_l] - if {$c1 eq {-}} { - set n [expr $n+1] ++ # There is a special situation to take care of. Consider this ++ # hunk: ++ # ++ # @@ -10,4 +10,4 @@ ++ # context before ++ # -old 1 ++ # -old 2 ++ # +new 1 ++ # +new 2 ++ # context after ++ # ++ # We used to keep the context lines in the order they appear in ++ # the hunk. But then it is not possible to correctly stage only ++ # "-old 1" and "+new 1" - it would result in this staged text: ++ # ++ # context before ++ # old 2 ++ # new 1 ++ # context after ++ # ++ # (By symmetry it is not possible to *un*stage "old 2" and "new ++ # 2".) ++ # ++ # We resolve the problem by introducing an asymmetry, namely, ++ # when a "+" line is *staged*, it is moved in front of the ++ # context lines that are generated from the "-" lines that are ++ # immediately before the "+" block. That is, we construct this ++ # patch: ++ # ++ # @@ -10,4 +10,5 @@ ++ # context before ++ # +new 1 ++ # old 1 ++ # old 2 ++ # context after ++ # ++ # But we do *not* treat "-" lines that are *un*staged in a ++ # special way. ++ # ++ # With this asymmetry it is possible to stage the change "old ++ # 1" -> "new 1" directly, and to stage the change "old 2" -> ++ # "new 2" by first staging the entire hunk and then unstaging ++ # the change "old 1" -> "new 1". ++ # ++ # Applying multiple lines adds complexity to the special ++ # situation. The pre_context must be moved after the entire ++ # first block of consecutive staged "+" lines, so that ++ # staging both additions gives the following patch: ++ # ++ # @@ -10,4 +10,6 @@ ++ # context before ++ # +new 1 ++ # +new 2 ++ # old 1 ++ # old 2 ++ # context after ++ ++ # This is non-empty if and only if we are _staging_ changes; ++ # then it accumulates the consecutive "-" lines (after ++ # converting them to context lines) in order to be moved after ++ # "+" change lines. ++ set pre_context {} ++ ++ set n 0 ++ set m 0 ++ set i_l [$ui_diff index "$i_l + 1 lines"] ++ set patch {} ++ while {[$ui_diff compare $i_l < "end - 1 chars"] && ++ [$ui_diff get $i_l "$i_l + 2 chars"] ne {@@}} { ++ set next_l [$ui_diff index "$i_l + 1 lines"] ++ set c1 [$ui_diff get $i_l] ++ if {[$ui_diff compare $first_l <= $i_l] && ++ [$ui_diff compare $i_l < $last_l] && ++ ($c1 eq {-} || $c1 eq {+})} { ++ # a line to stage/unstage ++ set ln [$ui_diff get $i_l $next_l] ++ if {$c1 eq {-}} { ++ set n [expr $n+1] ++ set patch "$patch$pre_context$ln" ++ set pre_context {} ++ } else { ++ set m [expr $m+1] ++ set patch "$patch$ln" ++ } ++ } elseif {$c1 ne {-} && $c1 ne {+}} { ++ # context line ++ set ln [$ui_diff get $i_l $next_l] + set patch "$patch$pre_context$ln" ++ set n [expr $n+1] ++ set m [expr $m+1] ++ set pre_context {} ++ } elseif {$c1 eq $to_context} { ++ # turn change line into context line ++ set ln [$ui_diff get "$i_l + 1 chars" $next_l] ++ if {$c1 eq {-}} { ++ set pre_context "$pre_context $ln" ++ } else { ++ set patch "$patch $ln" ++ } ++ set n [expr $n+1] ++ set m [expr $m+1] + } else { - set patch "$patch$ln$pre_context" - } - set pre_context {} - } elseif {$c1 ne {-} && $c1 ne {+}} { - # context line - set ln [$ui_diff get $i_l $next_l] - set patch "$patch$pre_context$ln" - set n [expr $n+1] - set pre_context {} - } elseif {$c1 eq $to_context} { - # turn change line into context line - set ln [$ui_diff get "$i_l + 1 chars" $next_l] - if {$c1 eq {-}} { - set pre_context "$pre_context $ln" - } else { - set patch "$patch $ln" ++ # a change in the opposite direction of ++ # to_context which is outside the range of ++ # lines to apply. ++ set patch "$patch$pre_context" ++ set pre_context {} + } - set n [expr $n+1] ++ set i_l $next_l + } - set i_l $next_l ++ set patch "$patch$pre_context" ++ set wholepatch "$wholepatch@@ -$hln,$n +$hln,$m @@\n$patch" ++ set first_l [$ui_diff index "$next_l + 1 lines"] + } - set patch "$patch$pre_context" - set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch" + + if {[catch { + set enc [get_path_encoding $current_diff_path] + set p [eval git_write $apply_cmd] + fconfigure $p -translation binary -encoding $enc + puts -nonewline $p $current_diff_header - puts -nonewline $p $patch ++ puts -nonewline $p $wholepatch + close $p} err]} { + error_popup [append $failed_msg "\n\n$err"] + } + + unlock_index +} diff --cc git-gui/lib/error.tcl index 75650157e,000000000..c0fa69af5 mode 100644,000000..100644 --- a/git-gui/lib/error.tcl +++ b/git-gui/lib/error.tcl @@@ -1,116 -1,0 +1,119 @@@ +# git-gui branch (create/delete) support +# Copyright (C) 2006, 2007 Shawn Pearce + +proc _error_parent {} { + set p [grab current .] + if {$p eq {}} { + return . + } + return $p +} + +proc error_popup {msg} { + set title [appname] + if {[reponame] ne {}} { + append title " ([reponame])" + } + set cmd [list tk_messageBox \ + -icon error \ + -type ok \ + -title [append "$title: " [mc "error"]] \ + -message $msg] + if {[winfo ismapped [_error_parent]]} { + lappend cmd -parent [_error_parent] + } + eval $cmd +} + +proc warn_popup {msg} { + set title [appname] + if {[reponame] ne {}} { + append title " ([reponame])" + } + set cmd [list tk_messageBox \ + -icon warning \ + -type ok \ + -title [append "$title: " [mc "warning"]] \ + -message $msg] + if {[winfo ismapped [_error_parent]]} { + lappend cmd -parent [_error_parent] + } + eval $cmd +} + +proc info_popup {msg} { + set title [appname] + if {[reponame] ne {}} { + append title " ([reponame])" + } + tk_messageBox \ + -parent [_error_parent] \ + -icon info \ + -type ok \ + -title $title \ + -message $msg +} + +proc ask_popup {msg} { + set title [appname] + if {[reponame] ne {}} { + append title " ([reponame])" + } + set cmd [list tk_messageBox \ + -icon question \ + -type yesno \ + -title $title \ + -message $msg] + if {[winfo ismapped [_error_parent]]} { + lappend cmd -parent [_error_parent] + } + eval $cmd +} + +proc hook_failed_popup {hook msg {is_fatal 1}} { ++ global use_ttk NS + set w .hookfail - toplevel $w ++ Dialog $w ++ wm withdraw $w + - frame $w.m - label $w.m.l1 -text "$hook hook failed:" \ ++ ${NS}::frame $w.m ++ ${NS}::label $w.m.l1 -text "$hook hook failed:" \ + -anchor w \ + -justify left \ + -font font_uibold + text $w.m.t \ + -background white \ + -foreground black \ + -borderwidth 1 \ + -relief sunken \ + -width 80 -height 10 \ + -font font_diff \ + -yscrollcommand [list $w.m.sby set] - scrollbar $w.m.sby -command [list $w.m.t yview] ++ ${NS}::scrollbar $w.m.sby -command [list $w.m.t yview] + pack $w.m.l1 -side top -fill x + if {$is_fatal} { - label $w.m.l2 \ ++ ${NS}::label $w.m.l2 \ + -text [mc "You must correct the above errors before committing."] \ + -anchor w \ + -justify left \ + -font font_uibold + pack $w.m.l2 -side bottom -fill x + } + pack $w.m.sby -side right -fill y + pack $w.m.t -side left -fill both -expand 1 + pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10 + + $w.m.t insert 1.0 $msg + $w.m.t conf -state disabled + - button $w.ok -text OK \ ++ ${NS}::button $w.ok -text OK \ + -width 15 \ + -command "destroy $w" + pack $w.ok -side bottom -anchor e -pady 10 -padx 10 + + bind $w "grab $w; focus $w" + bind $w "destroy $w" + wm title $w [strcat "[appname] ([reponame]): " [mc "error"]] ++ wm deiconify $w + tkwait window $w +} diff --cc git-gui/lib/index.tcl index 0b58bd887,000000000..e9db0c498 mode 100644,000000..100644 --- a/git-gui/lib/index.tcl +++ b/git-gui/lib/index.tcl @@@ -1,454 -1,0 +1,457 @@@ +# git-gui index (add/remove) support +# Copyright (C) 2006, 2007 Shawn Pearce + +proc _delete_indexlock {} { + if {[catch {file delete -- [gitdir index.lock]} err]} { + error_popup [strcat [mc "Unable to unlock the index."] "\n\n$err"] + } +} + +proc _close_updateindex {fd after} { ++ global use_ttk NS + fconfigure $fd -blocking 1 + if {[catch {close $fd} err]} { + set w .indexfried - toplevel $w ++ Dialog $w ++ wm withdraw $w + wm title $w [strcat "[appname] ([reponame]): " [mc "Index Error"]] + wm geometry $w "+[winfo rootx .]+[winfo rooty .]" + set s [mc "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."] + text $w.msg -yscrollcommand [list $w.vs set] \ + -width [string length $s] -relief flat \ + -borderwidth 0 -highlightthickness 0 \ - -background [$w cget -background] ++ -background [get_bg_color $w] + $w.msg tag configure bold -font font_uibold -justify center - scrollbar $w.vs -command [list $w.msg yview] ++ ${NS}::scrollbar $w.vs -command [list $w.msg yview] + $w.msg insert end $s bold \n\n$err {} + $w.msg configure -state disabled + - button $w.continue \ ++ ${NS}::button $w.continue \ + -text [mc "Continue"] \ + -command [list destroy $w] - button $w.unlock \ ++ ${NS}::button $w.unlock \ + -text [mc "Unlock Index"] \ + -command "destroy $w; _delete_indexlock" + grid $w.msg - $w.vs -sticky news + grid $w.unlock $w.continue - -sticky se -padx 2 -pady 2 + grid columnconfigure $w 0 -weight 1 + grid rowconfigure $w 0 -weight 1 + + wm protocol $w WM_DELETE_WINDOW update + bind $w.continue " + grab $w + focus %W + " ++ wm deiconify $w + tkwait window $w + + $::main_status stop + unlock_index + rescan $after 0 + return + } + + $::main_status stop + unlock_index + uplevel #0 $after +} + +proc update_indexinfo {msg pathList after} { + global update_index_cp + + if {![lock_index update]} return + + set update_index_cp 0 + set pathList [lsort $pathList] + set totalCnt [llength $pathList] + set batch [expr {int($totalCnt * .01) + 1}] + if {$batch > 25} {set batch 25} + + $::main_status start $msg [mc "files"] + set fd [git_write update-index -z --index-info] + fconfigure $fd \ + -blocking 0 \ + -buffering full \ + -buffersize 512 \ + -encoding binary \ + -translation binary + fileevent $fd writable [list \ + write_update_indexinfo \ + $fd \ + $pathList \ + $totalCnt \ + $batch \ + $after \ + ] +} + +proc write_update_indexinfo {fd pathList totalCnt batch after} { + global update_index_cp + global file_states current_diff_path + + if {$update_index_cp >= $totalCnt} { + _close_updateindex $fd $after + return + } + + for {set i $batch} \ + {$update_index_cp < $totalCnt && $i > 0} \ + {incr i -1} { + set path [lindex $pathList $update_index_cp] + incr update_index_cp + + set s $file_states($path) + switch -glob -- [lindex $s 0] { + A? {set new _O} + M? {set new _M} + T_ {set new _T} + D_ {set new _D} + D? {set new _?} + ?? {continue} + } + set info [lindex $s 2] + if {$info eq {}} continue + + puts -nonewline $fd "$info\t[encoding convertto $path]\0" + display_file $path $new + } + + $::main_status update $update_index_cp $totalCnt +} + +proc update_index {msg pathList after} { + global update_index_cp + + if {![lock_index update]} return + + set update_index_cp 0 + set pathList [lsort $pathList] + set totalCnt [llength $pathList] + set batch [expr {int($totalCnt * .01) + 1}] + if {$batch > 25} {set batch 25} + + $::main_status start $msg [mc "files"] + set fd [git_write update-index --add --remove -z --stdin] + fconfigure $fd \ + -blocking 0 \ + -buffering full \ + -buffersize 512 \ + -encoding binary \ + -translation binary + fileevent $fd writable [list \ + write_update_index \ + $fd \ + $pathList \ + $totalCnt \ + $batch \ + $after \ + ] +} + +proc write_update_index {fd pathList totalCnt batch after} { + global update_index_cp + global file_states current_diff_path + + if {$update_index_cp >= $totalCnt} { + _close_updateindex $fd $after + return + } + + for {set i $batch} \ + {$update_index_cp < $totalCnt && $i > 0} \ + {incr i -1} { + set path [lindex $pathList $update_index_cp] + incr update_index_cp + + switch -glob -- [lindex $file_states($path) 0] { + AD {set new __} + ?D {set new D_} + _O - + AM {set new A_} + _T {set new T_} + _U - + U? { + if {[file exists $path]} { + set new M_ + } else { + set new D_ + } + } + ?M {set new M_} + ?? {continue} + } + puts -nonewline $fd "[encoding convertto $path]\0" + display_file $path $new + } + + $::main_status update $update_index_cp $totalCnt +} + +proc checkout_index {msg pathList after} { + global update_index_cp + + if {![lock_index update]} return + + set update_index_cp 0 + set pathList [lsort $pathList] + set totalCnt [llength $pathList] + set batch [expr {int($totalCnt * .01) + 1}] + if {$batch > 25} {set batch 25} + + $::main_status start $msg [mc "files"] + set fd [git_write checkout-index \ + --index \ + --quiet \ + --force \ + -z \ + --stdin \ + ] + fconfigure $fd \ + -blocking 0 \ + -buffering full \ + -buffersize 512 \ + -encoding binary \ + -translation binary + fileevent $fd writable [list \ + write_checkout_index \ + $fd \ + $pathList \ + $totalCnt \ + $batch \ + $after \ + ] +} + +proc write_checkout_index {fd pathList totalCnt batch after} { + global update_index_cp + global file_states current_diff_path + + if {$update_index_cp >= $totalCnt} { + _close_updateindex $fd $after + return + } + + for {set i $batch} \ + {$update_index_cp < $totalCnt && $i > 0} \ + {incr i -1} { + set path [lindex $pathList $update_index_cp] + incr update_index_cp + switch -glob -- [lindex $file_states($path) 0] { + U? {continue} + ?M - + ?T - + ?D { + puts -nonewline $fd "[encoding convertto $path]\0" + display_file $path ?_ + } + } + } + + $::main_status update $update_index_cp $totalCnt +} + +proc unstage_helper {txt paths} { + global file_states current_diff_path + + if {![lock_index begin-update]} return + + set pathList [list] + set after {} + foreach path $paths { + switch -glob -- [lindex $file_states($path) 0] { + A? - + M? - + T_ - + D? { + lappend pathList $path + if {$path eq $current_diff_path} { + set after {reshow_diff;} + } + } + } + } + if {$pathList eq {}} { + unlock_index + } else { + update_indexinfo \ + $txt \ + $pathList \ + [concat $after [list ui_ready]] + } +} + +proc do_unstage_selection {} { + global current_diff_path selected_paths + + if {[array size selected_paths] > 0} { + unstage_helper \ + {Unstaging selected files from commit} \ + [array names selected_paths] + } elseif {$current_diff_path ne {}} { + unstage_helper \ + [mc "Unstaging %s from commit" [short_path $current_diff_path]] \ + [list $current_diff_path] + } +} + +proc add_helper {txt paths} { + global file_states current_diff_path + + if {![lock_index begin-update]} return + + set pathList [list] + set after {} + foreach path $paths { + switch -glob -- [lindex $file_states($path) 0] { + _U - + U? { + if {$path eq $current_diff_path} { + unlock_index + merge_stage_workdir $path + return + } + } + _O - + ?M - + ?D - + ?T { + lappend pathList $path + if {$path eq $current_diff_path} { + set after {reshow_diff;} + } + } + } + } + if {$pathList eq {}} { + unlock_index + } else { + update_index \ + $txt \ + $pathList \ + [concat $after {ui_status [mc "Ready to commit."]}] + } +} + +proc do_add_selection {} { + global current_diff_path selected_paths + + if {[array size selected_paths] > 0} { + add_helper \ + {Adding selected files} \ + [array names selected_paths] + } elseif {$current_diff_path ne {}} { + add_helper \ + [mc "Adding %s" [short_path $current_diff_path]] \ + [list $current_diff_path] + } +} + +proc do_add_all {} { + global file_states + + set paths [list] + foreach path [array names file_states] { + switch -glob -- [lindex $file_states($path) 0] { + U? {continue} + ?M - + ?T - + ?D {lappend paths $path} + } + } + add_helper {Adding all changed files} $paths +} + +proc revert_helper {txt paths} { + global file_states current_diff_path + + if {![lock_index begin-update]} return + + set pathList [list] + set after {} + foreach path $paths { + switch -glob -- [lindex $file_states($path) 0] { + U? {continue} + ?M - + ?T - + ?D { + lappend pathList $path + if {$path eq $current_diff_path} { + set after {reshow_diff;} + } + } + } + } + + + # Split question between singular and plural cases, because + # such distinction is needed in some languages. Previously, the + # code used "Revert changes in" for both, but that can't work + # in languages where 'in' must be combined with word from + # rest of string (in diffrent way for both cases of course). + # + # FIXME: Unfortunately, even that isn't enough in some languages + # as they have quite complex plural-form rules. Unfortunately, + # msgcat doesn't seem to support that kind of string translation. + # + set n [llength $pathList] + if {$n == 0} { + unlock_index + return + } elseif {$n == 1} { + set query [mc "Revert changes in file %s?" [short_path [lindex $pathList]]] + } else { + set query [mc "Revert changes in these %i files?" $n] + } + + set reply [tk_dialog \ + .confirm_revert \ + "[appname] ([reponame])" \ + "$query + +[mc "Any unstaged changes will be permanently lost by the revert."]" \ + question \ + 1 \ + [mc "Do Nothing"] \ + [mc "Revert Changes"] \ + ] + if {$reply == 1} { + checkout_index \ + $txt \ + $pathList \ + [concat $after [list ui_ready]] + } else { + unlock_index + } +} + +proc do_revert_selection {} { + global current_diff_path selected_paths + + if {[array size selected_paths] > 0} { + revert_helper \ + [mc "Reverting selected files"] \ + [array names selected_paths] + } elseif {$current_diff_path ne {}} { + revert_helper \ + [mc "Reverting %s" [short_path $current_diff_path]] \ + [list $current_diff_path] + } +} + +proc do_select_commit_type {} { + global commit_type selected_commit_type + + if {$selected_commit_type eq {new} + && [string match amend* $commit_type]} { + create_new_commit + } elseif {$selected_commit_type eq {amend} + && ![string match amend* $commit_type]} { + load_last_commit + + # The amend request was rejected... + # + if {![string match amend* $commit_type]} { + set selected_commit_type new + } + } +} diff --cc git-gui/lib/merge.tcl index 283e4915e,000000000..5cded2341 mode 100644,000000..100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/lib/merge.tcl @@@ -1,275 -1,0 +1,275 @@@ +# git-gui branch merge support +# Copyright (C) 2006, 2007 Shawn Pearce + +class merge { + +field w ; # top level window +field w_rev ; # mega-widget to pick the revision to merge + +method _can_merge {} { + global HEAD commit_type file_states + + if {[string match amend* $commit_type]} { + info_popup [mc "Cannot merge while amending. + +You must finish amending this commit before starting any type of merge. +"] + return 0 + } + + if {[committer_ident] eq {}} {return 0} + if {![lock_index merge]} {return 0} + + # -- Our in memory state should match the repository. + # + repository_state curType curHEAD curMERGE_HEAD + if {$commit_type ne $curType || $HEAD ne $curHEAD} { + 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 a merge can be performed. + +The rescan will be automatically started now. +"] + unlock_index + rescan ui_ready + return 0 + } + + foreach path [array names file_states] { + switch -glob -- [lindex $file_states($path) 0] { + _O { + continue; # and pray it works! + } + _U - + U? { + error_popup [mc "You are in the middle of a conflicted merge. + +File %s has merge conflicts. + +You must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge. +" [short_path $path]] + unlock_index + return 0 + } + ?? { + error_popup [mc "You are in the middle of a change. + +File %s is modified. + +You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise. +" [short_path $path]] + unlock_index + return 0 + } + } + } + + return 1 +} + +method _rev {} { + if {[catch {$w_rev commit_or_die}]} { + return {} + } + return [$w_rev get] +} + +method _visualize {} { + set rev [_rev $this] + if {$rev ne {}} { + do_gitk [list $rev --not HEAD] + } +} + +method _start {} { + global HEAD current_branch remote_url + + set name [_rev $this] + if {$name eq {}} { + return + } + + set spec [$w_rev get_tracking_branch] + set cmit [$w_rev get_commit] + + set fh [open [gitdir FETCH_HEAD] w] + fconfigure $fh -translation lf + if {$spec eq {}} { + set remote . + set branch $name + set stitle $branch + } else { + set remote $remote_url([lindex $spec 1]) + if {[regexp {^[^:@]*@[^:]*:/} $remote]} { + regsub {^[^:@]*@} $remote {} remote + } + set branch [lindex $spec 2] + set stitle [mc "%s of %s" $branch $remote] + } + regsub ^refs/heads/ $branch {} branch + puts $fh "$cmit\t\tbranch '$branch' of $remote" + close $fh + + set cmd [list git] + lappend cmd merge + lappend cmd --strategy=recursive + lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]] + lappend cmd HEAD + lappend cmd $name + + ui_status [mc "Merging %s and %s..." $current_branch $stitle] + set cons [console::new [mc "Merge"] "merge $stitle"] + console::exec $cons $cmd [cb _finish $cons] + + wm protocol $w WM_DELETE_WINDOW {} + destroy $w +} + +method _finish {cons ok} { + console::done $cons $ok + if {$ok} { + set msg [mc "Merge completed successfully."] + } else { + set msg [mc "Merge failed. Conflict resolution is required."] + } + unlock_index + rescan [list ui_status $msg] + delete_this +} + +constructor dialog {} { + global current_branch - global M1B ++ global M1B use_ttk NS + + if {![_can_merge $this]} { + delete_this + return + } + - make_toplevel top w ++ make_dialog top w + wm title $top [append "[appname] ([reponame]): " [mc "Merge"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + } + + set _start [cb _start] + - label $w.header \ ++ ${NS}::label $w.header \ + -text [mc "Merge Into %s" $current_branch] \ + -font font_uibold + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.visualize \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.visualize \ + -text [mc Visualize] \ + -command [cb _visualize] + pack $w.buttons.visualize -side left - button $w.buttons.merge \ ++ ${NS}::button $w.buttons.merge \ + -text [mc Merge] \ + -command $_start + pack $w.buttons.merge -side right - button $w.buttons.cancel \ ++ ${NS}::button $w.buttons.cancel \ + -text [mc "Cancel"] \ + -command [cb _cancel] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + + set w_rev [::choose_rev::new_unmerged $w.rev [mc "Revision To Merge"]] + pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 + + bind $w <$M1B-Key-Return> $_start + bind $w $_start + bind $w [cb _cancel] + wm protocol $w WM_DELETE_WINDOW [cb _cancel] + + bind $w.buttons.merge [cb _visible] + tkwait window $w +} + +method _visible {} { + grab $w + if {[is_config_true gui.matchtrackingbranch]} { + $w_rev pick_tracking_branch + } + $w_rev focus_filter +} + +method _cancel {} { + wm protocol $w WM_DELETE_WINDOW {} + unlock_index + destroy $w + delete_this +} + +} + +namespace eval merge { + +proc reset_hard {} { + global HEAD commit_type file_states + + if {[string match amend* $commit_type]} { + info_popup [mc "Cannot abort while amending. + +You must finish amending this commit. +"] + return + } + + if {![lock_index abort]} return + + if {[string match *merge* $commit_type]} { + set op_question [mc "Abort merge? + +Aborting the current merge will cause *ALL* uncommitted changes to be lost. + +Continue with aborting the current merge?"] + } else { + set op_question [mc "Reset changes? + +Resetting the changes will cause *ALL* uncommitted changes to be lost. + +Continue with resetting the current changes?"] + } + + if {[ask_popup $op_question] eq {yes}} { + set fd [git_read --stderr read-tree --reset -u -v HEAD] + fconfigure $fd -blocking 0 -translation binary + fileevent $fd readable [namespace code [list _reset_wait $fd]] + $::main_status start [mc "Aborting"] [mc "files reset"] + } else { + unlock_index + } +} + +proc _reset_wait {fd} { + global ui_comm + + $::main_status update_meter [read $fd] + + fconfigure $fd -blocking 1 + if {[eof $fd]} { + set fail [catch {close $fd} err] + $::main_status stop + unlock_index + + $ui_comm delete 0.0 end + $ui_comm edit modified false + + catch {file delete [gitdir MERGE_HEAD]} + catch {file delete [gitdir rr-cache MERGE_RR]} + catch {file delete [gitdir MERGE_RR]} + catch {file delete [gitdir SQUASH_MSG]} + catch {file delete [gitdir MERGE_MSG]} + catch {file delete [gitdir GITGUI_MSG]} + + if {$fail} { + warn_popup "[mc "Abort failed."]\n\n$err" + } + rescan {ui_status [mc "Abort completed. Ready."]} + } else { + fconfigure $fd -blocking 0 + } +} + +} diff --cc git-gui/lib/option.tcl index 1d55b49c9,000000000..d4c5e45c8 mode 100644,000000..100644 --- a/git-gui/lib/option.tcl +++ b/git-gui/lib/option.tcl @@@ -1,318 -1,0 +1,325 @@@ +# git-gui options editor +# Copyright (C) 2006, 2007 Shawn Pearce + +proc config_check_encodings {} { + global repo_config_new global_config_new + + set enc $global_config_new(gui.encoding) + if {$enc eq {}} { + set global_config_new(gui.encoding) [encoding system] + } elseif {[tcl_encoding $enc] eq {}} { + error_popup [mc "Invalid global encoding '%s'" $enc] + return 0 + } + + set enc $repo_config_new(gui.encoding) + if {$enc eq {}} { + set repo_config_new(gui.encoding) [encoding system] + } elseif {[tcl_encoding $enc] eq {}} { + error_popup [mc "Invalid repo encoding '%s'" $enc] + return 0 + } + + return 1 +} + +proc save_config {} { + global default_config font_descs + global repo_config global_config system_config + global repo_config_new global_config_new + global ui_comm_spell + + foreach option $font_descs { + set name [lindex $option 0] + set font [lindex $option 1] + font configure $font \ + -family $global_config_new(gui.$font^^family) \ + -size $global_config_new(gui.$font^^size) + font configure ${font}bold \ + -family $global_config_new(gui.$font^^family) \ + -size $global_config_new(gui.$font^^size) + font configure ${font}italic \ + -family $global_config_new(gui.$font^^family) \ + -size $global_config_new(gui.$font^^size) + set global_config_new(gui.$name) [font configure $font] + unset global_config_new(gui.$font^^family) + unset global_config_new(gui.$font^^size) + } + + foreach name [array names default_config] { + set value $global_config_new($name) + if {$value ne $global_config($name)} { + if {$value eq $system_config($name)} { + catch {git config --global --unset $name} + } else { + regsub -all "\[{}\]" $value {"} value + git config --global $name $value + } + set global_config($name) $value + if {$value eq $repo_config($name)} { + catch {git config --unset $name} + set repo_config($name) $value + } + } + } + + foreach name [array names default_config] { + set value $repo_config_new($name) + if {$value ne $repo_config($name)} { + if {$value eq $global_config($name)} { + catch {git config --unset $name} + } else { + regsub -all "\[{}\]" $value {"} value + git config $name $value + } + set repo_config($name) $value + } + } + + if {[info exists repo_config(gui.spellingdictionary)]} { + set value $repo_config(gui.spellingdictionary) + if {$value eq {none}} { + if {[info exists ui_comm_spell]} { + $ui_comm_spell stop + } + } elseif {[info exists ui_comm_spell]} { + $ui_comm_spell lang $value + } + } +} + +proc do_options {} { + global repo_config global_config font_descs + global repo_config_new global_config_new - global ui_comm_spell ++ global ui_comm_spell use_ttk NS + + array unset repo_config_new + array unset global_config_new + foreach name [array names repo_config] { + set repo_config_new($name) $repo_config($name) + } + load_config 1 + foreach name [array names repo_config] { + switch -- $name { + gui.diffcontext {continue} + } + set repo_config_new($name) $repo_config($name) + } + foreach name [array names global_config] { + set global_config_new($name) $global_config($name) + } + + set w .options_editor - toplevel $w ++ Dialog $w ++ wm withdraw $w ++ wm transient $w [winfo parent $w] + wm geometry $w "+[winfo rootx .]+[winfo rooty .]" + - frame $w.buttons - button $w.buttons.restore -text [mc "Restore Defaults"] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.restore -text [mc "Restore Defaults"] \ + -default normal \ + -command do_restore_defaults + pack $w.buttons.restore -side left - button $w.buttons.save -text [mc Save] \ ++ ${NS}::button $w.buttons.save -text [mc Save] \ + -default active \ + -command [list do_save_config $w] + pack $w.buttons.save -side right - button $w.buttons.cancel -text [mc "Cancel"] \ ++ ${NS}::button $w.buttons.cancel -text [mc "Cancel"] \ + -default normal \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - labelframe $w.repo -text [mc "%s Repository" [reponame]] - labelframe $w.global -text [mc "Global (All Repositories)"] ++ ${NS}::labelframe $w.repo -text [mc "%s Repository" [reponame]] ++ ${NS}::labelframe $w.global -text [mc "Global (All Repositories)"] + pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5 + pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5 + + set optid 0 + foreach option { + {t user.name {mc "User Name"}} + {t user.email {mc "Email Address"}} + + {b merge.summary {mc "Summarize Merge Commits"}} + {i-1..5 merge.verbosity {mc "Merge Verbosity"}} + {b merge.diffstat {mc "Show Diffstat After Merge"}} + {t merge.tool {mc "Use Merge Tool"}} + + {b gui.trustmtime {mc "Trust File Modification Timestamps"}} + {b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}} + {b gui.matchtrackingbranch {mc "Match Tracking Branches"}} + {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}} + {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}} + {i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}} + {i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}} + {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}} + {t gui.newbranchtemplate {mc "New Branch Name Template"}} + {c gui.encoding {mc "Default File Contents Encoding"}} + } { + set type [lindex $option 0] + set name [lindex $option 1] + set text [eval [lindex $option 2]] + incr optid + foreach f {repo global} { + switch -glob -- $type { + b { - checkbutton $w.$f.$optid -text $text \ ++ ${NS}::checkbutton $w.$f.$optid -text $text \ + -variable ${f}_config_new($name) \ + -onvalue true \ + -offvalue false + pack $w.$f.$optid -side top -anchor w + } + i-* { + regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max - frame $w.$f.$optid - label $w.$f.$optid.l -text "$text:" ++ ${NS}::frame $w.$f.$optid ++ ${NS}::label $w.$f.$optid.l -text "$text:" + pack $w.$f.$optid.l -side left -anchor w -fill x - spinbox $w.$f.$optid.v \ ++ tspinbox $w.$f.$optid.v \ + -textvariable ${f}_config_new($name) \ + -from $min \ + -to $max \ + -increment 1 \ + -width [expr {1 + [string length $max]}] + bind $w.$f.$optid.v {%W selection range 0 end} + pack $w.$f.$optid.v -side right -anchor e -padx 5 + pack $w.$f.$optid -side top -anchor w -fill x + } + c - + t { - frame $w.$f.$optid - label $w.$f.$optid.l -text "$text:" - entry $w.$f.$optid.v \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::frame $w.$f.$optid ++ ${NS}::label $w.$f.$optid.l -text "$text:" ++ ${NS}::entry $w.$f.$optid.v \ + -width 20 \ + -textvariable ${f}_config_new($name) + pack $w.$f.$optid.l -side left -anchor w + pack $w.$f.$optid.v -side left -anchor w \ + -fill x -expand 1 \ + -padx 5 + if {$type eq {c}} { + menu $w.$f.$optid.m + build_encoding_menu $w.$f.$optid.m \ + [list set ${f}_config_new($name)] 1 - button $w.$f.$optid.b \ ++ ${NS}::button $w.$f.$optid.b \ + -text [mc "Change"] \ + -command [list popup_btn_menu \ + $w.$f.$optid.m $w.$f.$optid.b] + pack $w.$f.$optid.b -side left -anchor w + } + pack $w.$f.$optid -side top -anchor w -fill x + } + } + } + } + + set all_dicts [linsert \ + [spellcheck::available_langs] \ + 0 \ + none] + incr optid + foreach f {repo global} { + if {![info exists ${f}_config_new(gui.spellingdictionary)]} { + if {[info exists ui_comm_spell]} { + set value [$ui_comm_spell lang] + } else { + set value none + } + set ${f}_config_new(gui.spellingdictionary) $value + } + - frame $w.$f.$optid - label $w.$f.$optid.l -text [mc "Spelling Dictionary:"] - eval tk_optionMenu $w.$f.$optid.v \ - ${f}_config_new(gui.spellingdictionary) \ - $all_dicts ++ ${NS}::frame $w.$f.$optid ++ ${NS}::label $w.$f.$optid.l -text [mc "Spelling Dictionary:"] ++ if {$use_ttk} { ++ ttk::combobox $w.$f.$optid.v \ ++ -textvariable ${f}_config_new(gui.spellingdictionary) \ ++ -values $all_dicts -state readonly ++ } else { ++ eval tk_optionMenu $w.$f.$optid.v \ ++ ${f}_config_new(gui.spellingdictionary) \ ++ $all_dicts ++ } + pack $w.$f.$optid.l -side left -anchor w -fill x + pack $w.$f.$optid.v -side right -anchor e -padx 5 + pack $w.$f.$optid -side top -anchor w -fill x + } + unset all_dicts + + set all_fonts [lsort [font families]] + foreach option $font_descs { + set name [lindex $option 0] + set font [lindex $option 1] + set text [eval [lindex $option 2]] + + set global_config_new(gui.$font^^family) \ + [font configure $font -family] + set global_config_new(gui.$font^^size) \ + [font configure $font -size] + - frame $w.global.$name - label $w.global.$name.l -text "$text:" - button $w.global.$name.b \ ++ ${NS}::frame $w.global.$name ++ ${NS}::label $w.global.$name.l -text "$text:" ++ ${NS}::button $w.global.$name.b \ + -text [mc "Change Font"] \ + -command [list \ - choose_font::pick \ ++ tchoosefont \ + $w \ + [mc "Choose %s" $text] \ + global_config_new(gui.$font^^family) \ + global_config_new(gui.$font^^size) \ + ] - label $w.global.$name.f -textvariable global_config_new(gui.$font^^family) - label $w.global.$name.s -textvariable global_config_new(gui.$font^^size) - label $w.global.$name.pt -text [mc "pt."] ++ ${NS}::label $w.global.$name.f -textvariable global_config_new(gui.$font^^family) ++ ${NS}::label $w.global.$name.s -textvariable global_config_new(gui.$font^^size) ++ ${NS}::label $w.global.$name.pt -text [mc "pt."] + pack $w.global.$name.l -side left -anchor w + pack $w.global.$name.b -side right -anchor e + pack $w.global.$name.pt -side right -anchor w + pack $w.global.$name.s -side right -anchor w + pack $w.global.$name.f -side right -anchor w + pack $w.global.$name -side top -anchor w -fill x + } + + bind $w "grab $w; focus $w.buttons.save" + bind $w "destroy $w" + bind $w [list do_save_config $w] + + if {[is_MacOSX]} { + set t [mc "Preferences"] + } else { + set t [mc "Options"] + } + wm title $w "[appname] ([reponame]): $t" ++ wm deiconify $w + tkwait window $w +} + +proc do_restore_defaults {} { + global font_descs default_config repo_config system_config + global repo_config_new global_config_new + + foreach name [array names default_config] { + set repo_config_new($name) $system_config($name) + set global_config_new($name) $system_config($name) + } + + foreach option $font_descs { + set name [lindex $option 0] + set repo_config(gui.$name) $system_config(gui.$name) + } + apply_config + + foreach option $font_descs { + set name [lindex $option 0] + set font [lindex $option 1] + set global_config_new(gui.$font^^family) \ + [font configure $font -family] + set global_config_new(gui.$font^^size) \ + [font configure $font -size] + } +} + +proc do_save_config {w} { + if {![config_check_encodings]} return + if {[catch {save_config} err]} { + error_popup [strcat [mc "Failed to completely save options:"] "\n\n$err"] + } + reshow_diff + destroy $w +} diff --cc git-gui/lib/remote_add.tcl index fb29422aa,000000000..50029d0ce mode 100644,000000..100644 --- a/git-gui/lib/remote_add.tcl +++ b/git-gui/lib/remote_add.tcl @@@ -1,191 -1,0 +1,190 @@@ +# git-gui remote adding support +# Copyright (C) 2008 Petr Baudis + +class remote_add { + +field w ; # widget path +field w_name ; # new remote name widget +field w_loc ; # new remote location widget + +field name {}; # name of the remote the user has chosen +field location {}; # location of the remote the user has chosen + +field opt_action fetch; # action to do after registering the remote locally + +constructor dialog {} { - global repo_config ++ global repo_config use_ttk NS + - make_toplevel top w ++ make_dialog top w ++ wm withdraw $top + wm title $top [append "[appname] ([reponame]): " [mc "Add Remote"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + } + - label $w.header -text [mc "Add New Remote"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Add New Remote"] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.create -text [mc Add] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.create -text [mc Add] \ + -default active \ + -command [cb _add] + pack $w.buttons.create -side right - button $w.buttons.cancel -text [mc Cancel] \ ++ ${NS}::button $w.buttons.cancel -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - labelframe $w.desc -text [mc "Remote Details"] ++ ${NS}::labelframe $w.desc -text [mc "Remote Details"] + - label $w.desc.name_l -text [mc "Name:"] ++ ${NS}::label $w.desc.name_l -text [mc "Name:"] + set w_name $w.desc.name_t - entry $w_name \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w_name \ + -width 40 \ + -textvariable @name \ + -validate key \ + -validatecommand [cb _validate_name %d %S] + grid $w.desc.name_l $w_name -sticky we -padx {0 5} + - label $w.desc.loc_l -text [mc "Location:"] ++ ${NS}::label $w.desc.loc_l -text [mc "Location:"] + set w_loc $w.desc.loc_t - entry $w_loc \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w_loc \ + -width 40 \ + -textvariable @location + grid $w.desc.loc_l $w_loc -sticky we -padx {0 5} + + grid columnconfigure $w.desc 1 -weight 1 + pack $w.desc -anchor nw -fill x -pady 5 -padx 5 + - labelframe $w.action -text [mc "Further Action"] ++ ${NS}::labelframe $w.action -text [mc "Further Action"] + - radiobutton $w.action.fetch \ ++ ${NS}::radiobutton $w.action.fetch \ + -text [mc "Fetch Immediately"] \ + -value fetch \ + -variable @opt_action + pack $w.action.fetch -anchor nw + - radiobutton $w.action.push \ ++ ${NS}::radiobutton $w.action.push \ + -text [mc "Initialize Remote Repository and Push"] \ + -value push \ + -variable @opt_action + pack $w.action.push -anchor nw + - radiobutton $w.action.none \ ++ ${NS}::radiobutton $w.action.none \ + -text [mc "Do Nothing Else Now"] \ + -value none \ + -variable @opt_action + pack $w.action.none -anchor nw + + grid columnconfigure $w.action 1 -weight 1 + pack $w.action -anchor nw -fill x -pady 5 -padx 5 + + bind $w [cb _visible] + bind $w [list destroy $w] + bind $w [cb _add]\;break ++ wm deiconify $top + tkwait window $w +} + +method _add {} { + global repo_config env + global M1B + + if {$name eq {}} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Please supply a remote name."] + focus $w_name + return + } + + # XXX: We abuse check-ref-format here, but + # that should be ok. + if {[catch {git check-ref-format "remotes/$name"}]} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "'%s' is not an acceptable remote name." $name] + focus $w_name + return + } + + if {[catch {add_single_remote $name $location}]} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Failed to add remote '%s' of location '%s'." $name $location] + focus $w_name + return + } + + switch -- $opt_action { + fetch { + set c [console::new \ + [mc "fetch %s" $name] \ + [mc "Fetching the %s" $name]] + console::exec $c [list git fetch $name] + } + push { + set cmds [list] + + # Parse the location + if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path] + || [regexp {([^:][^:]+):(.+)} $location xx host path]} { + set ssh ssh + if {[info exists env(GIT_SSH)]} { + set ssh $env(GIT_SSH) + } + lappend cmds [list exec $ssh $host mkdir -p $location && git --git-dir=$path init --bare] + } elseif { ! [regexp {://} $location xx] } { + lappend cmds [list exec mkdir -p $location] + lappend cmds [list exec git --git-dir=$location init --bare] + } else { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Do not know how to initialize repository at location '%s'." $location] + destroy $w + return + } + + set c [console::new \ + [mc "push %s" $name] \ + [mc "Setting up the %s (at %s)" $name $location]] + + lappend cmds [list exec git push -v --all $name] + console::chain $c $cmds + } + none { + } + } + + destroy $w +} + +method _validate_name {d S} { + if {$d == 1} { + if {[regexp {[~^:?*\[\0- ]} $S]} { + return 0 + } + } + return 1 +} + +method _visible {} { + grab $w + $w_name icursor end + focus $w_name +} + +} diff --cc git-gui/lib/remote_branch_delete.tcl index 241642062,000000000..f872a3d89 mode 100644,000000..100644 --- a/git-gui/lib/remote_branch_delete.tcl +++ b/git-gui/lib/remote_branch_delete.tcl @@@ -1,351 -1,0 +1,352 @@@ +# git-gui remote branch deleting support +# Copyright (C) 2007 Shawn Pearce + +class remote_branch_delete { + +field w +field head_m + +field urltype {url} +field remote {} +field url {} + +field checktype {head} +field check_head {} + +field status {} +field idle_id {} +field full_list {} +field head_list {} +field active_ls {} +field head_cache +field full_cache +field cached + +constructor dialog {} { - global all_remotes M1B ++ global all_remotes M1B use_ttk NS + - make_toplevel top w ++ make_dialog top w + wm title $top [append "[appname] ([reponame]): " [mc "Delete Branch Remotely"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + } + - label $w.header -text [mc "Delete Branch Remotely"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Delete Branch Remotely"] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.delete -text [mc Delete] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.delete -text [mc Delete] \ + -default active \ + -command [cb _delete] + pack $w.buttons.delete -side right - button $w.buttons.cancel -text [mc "Cancel"] \ ++ ${NS}::button $w.buttons.cancel -text [mc "Cancel"] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - labelframe $w.dest -text [mc "From Repository"] ++ ${NS}::labelframe $w.dest -text [mc "From Repository"] + if {$all_remotes ne {}} { - radiobutton $w.dest.remote_r \ ++ ${NS}::radiobutton $w.dest.remote_r \ + -text [mc "Remote:"] \ + -value remote \ + -variable @urltype - eval tk_optionMenu $w.dest.remote_m @remote $all_remotes ++ if {$use_ttk} { ++ ttk::combobox $w.dest.remote_m -textvariable @remote \ ++ -values $all_remotes -state readonly ++ } else { ++ eval tk_optionMenu $w.dest.remote_m @remote $all_remotes ++ } + grid $w.dest.remote_r $w.dest.remote_m -sticky w + if {[lsearch -sorted -exact $all_remotes origin] != -1} { + set remote origin + } else { + set remote [lindex $all_remotes 0] + } + set urltype remote + trace add variable @remote write [cb _write_remote] + } else { + set urltype url + } - radiobutton $w.dest.url_r \ ++ ${NS}::radiobutton $w.dest.url_r \ + -text [mc "Arbitrary Location:"] \ + -value url \ + -variable @urltype - entry $w.dest.url_t \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w.dest.url_t \ + -width 50 \ + -textvariable @url \ + -validate key \ + -validatecommand { + if {%d == 1 && [regexp {\s} %S]} {return 0} + return 1 + } + trace add variable @url write [cb _write_url] + grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5} + grid columnconfigure $w.dest 1 -weight 1 + pack $w.dest -anchor nw -fill x -pady 5 -padx 5 + - labelframe $w.heads -text [mc "Branches"] - listbox $w.heads.l \ ++ ${NS}::labelframe $w.heads -text [mc "Branches"] ++ slistbox $w.heads.l \ + -height 10 \ + -width 70 \ + -listvariable @head_list \ - -selectmode extended \ - -yscrollcommand [list $w.heads.sby set] - scrollbar $w.heads.sby -command [list $w.heads.l yview] ++ -selectmode extended + - frame $w.heads.footer - label $w.heads.footer.status \ ++ ${NS}::frame $w.heads.footer ++ ${NS}::label $w.heads.footer.status \ + -textvariable @status \ + -anchor w \ + -justify left - button $w.heads.footer.rescan \ ++ ${NS}::button $w.heads.footer.rescan \ + -text [mc "Rescan"] \ + -command [cb _rescan] + pack $w.heads.footer.status -side left -fill x + pack $w.heads.footer.rescan -side right + + pack $w.heads.footer -side bottom -fill x - pack $w.heads.sby -side right -fill y + pack $w.heads.l -side left -fill both -expand 1 + pack $w.heads -fill both -expand 1 -pady 5 -padx 5 + - labelframe $w.validate -text [mc "Delete Only If"] - radiobutton $w.validate.head_r \ ++ ${NS}::labelframe $w.validate -text [mc "Delete Only If"] ++ ${NS}::radiobutton $w.validate.head_r \ + -text [mc "Merged Into:"] \ + -value head \ + -variable @checktype + set head_m [tk_optionMenu $w.validate.head_m @check_head {}] + trace add variable @head_list write [cb _write_head_list] + trace add variable @check_head write [cb _write_check_head] + grid $w.validate.head_r $w.validate.head_m -sticky w - radiobutton $w.validate.always_r \ ++ ${NS}::radiobutton $w.validate.always_r \ + -text [mc "Always (Do not perform merge checks)"] \ + -value always \ + -variable @checktype + grid $w.validate.always_r -columnspan 2 -sticky w + grid columnconfigure $w.validate 1 -weight 1 + pack $w.validate -anchor nw -fill x -pady 5 -padx 5 + + trace add variable @urltype write [cb _write_urltype] + _rescan $this + + bind $w [cb _rescan] + bind $w <$M1B-Key-r> [cb _rescan] + bind $w <$M1B-Key-R> [cb _rescan] + bind $w [cb _delete] + bind $w [list destroy $w] + return $w +} + +method _delete {} { + switch $urltype { + remote {set uri $remote} + url {set uri $url} + } + + set cache $urltype:$uri + set crev {} + if {$checktype eq {head}} { + if {$check_head eq {}} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "A branch is required for 'Merged Into'."] + return + } + set crev $full_cache("$cache\nrefs/heads/$check_head") + } + + set not_merged [list] + set need_fetch 0 + set have_selection 0 + set push_cmd [list git push] + lappend push_cmd -v + lappend push_cmd $uri + + foreach i [$w.heads.l curselection] { + set ref [lindex $full_list $i] + if {$crev ne {}} { + set obj $full_cache("$cache\n$ref") + if {[catch {set m [git merge-base $obj $crev]}]} { + set need_fetch 1 + set m {} + } + if {$obj ne $m} { + lappend not_merged [lindex $head_list $i] + continue + } + } + + lappend push_cmd :$ref + set have_selection 1 + } + + if {$not_merged ne {}} { + set msg [mc "The following branches are not completely merged into %s: + + - %s" $check_head [join $not_merged "\n - "]] + + if {$need_fetch} { + append msg "\n\n" [mc "One or more of the merge tests failed because you have not fetched the necessary commits. Try fetching from %s first." $uri] + } + + tk_messageBox \ + -icon info \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message $msg + if {!$have_selection} return + } + + if {!$have_selection} { + tk_messageBox \ + -icon error \ + -type ok \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Please select one or more branches to delete."] + return + } + + if {$checktype ne {head}} { + if {[tk_messageBox \ + -icon warning \ + -type yesno \ + -title [wm title $w] \ + -parent $w \ + -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} { + return + } + } + + destroy $w + + set cons [console::new \ + "push $uri" \ + [mc "Deleting branches from %s" $uri]] + console::exec $cons $push_cmd +} + +method _rescan {{force 1}} { + switch $urltype { + remote {set uri $remote} + url {set uri $url} + } + + if {$force} { + unset -nocomplain cached($urltype:$uri) + } + + if {$idle_id ne {}} { + after cancel $idle_id + set idle_id {} + } + + _load $this $urltype:$uri $uri +} + +method _write_remote {args} { set urltype remote } +method _write_url {args} { set urltype url } +method _write_check_head {args} { set checktype head } + +method _write_head_list {args} { + global current_branch + + $head_m delete 0 end + foreach abr $head_list { + $head_m insert end radiobutton \ + -label $abr \ + -value $abr \ + -variable @check_head + } + if {[lsearch -exact -sorted $head_list $check_head] < 0} { + if {[lsearch -exact -sorted $head_list $current_branch] < 0} { + set check_head {} + } else { + set check_head $current_branch + } + } +} + +method _write_urltype {args} { + if {$urltype eq {url}} { + if {$idle_id ne {}} { + after cancel $idle_id + } + _load $this none: {} + set idle_id [after 1000 [cb _rescan 0]] + } else { + _rescan $this 0 + } +} + +method _load {cache uri} { + if {$active_ls ne {}} { + catch {close $active_ls} + } + + if {$uri eq {}} { + $w.heads.l conf -state disabled + set head_list [list] + set full_list [list] + set status [mc "No repository selected."] + return + } + + if {[catch {set x $cached($cache)}]} { + set status [mc "Scanning %s..." $uri] + $w.heads.l conf -state disabled + set head_list [list] + set full_list [list] + set head_cache($cache) [list] + set full_cache($cache) [list] + set active_ls [git_read ls-remote $uri] + fconfigure $active_ls \ + -blocking 0 \ + -translation lf \ + -encoding utf-8 + fileevent $active_ls readable [cb _read $cache $active_ls] + } else { + set status {} + set full_list $full_cache($cache) + set head_list $head_cache($cache) + $w.heads.l conf -state normal + } +} + +method _read {cache fd} { + if {$fd ne $active_ls} { + catch {close $fd} + return + } + + while {[gets $fd line] >= 0} { + if {[string match {*^{}} $line]} continue + if {[regexp {^([0-9a-f]{40}) (.*)$} $line _junk obj ref]} { + if {[regsub ^refs/heads/ $ref {} abr]} { + lappend head_list $abr + lappend head_cache($cache) $abr + lappend full_list $ref + lappend full_cache($cache) $ref + set full_cache("$cache\n$ref") $obj + } + } + } + + if {[eof $fd]} { + if {[catch {close $fd} err]} { + set status $err + set head_list [list] + set full_list [list] + } else { + set status {} + set cached($cache) 1 + $w.heads.l conf -state normal + } + } +} ifdeleted { + catch {close $fd} +} + +} diff --cc git-gui/lib/search.tcl index b371e9a30,000000000..7fdbf87bc mode 100644,000000..100644 --- a/git-gui/lib/search.tcl +++ b/git-gui/lib/search.tcl @@@ -1,198 -1,0 +1,199 @@@ +# incremental search panel +# based on code from gitk, Copyright (C) Paul Mackerras + +class searchbar { + +field w +field ctext + +field searchstring {} +field casesensitive 1 +field searchdirn -forwards + +field smarktop +field smarkbot + +constructor new {i_w i_text args} { ++ global use_ttk NS + set w $i_w + set ctext $i_text + - frame $w - label $w.l -text [mc Find:] ++ ${NS}::frame $w ++ ${NS}::label $w.l -text [mc Find:] + entry $w.ent -textvariable ${__this}::searchstring -background lightgreen - button $w.bn -text [mc Next] -command [cb find_next] - button $w.bp -text [mc Prev] -command [cb find_prev] - checkbutton $w.cs -text [mc Case-Sensitive] \ ++ ${NS}::button $w.bn -text [mc Next] -command [cb find_next] ++ ${NS}::button $w.bp -text [mc Prev] -command [cb find_prev] ++ ${NS}::checkbutton $w.cs -text [mc Case-Sensitive] \ + -variable ${__this}::casesensitive -command [cb _incrsearch] + pack $w.l -side left + pack $w.cs -side right + pack $w.bp -side right + pack $w.bn -side right + pack $w.ent -side left -expand 1 -fill x + + eval grid conf $w -sticky we $args + grid remove $w + + trace add variable searchstring write [cb _incrsearch_cb] + + bind $w [list delete_this $this] + return $this +} + +method show {} { + if {![visible $this]} { + grid $w + } + focus -force $w.ent +} + +method hide {} { + if {[visible $this]} { + focus $ctext + grid remove $w + } +} + +method visible {} { + return [winfo ismapped $w] +} + +method editor {} { + return $w.ent +} + +method _get_new_anchor {} { + # use start of selection if it is visible, + # or the bounds of the visible area + set top [$ctext index @0,0] + set bottom [$ctext index @0,[winfo height $ctext]] + set sel [$ctext tag ranges sel] + if {$sel ne {}} { + set spos [lindex $sel 0] + if {[lindex $spos 0] >= [lindex $top 0] && + [lindex $spos 0] <= [lindex $bottom 0]} { + return $spos + } + } + if {$searchdirn eq "-forwards"} { + return $top + } else { + return $bottom + } +} + +method _get_wrap_anchor {dir} { + if {$dir eq "-forwards"} { + return 1.0 + } else { + return end + } +} + +method _do_search {start {mlenvar {}} {dir {}} {endbound {}}} { + set cmd [list $ctext search] + if {$mlenvar ne {}} { + upvar $mlenvar mlen + lappend cmd -count mlen + } + if {!$casesensitive} { + lappend cmd -nocase + } + if {$dir eq {}} { + set dir $searchdirn + } + lappend cmd $dir -- $searchstring + if {$endbound ne {}} { + set here [eval $cmd [list $start] [list $endbound]] + } else { + set here [eval $cmd [list $start]] + if {$here eq {}} { + set here [eval $cmd [_get_wrap_anchor $this $dir]] + } + } + return $here +} + +method _incrsearch_cb {name ix op} { + after idle [cb _incrsearch] +} + +method _incrsearch {} { + $ctext tag remove found 1.0 end + if {[catch {$ctext index anchor}]} { + $ctext mark set anchor [_get_new_anchor $this] + } + if {$searchstring ne {}} { + set here [_do_search $this anchor mlen] + if {$here ne {}} { + $ctext see $here + $ctext tag remove sel 1.0 end + $ctext tag add sel $here "$here + $mlen c" + $w.ent configure -background lightgreen + _set_marks $this 1 + } else { + $w.ent configure -background lightpink + } + } +} + +method find_prev {} { + find_next $this -backwards +} + +method find_next {{dir -forwards}} { + focus $w.ent + $w.ent icursor end + set searchdirn $dir + $ctext mark unset anchor + if {$searchstring ne {}} { + set start [_get_new_anchor $this] + if {$dir eq "-forwards"} { + set start "$start + 1c" + } + set match [_do_search $this $start mlen] + $ctext tag remove sel 1.0 end + if {$match ne {}} { + $ctext see $match + $ctext tag add sel $match "$match + $mlen c" + } + } +} + +method _mark_range {first last} { + set mend $first.0 + while {1} { + set match [_do_search $this $mend mlen -forwards $last.end] + if {$match eq {}} break + set mend "$match + $mlen c" + $ctext tag add found $match $mend + } +} + +method _set_marks {doall} { + set topline [lindex [split [$ctext index @0,0] .] 0] + set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0] + if {$doall || $botline < $smarktop || $topline > $smarkbot} { + # no overlap with previous + _mark_range $this $topline $botline + set smarktop $topline + set smarkbot $botline + } else { + if {$topline < $smarktop} { + _mark_range $this $topline [expr {$smarktop-1}] + set smarktop $topline + } + if {$botline > $smarkbot} { + _mark_range $this [expr {$smarkbot+1}] $botline + set smarkbot $botline + } + } +} + +method scrolled {} { + if {$searchstring ne {}} { + after idle [cb _set_marks 0] + } +} + +} diff --cc git-gui/lib/shortcut.tcl index 2f20eb39c,000000000..79c1888e1 mode 100644,000000..100644 --- a/git-gui/lib/shortcut.tcl +++ b/git-gui/lib/shortcut.tcl @@@ -1,139 -1,0 +1,140 @@@ +# git-gui desktop icon creators +# Copyright (C) 2006, 2007 Shawn Pearce + +proc do_windows_shortcut {} { ++ global _gitworktree + set fn [tk_getSaveFile \ + -parent . \ + -title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \ + -initialfile "Git [reponame].lnk"] + if {$fn != {}} { + if {[file extension $fn] ne {.lnk}} { + set fn ${fn}.lnk + } + if {[catch { + win32_create_lnk $fn [list \ + [info nameofexecutable] \ + [file normalize $::argv0] \ + ] \ - [file dirname [file normalize [gitdir]]] ++ [file normalize [$_gitworktree]] + } err]} { + error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"] + } + } +} + +proc do_cygwin_shortcut {} { - global argv0 ++ global argv0 _gitworktree + + if {[catch { + set desktop [exec cygpath \ + --windows \ + --absolute \ + --long-name \ + --desktop] + }]} { + set desktop . + } + set fn [tk_getSaveFile \ + -parent . \ + -title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \ + -initialdir $desktop \ + -initialfile "Git [reponame].lnk"] + if {$fn != {}} { + if {[file extension $fn] ne {.lnk}} { + set fn ${fn}.lnk + } + if {[catch { + set sh [exec cygpath \ + --windows \ + --absolute \ + /bin/sh.exe] + set me [exec cygpath \ + --unix \ + --absolute \ + $argv0] + win32_create_lnk $fn [list \ + $sh -c \ + "CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \ + ] \ - [file dirname [file normalize [gitdir]]] ++ [file normalize [$_gitworktree]] + } err]} { + error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"] + } + } +} + +proc do_macosx_app {} { + global argv0 env + + set fn [tk_getSaveFile \ + -parent . \ + -title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \ + -initialdir [file join $env(HOME) Desktop] \ + -initialfile "Git [reponame].app"] + if {$fn != {}} { + if {[file extension $fn] ne {.app}} { + set fn ${fn}.app + } + if {[catch { + set Contents [file join $fn Contents] + set MacOS [file join $Contents MacOS] + set exe [file join $MacOS git-gui] + + file mkdir $MacOS + + set fd [open [file join $Contents Info.plist] w] + puts $fd { + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + git-gui + CFBundleIdentifier + org.spearce.git-gui + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleVersion + 1.0 + NSPrincipalClass + NSApplication + +} + close $fd + + set fd [open $exe w] + puts $fd "#!/bin/sh" + foreach name [lsort [array names env]] { + set value $env($name) + switch -- $name { + GIT_DIR { set value [file normalize [gitdir]] } + } + + switch -glob -- $name { + SSH_* - + GIT_* { + puts $fd "if test \"z\$$name\" = z; then" + puts $fd " export $name=[sq $value]" + puts $fd "fi &&" + } + } + } + puts $fd "export PATH=[sq [file dirname $::_git]]:\$PATH &&" + puts $fd "cd [sq [file normalize [pwd]]] &&" + puts $fd "exec \\" + puts $fd " [sq [info nameofexecutable]] \\" + puts $fd " [sq [file normalize $argv0]]" + close $fd + + file attributes $exe -permissions u+x,g+x,o+x + } err]} { + error_popup [strcat [mc "Cannot write icon:"] "\n\n$err"] + } + } +} diff --cc git-gui/lib/sshkey.tcl index 82a1a80ff,000000000..5f75bc96b mode 100644,000000..100644 --- a/git-gui/lib/sshkey.tcl +++ b/git-gui/lib/sshkey.tcl @@@ -1,126 -1,0 +1,128 @@@ +# git-gui about git-gui dialog +# Copyright (C) 2006, 2007 Shawn Pearce + +proc find_ssh_key {} { + foreach name {~/.ssh/id_dsa.pub ~/.ssh/id_rsa.pub ~/.ssh/identity.pub} { + if {[file exists $name]} { + set fh [open $name r] + set cont [read $fh] + close $fh + return [list $name $cont] + } + } + + return {} +} + +proc do_ssh_key {} { - global sshkey_title have_tk85 sshkey_fd ++ global sshkey_title have_tk85 sshkey_fd use_ttk NS + + set w .sshkey_dialog + if {[winfo exists $w]} { + raise $w + return + } + - toplevel $w ++ Dialog $w + wm transient $w . + + set finfo [find_ssh_key] + if {$finfo eq {}} { + set sshkey_title [mc "No keys found."] + set gen_state normal + } else { + set sshkey_title [mc "Found a public key in: %s" [lindex $finfo 0]] + set gen_state disabled + } + - frame $w.header -relief flat - label $w.header.lbl -textvariable sshkey_title -anchor w - button $w.header.gen -text [mc "Generate Key"] \ ++ ${NS}::frame $w.header ++ ${NS}::label $w.header.lbl -textvariable sshkey_title -anchor w ++ ${NS}::button $w.header.gen -text [mc "Generate Key"] \ + -command [list make_ssh_key $w] -state $gen_state + pack $w.header.lbl -side left -expand 1 -fill x + pack $w.header.gen -side right + pack $w.header -fill x -pady 5 -padx 5 + + text $w.contents -width 60 -height 10 -wrap char -relief sunken + pack $w.contents -fill both -expand 1 + if {$have_tk85} { - $w.contents configure -inactiveselectbackground darkblue ++ set clr darkblue ++ if {$use_ttk} { set clr [ttk::style lookup . -selectbackground] } ++ $w.contents configure -inactiveselectbackground $clr + } + - frame $w.buttons - button $w.buttons.close -text [mc Close] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.close -text [mc Close] \ + -default active -command [list destroy $w] + pack $w.buttons.close -side right - button $w.buttons.copy -text [mc "Copy To Clipboard"] \ ++ ${NS}::button $w.buttons.copy -text [mc "Copy To Clipboard"] \ + -command [list tk_textCopy $w.contents] + pack $w.buttons.copy -side left + pack $w.buttons -side bottom -fill x -pady 5 -padx 5 + + if {$finfo ne {}} { + $w.contents insert end [lindex $finfo 1] sel + } + $w.contents configure -state disabled + + bind $w "grab $w; focus $w.buttons.close" + bind $w "destroy $w" + bind $w "destroy $w" + bind $w kill_sshkey + wm title $w [mc "Your OpenSSH Public Key"] + tk::PlaceWindow $w widget . + tkwait window $w +} + +proc make_ssh_key {w} { + global sshkey_title sshkey_output sshkey_fd + + set sshkey_title [mc "Generating..."] + $w.header.gen configure -state disabled + + set cmdline [list sh -c {echo | ssh-keygen -q -t rsa -f ~/.ssh/id_rsa 2>&1}] + + if {[catch { set sshkey_fd [_open_stdout_stderr $cmdline] } err]} { + error_popup [mc "Could not start ssh-keygen:\n\n%s" $err] + return + } + + set sshkey_output {} + fconfigure $sshkey_fd -blocking 0 + fileevent $sshkey_fd readable [list read_sshkey_output $sshkey_fd $w] +} + +proc kill_sshkey {} { + global sshkey_fd + if {![info exists sshkey_fd]} return + catch { kill_file_process $sshkey_fd } + catch { close $sshkey_fd } +} + +proc read_sshkey_output {fd w} { + global sshkey_fd sshkey_output sshkey_title + + set sshkey_output "$sshkey_output[read $fd]" + if {![eof $fd]} return + + fconfigure $fd -blocking 1 + unset sshkey_fd + + $w.contents configure -state normal + if {[catch {close $fd} err]} { + set sshkey_title [mc "Generation failed."] + $w.contents insert end $err + $w.contents insert end "\n" + $w.contents insert end $sshkey_output + } else { + set finfo [find_ssh_key] + if {$finfo eq {}} { + set sshkey_title [mc "Generation succeded, but no keys found."] + $w.contents insert end $sshkey_output + } else { + set sshkey_title [mc "Your key is in: %s" [lindex $finfo 0]] + $w.contents insert end [lindex $finfo 1] sel + } + } + $w.contents configure -state disable +} diff --cc git-gui/lib/status_bar.tcl index 51d417755,000000000..5fe3aad38 mode 100644,000000..100644 --- a/git-gui/lib/status_bar.tcl +++ b/git-gui/lib/status_bar.tcl @@@ -1,127 -1,0 +1,129 @@@ +# git-gui status bar mega-widget +# Copyright (C) 2007 Shawn Pearce + +class status_bar { + +field w ; # our own window path +field w_l ; # text widget we draw messages into +field w_c ; # canvas we draw a progress bar into +field c_pack ; # script to pack the canvas with +field status {}; # single line of text we show +field prefix {}; # text we format into status +field units {}; # unit of progress +field meter {}; # current core git progress meter (if active) + +constructor new {path} { ++ global use_ttk NS + set w $path + set w_l $w.l + set w_c $w.c + - frame $w \ - -borderwidth 1 \ - -relief sunken - label $w_l \ ++ ${NS}::frame $w ++ if {!$use_ttk} { ++ $w configure -borderwidth 1 -relief sunken ++ } ++ ${NS}::label $w_l \ + -textvariable @status \ + -anchor w \ + -justify left + pack $w_l -side left + set c_pack [cb _oneline_pack] + + bind $w [cb _delete %W] + return $this +} + +method _oneline_pack {} { + $w_c conf -width 100 + pack $w_c -side right +} + +constructor two_line {path} { + set w $path + set w_l $w.l + set w_c $w.c + - frame $w - label $w_l \ ++ ${NS}::frame $w ++ ${NS}::label $w_l \ + -textvariable @status \ + -anchor w \ + -justify left + pack $w_l -anchor w -fill x + set c_pack [list pack $w_c -fill x] + + bind $w [cb _delete %W] + return $this +} + +method start {msg uds} { + if {[winfo exists $w_c]} { + $w_c coords bar 0 0 0 20 + } else { + canvas $w_c \ + -height [expr {int([winfo reqheight $w_l] * 0.6)}] \ + -borderwidth 1 \ + -relief groove \ + -highlightt 0 + $w_c create rectangle 0 0 0 20 -tags bar -fill navy + eval $c_pack + } + + set status $msg + set prefix $msg + set units $uds + set meter {} +} + +method update {have total} { + set pdone 0 + if {$total > 0} { + set pdone [expr {100 * $have / $total}] + set cdone [expr {[winfo width $w_c] * $have / $total}] + } + + set prec [string length [format %i $total]] + set status [mc "%s ... %*i of %*i %s (%3i%%)" \ + $prefix \ + $prec $have \ + $prec $total \ + $units $pdone] + $w_c coords bar 0 0 $cdone 20 +} + +method update_meter {buf} { + append meter $buf + set r [string last "\r" $meter] + if {$r == -1} { + return + } + + set prior [string range $meter 0 $r] + set meter [string range $meter [expr {$r + 1}] end] + set p "\\((\\d+)/(\\d+)\\)" + if {[regexp ":\\s*\\d+% $p\(?:, done.\\s*\n|\\s*\r)\$" $prior _j a b]} { + update $this $a $b + } elseif {[regexp "$p\\s+done\r\$" $prior _j a b]} { + update $this $a $b + } +} + +method stop {{msg {}}} { + destroy $w_c + if {$msg ne {}} { + set status $msg + } +} + +method show {msg {test {}}} { + if {$test eq {} || $status eq $test} { + set status $msg + } +} + +method _delete {current} { + if {$current eq $w} { + delete_this + } +} + +} diff --cc git-gui/lib/themed.tcl index 000000000,000000000..1da458673 new file mode 100644 --- /dev/null +++ b/git-gui/lib/themed.tcl @@@ -1,0 -1,0 +1,174 @@@ ++# Functions for supporting the use of themed Tk widgets in git-gui. ++# Copyright (C) 2009 Pat Thoyts ++ ++proc InitTheme {} { ++ # Create a color label style (bg can be overridden by widget option) ++ ttk::style layout Color.TLabel { ++ Color.Label.border -sticky news -children { ++ Color.label.fill -sticky news -children { ++ Color.Label.padding -sticky news -children { ++ Color.Label.label -sticky news}}}} ++ eval [linsert [ttk::style configure TLabel] 0 \ ++ ttk::style configure Color.TLabel] ++ ttk::style configure Color.TLabel \ ++ -borderwidth 0 -relief flat -padding 2 ++ ttk::style map Color.TLabel -background {{} gold} ++ # We also need a padded label. ++ ttk::style configure Padded.TLabel \ ++ -padding {5 5} -borderwidth 1 -relief solid ++ # We need a gold frame. ++ ttk::style layout Gold.TFrame { ++ Gold.Frame.border -sticky nswe -children { ++ Gold.Frame.fill -sticky nswe}} ++ ttk::style configure Gold.TFrame -background gold -relief flat ++ # listboxes should have a theme border so embed in ttk::frame ++ ttk::style layout SListbox.TFrame { ++ SListbox.Frame.Entry.field -sticky news -border true -children { ++ SListbox.Frame.padding -sticky news ++ } ++ } ++} ++ ++proc gold_frame {w args} { ++ global use_ttk ++ if {$use_ttk} { ++ eval [linsert $args 0 ttk::frame $w -style Gold.TFrame] ++ } else { ++ eval [linsert $args 0 frame $w -background gold] ++ } ++} ++ ++proc tlabel {w args} { ++ global use_ttk ++ if {$use_ttk} { ++ set cmd [list ttk::label $w -style Color.TLabel] ++ foreach {k v} $args { ++ switch -glob -- $k { ++ -activebackground {} ++ default { lappend cmd $k $v } ++ } ++ } ++ eval $cmd ++ } else { ++ eval [linsert $args 0 label $w] ++ } ++} ++ ++# The padded label gets used in the about class. ++proc paddedlabel {w args} { ++ global use_ttk ++ if {$use_ttk} { ++ eval [linsert $args 0 ttk::label $w -style Padded.TLabel] ++ } else { ++ eval [linsert $args 0 label $w \ ++ -padx 5 -pady 5 \ ++ -justify left \ ++ -anchor w \ ++ -borderwidth 1 \ ++ -relief solid] ++ } ++} ++ ++# Create a toplevel for use as a dialog. ++# If available, sets the EWMH dialog hint and if ttk is enabled ++# place a themed frame over the surface. ++proc Dialog {w args} { ++ eval [linsert $args 0 toplevel $w -class Dialog] ++ pave_toplevel $w ++ return $w ++} ++ ++# Tk toplevels are not themed - so pave it over with a themed frame to get ++# the base color correct per theme. ++proc pave_toplevel {w} { ++ global use_ttk ++ if {$use_ttk && ![winfo exists $w.!paving]} { ++ set paving [ttk::frame $w.!paving] ++ place $paving -x 0 -y 0 -relwidth 1 -relheight 1 ++ lower $paving ++ } ++} ++ ++# Create a scrolled listbox with appropriate border for the current theme. ++# On many themes the border for a scrolled listbox needs to go around the ++# listbox and the scrollbar. ++proc slistbox {w args} { ++ global use_ttk NS ++ if {$use_ttk} { ++ set f [ttk::frame $w -style SListbox.TFrame -padding 2] ++ } else { ++ set f [frame $w -relief flat] ++ } ++ if {[catch { ++ if {$use_ttk} { ++ eval [linsert $args 0 listbox $f.list -relief flat \ ++ -highlightthickness 0 -borderwidth 0] ++ } else { ++ eval [linsert $args 0 listbox $f.list] ++ } ++ ${NS}::scrollbar $f.vs -command [list $f.list yview] ++ $f.list configure -yscrollcommand [list $f.vs set] ++ grid $f.list $f.vs -sticky news ++ grid rowconfigure $f 0 -weight 1 ++ grid columnconfigure $f 0 -weight 1 ++ bind $f.list <> \ ++ [list event generate $w <>] ++ interp hide {} $w ++ interp alias {} $w {} $f.list ++ } err]} { ++ destroy $f ++ return -code error $err ++ } ++ return $w ++} ++ ++# fetch the background color from a widget. ++proc get_bg_color {w} { ++ global use_ttk ++ if {$use_ttk} { ++ set bg [ttk::style lookup [winfo class $w] -background] ++ } else { ++ set bg [$w cget -background] ++ } ++ return $bg ++} ++ ++# ttk::spinbox didn't get added until 8.6 ++proc tspinbox {w args} { ++ global use_ttk ++ if {$use_ttk && [llength [info commands ttk::spinbox]] > 0} { ++ eval [linsert $args 0 ttk::spinbox $w] ++ } else { ++ eval [linsert $args 0 spinbox $w] ++ } ++} ++ ++# Tk 8.6 provides a standard font selection dialog. This uses the native ++# dialogs on Windows and MacOSX or a standard Tk dialog on X11. ++proc tchoosefont {w title familyvar sizevar} { ++ if {[package vsatisfies [package provide Tk] 8.6]} { ++ upvar #0 $familyvar family ++ upvar #0 $sizevar size ++ tk fontchooser configure -parent $w -title $title \ ++ -font [list $family $size] \ ++ -command [list on_choosefont $familyvar $sizevar] ++ tk fontchooser show ++ } else { ++ choose_font::pick $w $title $familyvar $sizevar ++ } ++} ++ ++# Called when the Tk 8.6 fontchooser selects a font. ++proc on_choosefont {familyvar sizevar font} { ++ upvar #0 $familyvar family ++ upvar #0 $sizevar size ++ set font [font actual $font] ++ set family [dict get $font -family] ++ set size [dict get $font -size] ++} ++ ++# Local variables: ++# mode: tcl ++# indent-tabs-mode: t ++# tab-width: 4 ++# End: diff --cc git-gui/lib/tools_dlg.tcl index 5f7f08e23,000000000..7eeda9daf mode 100644,000000..100644 --- a/git-gui/lib/tools_dlg.tcl +++ b/git-gui/lib/tools_dlg.tcl @@@ -1,421 -1,0 +1,414 @@@ +# git-gui Tools menu dialogs + +class tools_add { + +field w ; # widget path +field w_name ; # new remote name widget +field w_cmd ; # new remote location widget + +field name {}; # name of the tool +field command {}; # command to execute +field add_global 0; # add to the --global config +field no_console 0; # disable using the console +field needs_file 0; # ensure filename is set +field confirm 0; # ask for confirmation +field ask_branch 0; # ask for a revision +field ask_args 0; # ask for additional args + +constructor dialog {} { - global repo_config ++ global repo_config use_ttk NS + - make_toplevel top w ++ make_dialog top w + wm title $top [append "[appname] ([reponame]): " [mc "Add Tool"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + wm transient $top . + } + - label $w.header -text [mc "Add New Tool Command"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Add New Tool Command"] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - checkbutton $w.buttons.global \ ++ ${NS}::frame $w.buttons ++ ${NS}::checkbutton $w.buttons.global \ + -text [mc "Add globally"] \ + -variable @add_global + pack $w.buttons.global -side left -padx 5 - button $w.buttons.create -text [mc Add] \ ++ ${NS}::button $w.buttons.create -text [mc Add] \ + -default active \ + -command [cb _add] + pack $w.buttons.create -side right - button $w.buttons.cancel -text [mc Cancel] \ ++ ${NS}::button $w.buttons.cancel -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - labelframe $w.desc -text [mc "Tool Details"] ++ ${NS}::labelframe $w.desc -text [mc "Tool Details"] + - label $w.desc.name_cmnt -anchor w\ ++ ${NS}::label $w.desc.name_cmnt -anchor w\ + -text [mc "Use '/' separators to create a submenu tree:"] + grid x $w.desc.name_cmnt -sticky we -padx {0 5} -pady {0 2} - label $w.desc.name_l -text [mc "Name:"] ++ ${NS}::label $w.desc.name_l -text [mc "Name:"] + set w_name $w.desc.name_t - entry $w_name \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w_name \ + -width 40 \ + -textvariable @name \ + -validate key \ + -validatecommand [cb _validate_name %d %S] + grid $w.desc.name_l $w_name -sticky we -padx {0 5} + - label $w.desc.cmd_l -text [mc "Command:"] ++ ${NS}::label $w.desc.cmd_l -text [mc "Command:"] + set w_cmd $w.desc.cmd_t - entry $w_cmd \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w_cmd \ + -width 40 \ + -textvariable @command + grid $w.desc.cmd_l $w_cmd -sticky we -padx {0 5} -pady {0 3} + + grid columnconfigure $w.desc 1 -weight 1 + pack $w.desc -anchor nw -fill x -pady 5 -padx 5 + - checkbutton $w.confirm \ ++ ${NS}::checkbutton $w.confirm \ + -text [mc "Show a dialog before running"] \ + -variable @confirm -command [cb _check_enable_dlg] + - labelframe $w.dlg -labelwidget $w.confirm ++ ${NS}::labelframe $w.dlg -labelwidget $w.confirm + - checkbutton $w.dlg.askbranch \ ++ ${NS}::checkbutton $w.dlg.askbranch \ + -text [mc "Ask the user to select a revision (sets \$REVISION)"] \ + -variable @ask_branch -state disabled + pack $w.dlg.askbranch -anchor w -padx 15 + - checkbutton $w.dlg.askargs \ ++ ${NS}::checkbutton $w.dlg.askargs \ + -text [mc "Ask the user for additional arguments (sets \$ARGS)"] \ + -variable @ask_args -state disabled + pack $w.dlg.askargs -anchor w -padx 15 + + pack $w.dlg -anchor nw -fill x -pady {0 8} -padx 5 + - checkbutton $w.noconsole \ ++ ${NS}::checkbutton $w.noconsole \ + -text [mc "Don't show the command output window"] \ + -variable @no_console + pack $w.noconsole -anchor w -padx 5 + - checkbutton $w.needsfile \ ++ ${NS}::checkbutton $w.needsfile \ + -text [mc "Run only if a diff is selected (\$FILENAME not empty)"] \ + -variable @needs_file + pack $w.needsfile -anchor w -padx 5 + + bind $w [cb _visible] + bind $w [list destroy $w] + bind $w [cb _add]\;break + tkwait window $w +} + +method _check_enable_dlg {} { + if {$confirm} { + $w.dlg.askbranch configure -state normal + $w.dlg.askargs configure -state normal + } else { + $w.dlg.askbranch configure -state disabled + $w.dlg.askargs configure -state disabled + } +} + +method _add {} { + global repo_config + + if {$name eq {}} { + error_popup [mc "Please supply a name for the tool."] + focus $w_name + return + } + + set item "guitool.$name.cmd" + + if {[info exists repo_config($item)]} { + error_popup [mc "Tool '%s' already exists." $name] + focus $w_name + return + } + + set cmd [list git config] + if {$add_global} { lappend cmd --global } + set items {} + if {$no_console} { lappend items "guitool.$name.noconsole" } + if {$needs_file} { lappend items "guitool.$name.needsfile" } + if {$confirm} { + if {$ask_args} { lappend items "guitool.$name.argprompt" } + if {$ask_branch} { lappend items "guitool.$name.revprompt" } + if {!$ask_args && !$ask_branch} { + lappend items "guitool.$name.confirm" + } + } + + if {[catch { + eval $cmd [list $item $command] + foreach citem $items { eval $cmd [list $citem yes] } + } err]} { + error_popup [mc "Could not add tool:\n%s" $err] + } else { + set repo_config($item) $command + foreach citem $items { set repo_config($citem) yes } + + tools_populate_all + } + + destroy $w +} + +method _validate_name {d S} { + if {$d == 1} { + if {[regexp {[~?*&\[\0\"\\\{]} $S]} { + return 0 + } + } + return 1 +} + +method _visible {} { + grab $w + $w_name icursor end + focus $w_name +} + +} + +class tools_remove { + +field w ; # widget path +field w_names ; # name list + +constructor dialog {} { - global repo_config global_config system_config ++ global repo_config global_config system_config use_ttk NS + + load_config 1 + - make_toplevel top w ++ make_dialog top w + wm title $top [append "[appname] ([reponame]): " [mc "Remove Tool"]] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + wm transient $top . + } + - label $w.header -text [mc "Remove Tool Commands"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Remove Tool Commands"] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.create -text [mc Remove] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.create -text [mc Remove] \ + -default active \ + -command [cb _remove] + pack $w.buttons.create -side right - button $w.buttons.cancel -text [mc Cancel] \ ++ ${NS}::button $w.buttons.cancel -text [mc Cancel] \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - frame $w.list ++ ${NS}::frame $w.list + set w_names $w.list.l - listbox $w_names \ ++ slistbox $w_names \ + -height 10 \ + -width 30 \ + -selectmode extended \ - -exportselection false \ - -yscrollcommand [list $w.list.sby set] - scrollbar $w.list.sby -command [list $w.list.l yview] - pack $w.list.sby -side right -fill y ++ -exportselection false + pack $w.list.l -side left -fill both -expand 1 + pack $w.list -fill both -expand 1 -pady 5 -padx 5 + + set local_cnt 0 + foreach fullname [tools_list] { + # Cannot delete system tools + if {[info exists system_config(guitool.$fullname.cmd)]} continue + + $w_names insert end $fullname + if {![info exists global_config(guitool.$fullname.cmd)]} { + $w_names itemconfigure end -foreground blue + incr local_cnt + } + } + + if {$local_cnt > 0} { - label $w.colorlbl -foreground blue \ ++ ${NS}::label $w.colorlbl -foreground blue \ + -text [mc "(Blue denotes repository-local tools)"] + pack $w.colorlbl -fill x -pady 5 -padx 5 + } + + bind $w [cb _visible] + bind $w [list destroy $w] + bind $w [cb _remove]\;break + tkwait window $w +} + +method _remove {} { + foreach i [$w_names curselection] { + set name [$w_names get $i] + + catch { git config --remove-section guitool.$name } + catch { git config --global --remove-section guitool.$name } + } + + load_config 0 + tools_populate_all + + destroy $w +} + +method _visible {} { + grab $w + focus $w_names +} + +} + +class tools_askdlg { + +field w ; # widget path +field w_rev {}; # revision browser +field w_args {}; # arguments + +field is_ask_args 0; # has arguments field +field is_ask_revs 0; # has revision browser + +field is_ok 0; # ok to start +field argstr {}; # arguments + +constructor dialog {fullname} { - global M1B ++ global M1B use_ttk NS + + set title [get_config "guitool.$fullname.title"] + if {$title eq {}} { + regsub {/} $fullname { / } title + } + - make_toplevel top w -autodelete 0 ++ make_dialog top w -autodelete 0 + wm title $top [append "[appname] ([reponame]): " $title] + if {$top ne {.}} { + wm geometry $top "+[winfo rootx .]+[winfo rooty .]" + wm transient $top . + } + + set prompt [get_config "guitool.$fullname.prompt"] + if {$prompt eq {}} { + set command [get_config "guitool.$fullname.cmd"] + set prompt [mc "Run Command: %s" $command] + } + - label $w.header -text $prompt -font font_uibold ++ ${NS}::label $w.header -text $prompt -font font_uibold -anchor center + pack $w.header -side top -fill x + + set argprompt [get_config "guitool.$fullname.argprompt"] + set revprompt [get_config "guitool.$fullname.revprompt"] + + set is_ask_args [expr {$argprompt ne {}}] + set is_ask_revs [expr {$revprompt ne {}}] + + if {$is_ask_args} { + if {$argprompt eq {yes} || $argprompt eq {true} || $argprompt eq {1}} { + set argprompt [mc "Arguments"] + } + - labelframe $w.arg -text $argprompt ++ ${NS}::labelframe $w.arg -text $argprompt + + set w_args $w.arg.txt - entry $w_args \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w_args \ + -width 40 \ + -textvariable @argstr + pack $w_args -padx 5 -pady 5 -fill both + pack $w.arg -anchor nw -fill both -pady 5 -padx 5 + } + + if {$is_ask_revs} { + if {$revprompt eq {yes} || $revprompt eq {true} || $revprompt eq {1}} { + set revprompt [mc "Revision"] + } + + if {[is_config_true "guitool.$fullname.revunmerged"]} { + set w_rev [::choose_rev::new_unmerged $w.rev $revprompt] + } else { + set w_rev [::choose_rev::new $w.rev $revprompt] + } + + pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 + } + - frame $w.buttons ++ ${NS}::frame $w.buttons + if {$is_ask_revs} { - button $w.buttons.visualize \ ++ ${NS}::button $w.buttons.visualize \ + -text [mc Visualize] \ + -command [cb _visualize] + pack $w.buttons.visualize -side left + } - button $w.buttons.ok \ ++ ${NS}::button $w.buttons.ok \ + -text [mc OK] \ + -command [cb _start] + pack $w.buttons.ok -side right - button $w.buttons.cancel \ ++ ${NS}::button $w.buttons.cancel \ + -text [mc "Cancel"] \ + -command [cb _cancel] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + + bind $w <$M1B-Key-Return> [cb _start] + bind $w [cb _start] + bind $w [cb _cancel] + wm protocol $w WM_DELETE_WINDOW [cb _cancel] + + bind $w [cb _visible] + return $this +} + +method execute {} { + tkwait window $w + set rv $is_ok + delete_this + return $rv +} + +method _visible {} { + grab $w + if {$is_ask_args} { + focus $w_args + } elseif {$is_ask_revs} { + $w_rev focus_filter + } +} + +method _cancel {} { + wm protocol $w WM_DELETE_WINDOW {} + destroy $w +} + +method _rev {} { + if {[catch {$w_rev commit_or_die}]} { + return {} + } + return [$w_rev get] +} + +method _visualize {} { + global current_branch + set rev [_rev $this] + if {$rev ne {}} { + do_gitk [list --left-right "$current_branch...$rev"] + } +} + +method _start {} { + global env + + if {$is_ask_revs} { + set name [_rev $this] + if {$name eq {}} { + return + } + set env(REVISION) $name + } + + if {$is_ask_args} { + set env(ARGS) $argstr + } + + set is_ok 1 + _cancel $this +} + +} diff --cc git-gui/lib/transport.tcl index b18d9c7a1,000000000..60e3a642c mode 100644,000000..100644 --- a/git-gui/lib/transport.tcl +++ b/git-gui/lib/transport.tcl @@@ -1,195 -1,0 +1,199 @@@ +# git-gui transport (fetch/push) support +# Copyright (C) 2006, 2007 Shawn Pearce + +proc fetch_from {remote} { + set w [console::new \ + [mc "fetch %s" $remote] \ + [mc "Fetching new changes from %s" $remote]] + set cmds [list] + lappend cmds [list exec git fetch $remote] + if {[is_config_true gui.pruneduringfetch]} { + lappend cmds [list exec git remote prune $remote] + } + console::chain $w $cmds +} + +proc prune_from {remote} { + set w [console::new \ + [mc "remote prune %s" $remote] \ + [mc "Pruning tracking branches deleted from %s" $remote]] + console::exec $w [list git remote prune $remote] +} + +proc push_to {remote} { + set w [console::new \ + [mc "push %s" $remote] \ + [mc "Pushing changes to %s" $remote]] + set cmd [list git push] + lappend cmd -v + lappend cmd $remote + console::exec $w $cmd +} + +proc start_push_anywhere_action {w} { + global push_urltype push_remote push_url push_thin push_tags + global push_force + global repo_config + + set is_mirror 0 + set r_url {} + switch -- $push_urltype { + remote { + set r_url $push_remote + catch {set is_mirror $repo_config(remote.$push_remote.mirror)} + } + url {set r_url $push_url} + } + if {$r_url eq {}} return + + set cmd [list git push] + lappend cmd -v + if {$push_thin} { + lappend cmd --thin + } + if {$push_force} { + lappend cmd --force + } + if {$push_tags} { + lappend cmd --tags + } + lappend cmd $r_url + if {$is_mirror} { + set cons [console::new \ + [mc "push %s" $r_url] \ + [mc "Mirroring to %s" $r_url]] + } else { + set cnt 0 + foreach i [$w.source.l curselection] { + set b [$w.source.l get $i] + lappend cmd "refs/heads/$b:refs/heads/$b" + incr cnt + } + if {$cnt == 0} { + return + } elseif {$cnt == 1} { + set unit branch + } else { + set unit branches + } + + set cons [console::new \ + [mc "push %s" $r_url] \ + [mc "Pushing %s %s to %s" $cnt $unit $r_url]] + } + console::exec $cons $cmd + destroy $w +} + +trace add variable push_remote write \ + [list radio_selector push_urltype remote] + +proc do_push_anywhere {} { + global all_remotes current_branch + global push_urltype push_remote push_url push_thin push_tags - global push_force ++ global push_force use_ttk NS + + set w .push_setup + toplevel $w ++ wm withdraw $w + wm geometry $w "+[winfo rootx .]+[winfo rooty .]" ++ pave_toplevel $w + - label $w.header -text [mc "Push Branches"] -font font_uibold ++ ${NS}::label $w.header -text [mc "Push Branches"] \ ++ -font font_uibold -anchor center + pack $w.header -side top -fill x + - frame $w.buttons - button $w.buttons.create -text [mc Push] \ ++ ${NS}::frame $w.buttons ++ ${NS}::button $w.buttons.create -text [mc Push] \ + -default active \ + -command [list start_push_anywhere_action $w] + pack $w.buttons.create -side right - button $w.buttons.cancel -text [mc "Cancel"] \ ++ ${NS}::button $w.buttons.cancel -text [mc "Cancel"] \ + -default normal \ + -command [list destroy $w] + pack $w.buttons.cancel -side right -padx 5 + pack $w.buttons -side bottom -fill x -pady 10 -padx 10 + - labelframe $w.source -text [mc "Source Branches"] - listbox $w.source.l \ ++ ${NS}::labelframe $w.source -text [mc "Source Branches"] ++ slistbox $w.source.l \ + -height 10 \ + -width 70 \ - -selectmode extended \ - -yscrollcommand [list $w.source.sby set] ++ -selectmode extended + foreach h [load_all_heads] { + $w.source.l insert end $h + if {$h eq $current_branch} { + $w.source.l select set end + } + } - scrollbar $w.source.sby -command [list $w.source.l yview] - pack $w.source.sby -side right -fill y + pack $w.source.l -side left -fill both -expand 1 + pack $w.source -fill both -expand 1 -pady 5 -padx 5 + - labelframe $w.dest -text [mc "Destination Repository"] ++ ${NS}::labelframe $w.dest -text [mc "Destination Repository"] + if {$all_remotes ne {}} { - radiobutton $w.dest.remote_r \ ++ ${NS}::radiobutton $w.dest.remote_r \ + -text [mc "Remote:"] \ + -value remote \ + -variable push_urltype - eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes ++ if {$use_ttk} { ++ ttk::combobox $w.dest.remote_m -textvariable push_remote \ ++ -values $all_remotes ++ } else { ++ eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes ++ } + grid $w.dest.remote_r $w.dest.remote_m -sticky w + if {[lsearch -sorted -exact $all_remotes origin] != -1} { + set push_remote origin + } else { + set push_remote [lindex $all_remotes 0] + } + set push_urltype remote + } else { + set push_urltype url + } - radiobutton $w.dest.url_r \ ++ ${NS}::radiobutton $w.dest.url_r \ + -text [mc "Arbitrary Location:"] \ + -value url \ + -variable push_urltype - entry $w.dest.url_t \ - -borderwidth 1 \ - -relief sunken \ ++ ${NS}::entry $w.dest.url_t \ + -width 50 \ + -textvariable push_url \ + -validate key \ + -validatecommand { + if {%d == 1 && [regexp {\s} %S]} {return 0} + if {%d == 1 && [string length %S] > 0} { + set push_urltype url + } + return 1 + } + grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5} + grid columnconfigure $w.dest 1 -weight 1 + pack $w.dest -anchor nw -fill x -pady 5 -padx 5 + - labelframe $w.options -text [mc "Transfer Options"] - checkbutton $w.options.force \ ++ ${NS}::labelframe $w.options -text [mc "Transfer Options"] ++ ${NS}::checkbutton $w.options.force \ + -text [mc "Force overwrite existing branch (may discard changes)"] \ + -variable push_force + grid $w.options.force -columnspan 2 -sticky w - checkbutton $w.options.thin \ ++ ${NS}::checkbutton $w.options.thin \ + -text [mc "Use thin pack (for slow network connections)"] \ + -variable push_thin + grid $w.options.thin -columnspan 2 -sticky w - checkbutton $w.options.tags \ ++ ${NS}::checkbutton $w.options.tags \ + -text [mc "Include tags"] \ + -variable push_tags + grid $w.options.tags -columnspan 2 -sticky w + grid columnconfigure $w.options 1 -weight 1 + pack $w.options -anchor nw -fill x -pady 5 -padx 5 + + set push_url {} + set push_force 0 + set push_thin 0 + set push_tags 0 + + bind $w "grab $w; focus $w.buttons.create" + bind $w "destroy $w" + bind $w [list start_push_anywhere_action $w] + wm title $w [append "[appname] ([reponame]): " [mc "Push"]] ++ wm deiconify $w + tkwait window $w +} diff --cc git-gui/po/de.po index 51abb50bb,000000000..44c5ddc8b mode 100644,000000..100644 --- a/git-gui/po/de.po +++ b/git-gui/po/de.po @@@ -1,2564 -1,0 +1,2592 @@@ +# Translation of git-gui to German. +# Copyright (C) 2007 Shawn Pearce, et al. +# This file is distributed under the same license as the git package. +# Christian Stimming , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-12-06 20:51+0100\n" - "PO-Revision-Date: 2008-12-06 21:22+0100\n" ++"POT-Creation-Date: 2010-01-26 22:22+0100\n" ++"PO-Revision-Date: 2010-01-26 22:25+0100\n" +"Last-Translator: Christian Stimming \n" +"Language-Team: German\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + - #: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 - #: git-gui.sh:763 ++#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 ++#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "git-gui: Programmfehler" + - #: git-gui.sh:593 ++#: git-gui.sh:743 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Ungültige Zeichensatz-Angabe in %s:" + - #: git-gui.sh:620 ++#: git-gui.sh:779 +msgid "Main Font" +msgstr "Programmschriftart" + - #: git-gui.sh:621 ++#: git-gui.sh:780 +msgid "Diff/Console Font" +msgstr "Vergleich-Schriftart" + - #: git-gui.sh:635 ++#: git-gui.sh:794 +msgid "Cannot find git in PATH." +msgstr "Git kann im PATH nicht gefunden werden." + - #: git-gui.sh:662 ++#: git-gui.sh:821 +msgid "Cannot parse Git version string:" +msgstr "Git Versionsangabe kann nicht erkannt werden:" + - #: git-gui.sh:680 ++#: git-gui.sh:839 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Die Version von Git kann nicht bestimmt werden.\n" +"\n" +"»%s« behauptet, es sei Version »%s«.\n" +"\n" +"%s benötigt mindestens Git 1.5.0 oder höher.\n" +"\n" +"Soll angenommen werden, »%s« sei Version 1.5.0?\n" + - #: git-gui.sh:918 ++#: git-gui.sh:1128 +msgid "Git directory not found:" +msgstr "Git-Verzeichnis nicht gefunden:" + - #: git-gui.sh:925 ++#: git-gui.sh:1146 +msgid "Cannot move to top of working directory:" +msgstr "" +"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt " +"werden:" + - #: git-gui.sh:932 - msgid "Cannot use funny .git directory:" - msgstr "Unerwartete Struktur des .git Verzeichnis:" ++#: git-gui.sh:1154 ++msgid "Cannot use bare repository:" ++msgstr "Leeres Projektarchiv kann nicht benutzt werden:" + - #: git-gui.sh:937 ++#: git-gui.sh:1162 +msgid "No working directory" +msgstr "Kein Arbeitsverzeichnis" + - #: git-gui.sh:1084 lib/checkout_op.tcl:283 ++#: git-gui.sh:1334 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "Dateistatus aktualisieren..." + - #: git-gui.sh:1149 ++#: git-gui.sh:1390 +msgid "Scanning for modified files ..." +msgstr "Nach geänderten Dateien suchen..." + - #: git-gui.sh:1367 ++#: git-gui.sh:1454 +msgid "Calling prepare-commit-msg hook..." +msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle..." + - #: git-gui.sh:1384 ++#: git-gui.sh:1471 +msgid "Commit declined by prepare-commit-msg hook." - msgstr "Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)." ++msgstr "" ++"Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit " ++"hook«)." + - #: git-gui.sh:1542 lib/browser.tcl:246 ++#: git-gui.sh:1629 lib/browser.tcl:246 +msgid "Ready." +msgstr "Bereit." + - #: git-gui.sh:1590 ++#: git-gui.sh:1787 ++#, tcl-format ++msgid "Displaying only %s of %s files." ++msgstr "Nur %s von %s Dateien werden angezeigt." ++ ++#: git-gui.sh:1913 +msgid "Unmodified" +msgstr "Unverändert" + - #: git-gui.sh:1592 ++#: git-gui.sh:1915 +msgid "Modified, not staged" +msgstr "Verändert, nicht bereitgestellt" + - #: git-gui.sh:1593 git-gui.sh:1598 ++#: git-gui.sh:1916 git-gui.sh:1924 +msgid "Staged for commit" +msgstr "Bereitgestellt zum Eintragen" + - #: git-gui.sh:1594 git-gui.sh:1599 ++#: git-gui.sh:1917 git-gui.sh:1925 +msgid "Portions staged for commit" +msgstr "Teilweise bereitgestellt zum Eintragen" + - #: git-gui.sh:1595 git-gui.sh:1600 ++#: git-gui.sh:1918 git-gui.sh:1926 +msgid "Staged for commit, missing" +msgstr "Bereitgestellt zum Eintragen, fehlend" + - #: git-gui.sh:1658 ++#: git-gui.sh:1920 +msgid "File type changed, not staged" +msgstr "Dateityp geändert, nicht bereitgestellt" + - #: git-gui.sh:1659 ++#: git-gui.sh:1921 +msgid "File type changed, staged" +msgstr "Dateityp geändert, bereitgestellt" + - #: git-gui.sh:1661 ++#: git-gui.sh:1923 +msgid "Untracked, not staged" +msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt" + - #: git-gui.sh:1602 ++#: git-gui.sh:1928 +msgid "Missing" +msgstr "Fehlend" + - #: git-gui.sh:1603 ++#: git-gui.sh:1929 +msgid "Staged for removal" +msgstr "Bereitgestellt zum Löschen" + - #: git-gui.sh:1604 ++#: git-gui.sh:1930 +msgid "Staged for removal, still present" +msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden" + - #: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609 ++#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 ++#: git-gui.sh:1936 git-gui.sh:1937 +msgid "Requires merge resolution" +msgstr "Konfliktauflösung nötig" + - #: git-gui.sh:1644 ++#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." +msgstr "Gitk wird gestartet... bitte warten." + - #: git-gui.sh:1698 ++#: git-gui.sh:1984 +msgid "Couldn't find gitk in PATH" +msgstr "Gitk kann im PATH nicht gefunden werden." + - #: git-gui.sh:1948 lib/choose_repository.tcl:36 ++#: git-gui.sh:2043 ++msgid "Couldn't find git gui in PATH" ++msgstr "»Git gui« kann im PATH nicht gefunden werden." ++ ++#: git-gui.sh:2455 lib/choose_repository.tcl:36 +msgid "Repository" +msgstr "Projektarchiv" + - #: git-gui.sh:1861 ++#: git-gui.sh:2456 +msgid "Edit" +msgstr "Bearbeiten" + - #: git-gui.sh:1863 lib/choose_rev.tcl:561 ++#: git-gui.sh:2458 lib/choose_rev.tcl:561 +msgid "Branch" +msgstr "Zweig" + - #: git-gui.sh:1866 lib/choose_rev.tcl:548 ++#: git-gui.sh:2461 lib/choose_rev.tcl:548 +msgid "Commit@@noun" +msgstr "Version" + - #: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167 ++#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Zusammenführen" + - #: git-gui.sh:1870 lib/choose_rev.tcl:557 ++#: git-gui.sh:2465 lib/choose_rev.tcl:557 +msgid "Remote" +msgstr "Andere Archive" + - #: git-gui.sh:2293 ++#: git-gui.sh:2468 +msgid "Tools" +msgstr "Werkzeuge" + - #: git-gui.sh:2302 ++#: git-gui.sh:2477 +msgid "Explore Working Copy" +msgstr "Arbeitskopie im Dateimanager" + - #: git-gui.sh:2247 ++#: git-gui.sh:2483 +msgid "Browse Current Branch's Files" +msgstr "Aktuellen Zweig durchblättern" + - #: git-gui.sh:1883 ++#: git-gui.sh:2487 +msgid "Browse Branch Files..." +msgstr "Einen Zweig durchblättern..." + - #: git-gui.sh:1888 ++#: git-gui.sh:2492 +msgid "Visualize Current Branch's History" +msgstr "Aktuellen Zweig darstellen" + - #: git-gui.sh:1892 ++#: git-gui.sh:2496 +msgid "Visualize All Branch History" +msgstr "Alle Zweige darstellen" + - #: git-gui.sh:1899 ++#: git-gui.sh:2503 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Zweig »%s« durchblättern" + - #: git-gui.sh:1901 ++#: git-gui.sh:2505 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Historie von »%s« darstellen" + - #: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Datenbankstatistik" + - #: git-gui.sh:1909 lib/database.tcl:34 ++#: git-gui.sh:2513 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Datenbank komprimieren" + - #: git-gui.sh:1912 ++#: git-gui.sh:2516 +msgid "Verify Database" +msgstr "Datenbank überprüfen" + - #: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7 - #: lib/shortcut.tcl:39 lib/shortcut.tcl:71 ++#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 ++#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +msgid "Create Desktop Icon" +msgstr "Desktop-Icon erstellen" + - #: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185 ++#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +msgid "Quit" +msgstr "Beenden" + - #: git-gui.sh:1939 ++#: git-gui.sh:2547 +msgid "Undo" +msgstr "Rückgängig" + - #: git-gui.sh:1942 ++#: git-gui.sh:2550 +msgid "Redo" +msgstr "Wiederholen" + - #: git-gui.sh:1946 git-gui.sh:2443 ++#: git-gui.sh:2554 git-gui.sh:3109 +msgid "Cut" +msgstr "Ausschneiden" + - #: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614 ++#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "Kopieren" + - #: git-gui.sh:1952 git-gui.sh:2449 ++#: git-gui.sh:2560 git-gui.sh:3115 +msgid "Paste" +msgstr "Einfügen" + - #: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26 ++#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Löschen" + - #: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71 ++#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +msgid "Select All" +msgstr "Alle auswählen" + - #: git-gui.sh:1968 ++#: git-gui.sh:2576 +msgid "Create..." +msgstr "Erstellen..." + - #: git-gui.sh:1974 ++#: git-gui.sh:2582 +msgid "Checkout..." +msgstr "Umstellen..." + - #: git-gui.sh:1980 ++#: git-gui.sh:2588 +msgid "Rename..." +msgstr "Umbenennen..." + - #: git-gui.sh:1985 git-gui.sh:2085 ++#: git-gui.sh:2593 +msgid "Delete..." +msgstr "Löschen..." + - #: git-gui.sh:1990 ++#: git-gui.sh:2598 +msgid "Reset..." +msgstr "Zurücksetzen..." + - #: git-gui.sh:2372 ++#: git-gui.sh:2608 +msgid "Done" +msgstr "Fertig" + - #: git-gui.sh:2374 ++#: git-gui.sh:2610 +msgid "Commit@@verb" +msgstr "Eintragen" + - #: git-gui.sh:2383 git-gui.sh:2786 ++#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "Neue Version" + - #: git-gui.sh:2010 git-gui.sh:2396 ++#: git-gui.sh:2627 git-gui.sh:3057 +msgid "Amend Last Commit" +msgstr "Letzte nachbessern" + - #: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Neu laden" + - #: git-gui.sh:2025 ++#: git-gui.sh:2643 +msgid "Stage To Commit" +msgstr "Zum Eintragen bereitstellen" + - #: git-gui.sh:2031 ++#: git-gui.sh:2649 +msgid "Stage Changed Files To Commit" +msgstr "Geänderte Dateien bereitstellen" + - #: git-gui.sh:2037 ++#: git-gui.sh:2655 +msgid "Unstage From Commit" +msgstr "Aus der Bereitstellung herausnehmen" + - #: git-gui.sh:2042 lib/index.tcl:395 ++#: git-gui.sh:2661 lib/index.tcl:412 +msgid "Revert Changes" +msgstr "Änderungen verwerfen" + - #: git-gui.sh:2141 git-gui.sh:2702 ++#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +msgid "Show Less Context" +msgstr "Weniger Zeilen anzeigen" + - #: git-gui.sh:2145 git-gui.sh:2706 ++#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +msgid "Show More Context" +msgstr "Mehr Zeilen anzeigen" + - #: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569 ++#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +msgid "Sign Off" +msgstr "Abzeichnen" + - #: git-gui.sh:2458 ++#: git-gui.sh:2696 +msgid "Local Merge..." +msgstr "Lokales Zusammenführen..." + - #: git-gui.sh:2069 ++#: git-gui.sh:2701 +msgid "Abort Merge..." +msgstr "Zusammenführen abbrechen..." + - #: git-gui.sh:2475 ++#: git-gui.sh:2713 git-gui.sh:2741 +msgid "Add..." +msgstr "Hinzufügen..." + - #: git-gui.sh:2479 ++#: git-gui.sh:2717 +msgid "Push..." +msgstr "Versenden..." + - #: git-gui.sh:2483 ++#: git-gui.sh:2721 +msgid "Delete Branch..." +msgstr "Zweig löschen..." + - #: git-gui.sh:2493 git-gui.sh:2515 lib/about.tcl:14 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 - #, tcl-format - msgid "About %s" - msgstr "Über %s" - - #: git-gui.sh:2099 - msgid "Preferences..." - msgstr "Einstellungen..." - - #: git-gui.sh:2107 git-gui.sh:2639 ++#: git-gui.sh:2731 git-gui.sh:3292 +msgid "Options..." +msgstr "Optionen..." + - #: git-gui.sh:2576 ++#: git-gui.sh:2742 +msgid "Remove..." +msgstr "Entfernen..." + - #: git-gui.sh:2585 lib/choose_repository.tcl:50 ++#: git-gui.sh:2751 lib/choose_repository.tcl:50 +msgid "Help" +msgstr "Hilfe" + - #: git-gui.sh:2154 ++#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 ++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 ++#, tcl-format ++msgid "About %s" ++msgstr "Über %s" ++ ++#: git-gui.sh:2783 +msgid "Online Documentation" +msgstr "Online-Dokumentation" + - #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 ++#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +msgid "Show SSH Key" +msgstr "SSH-Schlüssel anzeigen" + - #: git-gui.sh:2707 ++#: git-gui.sh:2893 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis " +"nicht gefunden" + - #: git-gui.sh:2271 ++#: git-gui.sh:2926 +msgid "Current Branch:" +msgstr "Aktueller Zweig:" + - #: git-gui.sh:2292 ++#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" +msgstr "Bereitstellung (zum Eintragen)" + - #: git-gui.sh:2312 ++#: git-gui.sh:2967 +msgid "Unstaged Changes" +msgstr "Nicht bereitgestellte Änderungen" + - #: git-gui.sh:2362 ++#: git-gui.sh:3017 +msgid "Stage Changed" +msgstr "Alles bereitstellen" + - #: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182 ++#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +msgid "Push" +msgstr "Versenden" + - #: git-gui.sh:2408 ++#: git-gui.sh:3071 +msgid "Initial Commit Message:" +msgstr "Erste Versionsbeschreibung:" + - #: git-gui.sh:2409 ++#: git-gui.sh:3072 +msgid "Amended Commit Message:" +msgstr "Nachgebesserte Beschreibung:" + - #: git-gui.sh:2410 ++#: git-gui.sh:3073 +msgid "Amended Initial Commit Message:" +msgstr "Nachgebesserte erste Beschreibung:" + - #: git-gui.sh:2411 ++#: git-gui.sh:3074 +msgid "Amended Merge Commit Message:" +msgstr "Nachgebesserte Zusammenführungs-Beschreibung:" + - #: git-gui.sh:2412 ++#: git-gui.sh:3075 +msgid "Merge Commit Message:" +msgstr "Zusammenführungs-Beschreibung:" + - #: git-gui.sh:2413 ++#: git-gui.sh:3076 +msgid "Commit Message:" +msgstr "Versionsbeschreibung:" + - #: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73 ++#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +msgid "Copy All" +msgstr "Alle kopieren" + - #: git-gui.sh:2483 lib/blame.tcl:107 ++#: git-gui.sh:3149 lib/blame.tcl:104 +msgid "File:" +msgstr "Datei:" + - #: git-gui.sh:2834 ++#: git-gui.sh:3255 +msgid "Refresh" +msgstr "Aktualisieren" + - #: git-gui.sh:2631 ++#: git-gui.sh:3276 +msgid "Decrease Font Size" +msgstr "Schriftgröße verkleinern" + - #: git-gui.sh:2635 ++#: git-gui.sh:3280 +msgid "Increase Font Size" +msgstr "Schriftgröße vergrößern" + - #: git-gui.sh:3033 lib/blame.tcl:281 ++#: git-gui.sh:3288 lib/blame.tcl:281 +msgid "Encoding" +msgstr "Zeichenkodierung" + - #: git-gui.sh:3044 ++#: git-gui.sh:3299 +msgid "Apply/Reverse Hunk" +msgstr "Kontext anwenden/umkehren" + - #: git-gui.sh:2875 ++#: git-gui.sh:3304 +msgid "Apply/Reverse Line" +msgstr "Zeile anwenden/umkehren" + - #: git-gui.sh:2885 ++#: git-gui.sh:3323 +msgid "Run Merge Tool" +msgstr "Zusammenführungswerkzeug" + - #: git-gui.sh:2890 ++#: git-gui.sh:3328 +msgid "Use Remote Version" +msgstr "Entfernte Version benutzen" + - #: git-gui.sh:2894 ++#: git-gui.sh:3332 +msgid "Use Local Version" +msgstr "Lokale Version benutzen" + - #: git-gui.sh:2898 ++#: git-gui.sh:3336 +msgid "Revert To Base" +msgstr "Ursprüngliche Version benutzen" + - #: git-gui.sh:3091 ++#: git-gui.sh:3354 ++msgid "Visualize These Changes In The Submodule" ++msgstr "Diese Änderungen im Untermodul darstellen" ++ ++#: git-gui.sh:3358 ++msgid "Visualize Current Branch History In The Submodule" ++msgstr "Aktuellen Zweig im Untermodul darstellen" ++ ++#: git-gui.sh:3362 ++msgid "Visualize All Branch History In The Submodule" ++msgstr "Alle Zweige im Untermodul darstellen" ++ ++#: git-gui.sh:3367 ++msgid "Start git gui In The Submodule" ++msgstr "Git gui im Untermodul starten" ++ ++#: git-gui.sh:3389 +msgid "Unstage Hunk From Commit" +msgstr "Kontext aus Bereitstellung herausnehmen" + - #: git-gui.sh:2748 ++#: git-gui.sh:3391 ++msgid "Unstage Lines From Commit" ++msgstr "Zeilen aus der Bereitstellung herausnehmen" ++ ++#: git-gui.sh:3393 +msgid "Unstage Line From Commit" +msgstr "Zeile aus der Bereitstellung herausnehmen" + - #: git-gui.sh:2750 ++#: git-gui.sh:3396 +msgid "Stage Hunk For Commit" +msgstr "Kontext zur Bereitstellung hinzufügen" + - #: git-gui.sh:2751 ++#: git-gui.sh:3398 ++msgid "Stage Lines For Commit" ++msgstr "Zeilen zur Bereitstellung hinzufügen" ++ ++#: git-gui.sh:3400 +msgid "Stage Line For Commit" +msgstr "Zeile zur Bereitstellung hinzufügen" + - #: git-gui.sh:2771 ++#: git-gui.sh:3424 +msgid "Initializing..." +msgstr "Initialisieren..." + - #: git-gui.sh:2762 ++#: git-gui.sh:3541 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"Möglicherweise gibt es Probleme mit manchen Umgebungsvariablen.\n" +"\n" +"Die folgenden Umgebungsvariablen können vermutlich nicht \n" +"von %s an Git weitergegeben werden:\n" +"\n" + - #: git-gui.sh:2792 ++#: git-gui.sh:3570 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"Dies ist ein bekanntes Problem der Tcl-Version, die\n" +"in Cygwin mitgeliefert wird." + - #: git-gui.sh:2797 ++#: git-gui.sh:3575 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"Um den Namen »%s« zu ändern, sollten Sie die \n" +"gewünschten Werte für die Einstellung user.name und \n" +"user.email in Ihre Datei ~/.gitconfig einfügen.\n" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - eine grafische Oberfläche für Git." + - #: lib/blame.tcl:77 ++#: lib/blame.tcl:72 +msgid "File Viewer" +msgstr "Datei-Browser" + - #: lib/blame.tcl:81 ++#: lib/blame.tcl:78 +msgid "Commit:" +msgstr "Version:" + - #: lib/blame.tcl:264 ++#: lib/blame.tcl:271 +msgid "Copy Commit" +msgstr "Version kopieren" + +#: lib/blame.tcl:275 +msgid "Find Text..." +msgstr "Text suchen..." + +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" +msgstr "Volle Kopie-Erkennung" + - #: lib/blame.tcl:263 ++#: lib/blame.tcl:288 +msgid "Show History Context" +msgstr "Historien-Kontext anzeigen" + - #: lib/blame.tcl:266 ++#: lib/blame.tcl:291 +msgid "Blame Parent Commit" +msgstr "Elternversion annotieren" + - #: lib/blame.tcl:394 ++#: lib/blame.tcl:450 +#, tcl-format +msgid "Reading %s..." +msgstr "%s lesen..." + - #: lib/blame.tcl:488 ++#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." +msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." + - #: lib/blame.tcl:508 ++#: lib/blame.tcl:577 +msgid "lines annotated" +msgstr "Zeilen annotiert" + - #: lib/blame.tcl:689 ++#: lib/blame.tcl:769 +msgid "Loading original location annotations..." +msgstr "Annotierungen für ursprünglichen Ort werden geladen..." + - #: lib/blame.tcl:692 ++#: lib/blame.tcl:772 +msgid "Annotation complete." +msgstr "Annotierung vollständig." + - #: lib/blame.tcl:737 ++#: lib/blame.tcl:802 +msgid "Busy" +msgstr "Verarbeitung läuft" + - #: lib/blame.tcl:738 ++#: lib/blame.tcl:803 +msgid "Annotation process is already running." +msgstr "Annotierung läuft bereits." + - #: lib/blame.tcl:777 ++#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." +msgstr "Intensive Kopie-Erkennung läuft..." + - #: lib/blame.tcl:827 ++#: lib/blame.tcl:910 +msgid "Loading annotation..." +msgstr "Annotierung laden..." + - #: lib/blame.tcl:802 ++#: lib/blame.tcl:963 +msgid "Author:" +msgstr "Autor:" + - #: lib/blame.tcl:806 ++#: lib/blame.tcl:967 +msgid "Committer:" +msgstr "Eintragender:" + - #: lib/blame.tcl:811 ++#: lib/blame.tcl:972 +msgid "Original File:" +msgstr "Ursprüngliche Datei:" + - #: lib/blame.tcl:1021 ++#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" +msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:" + - #: lib/blame.tcl:1076 ++#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" +msgstr "Elternversion kann nicht gefunden werden:" + - #: lib/blame.tcl:1001 ++#: lib/blame.tcl:1090 +msgid "Unable to display parent" +msgstr "Elternversion kann nicht angezeigt werden" + - #: lib/blame.tcl:1002 lib/diff.tcl:191 ++#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" +msgstr "Fehler beim Laden des Vergleichs:" + - #: lib/blame.tcl:1142 ++#: lib/blame.tcl:1231 +msgid "Originally By:" +msgstr "Ursprünglich von:" + - #: lib/blame.tcl:931 ++#: lib/blame.tcl:1237 +msgid "In File:" +msgstr "In Datei:" + - #: lib/blame.tcl:936 ++#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" +msgstr "Kopiert oder verschoben durch:" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Auf Zweig umstellen" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Umstellen" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 - #: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171 - #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 ++#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 ++#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 ++#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 ++#: lib/transport.tcl:108 +msgid "Cancel" +msgstr "Abbrechen" + - #: lib/branch_checkout.tcl:32 lib/browser.tcl:287 ++#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" +msgstr "Version" + - #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242 ++#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" +msgstr "Optionen" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Übernahmezweig anfordern" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Verbindung zu lokalem Zweig lösen" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Zweig erstellen" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Neuen Zweig erstellen" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:371 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +msgid "Create" +msgstr "Erstellen" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Zweigname" + - #: lib/branch_create.tcl:43 ++#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" +msgstr "Name:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Passend zu Übernahmezweig-Name" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Anfangsversion" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Existierenden Zweig aktualisieren:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Nein" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Nur Schnellzusammenführung" + - #: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 ++#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" +msgstr "Zurücksetzen" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Arbeitskopie umstellen nach Erstellen" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Bitte wählen Sie einen Übernahmezweig." + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "Übernahmezweig »%s« ist kein Zweig im anderen Projektarchiv." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Bitte geben Sie einen Zweignamen an." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "»%s« ist kein zulässiger Zweigname." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Zweig löschen" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Lokalen Zweig löschen" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Lokale Zweige" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Nur löschen, wenn zusammengeführt nach" + - #: lib/branch_delete.tcl:54 - msgid "Always (Do not perform merge test.)" - msgstr "Immer (ohne Zusammenführungstest)" ++#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 ++msgid "Always (Do not perform merge checks)" ++msgstr "Immer (Keine Zusammenführungsprüfung)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +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 lib/remote_branch_delete.tcl:217 ++msgid "" ++"Recovering deleted branches is difficult.\n" ++"\n" ++"Delete the selected branches?" ++msgstr "" ++"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand " ++"möglich.\n" ++"\n" ++"Sollen die ausgewählten Zweige gelöscht werden?" ++ +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Fehler beim Löschen der Zweige:\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Zweig umbenennen" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Umbenennen" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Zweig:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Neuer Name:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Bitte wählen Sie einen Zweig zum umbenennen." + - #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 ++#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "Zweig »%s« existiert bereits." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Fehler beim Umbenennen von »%s«." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Starten..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "Datei-Browser" + +#: lib/browser.tcl:126 lib/browser.tcl:143 +#, tcl-format +msgid "Loading %s..." +msgstr "%s laden..." + +#: lib/browser.tcl:187 +msgid "[Up To Parent]" +msgstr "[Nach oben]" + +#: lib/browser.tcl:267 lib/browser.tcl:273 +msgid "Browse Branch Files" +msgstr "Dateien des Zweigs durchblättern" + - #: lib/browser.tcl:278 lib/choose_repository.tcl:387 - #: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484 - #: lib/choose_repository.tcl:987 ++#: lib/browser.tcl:278 lib/choose_repository.tcl:398 ++#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 ++#: lib/choose_repository.tcl:1028 +msgid "Browse" +msgstr "Blättern" + - #: lib/checkout_op.tcl:79 ++#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Änderungen »%s« von »%s« anfordern" + - #: lib/checkout_op.tcl:127 ++#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden" + - #: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31 ++#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 ++#: lib/sshkey.tcl:53 +msgid "Close" +msgstr "Schließen" + - #: lib/checkout_op.tcl:169 ++#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "Zweig »%s« existiert nicht." + - #: lib/checkout_op.tcl:193 ++#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." +msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«." + - #: lib/checkout_op.tcl:228 ++#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"Zweig »%s« existiert bereits.\n" +"\n" +"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres " +"Zusammenführen ist notwendig." + - #: lib/checkout_op.tcl:220 ++#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "Zusammenführungsmethode »%s« nicht unterstützt." + - #: lib/checkout_op.tcl:239 ++#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "Aktualisieren von »%s« fehlgeschlagen." + - #: lib/checkout_op.tcl:251 ++#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." +msgstr "Bereitstellung (»index«) ist zur Bearbeitung gesperrt (»locked«)." + - #: lib/checkout_op.tcl:266 ++#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" +"\n" +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"geändert. Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n" +"\n" +"Es wird gleich neu geladen.\n" + - #: lib/checkout_op.tcl:322 ++#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Arbeitskopie umstellen auf »%s«..." + - #: lib/checkout_op.tcl:323 ++#: lib/checkout_op.tcl:346 +msgid "files checked out" +msgstr "Dateien aktualisiert" + - #: lib/checkout_op.tcl:353 ++#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "" +"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist " +"notwendig)." + - #: lib/checkout_op.tcl:354 ++#: lib/checkout_op.tcl:377 +msgid "File level merge required." +msgstr "Zusammenführen der Dateien ist notwendig." + - #: lib/checkout_op.tcl:358 ++#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Es wird auf Zweig »%s« verblieben." + - #: lib/checkout_op.tcl:429 ++#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n" +"\n" +"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen " +"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«." + - #: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450 ++#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#, tcl-format +msgid "Checked out '%s'." +msgstr "Umgestellt auf »%s«." + - #: lib/checkout_op.tcl:478 ++#: lib/checkout_op.tcl:535 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:" + - #: lib/checkout_op.tcl:500 ++#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." +msgstr "" +"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt " +"werden." + - #: lib/checkout_op.tcl:505 ++#: lib/checkout_op.tcl:562 +#, tcl-format +msgid "Reset '%s'?" +msgstr "»%s« zurücksetzen?" + - #: lib/checkout_op.tcl:510 lib/merge.tcl:163 ++#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +msgid "Visualize" +msgstr "Darstellen" + - #: lib/checkout_op.tcl:578 ++#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"Lokaler Zweig kann nicht gesetzt werden.\n" +"\n" +"Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt " +"aktualisiert, aber einige interne Git-Dateien konnten nicht geändert " +"werden.\n" +"\n" +"Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen." + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "Auswählen" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "Schriftfamilie" + +#: lib/choose_font.tcl:74 +msgid "Font Size" +msgstr "Schriftgröße" + +#: lib/choose_font.tcl:91 +msgid "Font Example" +msgstr "Schriftbeispiel" + +#: lib/choose_font.tcl:103 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"Dies ist ein Beispieltext.\n" +"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen." + +#: lib/choose_repository.tcl:28 +msgid "Git Gui" +msgstr "Git Gui" + - #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376 ++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +msgid "Create New Repository" +msgstr "Neues Projektarchiv" + - #: lib/choose_repository.tcl:87 ++#: lib/choose_repository.tcl:93 +msgid "New..." +msgstr "Neu..." + - #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460 ++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +msgid "Clone Existing Repository" +msgstr "Projektarchiv klonen" + - #: lib/choose_repository.tcl:100 ++#: lib/choose_repository.tcl:106 +msgid "Clone..." +msgstr "Klonen..." + - #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976 ++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +msgid "Open Existing Repository" +msgstr "Projektarchiv öffnen" + - #: lib/choose_repository.tcl:113 ++#: lib/choose_repository.tcl:119 +msgid "Open..." +msgstr "Öffnen..." + - #: lib/choose_repository.tcl:126 ++#: lib/choose_repository.tcl:132 +msgid "Recent Repositories" +msgstr "Zuletzt benutzte Projektarchive" + - #: lib/choose_repository.tcl:132 ++#: lib/choose_repository.tcl:138 +msgid "Open Recent Repository:" +msgstr "Zuletzt benutztes Projektarchiv öffnen:" + - #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303 - #: lib/choose_repository.tcl:310 ++#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 ++#: lib/choose_repository.tcl:320 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "Projektarchiv »%s« konnte nicht erstellt werden:" + - #: lib/choose_repository.tcl:387 ++#: lib/choose_repository.tcl:391 +msgid "Directory:" +msgstr "Verzeichnis:" + - #: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537 - #: lib/choose_repository.tcl:1011 ++#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 ++#: lib/choose_repository.tcl:1052 +msgid "Git Repository" +msgstr "Git Projektarchiv" + - #: lib/choose_repository.tcl:442 ++#: lib/choose_repository.tcl:448 +#, tcl-format +msgid "Directory %s already exists." +msgstr "Verzeichnis »%s« existiert bereits." + - #: lib/choose_repository.tcl:446 ++#: lib/choose_repository.tcl:452 +#, tcl-format +msgid "File %s already exists." +msgstr "Datei »%s« existiert bereits." + - #: lib/choose_repository.tcl:455 ++#: lib/choose_repository.tcl:466 +msgid "Clone" +msgstr "Klonen" + - #: lib/choose_repository.tcl:473 ++#: lib/choose_repository.tcl:479 +msgid "Source Location:" +msgstr "Herkunft:" + - #: lib/choose_repository.tcl:484 ++#: lib/choose_repository.tcl:490 +msgid "Target Directory:" +msgstr "Zielverzeichnis:" + - #: lib/choose_repository.tcl:490 ++#: lib/choose_repository.tcl:502 +msgid "Clone Type:" +msgstr "Art des Klonens:" + - #: lib/choose_repository.tcl:495 ++#: lib/choose_repository.tcl:508 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Standard (schnell, teilweise redundant, Hardlinks)" + - #: lib/choose_repository.tcl:501 ++#: lib/choose_repository.tcl:514 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Alles kopieren (langsamer, volle Redundanz)" + - #: lib/choose_repository.tcl:507 ++#: lib/choose_repository.tcl:520 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)" + - #: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590 - #: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806 - #: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025 ++#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 ++#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 ++#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "Kein Git-Projektarchiv in »%s« gefunden." + - #: lib/choose_repository.tcl:579 ++#: lib/choose_repository.tcl:592 +msgid "Standard only available for local repository." +msgstr "Standard ist nur für lokale Projektarchive verfügbar." + - #: lib/choose_repository.tcl:583 ++#: lib/choose_repository.tcl:596 +msgid "Shared only available for local repository." +msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar." + - #: lib/choose_repository.tcl:604 ++#: lib/choose_repository.tcl:617 +#, tcl-format +msgid "Location %s already exists." +msgstr "Projektarchiv »%s« existiert bereits." + - #: lib/choose_repository.tcl:615 ++#: lib/choose_repository.tcl:628 +msgid "Failed to configure origin" +msgstr "Der Ursprungsort konnte nicht eingerichtet werden" + - #: lib/choose_repository.tcl:627 ++#: lib/choose_repository.tcl:640 +msgid "Counting objects" +msgstr "Objekte werden gezählt" + - #: lib/choose_repository.tcl:628 ++#: lib/choose_repository.tcl:641 +msgid "buckets" +msgstr "Buckets" + - #: lib/choose_repository.tcl:652 ++#: lib/choose_repository.tcl:665 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s" + - #: lib/choose_repository.tcl:688 ++#: lib/choose_repository.tcl:701 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Von »%s« konnte nichts geklont werden." + - #: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904 - #: lib/choose_repository.tcl:916 ++#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 ++#: lib/choose_repository.tcl:929 +msgid "The 'master' branch has not been initialized." +msgstr "Der »master«-Zweig wurde noch nicht initialisiert." + - #: lib/choose_repository.tcl:703 ++#: lib/choose_repository.tcl:716 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert." + - #: lib/choose_repository.tcl:715 ++#: lib/choose_repository.tcl:728 +#, tcl-format +msgid "Cloning from %s" +msgstr "Kopieren von »%s«" + - #: lib/choose_repository.tcl:746 ++#: lib/choose_repository.tcl:759 +msgid "Copying objects" +msgstr "Objektdatenbank kopieren" + - #: lib/choose_repository.tcl:747 ++#: lib/choose_repository.tcl:760 +msgid "KiB" +msgstr "KB" + - #: lib/choose_repository.tcl:771 ++#: lib/choose_repository.tcl:784 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Objekt kann nicht kopiert werden: %s" + - #: lib/choose_repository.tcl:781 ++#: lib/choose_repository.tcl:794 +msgid "Linking objects" +msgstr "Objekte verlinken" + - #: lib/choose_repository.tcl:782 ++#: lib/choose_repository.tcl:795 +msgid "objects" +msgstr "Objekte" + - #: lib/choose_repository.tcl:790 ++#: lib/choose_repository.tcl:803 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s" + - #: lib/choose_repository.tcl:845 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "" +"Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die " +"Ausgaben auf der Konsole für weitere Angaben." + - #: lib/choose_repository.tcl:856 ++#: lib/choose_repository.tcl:869 +msgid "Cannot fetch tags. See console output for details." +msgstr "" +"Markierungen konnten nicht angefordert werden. Kontrollieren Sie die " +"Ausgaben auf der Konsole für weitere Angaben." + - #: lib/choose_repository.tcl:880 ++#: lib/choose_repository.tcl:893 +msgid "Cannot determine HEAD. See console output for details." +msgstr "" +"Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " +"Ausgaben auf der Konsole für weitere Angaben." + - #: lib/choose_repository.tcl:889 ++#: lib/choose_repository.tcl:902 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden." + - #: lib/choose_repository.tcl:895 ++#: lib/choose_repository.tcl:908 +msgid "Clone failed." +msgstr "Klonen fehlgeschlagen." + - #: lib/choose_repository.tcl:902 ++#: lib/choose_repository.tcl:915 +msgid "No default branch obtained." +msgstr "Kein voreingestellter Zweig gefunden." + - #: lib/choose_repository.tcl:913 ++#: lib/choose_repository.tcl:926 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "»%s« wurde nicht als Version gefunden." + - #: lib/choose_repository.tcl:925 ++#: lib/choose_repository.tcl:938 +msgid "Creating working directory" +msgstr "Arbeitskopie erstellen" + - #: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127 - #: lib/index.tcl:193 ++#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 ++#: lib/index.tcl:198 +msgid "files" +msgstr "Dateien" + - #: lib/choose_repository.tcl:955 ++#: lib/choose_repository.tcl:968 +msgid "Initial file checkout failed." +msgstr "Erstellen der Arbeitskopie fehlgeschlagen." + - #: lib/choose_repository.tcl:971 ++#: lib/choose_repository.tcl:1011 +msgid "Open" +msgstr "Öffnen" + - #: lib/choose_repository.tcl:981 ++#: lib/choose_repository.tcl:1021 +msgid "Repository:" +msgstr "Projektarchiv:" + - #: lib/choose_repository.tcl:1031 ++#: lib/choose_repository.tcl:1072 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Projektarchiv »%s« konnte nicht geöffnet werden." + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "Abgetrennte Arbeitskopie-Version" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Version Regexp-Ausdruck:" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "Lokaler Zweig" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "Übernahmezweig" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +msgid "Tag" +msgstr "Markierung" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Ungültige Version: %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "Keine Version ausgewählt." + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "Versions-Ausdruck ist leer." + +#: lib/choose_rev.tcl:531 +msgid "Updated" +msgstr "Aktualisiert" + +#: lib/choose_rev.tcl:559 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Keine Version zur Nachbesserung vorhanden.\n" +"\n" +"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende " +"Version, die Sie nachbessern könnten.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Nachbesserung währen Zusammenführung nicht möglich.\n" +"\n" +"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht " +"beendet. Sie können keine vorige Übertragung nachbessern, solange eine " +"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung " +"beenden oder abbrechen.\n" + - #: lib/commit.tcl:49 ++#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:" + - #: lib/commit.tcl:76 ++#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "Benutzername konnte nicht bestimmt werden:" + - #: lib/commit.tcl:81 ++#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:" + - #: lib/commit.tcl:133 ++#: lib/commit.tcl:129 ++#, tcl-format ++msgid "warning: Tcl does not support encoding '%s'." ++msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht." ++ ++#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" +"\n" +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n" +"\n" +"Es wird gleich neu geladen.\n" + - #: lib/commit.tcl:154 ++#: lib/commit.tcl:172 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n" +"\n" +"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie " +"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n" + - #: lib/commit.tcl:162 ++#: lib/commit.tcl:180 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Unbekannter Dateizustand »%s«.\n" +"\n" +"Datei »%s« kann nicht eingetragen werden.\n" + - #: lib/commit.tcl:170 ++#: lib/commit.tcl:188 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Keine Änderungen vorhanden, die eingetragen werden könnten.\n" +"\n" +"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n" + - #: lib/commit.tcl:183 ++#: lib/commit.tcl:203 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Bitte geben Sie eine Versionsbeschreibung ein.\n" +"\n" +"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n" +"\n" +"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n" +"\n" +"- Zweite Zeile: Leerzeile\n" +"\n" +"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n" + - #: lib/commit.tcl:207 - #, tcl-format - msgid "warning: Tcl does not support encoding '%s'." - msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht." - - #: lib/commit.tcl:221 ++#: lib/commit.tcl:234 +msgid "Calling pre-commit hook..." +msgstr "Aufrufen der Vor-Eintragen-Kontrolle..." + - #: lib/commit.tcl:236 ++#: lib/commit.tcl:249 +msgid "Commit declined by pre-commit hook." +msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)." + - #: lib/commit.tcl:259 ++#: lib/commit.tcl:272 +msgid "Calling commit-msg hook..." +msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle..." + - #: lib/commit.tcl:274 ++#: lib/commit.tcl:287 +msgid "Commit declined by commit-msg hook." +msgstr "" +"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message " +"hook«)." + - #: lib/commit.tcl:287 ++#: lib/commit.tcl:300 +msgid "Committing changes..." +msgstr "Änderungen eintragen..." + - #: lib/commit.tcl:303 ++#: lib/commit.tcl:316 +msgid "write-tree failed:" +msgstr "write-tree fehlgeschlagen:" + - #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368 ++#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +msgid "Commit failed." +msgstr "Eintragen fehlgeschlagen." + - #: lib/commit.tcl:321 ++#: lib/commit.tcl:334 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "Version »%s« scheint beschädigt zu sein" + - #: lib/commit.tcl:326 ++#: lib/commit.tcl:339 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Keine Änderungen einzutragen.\n" +"\n" +"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts " +"zusammengeführt.\n" +"\n" +"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n" + - #: lib/commit.tcl:333 ++#: lib/commit.tcl:346 +msgid "No changes to commit." +msgstr "Keine Änderungen, die eingetragen werden können." + - #: lib/commit.tcl:347 ++#: lib/commit.tcl:360 +msgid "commit-tree failed:" +msgstr "commit-tree fehlgeschlagen:" + - #: lib/commit.tcl:367 ++#: lib/commit.tcl:381 +msgid "update-ref failed:" +msgstr "update-ref fehlgeschlagen:" + - #: lib/commit.tcl:454 ++#: lib/commit.tcl:469 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Version %s übertragen: %s" + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Verarbeitung. Bitte warten..." + +#: lib/console.tcl:186 +msgid "Success" +msgstr "Erfolgreich" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "Fehler: Kommando fehlgeschlagen" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "Anzahl unverknüpfter Objekte" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "Festplattenplatz von unverknüpften Objekten" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "Anzahl komprimierter Objekte" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "Anzahl Komprimierungseinheiten" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "Festplattenplatz von komprimierten Objekten" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "Dateien im Mülleimer" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Objektdatenbank komprimieren" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen" + - #: lib/database.tcl:108 ++#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " - "the database when more than %i loose objects exist.\n" ++"the database.\n" +"\n" +"Compress the database now?" +msgstr "" +"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n" +"\n" - "Für eine optimale Performance wird empfohlen, die Datenbank des " - "Projektarchivs zu komprimieren, sobald mehr als %i nicht verknüpfte Objekte " - "vorliegen.\n" ++"Für eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n" +"\n" +"Soll die Datenbank jetzt komprimiert werden?" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Ungültiges Datum von Git: %s" + - #: lib/diff.tcl:42 ++#: lib/diff.tcl:64 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Keine Änderungen feststellbar.\n" +"\n" - "»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei " - "von einem anderen Programm modifiziert, aber der Inhalt der Datei ist " ++"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei von " ++"einem anderen Programm modifiziert, aber der Inhalt der Datei ist " +"unverändert.\n" +"\n" +"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen " +"Dateien zu prüfen." + - #: lib/diff.tcl:81 ++#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Vergleich von »%s« laden..." + - #: lib/diff.tcl:120 ++#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"LOKAL: gelöscht\n" +"ANDERES:\n" + - #: lib/diff.tcl:125 ++#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"ANDERES: gelöscht\n" +"LOKAL:\n" + - #: lib/diff.tcl:132 ++#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "LOKAL:\n" + - #: lib/diff.tcl:135 ++#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "ANDERES:\n" + - #: lib/diff.tcl:197 lib/diff.tcl:296 ++#: lib/diff.tcl:202 lib/diff.tcl:319 +#, tcl-format +msgid "Unable to display %s" +msgstr "Datei »%s« kann nicht angezeigt werden" + - #: lib/diff.tcl:115 ++#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "Fehler beim Laden der Datei:" + - #: lib/diff.tcl:122 ++#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "Git-Projektarchiv (Unterprojekt)" + - #: lib/diff.tcl:134 ++#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." +msgstr "* Binärdatei (Inhalt wird nicht angezeigt)" + - #: lib/diff.tcl:222 ++#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n" +"* Nur erste %d Bytes werden angezeigt.\n" + - #: lib/diff.tcl:228 ++#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n" +"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n" + - #: lib/diff.tcl:436 ++#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." +msgstr "" +"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung." + - #: lib/diff.tcl:310 ++#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." +msgstr "Fehler beim Bereitstellen des gewählten Kontexts." + - #: lib/diff.tcl:386 ++#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." +msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung." + - #: lib/diff.tcl:394 ++#: lib/diff.tcl:576 +msgid "Failed to stage selected line." +msgstr "Fehler beim Bereitstellen der gewählten Zeile." + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Voreinstellung" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "Systemweit (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Andere" + +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" +msgstr "Fehler" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "Warnung" + +#: lib/error.tcl:94 +msgid "You must correct the above errors before committing." +msgstr "" +"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können." + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Bereitstellung kann nicht wieder freigegeben werden." + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Fehler in Bereitstellung" + - #: lib/index.tcl:21 ++#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine " +"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu " +"synchronisieren." + - #: lib/index.tcl:27 ++#: lib/index.tcl:28 +msgid "Continue" +msgstr "Fortsetzen" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Bereitstellung freigeben" + - #: lib/index.tcl:282 ++#: lib/index.tcl:289 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "Datei »%s« aus der Bereitstellung herausnehmen" + - #: lib/index.tcl:313 ++#: lib/index.tcl:328 +msgid "Ready to commit." +msgstr "Bereit zum Eintragen." + - #: lib/index.tcl:326 ++#: lib/index.tcl:341 +#, tcl-format +msgid "Adding %s" +msgstr "»%s« hinzufügen..." + - #: lib/index.tcl:381 ++#: lib/index.tcl:398 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Änderungen in Datei »%s« verwerfen?" + - #: lib/index.tcl:383 ++#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Änderungen in den gewählten %i Dateien verwerfen?" + - #: lib/index.tcl:391 ++#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen." + - #: lib/index.tcl:394 ++#: lib/index.tcl:411 +msgid "Do Nothing" +msgstr "Nichts tun" + - #: lib/index.tcl:419 ++#: lib/index.tcl:429 +msgid "Reverting selected files" +msgstr "Änderungen in gewählten Dateien verwerfen" + - #: lib/index.tcl:423 ++#: lib/index.tcl:433 +#, tcl-format +msgid "Reverting %s" +msgstr "Änderungen in %s verwerfen" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n" +"\n" +"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie " +"zusammenführen können.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" +"\n" +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"geändert. Vor einem Zusammenführen muss neu geladen werden.\n" +"\n" +"Es wird gleich neu geladen.\n" + - #: lib/merge.tcl:44 ++#: lib/merge.tcl:45 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Zusammenführung mit Konflikten.\n" +"\n" +"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese " +"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder " +"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst " +"danach kann eine neue Zusammenführung begonnen werden.\n" + - #: lib/merge.tcl:54 ++#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Es liegen Änderungen vor.\n" +"\n" +"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte " +"Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser " +"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich " +"einfacher beheben oder abbrechen.\n" + - #: lib/merge.tcl:106 ++#: lib/merge.tcl:107 +#, tcl-format +msgid "%s of %s" +msgstr "%s von %s" + - #: lib/merge.tcl:119 ++#: lib/merge.tcl:120 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "Zusammenführen von %s und %s..." + - #: lib/merge.tcl:130 ++#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "Zusammenführen erfolgreich abgeschlossen." + - #: lib/merge.tcl:132 ++#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig." + - #: lib/merge.tcl:157 ++#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "Zusammenführen in »%s«" + - #: lib/merge.tcl:176 ++#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "Zusammenzuführende Version" + - #: lib/merge.tcl:211 ++#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"Abbruch der Nachbesserung ist nicht möglich.\n" +"\n" +"Sie müssen die Nachbesserung der Version abschließen.\n" + - #: lib/merge.tcl:221 ++#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Zusammenführen abbrechen?\n" +"\n" +"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen " +"verloren.\n" +"\n" +"Zusammenführen jetzt abbrechen?" + - #: lib/merge.tcl:227 ++#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Änderungen zurücksetzen?\n" +"\n" +"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen " +"verloren.\n" +"\n" +"Änderungen jetzt zurücksetzen?" + - #: lib/merge.tcl:238 ++#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "Abbruch" + - #: lib/merge.tcl:238 ++#: lib/merge.tcl:239 +msgid "files reset" +msgstr "Dateien zurückgesetzt" + - #: lib/merge.tcl:265 ++#: lib/merge.tcl:267 +msgid "Abort failed." +msgstr "Abbruch fehlgeschlagen." + - #: lib/merge.tcl:267 ++#: lib/merge.tcl:269 +msgid "Abort completed. Ready." +msgstr "Abbruch durchgeführt. Bereit." + - #: lib/mergetool.tcl:14 ++#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "Konflikt durch Basisversion ersetzen?" + - #: lib/mergetool.tcl:15 ++#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "Konflikt durch diesen Zweig ersetzen?" + - #: lib/mergetool.tcl:16 ++#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "Konflikt durch anderen Zweig ersetzen?" + - #: lib/mergetool.tcl:20 ++#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n" +"\n" +"»%s« wird überschrieben.\n" +"\n" +"Diese Operation kann nur rückgängig gemacht werden, wenn die\n" +"Zusammenführung erneut gestartet wird." + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "Auflösung hinzugefügt für %s" + - #: lib/mergetool.tcl:119 ++#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "" +"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch " +"das Zusamenführungswerkzeug gelöst werden." + - #: lib/mergetool.tcl:124 ++#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "Konflikt-Datei existiert nicht" + - #: lib/mergetool.tcl:236 ++#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "Kein GUI Zusammenführungswerkzeug: »%s«" + - #: lib/mergetool.tcl:240 ++#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«" + - #: lib/mergetool.tcl:275 ++#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" +msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?" + - #: lib/mergetool.tcl:295 ++#: lib/mergetool.tcl:323 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" +"Fehler beim Abrufen der Dateiversionen:\n" +"%s" + - #: lib/mergetool.tcl:315 ++#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" +"Zusammenführungswerkzeug konnte nicht gestartet werden:\n" +"\n" +"%s" + - #: lib/mergetool.tcl:319 ++#: lib/mergetool.tcl:347 +msgid "Running merge tool..." +msgstr "Zusammenführungswerkzeug starten..." + - #: lib/mergetool.tcl:347 lib/mergetool.tcl:363 ++#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." +msgstr "Zusammenführungswerkzeug fehlgeschlagen." + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "Ungültige globale Zeichenkodierung »%s«" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "Ungültige Archiv-Zeichenkodierung »%s«" + +#: lib/option.tcl:117 +msgid "Restore Defaults" +msgstr "Voreinstellungen wiederherstellen" + - #: lib/option.tcl:99 ++#: lib/option.tcl:121 +msgid "Save" +msgstr "Speichern" + - #: lib/option.tcl:109 ++#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" +msgstr "Projektarchiv %s" + - #: lib/option.tcl:110 ++#: lib/option.tcl:132 +msgid "Global (All Repositories)" +msgstr "Global (Alle Projektarchive)" + - #: lib/option.tcl:116 ++#: lib/option.tcl:138 +msgid "User Name" +msgstr "Benutzername" + - #: lib/option.tcl:117 ++#: lib/option.tcl:139 +msgid "Email Address" +msgstr "E-Mail-Adresse" + - #: lib/option.tcl:119 ++#: lib/option.tcl:141 +msgid "Summarize Merge Commits" +msgstr "Zusammenführungs-Versionen zusammenfassen" + - #: lib/option.tcl:120 ++#: lib/option.tcl:142 +msgid "Merge Verbosity" +msgstr "Ausführlichkeit der Zusammenführen-Meldungen" + - #: lib/option.tcl:121 ++#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" +msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" + - #: lib/option.tcl:122 ++#: lib/option.tcl:144 +msgid "Use Merge Tool" +msgstr "Zusammenführungswerkzeug" + - #: lib/option.tcl:124 ++#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" +msgstr "Auf Dateiänderungsdatum verlassen" + - #: lib/option.tcl:124 ++#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" +msgstr "Übernahmezweige aufräumen während Anforderung" + - #: lib/option.tcl:125 ++#: lib/option.tcl:148 +msgid "Match Tracking Branches" +msgstr "Passend zu Übernahmezweig" + - #: lib/option.tcl:126 ++#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" +msgstr "Kopie-Annotieren nur bei geänderten Dateien" + - #: lib/option.tcl:127 ++#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" +msgstr "Mindestzahl Zeichen für Kopie-Annotieren" + - #: lib/option.tcl:128 ++#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" +msgstr "Anzahl Tage für Historien-Kontext" + - #: lib/option.tcl:129 ++#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" +msgstr "Anzahl der Kontextzeilen beim Vergleich" + - #: lib/option.tcl:127 ++#: lib/option.tcl:153 +msgid "Commit Message Text Width" +msgstr "Textbreite der Versionsbeschreibung" + - #: lib/option.tcl:128 ++#: lib/option.tcl:154 +msgid "New Branch Name Template" +msgstr "Namensvorschlag für neue Zweige" + +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" +msgstr "Voreingestellte Zeichenkodierung" + +#: lib/option.tcl:203 +msgid "Change" +msgstr "Ändern" + +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" +msgstr "Wörterbuch Rechtschreibprüfung:" + - #: lib/option.tcl:216 ++#: lib/option.tcl:254 +msgid "Change Font" +msgstr "Schriftart ändern" + - #: lib/option.tcl:220 ++#: lib/option.tcl:258 +#, tcl-format +msgid "Choose %s" +msgstr "%s wählen" + - #: lib/option.tcl:226 ++#: lib/option.tcl:264 +msgid "pt." +msgstr "pt." + - #: lib/option.tcl:240 ++#: lib/option.tcl:278 +msgid "Preferences" +msgstr "Einstellungen" + - #: lib/option.tcl:275 ++#: lib/option.tcl:314 +msgid "Failed to completely save options:" +msgstr "Optionen konnten nicht gespeichert werden:" + +#: lib/remote_add.tcl:19 +msgid "Add Remote" +msgstr "Anderes Archiv hinzufügen" + +#: lib/remote_add.tcl:24 +msgid "Add New Remote" +msgstr "Neues anderes Archiv hinzufügen" + - #: lib/remote_add.tcl:28 ++#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" +msgstr "Hinzufügen" + +#: lib/remote_add.tcl:37 +msgid "Remote Details" +msgstr "Einzelheiten des anderen Archivs" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "Adresse:" + +#: lib/remote_add.tcl:62 +msgid "Further Action" +msgstr "Weitere Aktion jetzt" + +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" +msgstr "Gleich anfordern" + +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" +msgstr "Anderes Archiv initialisieren und dahin versenden" + +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" +msgstr "Nichts tun" + +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." +msgstr "Bitte geben Sie einen Namen des anderen Archivs an." + +#: lib/remote_add.tcl:114 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "»%s« ist kein zulässiger Name eines anderen Archivs." + +#: lib/remote_add.tcl:125 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "Fehler beim Hinzufügen des anderen Archivs »%s« aus Herkunftsort »%s«." + +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "»%s« anfordern" + +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" +msgstr "»%s« anfordern" + +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." - msgstr "" - "Initialisieren eines anderen Archivs an Adresse »%s« ist nicht möglich." ++msgstr "Initialisieren eines anderen Archivs an Adresse »%s« ist nicht möglich." + +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 +#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" +msgstr "»%s« versenden..." + +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "Einrichten von »%s« an »%s«" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "Zweig in anderem Archiv löschen" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "In Projektarchiv" + - #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 ++#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" +msgstr "Anderes Archiv:" + - #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 ++#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" +msgstr "Adresse:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Zweige" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Nur löschen, wenn" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Zusammengeführt mit:" + - #: lib/remote_branch_delete.tcl:119 - msgid "Always (Do not perform merge checks)" - msgstr "Immer (Keine Zusammenführungsprüfung)" - +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden." + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die " +"notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, " +"zuerst von »%s« anzufordern." + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll." + - #: lib/remote_branch_delete.tcl:216 - msgid "" - "Recovering deleted branches is difficult.\n" - "\n" - "Delete the selected branches?" - msgstr "" - "Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand " - "möglich.\n" - "\n" - "Sollen die ausgewählten Zweige gelöscht werden?" - +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Zweige auf »%s« werden gelöscht" + - #: lib/remote_branch_delete.tcl:286 ++#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." +msgstr "Kein Projektarchiv ausgewählt." + - #: lib/remote_branch_delete.tcl:291 ++#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." +msgstr "»%s« laden..." + +#: lib/remote.tcl:163 +msgid "Remove Remote" +msgstr "Anderes Archiv entfernen" + +#: lib/remote.tcl:168 +msgid "Prune from" +msgstr "Aufräumen von" + - #: lib/remote.tcl:170 ++#: lib/remote.tcl:173 +msgid "Fetch from" +msgstr "Anfordern von" + - #: lib/remote.tcl:213 ++#: lib/remote.tcl:215 +msgid "Push to" +msgstr "Versenden nach" + +#: lib/search.tcl:21 +msgid "Find:" +msgstr "Suchen:" + - #: lib/search.tcl:22 ++#: lib/search.tcl:23 +msgid "Next" +msgstr "Nächster" + - #: lib/search.tcl:23 ++#: lib/search.tcl:24 +msgid "Prev" +msgstr "Voriger" + +#: lib/search.tcl:25 +msgid "Case-Sensitive" +msgstr "Groß-/Kleinschreibung unterscheiden" + - #: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "Fehler beim Schreiben der Verknüpfung:" + - #: lib/shortcut.tcl:136 ++#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "Fehler beim Erstellen des Icons:" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Rechtschreibprüfungsprogramm nicht unterstützt" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "Rechtschreibprüfung nicht verfügbar" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "Wörterbuch auf %s zurückgesetzt." + +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Unbekanntes Rechtschreibprüfungsprogramm" + - #: lib/spellcheck.tcl:180 ++#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Keine Vorschläge" + - #: lib/spellcheck.tcl:381 ++#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm" + - #: lib/spellcheck.tcl:385 ++#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Rechtschreibprüfung fehlgeschlagen" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "Keine Schlüssel gefunden." + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "Öffentlicher Schlüssel gefunden in: %s" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "Schlüssel erzeugen" + +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" +msgstr "In Zwischenablage kopieren" + +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" +msgstr "Ihr OpenSSH öffenlicher Schlüssel" + +#: lib/sshkey.tcl:78 +msgid "Generating..." +msgstr "Erzeugen..." + +#: lib/sshkey.tcl:84 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"Konnte »ssh-keygen« nicht starten:\n" +"\n" +"%s" + +#: lib/sshkey.tcl:111 +msgid "Generation failed." +msgstr "Schlüsselerzeugung fehlgeschlagen." + +#: lib/sshkey.tcl:118 +msgid "Generation succeded, but no keys found." +msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden." + +#: lib/sshkey.tcl:121 +#, tcl-format +msgid "Your key is in: %s" +msgstr "Ihr Schlüssel ist abgelegt in: %s" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s ... %*i von %*i %s (%3i%%)" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "Werkzeug hinzufügen" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "Neues Kommando für Werkzeug hinzufügen" + +#: lib/tools_dlg.tcl:33 +msgid "Add globally" +msgstr "Global hinzufügen" + +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" +msgstr "Einzelheiten des Werkzeugs" + +#: lib/tools_dlg.tcl:48 +msgid "Use '/' separators to create a submenu tree:" +msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:" + +#: lib/tools_dlg.tcl:61 +msgid "Command:" +msgstr "Kommando:" + +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" +msgstr "Bestätigungsfrage vor Starten anzeigen" + +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "Benutzer nach Version fragen (setzt $REVISION)" + +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)" + +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" +msgstr "Kein Ausgabefenster zeigen" + +#: lib/tools_dlg.tcl:97 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)" + +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." +msgstr "Bitte geben Sie einen Werkzeugnamen an." + +#: lib/tools_dlg.tcl:129 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "Werkzeug »%s« existiert bereits." + +#: lib/tools_dlg.tcl:151 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" +"Werkzeug konnte nicht hinzugefügt werden:\n" +"\n" +"%s" + +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" +msgstr "Werkzeug entfernen" + +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" +msgstr "Werkzeugkommandos entfernen" + +#: lib/tools_dlg.tcl:200 +msgid "Remove" +msgstr "Entfernen" + +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" +msgstr "(Werkzeuge für lokales Archiv werden in Blau angezeigt)" + +#: lib/tools_dlg.tcl:297 +#, tcl-format +msgid "Run Command: %s" +msgstr "Kommando aufrufen: %s" + +#: lib/tools_dlg.tcl:311 +msgid "Arguments" +msgstr "Argumente" + +#: lib/tools_dlg.tcl:348 +msgid "OK" +msgstr "Ok" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein." + +#: lib/tools.tcl:90 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "Wollen Sie %s wirklich starten?" + +#: lib/tools.tcl:110 +#, tcl-format +msgid "Tool: %s" +msgstr "Werkzeug: %s" + +#: lib/tools.tcl:111 +#, tcl-format +msgid "Running: %s" +msgstr "Starten: %s" + +#: lib/tools.tcl:149 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "Werkzeug erfolgreich abgeschlossen: %s" + +#: lib/tools.tcl:151 +#, tcl-format +msgid "Tool failed: %s" +msgstr "Werkzeug fehlgeschlagen: %s" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Neue Änderungen von »%s« holen" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "Aufräumen von »%s«" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Änderungen nach »%s« versenden" + +#: lib/transport.tcl:64 +#, tcl-format +msgid "Mirroring to %s" +msgstr "Spiegeln nach %s" + +#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "%s %s nach %s versenden" + - #: lib/transport.tcl:89 ++#: lib/transport.tcl:100 +msgid "Push Branches" +msgstr "Zweige versenden" + - #: lib/transport.tcl:103 ++#: lib/transport.tcl:114 +msgid "Source Branches" +msgstr "Lokale Zweige" + - #: lib/transport.tcl:120 ++#: lib/transport.tcl:131 +msgid "Destination Repository" +msgstr "Ziel-Projektarchiv" + - #: lib/transport.tcl:158 ++#: lib/transport.tcl:169 +msgid "Transfer Options" +msgstr "Netzwerk-Einstellungen" + - #: lib/transport.tcl:160 ++#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "" +"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)" + - #: lib/transport.tcl:164 ++#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" +msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" + - #: lib/transport.tcl:168 ++#: lib/transport.tcl:179 +msgid "Include tags" +msgstr "Mit Markierungen übertragen" diff --cc git-gui/po/fr.po index a944ace6c,000000000..81706965f mode 100644,000000..100644 --- a/git-gui/po/fr.po +++ b/git-gui/po/fr.po @@@ -1,2558 -1,0 +1,2604 @@@ +# translation of fr.po to French +# Translation of git-gui to French. +# Copyright (C) 2008 Shawn Pearce, et al. +# This file is distributed under the same license as the git package. +# +# Christian Couder , 2008. +# Alexandre Bourget , 2008. +msgid "" +msgstr "" +"Project-Id-Version: fr\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-11-16 13:56-0800\n" - "PO-Revision-Date: 2008-11-20 10:20+0100\n" ++"POT-Creation-Date: 2010-01-26 15:47-0800\n" ++"PO-Revision-Date: 2010-02-02 12:59+0100\n" +"Last-Translator: Christian Couder \n" +"Language-Team: French\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + - #: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 - #: git-gui.sh:866 ++#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 ++#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "git-gui: erreur fatale" + - #: git-gui.sh:689 ++#: git-gui.sh:743 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Police invalide spécifiée dans %s :" + - #: git-gui.sh:723 ++#: git-gui.sh:779 +msgid "Main Font" +msgstr "Police principale" + - #: git-gui.sh:724 ++#: git-gui.sh:780 +msgid "Diff/Console Font" +msgstr "Police diff/console" + - #: git-gui.sh:738 ++#: git-gui.sh:794 +msgid "Cannot find git in PATH." +msgstr "Impossible de trouver git dans PATH." + - #: git-gui.sh:765 ++#: git-gui.sh:821 +msgid "Cannot parse Git version string:" +msgstr "Impossible de parser la version de Git :" + - #: git-gui.sh:783 ++#: git-gui.sh:839 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Impossible de déterminer la version de Git.\n" +"\n" +"%s affirme qu'il s'agit de la version '%s'.\n" +"\n" +"%s nécessite au moins Git 1.5.0.\n" +"\n" +"Peut-on considérer que '%s' est en version 1.5.0 ?\n" + - #: git-gui.sh:1062 ++#: git-gui.sh:1128 +msgid "Git directory not found:" +msgstr "Impossible de trouver le répertoire git :" + - #: git-gui.sh:1069 ++#: git-gui.sh:1146 +msgid "Cannot move to top of working directory:" +msgstr "Impossible d'aller à la racine du répertoire de travail :" + - #: git-gui.sh:1076 - msgid "Cannot use funny .git directory:" - msgstr "Impossible d'utiliser le répertoire .git:" ++#: git-gui.sh:1154 ++msgid "Cannot use bare repository:" ++msgstr "Impossible d'utiliser un dépôt nu (bare) :" + - #: git-gui.sh:1081 ++#: git-gui.sh:1162 +msgid "No working directory" +msgstr "Aucun répertoire de travail" + - #: git-gui.sh:1247 lib/checkout_op.tcl:305 ++#: git-gui.sh:1334 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "Rafraîchissement du statut des fichiers..." + - #: git-gui.sh:1303 ++#: git-gui.sh:1390 +msgid "Scanning for modified files ..." +msgstr "Recherche de fichiers modifiés..." + - #: git-gui.sh:1367 ++#: git-gui.sh:1454 +msgid "Calling prepare-commit-msg hook..." +msgstr "Lancement de l'action de préparation du message de commit..." + - #: git-gui.sh:1384 ++#: git-gui.sh:1471 +msgid "Commit declined by prepare-commit-msg hook." +msgstr "Commit refusé par l'action de préparation du message de commit." + - #: git-gui.sh:1542 lib/browser.tcl:246 ++#: git-gui.sh:1629 lib/browser.tcl:246 +msgid "Ready." +msgstr "Prêt." + - #: git-gui.sh:1819 ++#: git-gui.sh:1787 ++#, tcl-format ++msgid "Displaying only %s of %s files." ++msgstr "Affiche seulement %s fichiers sur %s." ++ ++#: git-gui.sh:1913 +msgid "Unmodified" +msgstr "Non modifié" + - #: git-gui.sh:1821 ++#: git-gui.sh:1915 +msgid "Modified, not staged" +msgstr "Modifié, pas indexé" + - #: git-gui.sh:1822 git-gui.sh:1830 ++#: git-gui.sh:1916 git-gui.sh:1924 +msgid "Staged for commit" +msgstr "Indexé" + - #: git-gui.sh:1823 git-gui.sh:1831 ++#: git-gui.sh:1917 git-gui.sh:1925 +msgid "Portions staged for commit" +msgstr "Portions indexées" + - #: git-gui.sh:1824 git-gui.sh:1832 ++#: git-gui.sh:1918 git-gui.sh:1926 +msgid "Staged for commit, missing" +msgstr "Indexés, manquant" + - #: git-gui.sh:1826 ++#: git-gui.sh:1920 +msgid "File type changed, not staged" +msgstr "Le type de fichier a changé, non indexé" + - #: git-gui.sh:1827 ++#: git-gui.sh:1921 +msgid "File type changed, staged" +msgstr "Le type de fichier a changé, indexé" + - #: git-gui.sh:1829 ++#: git-gui.sh:1923 +msgid "Untracked, not staged" +msgstr "Non versionné, non indexé" + - #: git-gui.sh:1834 ++#: git-gui.sh:1928 +msgid "Missing" +msgstr "Manquant" + - #: git-gui.sh:1835 ++#: git-gui.sh:1929 +msgid "Staged for removal" +msgstr "Indexé pour suppression" + - #: git-gui.sh:1836 ++#: git-gui.sh:1930 +msgid "Staged for removal, still present" +msgstr "Indexé pour suppression, toujours présent" + - #: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 - #: git-gui.sh:1842 git-gui.sh:1843 ++#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 ++#: git-gui.sh:1936 git-gui.sh:1937 +msgid "Requires merge resolution" +msgstr "Nécessite la résolution d'une fusion" + - #: git-gui.sh:1878 ++#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." +msgstr "Lancement de gitk... un instant..." + - #: git-gui.sh:1887 ++#: git-gui.sh:1984 +msgid "Couldn't find gitk in PATH" +msgstr "Impossible de trouver gitk dans PATH." + - #: git-gui.sh:2280 lib/choose_repository.tcl:36 ++#: git-gui.sh:2043 ++msgid "Couldn't find git gui in PATH" ++msgstr "Impossible de trouver git gui dans PATH" ++ ++#: git-gui.sh:2455 lib/choose_repository.tcl:36 +msgid "Repository" +msgstr "Dépôt" + - #: git-gui.sh:2281 ++#: git-gui.sh:2456 +msgid "Edit" +msgstr "Édition" + - #: git-gui.sh:2283 lib/choose_rev.tcl:561 ++#: git-gui.sh:2458 lib/choose_rev.tcl:561 +msgid "Branch" +msgstr "Branche" + - #: git-gui.sh:2286 lib/choose_rev.tcl:548 ++#: git-gui.sh:2461 lib/choose_rev.tcl:548 +msgid "Commit@@noun" +msgstr "Commit" + - #: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Fusionner" + - #: git-gui.sh:2290 lib/choose_rev.tcl:557 ++#: git-gui.sh:2465 lib/choose_rev.tcl:557 +msgid "Remote" +msgstr "Dépôt distant" + - #: git-gui.sh:2293 ++#: git-gui.sh:2468 +msgid "Tools" +msgstr "Outils" + - #: git-gui.sh:2302 ++#: git-gui.sh:2477 +msgid "Explore Working Copy" +msgstr "Explorer la copie de travail" + - #: git-gui.sh:2307 ++#: git-gui.sh:2483 +msgid "Browse Current Branch's Files" +msgstr "Naviguer dans la branche courante" + - #: git-gui.sh:2311 ++#: git-gui.sh:2487 +msgid "Browse Branch Files..." +msgstr "Naviguer dans la branche..." + - #: git-gui.sh:2316 ++#: git-gui.sh:2492 +msgid "Visualize Current Branch's History" +msgstr "Visualiser l'historique de la branche courante" + - #: git-gui.sh:2320 ++#: git-gui.sh:2496 +msgid "Visualize All Branch History" +msgstr "Voir l'historique de toutes les branches" + - #: git-gui.sh:2327 ++#: git-gui.sh:2503 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Parcourir l'arborescence de %s" + - #: git-gui.sh:2329 ++#: git-gui.sh:2505 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Voir l'historique de la branche : %s" + - #: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Statistiques du dépôt" + - #: git-gui.sh:2337 lib/database.tcl:34 ++#: git-gui.sh:2513 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Comprimer le dépôt" + - #: git-gui.sh:2340 ++#: git-gui.sh:2516 +msgid "Verify Database" +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 ++#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 ++#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +msgid "Create Desktop Icon" +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:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +msgid "Quit" +msgstr "Quitter" + - #: git-gui.sh:2371 ++#: git-gui.sh:2547 +msgid "Undo" +msgstr "Défaire" + - #: git-gui.sh:2374 ++#: git-gui.sh:2550 +msgid "Redo" +msgstr "Refaire" + - #: git-gui.sh:2378 git-gui.sh:2923 ++#: git-gui.sh:2554 git-gui.sh:3109 +msgid "Cut" +msgstr "Couper" + - #: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082 ++#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "Copier" + - #: git-gui.sh:2384 git-gui.sh:2929 ++#: git-gui.sh:2560 git-gui.sh:3115 +msgid "Paste" +msgstr "Coller" + - #: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26 ++#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Supprimer" + - #: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71 ++#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +msgid "Select All" +msgstr "Tout sélectionner" + - #: git-gui.sh:2400 ++#: git-gui.sh:2576 +msgid "Create..." +msgstr "Créer..." + - #: git-gui.sh:2406 ++#: git-gui.sh:2582 +msgid "Checkout..." +msgstr "Charger (checkout)..." + - #: git-gui.sh:2412 ++#: git-gui.sh:2588 +msgid "Rename..." +msgstr "Renommer..." + - #: git-gui.sh:2417 ++#: git-gui.sh:2593 +msgid "Delete..." +msgstr "Supprimer..." + - #: git-gui.sh:2422 ++#: git-gui.sh:2598 +msgid "Reset..." +msgstr "Réinitialiser..." + - #: git-gui.sh:2432 ++#: git-gui.sh:2608 +msgid "Done" +msgstr "Effectué" + - #: git-gui.sh:2434 ++#: git-gui.sh:2610 +msgid "Commit@@verb" +msgstr "Commiter@@verb" + - #: git-gui.sh:2443 git-gui.sh:2864 ++#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "Nouveau commit" + - #: git-gui.sh:2451 git-gui.sh:2871 ++#: git-gui.sh:2627 git-gui.sh:3057 +msgid "Amend Last Commit" +msgstr "Corriger dernier commit" + - #: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Recharger modifs." + - #: git-gui.sh:2467 ++#: git-gui.sh:2643 +msgid "Stage To Commit" +msgstr "Indexer" + - #: git-gui.sh:2473 ++#: git-gui.sh:2649 +msgid "Stage Changed Files To Commit" +msgstr "Indexer toutes modifications" + - #: git-gui.sh:2479 ++#: git-gui.sh:2655 +msgid "Unstage From Commit" +msgstr "Désindexer" + - #: git-gui.sh:2484 lib/index.tcl:410 ++#: git-gui.sh:2661 lib/index.tcl:412 +msgid "Revert Changes" +msgstr "Annuler les modifications" + - #: git-gui.sh:2491 git-gui.sh:3069 ++#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +msgid "Show Less Context" +msgstr "Montrer moins de contexte" + - #: git-gui.sh:2495 git-gui.sh:3073 ++#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +msgid "Show More Context" +msgstr "Montrer plus de contexte" + - #: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947 ++#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +msgid "Sign Off" +msgstr "Signer" + - #: git-gui.sh:2518 ++#: git-gui.sh:2696 +msgid "Local Merge..." +msgstr "Fusion locale..." + - #: git-gui.sh:2523 ++#: git-gui.sh:2701 +msgid "Abort Merge..." +msgstr "Abandonner fusion..." + - #: git-gui.sh:2535 git-gui.sh:2575 ++#: git-gui.sh:2713 git-gui.sh:2741 +msgid "Add..." +msgstr "Ajouter..." + - #: git-gui.sh:2539 ++#: git-gui.sh:2717 +msgid "Push..." +msgstr "Pousser..." + - #: git-gui.sh:2543 ++#: git-gui.sh:2721 +msgid "Delete Branch..." +msgstr "Supprimer branche..." + - #: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 - #, tcl-format - msgid "About %s" - msgstr "À propos de %s" - - #: git-gui.sh:2557 - msgid "Preferences..." - msgstr "Préférences..." - - #: git-gui.sh:2565 git-gui.sh:3115 ++#: git-gui.sh:2731 git-gui.sh:3292 +msgid "Options..." +msgstr "Options..." + - #: git-gui.sh:2576 ++#: git-gui.sh:2742 +msgid "Remove..." +msgstr "Supprimer..." + - #: git-gui.sh:2585 lib/choose_repository.tcl:50 ++#: git-gui.sh:2751 lib/choose_repository.tcl:50 +msgid "Help" +msgstr "Aide" + - #: git-gui.sh:2611 ++#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 ++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 ++#, tcl-format ++msgid "About %s" ++msgstr "À propos de %s" ++ ++#: git-gui.sh:2783 +msgid "Online Documentation" +msgstr "Documentation en ligne" + - #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 ++#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +msgid "Show SSH Key" +msgstr "Montrer la clé SSH" + - #: git-gui.sh:2707 ++#: git-gui.sh:2893 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire " +"inexistant" + - #: git-gui.sh:2740 ++#: git-gui.sh:2926 +msgid "Current Branch:" +msgstr "Branche courante :" + - #: git-gui.sh:2761 ++#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" +msgstr "Modifs. indexées (pour commit)" + - #: git-gui.sh:2781 ++#: git-gui.sh:2967 +msgid "Unstaged Changes" +msgstr "Modifs. non indexées" + - #: git-gui.sh:2831 ++#: git-gui.sh:3017 +msgid "Stage Changed" +msgstr "Indexer modifs." + - #: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182 ++#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +msgid "Push" +msgstr "Pousser" + - #: git-gui.sh:2885 ++#: git-gui.sh:3071 +msgid "Initial Commit Message:" +msgstr "Message de commit initial :" + - #: git-gui.sh:2886 ++#: git-gui.sh:3072 +msgid "Amended Commit Message:" +msgstr "Message de commit corrigé :" + - #: git-gui.sh:2887 ++#: git-gui.sh:3073 +msgid "Amended Initial Commit Message:" +msgstr "Message de commit initial corrigé :" + - #: git-gui.sh:2888 ++#: git-gui.sh:3074 +msgid "Amended Merge Commit Message:" +msgstr "Message de commit de fusion corrigé :" + - #: git-gui.sh:2889 ++#: git-gui.sh:3075 +msgid "Merge Commit Message:" +msgstr "Message de commit de fusion :" + - #: git-gui.sh:2890 ++#: git-gui.sh:3076 +msgid "Commit Message:" +msgstr "Message de commit :" + - #: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73 ++#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +msgid "Copy All" +msgstr "Copier tout" + - #: git-gui.sh:2963 lib/blame.tcl:104 ++#: git-gui.sh:3149 lib/blame.tcl:104 +msgid "File:" +msgstr "Fichier :" + - #: git-gui.sh:3078 ++#: git-gui.sh:3255 +msgid "Refresh" +msgstr "Rafraîchir" + - #: git-gui.sh:3099 ++#: git-gui.sh:3276 +msgid "Decrease Font Size" +msgstr "Diminuer la police" + - #: git-gui.sh:3103 ++#: git-gui.sh:3280 +msgid "Increase Font Size" +msgstr "Agrandir la police" + - #: git-gui.sh:3111 lib/blame.tcl:281 ++#: git-gui.sh:3288 lib/blame.tcl:281 +msgid "Encoding" +msgstr "Codage des caractères" + - #: git-gui.sh:3122 ++#: git-gui.sh:3299 +msgid "Apply/Reverse Hunk" +msgstr "Appliquer/Inverser section" + - #: git-gui.sh:3127 ++#: git-gui.sh:3304 +msgid "Apply/Reverse Line" +msgstr "Appliquer/Inverser la ligne" + - #: git-gui.sh:3137 ++#: git-gui.sh:3323 +msgid "Run Merge Tool" +msgstr "Lancer l'outil de fusion" + - #: git-gui.sh:3142 ++#: git-gui.sh:3328 +msgid "Use Remote Version" +msgstr "Utiliser la version distante" + - #: git-gui.sh:3146 ++#: git-gui.sh:3332 +msgid "Use Local Version" +msgstr "Utiliser la version locale" + - #: git-gui.sh:3150 ++#: git-gui.sh:3336 +msgid "Revert To Base" +msgstr "Revenir à la version de base" + - #: git-gui.sh:3169 ++#: git-gui.sh:3354 ++msgid "Visualize These Changes In The Submodule" ++msgstr "Voir les changments dans le sous-module" ++ ++#: git-gui.sh:3358 ++msgid "Visualize Current Branch History In The Submodule" ++msgstr "Voir l'historique de la branche courante du sous-module" ++ ++#: git-gui.sh:3362 ++msgid "Visualize All Branch History In The Submodule" ++msgstr "Voir l'historique de toutes les branches du sous-module" ++ ++#: git-gui.sh:3367 ++msgid "Start git gui In The Submodule" ++msgstr "Démarrer git gui dans le sous-module" ++ ++#: git-gui.sh:3389 +msgid "Unstage Hunk From Commit" +msgstr "Désindexer la section" + - #: git-gui.sh:3170 ++#: git-gui.sh:3391 ++msgid "Unstage Lines From Commit" ++msgstr "Désindexer la ligne du commit" ++ ++#: git-gui.sh:3393 +msgid "Unstage Line From Commit" +msgstr "Désindexer la ligne" + - #: git-gui.sh:3172 ++#: git-gui.sh:3396 +msgid "Stage Hunk For Commit" +msgstr "Indexer la section" + - #: git-gui.sh:3173 ++#: git-gui.sh:3398 ++msgid "Stage Lines For Commit" ++msgstr "Indexer les lignes" ++ ++#: git-gui.sh:3400 +msgid "Stage Line For Commit" +msgstr "Indexer la ligne" + - #: git-gui.sh:3196 ++#: git-gui.sh:3424 +msgid "Initializing..." +msgstr "Initialisation..." + - #: git-gui.sh:3301 ++#: git-gui.sh:3541 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"Des problèmes d'environnement sont possibles.\n" +"\n" +"Les variables d'environnement suivantes seront\n" +"probablement ignorées par tous les\n" +"sous-processus de Git lancés par %s\n" +"\n" + - #: git-gui.sh:3331 ++#: git-gui.sh:3570 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"Ceci est dû à un problème connu avec\n" +"le binaire Tcl distribué par Cygwin." + - #: git-gui.sh:3336 ++#: git-gui.sh:3575 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"Un bon remplacement pour %s\n" +"est de mettre les valeurs pour 'user.name' (nom\n" +"de l'utilisateur) et 'user.email' (addresse email\n" +"de l'utilisateur) dans votre fichier '~/.gitconfig'.\n" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - une interface graphique utilisateur pour Git" + +#: lib/blame.tcl:72 +msgid "File Viewer" +msgstr "Visionneur de fichier" + +#: lib/blame.tcl:78 +msgid "Commit:" +msgstr "Commit :" + +#: lib/blame.tcl:271 +msgid "Copy Commit" +msgstr "Copier commit" + +#: lib/blame.tcl:275 +msgid "Find Text..." +msgstr "Chercher texte..." + +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" +msgstr "Lancer la détection approfondie des copies" + +#: lib/blame.tcl:288 +msgid "Show History Context" +msgstr "Montrer l'historique" + +#: lib/blame.tcl:291 +msgid "Blame Parent Commit" +msgstr "Blâmer le commit parent" + +#: lib/blame.tcl:450 +#, tcl-format +msgid "Reading %s..." +msgstr "Lecture de %s..." + +#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." +msgstr "Chargement des annotations de suivi des copies/déplacements..." + +#: lib/blame.tcl:577 +msgid "lines annotated" +msgstr "lignes annotées" + +#: lib/blame.tcl:769 +msgid "Loading original location annotations..." +msgstr "Chargement des annotations d'emplacement original" + +#: lib/blame.tcl:772 +msgid "Annotation complete." +msgstr "Annotation terminée." + +#: lib/blame.tcl:802 +msgid "Busy" +msgstr "Occupé" + +#: lib/blame.tcl:803 +msgid "Annotation process is already running." +msgstr "Annotation en cours d'exécution." + +#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." +msgstr "Recherche de copie approfondie en cours..." + +#: lib/blame.tcl:910 +msgid "Loading annotation..." +msgstr "Chargement des annotations..." + - #: lib/blame.tcl:964 ++#: lib/blame.tcl:963 +msgid "Author:" +msgstr "Auteur :" + - #: lib/blame.tcl:968 ++#: lib/blame.tcl:967 +msgid "Committer:" +msgstr "Commiteur :" + - #: lib/blame.tcl:973 ++#: lib/blame.tcl:972 +msgid "Original File:" +msgstr "Fichier original :" + - #: lib/blame.tcl:1021 ++#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" +msgstr "Impossible de trouver le commit HEAD :" + - #: lib/blame.tcl:1076 ++#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" +msgstr "Impossible de trouver le commit parent :" + - #: lib/blame.tcl:1091 ++#: lib/blame.tcl:1090 +msgid "Unable to display parent" +msgstr "Impossible d'afficher le parent" + - #: lib/blame.tcl:1092 lib/diff.tcl:297 ++#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" +msgstr "Erreur lors du chargement des différences :" + - #: lib/blame.tcl:1232 ++#: lib/blame.tcl:1231 +msgid "Originally By:" +msgstr "À l'origine par :" + - #: lib/blame.tcl:1238 ++#: lib/blame.tcl:1237 +msgid "In File:" +msgstr "Dans le fichier :" + - #: lib/blame.tcl:1243 ++#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" +msgstr "Copié ou déplacé ici par :" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Charger la branche (checkout)" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Charger (checkout)" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 - #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 ++#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 - #: lib/transport.tcl:97 ++#: lib/transport.tcl:108 +msgid "Cancel" +msgstr "Annuler" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" +msgstr "Révision" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" +msgstr "Options" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Récupérer la branche de suivi" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Détacher de la branche locale" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Créer une branche" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +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:381 +msgid "Create" +msgstr "Créer" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Nom de branche" + +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" +msgstr "Nom :" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Trouver nom de branche de suivi" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Révision initiale" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Mettre à jour une branche existante :" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Non" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +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:571 +msgid "Reset" +msgstr "Réinitialiser" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Charger (checkout) après création" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Choisissez une branche de suivi" + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "La branche de suivi %s n'est pas une branche dans le dépôt distant." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Fournissez un nom de branche." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "'%s' n'est pas un nom de branche acceptable." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Supprimer branche" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Supprimer branche locale" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Branches locales" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Supprimer seulement si fusionnée dans :" + - #: lib/branch_delete.tcl:54 - msgid "Always (Do not perform merge test.)" - msgstr "Toujours (Ne pas faire de test de fusion.)" ++#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 ++msgid "Always (Do not perform merge checks)" ++msgstr "Toujours (ne pas vérifier les fusions)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :" + ++#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 ++msgid "" ++"Recovering deleted branches is difficult.\n" ++"\n" ++"Delete the selected branches?" ++msgstr "" ++"Il est difficile de récupérer des branches supprimées.\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é :\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Renommer branche" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Renommer" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Branche :" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Nouveau nom :" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Merci de sélectionner une branche à renommer." + - #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 ++#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "La branche '%s' existe déjà." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Échec pour renommer '%s'." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Lancement..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "Visionneur de fichier" + +#: lib/browser.tcl:126 lib/browser.tcl:143 +#, tcl-format +msgid "Loading %s..." +msgstr "Chargement de %s..." + +#: lib/browser.tcl:187 +msgid "[Up To Parent]" +msgstr "[Jusqu'au parent]" + +#: lib/browser.tcl:267 lib/browser.tcl:273 +msgid "Browse Branch Files" +msgstr "Naviguer dans les fichiers de le branche" + - #: lib/browser.tcl:278 lib/choose_repository.tcl:394 - #: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 - #: lib/choose_repository.tcl:995 ++#: lib/browser.tcl:278 lib/choose_repository.tcl:398 ++#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 ++#: lib/choose_repository.tcl:1028 +msgid "Browse" +msgstr "Naviguer" + - #: lib/checkout_op.tcl:84 ++#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Récupération de %s à partir de %s" + - #: lib/checkout_op.tcl:132 ++#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "erreur fatale : Impossible de résoudre %s" + - #: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 ++#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 +#: lib/sshkey.tcl:53 +msgid "Close" +msgstr "Fermer" + - #: lib/checkout_op.tcl:174 ++#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "La branche '%s' n'existe pas." + - #: lib/checkout_op.tcl:193 ++#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." +msgstr "Échec de la configuration simplifiée de git-pull pour '%s'." + - #: lib/checkout_op.tcl:228 ++#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"La branche '%s' existe déjà.\n" +"\n" +"Impossible de faire une avance rapide (fast forward) vers %s.\n" +"Une fusion est nécessaire." + - #: lib/checkout_op.tcl:242 ++#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "La stratégie de fusion '%s' n'est pas supportée." + - #: lib/checkout_op.tcl:261 ++#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "La mise à jour de '%s' a échoué." + - #: lib/checkout_op.tcl:273 ++#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." +msgstr "L'index (staging area) est déjà verrouillé." + - #: lib/checkout_op.tcl:288 ++#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'état lors de la dernière synchronisation ne correspond plus à l'état du " +"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 " +"modifier la branche courante.\n" +"\n" +"Cela va être fait tout de suite automatiquement.\n" + - #: lib/checkout_op.tcl:344 ++#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Mise à jour du répertoire courant avec '%s'..." + - #: lib/checkout_op.tcl:345 ++#: lib/checkout_op.tcl:346 +msgid "files checked out" +msgstr "fichiers chargés" + - #: lib/checkout_op.tcl:375 ++#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." - msgstr "Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers)." ++msgstr "" ++"Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers)." + - #: lib/checkout_op.tcl:376 ++#: lib/checkout_op.tcl:377 +msgid "File level merge required." +msgstr "Il est nécessaire de fusionner des fichiers." + - #: lib/checkout_op.tcl:380 ++#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Le répertoire de travail reste sur la branche '%s'." + - #: lib/checkout_op.tcl:451 ++#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Vous n'êtes plus sur une branche locale.\n" +"\n" +"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 ++#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#, tcl-format +msgid "Checked out '%s'." +msgstr "'%s' chargé." + - #: lib/checkout_op.tcl:500 ++#: lib/checkout_op.tcl:535 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "Réinitialiser '%s' à '%s' va faire perdre les commits suivants :" + - #: lib/checkout_op.tcl:522 ++#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." +msgstr "Récupérer les commits perdus ne sera peut être pas facile." + - #: lib/checkout_op.tcl:527 ++#: lib/checkout_op.tcl:562 +#, tcl-format +msgid "Reset '%s'?" +msgstr "Réinitialiser '%s' ?" + - #: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 ++#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +msgid "Visualize" +msgstr "Visualiser" + - #: lib/checkout_op.tcl:600 ++#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"Le changement de la branche courante a échoué.\n" +"\n" +"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été " +"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a " +"échouée.\n" +"\n" +"Cela n'aurait pas dû se produire. %s va abandonner et se terminer." + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "Sélectionner" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "Familles de polices" + +#: lib/choose_font.tcl:74 +msgid "Font Size" +msgstr "Taille de police" + +#: lib/choose_font.tcl:91 +msgid "Font Example" +msgstr "Exemple de police" + +#: lib/choose_font.tcl:103 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"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" +msgstr "Git Gui" + - #: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 ++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +msgid "Create New Repository" +msgstr "Créer nouveau dépôt" + +#: lib/choose_repository.tcl:93 +msgid "New..." +msgstr "Nouveau..." + - #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 ++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +msgid "Clone Existing Repository" +msgstr "Cloner un dépôt existant" + +#: lib/choose_repository.tcl:106 +msgid "Clone..." +msgstr "Cloner..." + - #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 ++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +msgid "Open Existing Repository" +msgstr "Ouvrir un dépôt existant" + +#: lib/choose_repository.tcl:119 +msgid "Open..." +msgstr "Ouvrir..." + +#: lib/choose_repository.tcl:132 +msgid "Recent Repositories" +msgstr "Dépôts récemment utilisés" + +#: lib/choose_repository.tcl:138 +msgid "Open Recent Repository:" +msgstr "Ouvrir un dépôt récent :" + - #: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 - #: lib/choose_repository.tcl:316 ++#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 ++#: lib/choose_repository.tcl:320 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "La création du dépôt %s a échoué :" + - #: lib/choose_repository.tcl:387 ++#: lib/choose_repository.tcl:391 +msgid "Directory:" +msgstr "Répertoire :" + - #: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 - #: lib/choose_repository.tcl:1017 ++#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 ++#: lib/choose_repository.tcl:1052 +msgid "Git Repository" +msgstr "Dépôt Git" + - #: lib/choose_repository.tcl:442 ++#: lib/choose_repository.tcl:448 +#, tcl-format +msgid "Directory %s already exists." +msgstr "Le répertoire %s existe déjà." + - #: lib/choose_repository.tcl:446 ++#: lib/choose_repository.tcl:452 +#, tcl-format +msgid "File %s already exists." +msgstr "Le fichier %s existe déjà." + - #: lib/choose_repository.tcl:460 ++#: lib/choose_repository.tcl:466 +msgid "Clone" +msgstr "Cloner" + - #: lib/choose_repository.tcl:473 ++#: lib/choose_repository.tcl:479 +msgid "Source Location:" +msgstr "Emplacement source :" + - #: lib/choose_repository.tcl:484 ++#: lib/choose_repository.tcl:490 +msgid "Target Directory:" +msgstr "Répertoire cible :" + - #: lib/choose_repository.tcl:496 ++#: lib/choose_repository.tcl:502 +msgid "Clone Type:" +msgstr "Type de clonage :" + - #: lib/choose_repository.tcl:502 ++#: lib/choose_repository.tcl:508 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Standard (rapide, semi-redondant, liens durs)" + - #: lib/choose_repository.tcl:508 ++#: lib/choose_repository.tcl:514 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Copy complète (plus lent, sauvegarde redondante)" + - #: lib/choose_repository.tcl:514 ++#: lib/choose_repository.tcl:520 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)" + - #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 - #: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 - #: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 ++#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 ++#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 ++#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "'%s' n'est pas un dépôt Git." + - #: lib/choose_repository.tcl:586 ++#: lib/choose_repository.tcl:592 +msgid "Standard only available for local repository." +msgstr "Standard n'est disponible que pour un dépôt local." + - #: lib/choose_repository.tcl:590 ++#: lib/choose_repository.tcl:596 +msgid "Shared only available for local repository." +msgstr "Partagé n'est disponible que pour un dépôt local." + - #: lib/choose_repository.tcl:611 ++#: lib/choose_repository.tcl:617 +#, tcl-format +msgid "Location %s already exists." +msgstr "L'emplacement %s existe déjà." + - #: lib/choose_repository.tcl:622 ++#: lib/choose_repository.tcl:628 +msgid "Failed to configure origin" +msgstr "La configuration de l'origine a échoué." + - #: lib/choose_repository.tcl:634 ++#: lib/choose_repository.tcl:640 +msgid "Counting objects" +msgstr "Décompte des objets" + - #: lib/choose_repository.tcl:635 ++#: lib/choose_repository.tcl:641 +msgid "buckets" +msgstr "paniers" + - #: lib/choose_repository.tcl:659 ++#: lib/choose_repository.tcl:665 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "Impossible de copier 'objects/info/alternates' : %s" + - #: lib/choose_repository.tcl:695 ++#: lib/choose_repository.tcl:701 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Il n'y a rien à cloner depuis %s." + - #: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 - #: lib/choose_repository.tcl:923 ++#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 ++#: lib/choose_repository.tcl:929 +msgid "The 'master' branch has not been initialized." +msgstr "La branche 'master' n'a pas été initialisée." + - #: lib/choose_repository.tcl:710 ++#: lib/choose_repository.tcl:716 +msgid "Hardlinks are unavailable. Falling back to copying." - msgstr "Les liens durs ne sont pas supportés. Une copie sera effectuée à la place." ++msgstr "" ++"Les liens durs ne sont pas supportés. Une copie sera effectuée à la place." + - #: lib/choose_repository.tcl:722 ++#: lib/choose_repository.tcl:728 +#, tcl-format +msgid "Cloning from %s" +msgstr "Clonage depuis %s" + - #: lib/choose_repository.tcl:753 ++#: lib/choose_repository.tcl:759 +msgid "Copying objects" +msgstr "Copie des objets" + - #: lib/choose_repository.tcl:754 ++#: lib/choose_repository.tcl:760 +msgid "KiB" +msgstr "KiB" + - #: lib/choose_repository.tcl:778 ++#: lib/choose_repository.tcl:784 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Impossible de copier l'objet : %s" + - #: lib/choose_repository.tcl:788 ++#: lib/choose_repository.tcl:794 +msgid "Linking objects" +msgstr "Liaison des objets" + - #: lib/choose_repository.tcl:789 ++#: lib/choose_repository.tcl:795 +msgid "objects" +msgstr "objets" + - #: lib/choose_repository.tcl:797 ++#: lib/choose_repository.tcl:803 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "Impossible créer un lien dur pour l'objet : %s" + - #: lib/choose_repository.tcl:852 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "" +"Impossible de récupérer les branches et objets. Voir la sortie console pour " +"plus de détails." + - #: lib/choose_repository.tcl:863 ++#: lib/choose_repository.tcl:869 +msgid "Cannot fetch tags. See console output for details." +msgstr "" +"Impossible de récupérer les marques (tags). Voir la sortie console pour plus " +"de détails." + - #: lib/choose_repository.tcl:887 ++#: lib/choose_repository.tcl:893 +msgid "Cannot determine HEAD. See console output for details." - msgstr "Impossible de déterminer HEAD. Voir la sortie console pour plus de détails." ++msgstr "" ++"Impossible de déterminer HEAD. Voir la sortie console pour plus de détails." + - #: lib/choose_repository.tcl:896 ++#: lib/choose_repository.tcl:902 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "Impossible de nettoyer %s" + - #: lib/choose_repository.tcl:902 ++#: lib/choose_repository.tcl:908 +msgid "Clone failed." +msgstr "Le clonage a échoué." + - #: lib/choose_repository.tcl:909 ++#: lib/choose_repository.tcl:915 +msgid "No default branch obtained." +msgstr "Aucune branche par défaut n'a été obtenue." + - #: lib/choose_repository.tcl:920 ++#: lib/choose_repository.tcl:926 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "Impossible de résoudre %s comme commit." + - #: lib/choose_repository.tcl:932 ++#: lib/choose_repository.tcl:938 +msgid "Creating working directory" +msgstr "Création du répertoire de travail" + - #: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 - #: lib/index.tcl:196 ++#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 ++#: lib/index.tcl:198 +msgid "files" +msgstr "fichiers" + - #: lib/choose_repository.tcl:962 ++#: lib/choose_repository.tcl:968 +msgid "Initial file checkout failed." +msgstr "Le chargement initial du fichier a échoué." + - #: lib/choose_repository.tcl:978 ++#: lib/choose_repository.tcl:1011 +msgid "Open" +msgstr "Ouvrir" + - #: lib/choose_repository.tcl:988 ++#: lib/choose_repository.tcl:1021 +msgid "Repository:" +msgstr "Dépôt :" + - #: lib/choose_repository.tcl:1037 ++#: lib/choose_repository.tcl:1072 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Impossible d'ouvrir le dépôt %s :" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "Cet emprunt détaché" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Expression de révision :" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "Branche locale" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "Branche de suivi" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +msgid "Tag" +msgstr "Marque (tag)" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Révision invalide : %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "Pas de révision sélectionnée." + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "L'expression de révision est vide." + +#: lib/choose_rev.tcl:531 +msgid "Updated" +msgstr "Mise à jour:" + +#: lib/choose_rev.tcl:559 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Il n'y a rien à corriger.\n" +"\n" +"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à " +"corriger.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Impossible de corriger pendant une fusion.\n" +"\n" +"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 ++#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "Erreur lors du chargement des données de commit pour correction :" + - #: lib/commit.tcl:76 ++#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "Impossible d'obtenir votre identité :" + - #: lib/commit.tcl:81 ++#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "GIT_COMMITTER_IDENT invalide :" + - #: lib/commit.tcl:133 ++#: lib/commit.tcl:129 ++#, tcl-format ++msgid "warning: Tcl does not support encoding '%s'." ++msgstr "attention : Tcl ne supporte pas le codage '%s'." ++ ++#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'état lors de la dernière synchronisation ne correspond plus à l'état du " +"dépôt.\n" +"\n" +"Un autre programme Git a modifié ce dépôt depuis la dernière " +"synchronisation. Une resynshronisation doit être effectuée avant de pouvoir " +"créer un nouveau commit.\n" +"\n" +"Cela va être fait tout de suite automatiquement.\n" + - #: lib/commit.tcl:156 ++#: lib/commit.tcl:172 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Des fichiers non fusionnés ne peuvent être commités.\n" +"\n" +"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-" +"commiter le fichier avant de pouvoir commiter.\n" + - #: lib/commit.tcl:164 ++#: lib/commit.tcl:180 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Un état de fichier inconnu %s a été détecté.\n" +"\n" +"Le fichier %s ne peut pas être commité par ce programme.\n" + - #: lib/commit.tcl:172 ++#: lib/commit.tcl:188 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Pas de modification à commiter.\n" +"\n" +"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n" + - #: lib/commit.tcl:187 ++#: lib/commit.tcl:203 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Merci de fournir un message de commit.\n" +"\n" +"Un bon message de commit a le format suivant :\n" +"\n" +"- Première ligne : décrire en une phrase ce que vous avez fait.\n" +"- Deuxième ligne : rien.\n" +"- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n" + - #: lib/commit.tcl:211 - #, tcl-format - msgid "warning: Tcl does not support encoding '%s'." - msgstr "attention : Tcl ne supporte pas le codage '%s'." - - #: lib/commit.tcl:227 ++#: lib/commit.tcl:234 +msgid "Calling pre-commit hook..." +msgstr "Lancement de l'action d'avant-commit..." + - #: lib/commit.tcl:242 ++#: lib/commit.tcl:249 +msgid "Commit declined by pre-commit hook." +msgstr "Commit refusé par l'action d'avant-commit." + - #: lib/commit.tcl:265 ++#: lib/commit.tcl:272 +msgid "Calling commit-msg hook..." +msgstr "Lancement de l'action \"message de commit\"..." + - #: lib/commit.tcl:280 ++#: lib/commit.tcl:287 +msgid "Commit declined by commit-msg hook." +msgstr "Commit refusé par l'action \"message de commit\"." + - #: lib/commit.tcl:293 ++#: lib/commit.tcl:300 +msgid "Committing changes..." +msgstr "Commit des modifications..." + - #: lib/commit.tcl:309 ++#: lib/commit.tcl:316 +msgid "write-tree failed:" +msgstr "write-tree a échoué :" + - #: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374 ++#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +msgid "Commit failed." +msgstr "Le commit a échoué." + - #: lib/commit.tcl:327 ++#: lib/commit.tcl:334 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "Le commit %s semble être corrompu" + - #: lib/commit.tcl:332 ++#: lib/commit.tcl:339 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Pas de modification à commiter.\n" +"\n" +"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit " +"de fusion.\n" +"\n" +"Une resynchronisation va être lancée tout de suite automatiquement.\n" + - #: lib/commit.tcl:339 ++#: lib/commit.tcl:346 +msgid "No changes to commit." +msgstr "Pas de modifications à commiter." + - #: lib/commit.tcl:353 ++#: lib/commit.tcl:360 +msgid "commit-tree failed:" +msgstr "commit-tree a échoué :" + - #: lib/commit.tcl:373 ++#: lib/commit.tcl:381 +msgid "update-ref failed:" +msgstr "update-ref a échoué :" + - #: lib/commit.tcl:461 ++#: lib/commit.tcl:469 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Commit %s créé : %s" + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Travail en cours... merci de patienter..." + +#: lib/console.tcl:186 +msgid "Success" +msgstr "Succès" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "Erreur : échec de la commande" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "Nombre d'objets en fichier particulier" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "Espace disque utilisé par les fichiers particuliers" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "Nombre d'objets empaquetés" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "Nombre de paquets d'objets" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "Espace disque utilisé par les objets empaquetés" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "Objets empaquetés attendant d'être supprimés" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "Fichiers poubelle" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Compression de la base des objets" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Vérification de la base des objets avec fsck-objects" + - #: lib/database.tcl:108 ++#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " - "the database when more than %i loose objects exist.\n" ++"the database.\n" +"\n" +"Compress the database now?" +msgstr "" +"Ce dépôt comprend actuellement environ %i objets ayant leur fichier " +"particulier.\n" +"\n" +"Pour conserver une performance optimale, il est fortement recommandé de " - "comprimer la base quand plus de %i objets ayant leur fichier particulier " - "existent.\n" ++"comprimer la base de donnée.\n" +"\n" +"Comprimer la base maintenant ?" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Date invalide de Git : %s" + - #: lib/diff.tcl:59 ++#: lib/diff.tcl:64 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Aucune différence détectée.\n" +"\n" +"%s ne comporte aucune modification.\n" +"\n" +"La date de modification de ce fichier a été mise à jour par une autre " +"application, mais le contenu du fichier n'a pas changé.\n" +"\n" +"Une resynchronisation va être lancée automatiquement pour trouver d'autres " +"fichiers qui pourraient se trouver dans le même état." + - #: lib/diff.tcl:99 ++#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Chargement des différences de %s..." + - #: lib/diff.tcl:120 ++#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"LOCAL : supprimé\n" +"DISTANT :\n" + - #: lib/diff.tcl:125 ++#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"DISTANT : supprimé\n" +"LOCAL :\n" + - #: lib/diff.tcl:132 ++#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "LOCAL :\n" + - #: lib/diff.tcl:135 ++#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "DISTANT :\n" + - #: lib/diff.tcl:197 lib/diff.tcl:296 ++#: lib/diff.tcl:202 lib/diff.tcl:319 +#, tcl-format +msgid "Unable to display %s" +msgstr "Impossible d'afficher %s" + - #: lib/diff.tcl:198 ++#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "Erreur lors du chargement du fichier :" + - #: lib/diff.tcl:205 ++#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "Dépôt Git (sous projet)" + - #: lib/diff.tcl:217 ++#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." +msgstr "* Fichier binaire (pas d'apperçu du contenu)." + - #: lib/diff.tcl:222 ++#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* Le fichier non suivi fait %d octets.\n" +"* Seuls les %d premiers octets sont montrés.\n" + - #: lib/diff.tcl:228 ++#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"* Fichier suivi raccourcis ici de %s.\n" +"* Pour voir le fichier entier, utilisez un éditeur externe.\n" + - #: lib/diff.tcl:436 ++#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." +msgstr "Échec lors de la désindexation de la section sélectionnée." + - #: lib/diff.tcl:443 ++#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." +msgstr "Échec lors de l'indexation de la section." + - #: lib/diff.tcl:509 ++#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." +msgstr "Échec lors de la désindexation de la ligne sélectionnée." + - #: lib/diff.tcl:517 ++#: lib/diff.tcl:576 +msgid "Failed to stage selected line." +msgstr "Échec lors de l'indexation de la ligne." + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Défaut" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "Système (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Autre" + +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" +msgstr "erreur" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "attention" + +#: lib/error.tcl:94 +msgid "You must correct the above errors before committing." +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éverrouiller l'index." + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Erreur de l'index" + - #: lib/index.tcl:21 ++#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Échec de la mise à jour de l'index. Une resynchronisation va être lancée " +"automatiquement." + - #: lib/index.tcl:27 ++#: lib/index.tcl:28 +msgid "Continue" +msgstr "Continuer" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Déverrouiller l'index" + - #: lib/index.tcl:287 ++#: lib/index.tcl:289 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "Désindexation de : %s" + - #: lib/index.tcl:326 ++#: lib/index.tcl:328 +msgid "Ready to commit." +msgstr "Prêt à être commité." + - #: lib/index.tcl:339 ++#: lib/index.tcl:341 +#, tcl-format +msgid "Adding %s" +msgstr "Ajout de %s" + - #: lib/index.tcl:396 ++#: lib/index.tcl:398 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Annuler les modifications dans le fichier %s ? " + - #: lib/index.tcl:398 ++#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Annuler les modifications dans ces %i fichiers ?" + - #: lib/index.tcl:406 ++#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Toutes les modifications non-indexées seront définitivement perdues par " +"l'annulation." + - #: lib/index.tcl:409 ++#: lib/index.tcl:411 +msgid "Do Nothing" +msgstr "Ne rien faire" + - #: lib/index.tcl:427 ++#: lib/index.tcl:429 +msgid "Reverting selected files" +msgstr "Annuler modifications dans fichiers selectionnés" + - #: lib/index.tcl:431 ++#: lib/index.tcl:433 +#, tcl-format +msgid "Reverting %s" +msgstr "Annulation des modifications dans %s" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Impossible de fusionner pendant une correction.\n" +"\n" +"Vous devez finir de corriger ce commit avant de lancer une quelconque " +"fusion.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'état lors de la dernière synchronisation ne correspond plus à l'état du " +"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 " +"fusionner de nouveau.\n" +"\n" +"Cela va être fait tout de suite automatiquement\n" + +#: lib/merge.tcl:45 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Vous êtes au milieu d'une fusion conflictuelle.\n" +"\n" +"Le fichier %s a des conflicts de fusion.\n" +"\n" +"Vous devez les résoudre, puis indexer le fichier, et enfin commiter pour " +"terminer la fusion courante. Seulement à ce moment là sera-t-il possible " +"d'effectuer une nouvelle fusion.\n" + +#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Vous êtes au milieu d'une modification.\n" +"\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é.\n" + +#: lib/merge.tcl:107 +#, tcl-format +msgid "%s of %s" +msgstr "%s de %s" + +#: lib/merge.tcl:120 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "Fusion de %s et %s..." + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +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é. Il est nécessaire de résoudre les conflits." + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "Fusion dans %s" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "Révision à fusionner" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"Impossible d'abandonner en cours de correction.\n" +"\n" +"Vous devez finir de corriger ce commit.\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Abandonner la fusion ?\n" +"\n" +"Abandonner la fusion courante entrainera la perte de TOUTES les " +"modifications non commitées.\n" +"\n" +"Abandonner quand même la fusion courante ?" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Réinitialiser les modifications ?\n" +"\n" +"Réinitialiser les modifications va faire perdre TOUTES les modifications non " +"commitées.\n" +"\n" +"Réinitialiser quand même les modifications courantes ?" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "Abandon" + +#: lib/merge.tcl:239 +msgid "files reset" +msgstr "fichiers réinitialisés" + +#: lib/merge.tcl:267 +msgid "Abort failed." +msgstr "L'abandon a échoué." + +#: lib/merge.tcl:269 +msgid "Abort completed. Ready." +msgstr "Abandon teminé. Prêt." + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "Forcer la résolution à la version de base ?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "Forcer la résolution à cette branche ?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "Forcer la résolution à l'autre branche ?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"Noter que le diff ne montre que les modifications en conflit.\n" +"\n" +"%s sera écrasé.\n" +"\n" +"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 conflits non résolus, indexer quand même ?" ++msgstr "" ++"Le fichier %s semble avoir des conflits non résolus, indexer quand même ?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +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 conflits 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 conflit n'existe pas." + +#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "'%s' n'est pas un outil graphique pour fusionner des fichiers." + +#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "Outil de fusion '%s' non supporté" + +#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" +msgstr "L'outil de fusion tourne déjà, faut-il le terminer ?" + +#: lib/mergetool.tcl:323 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" +"Erreur lors de la récupération des versions :\n" +"%s" + +#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" +"Impossible de lancer l'outil de fusion :\n" +"\n" +"%s" + +#: lib/mergetool.tcl:347 +msgid "Running merge tool..." +msgstr "Lancement de l'outil de fusion..." + +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." +msgstr "L'outil de fusion a échoué." + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "Codage global '%s' invalide" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "Codage de dépôt '%s' invalide" + +#: lib/option.tcl:117 +msgid "Restore Defaults" +msgstr "Remettre les valeurs par défaut" + +#: lib/option.tcl:121 +msgid "Save" +msgstr "Sauvegarder" + +#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" +msgstr "Dépôt : %s" + +#: lib/option.tcl:132 +msgid "Global (All Repositories)" +msgstr "Globales (tous les dépôts)" + +#: lib/option.tcl:138 +msgid "User Name" +msgstr "Nom d'utilisateur" + +#: lib/option.tcl:139 +msgid "Email Address" +msgstr "Adresse email" + +#: lib/option.tcl:141 +msgid "Summarize Merge Commits" +msgstr "Résumer les commits de fusion" + +#: lib/option.tcl:142 +msgid "Merge Verbosity" +msgstr "Fusion bavarde" + +#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" +msgstr "Montrer statistiques de diff après fusion" + +#: lib/option.tcl:144 +msgid "Use Merge Tool" +msgstr "Utiliser outil de fusion" + +#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" +msgstr "Faire confiance aux dates de modification de fichiers " + +#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" +msgstr "Purger les branches de suivi pendant la récupération" + +#: lib/option.tcl:148 +msgid "Match Tracking Branches" +msgstr "Faire correspondre les branches de suivi" + +#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" +msgstr "Annoter les copies seulement sur fichiers modifiés" + +#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" +msgstr "Minimum de caratères pour annoter une copie" + +#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" +msgstr "Distance de blâme dans l'historique (jours)" + +#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" +msgstr "Nombre de lignes de contexte dans les diffs" + +#: lib/option.tcl:153 +msgid "Commit Message Text Width" +msgstr "Largeur du texte de message de commit" + +#: lib/option.tcl:154 +msgid "New Branch Name Template" +msgstr "Nouveau modèle de nom de branche" + +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" +msgstr "Codage du contenu des fichiers par défaut" + +#: lib/option.tcl:203 +msgid "Change" +msgstr "Modifier" + +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" +msgstr "Dictionnaire d'orthographe :" + +#: lib/option.tcl:254 +msgid "Change Font" +msgstr "Modifier les polices" + +#: lib/option.tcl:258 +#, tcl-format +msgid "Choose %s" +msgstr "Choisir %s" + +#: lib/option.tcl:264 +msgid "pt." +msgstr "pt." + +#: lib/option.tcl:278 +msgid "Preferences" +msgstr "Préférences" + +#: lib/option.tcl:314 +msgid "Failed to completely save options:" +msgstr "La sauvegarde complète des options a échoué :" + +#: lib/remote.tcl:163 +msgid "Remove Remote" +msgstr "Supprimer un dépôt distant" + +#: lib/remote.tcl:168 +msgid "Prune from" +msgstr "Purger de" + +#: lib/remote.tcl:173 +msgid "Fetch from" +msgstr "Récupérer de" + +#: lib/remote.tcl:215 +msgid "Push to" +msgstr "Pousser vers" + +#: lib/remote_add.tcl:19 +msgid "Add Remote" +msgstr "Ajouter un dépôt distant" + +#: lib/remote_add.tcl:24 +msgid "Add New Remote" +msgstr "Ajouter un nouveau dépôt distant" + +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" +msgstr "Ajouter" + +#: lib/remote_add.tcl:37 +msgid "Remote Details" +msgstr "Détails des dépôts distants" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "Emplacement :" + +#: lib/remote_add.tcl:62 +msgid "Further Action" +msgstr "Action supplémentaire" + +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" +msgstr "Récupérer immédiatement" + +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" +msgstr "Initialiser un dépôt distant et pousser" + +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" +msgstr "Ne rien faire d'autre maintenant" + +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." +msgstr "Merci de fournir un nom de dépôt distant." + +#: lib/remote_add.tcl:114 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "'%s' n'est pas un nom de dépôt distant acceptable." + +#: lib/remote_add.tcl:125 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "Échec de l'ajout du dépôt distant '%s' à l'emplacement '%s'." + +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "récupérer %s" + +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" +msgstr "Récupération de %s" + +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "Pas de méthode connue pour initialiser le dépôt à l'emplacement '%s'." + - #: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71 ++#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 ++#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" +msgstr "pousser %s" + +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" +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 une branche à distance" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "Dépôt source" + - #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 ++#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" +msgstr "Branche distante :" + - #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 ++#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" +msgstr "Emplacement arbitraire :" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Branches" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Supprimer seulement si" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Fusionné dans :" + - #: lib/remote_branch_delete.tcl:119 - msgid "Always (Do not perform merge checks)" - msgstr "Toujours (ne pas vérifier les fusions)" - +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "Une branche est nécessaire pour 'Fusionné dans'." + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"Les branches suivantes ne sont pas complètement fusionnées dans %s :\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"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." ++"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." +msgstr "Merci de sélectionner une ou plusieurs branches à supprimer." + - #: lib/remote_branch_delete.tcl:216 - msgid "" - "Recovering deleted branches is difficult.\n" - "\n" - "Delete the selected branches?" - msgstr "" - "Il est difficile de récupérer des branches supprimées.\n" - "\n" - "Supprimer les branches sélectionnées ?" - +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Suppression des branches de %s" + - #: lib/remote_branch_delete.tcl:286 ++#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." +msgstr "Aucun dépôt n'est sélectionné." + - #: lib/remote_branch_delete.tcl:291 ++#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." +msgstr "Synchronisation de %s..." + +#: lib/search.tcl:21 +msgid "Find:" +msgstr "Chercher :" + +#: lib/search.tcl:23 +msgid "Next" +msgstr "Suivant" + +#: lib/search.tcl:24 +msgid "Prev" +msgstr "Précédent" + +#: lib/search.tcl:25 +msgid "Case-Sensitive" +msgstr "Sensible à la casse" + - #: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "Impossible d'écrire le raccourci :" + - #: lib/shortcut.tcl:136 ++#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "Impossible d'écrire l'icône :" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Vérificateur d'orthographe non supporté" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "La vérification d'orthographe n'est pas disponible" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "Configuration de vérification d'orthographe invalide" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +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é silencieusement au démarrage" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Vérificateur d'orthographe non reconnu" + +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Aucune suggestion" + +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "EOF inattendue envoyée par le vérificateur d'orthographe" + +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Le vérificateur d'orthographe a échoué" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "Aucune clé trouvée." + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "Clé publique trouvée dans : %s" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "Générer une clé" + +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" +msgstr "Copier dans le presse-papier" + +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" +msgstr "Votre clé publique OpenSSH" + +#: lib/sshkey.tcl:78 +msgid "Generating..." +msgstr "Génération..." + +#: lib/sshkey.tcl:84 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"Impossible de lancer ssh-keygen :\n" +"\n" +"%s" + +#: lib/sshkey.tcl:111 +msgid "Generation failed." +msgstr "La génération a échoué." + +#: lib/sshkey.tcl:118 +msgid "Generation succeded, but no keys found." +msgstr "La génération a réussi, mais aucune clé n'a été trouvée." + +#: lib/sshkey.tcl:121 +#, tcl-format +msgid "Your key is in: %s" +msgstr "Votre clé est dans : %s" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s ... %*i de %*i %s (%3i%%)" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +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 ?" + +#: lib/tools.tcl:110 +#, tcl-format +msgid "Tool: %s" +msgstr "Outil : %s" + +#: lib/tools.tcl:111 +#, tcl-format +msgid "Running: %s" +msgstr "Lancement de : %s" + +#: lib/tools.tcl:149 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "L'outil a terminé avec succès : %s" + +#: lib/tools.tcl:151 +#, tcl-format +msgid "Tool failed: %s" +msgstr "L'outil a échoué : %s" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "Ajouter un outil" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "Ajouter une nouvelle commande d'outil" + +#: lib/tools_dlg.tcl:33 +msgid "Add globally" +msgstr "Ajouter globalement" + +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" +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 :" + +#: lib/tools_dlg.tcl:61 +msgid "Command:" +msgstr "Commande :" + +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" +msgstr "Montrer une boîte de dialogue avant le lancement" + +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" - msgstr "Demander à l'utilisateur de sélectionner une révision (change $REVISION)" ++msgstr "" ++"Demander à l'utilisateur de sélectionner une révision (change $REVISION)" + +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "Demander à l'utilisateur des arguments supplémentaires (change $ARGS)" + +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" +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 sélectionné ($FILENAME non vide)" + +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." +msgstr "Merci de fournir un nom pour l'outil." + +#: lib/tools_dlg.tcl:129 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "L'outil '%s' existe déjà." + +#: lib/tools_dlg.tcl:151 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" +"Impossible d'ajouter l'outil :\n" +"%s" + +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" +msgstr "Supprimer l'outil" + +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" +msgstr "Supprimer des commandes d'outil" + +#: lib/tools_dlg.tcl:200 +msgid "Remove" +msgstr "Supprimer" + +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" +msgstr "(Le bleu indique des outils locaux au dépôt)" + +#: lib/tools_dlg.tcl:297 +#, tcl-format +msgid "Run Command: %s" +msgstr "Lancer commande : %s" + +#: lib/tools_dlg.tcl:311 +msgid "Arguments" +msgstr "Arguments" + +#: lib/tools_dlg.tcl:348 +msgid "OK" +msgstr "OK" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Récupération des dernières modifications de %s" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "purger à distance %s" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Nettoyer les branches de suivi supprimées de %s" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Les modifications sont poussées vers %s" + - #: lib/transport.tcl:72 ++#: lib/transport.tcl:64 ++#, tcl-format ++msgid "Mirroring to %s" ++msgstr "Dupliquer dans %s" ++ ++#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "Pousse %s %s vers %s" + - #: lib/transport.tcl:89 ++#: lib/transport.tcl:100 +msgid "Push Branches" +msgstr "Pousser branches" + - #: lib/transport.tcl:103 ++#: lib/transport.tcl:114 +msgid "Source Branches" +msgstr "Branches source" + - #: lib/transport.tcl:120 ++#: lib/transport.tcl:131 +msgid "Destination Repository" +msgstr "Dépôt de destination" + - #: lib/transport.tcl:158 ++#: lib/transport.tcl:169 +msgid "Transfer Options" +msgstr "Options de transfert" + - #: lib/transport.tcl:160 ++#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "" +"Forcer l'écrasement d'une branche existante (peut supprimer des " +"modifications)" + - #: lib/transport.tcl:164 ++#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" +msgstr "Utiliser des petits paquets (pour les connexions lentes)" + - #: lib/transport.tcl:168 ++#: lib/transport.tcl:179 +msgid "Include tags" +msgstr "Inclure les marques (tags)" + ++#~ msgid "Cannot use funny .git directory:" ++#~ msgstr "Impossible d'utiliser le répertoire .git:" ++ ++#~ msgid "Preferences..." ++#~ msgstr "Préférences..." ++ ++#~ msgid "Always (Do not perform merge test.)" ++#~ msgstr "Toujours (Ne pas faire de test de fusion.)" diff --cc git-gui/po/git-gui.pot index 074582d97,000000000..1ae2aaa0b mode 100644,000000..100644 --- a/git-gui/po/git-gui.pot +++ b/git-gui/po/git-gui.pot @@@ -1,2374 -1,0 +1,2394 @@@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-12-08 08:31-0800\n" ++"POT-Creation-Date: 2010-01-26 15:47-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + - #: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 - #: git-gui.sh:866 ++#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 ++#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "" + - #: git-gui.sh:689 ++#: git-gui.sh:743 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "" + - #: git-gui.sh:723 ++#: git-gui.sh:779 +msgid "Main Font" +msgstr "" + - #: git-gui.sh:724 ++#: git-gui.sh:780 +msgid "Diff/Console Font" +msgstr "" + - #: git-gui.sh:738 ++#: git-gui.sh:794 +msgid "Cannot find git in PATH." +msgstr "" + - #: git-gui.sh:765 ++#: git-gui.sh:821 +msgid "Cannot parse Git version string:" +msgstr "" + - #: git-gui.sh:783 ++#: git-gui.sh:839 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" + - #: git-gui.sh:1062 ++#: git-gui.sh:1128 +msgid "Git directory not found:" +msgstr "" + - #: git-gui.sh:1069 ++#: git-gui.sh:1146 +msgid "Cannot move to top of working directory:" +msgstr "" + - #: git-gui.sh:1076 - msgid "Cannot use funny .git directory:" ++#: git-gui.sh:1154 ++msgid "Cannot use bare repository:" +msgstr "" + - #: git-gui.sh:1081 ++#: git-gui.sh:1162 +msgid "No working directory" +msgstr "" + - #: git-gui.sh:1247 lib/checkout_op.tcl:305 ++#: git-gui.sh:1334 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "" + - #: git-gui.sh:1303 ++#: git-gui.sh:1390 +msgid "Scanning for modified files ..." +msgstr "" + - #: git-gui.sh:1367 ++#: git-gui.sh:1454 +msgid "Calling prepare-commit-msg hook..." +msgstr "" + - #: git-gui.sh:1384 ++#: git-gui.sh:1471 +msgid "Commit declined by prepare-commit-msg hook." +msgstr "" + - #: git-gui.sh:1542 lib/browser.tcl:246 ++#: git-gui.sh:1629 lib/browser.tcl:246 +msgid "Ready." +msgstr "" + - #: git-gui.sh:1726 ++#: git-gui.sh:1787 +#, tcl-format +msgid "Displaying only %s of %s files." +msgstr "" + - #: git-gui.sh:1819 ++#: git-gui.sh:1913 +msgid "Unmodified" +msgstr "" + - #: git-gui.sh:1821 ++#: git-gui.sh:1915 +msgid "Modified, not staged" +msgstr "" + - #: git-gui.sh:1822 git-gui.sh:1830 ++#: git-gui.sh:1916 git-gui.sh:1924 +msgid "Staged for commit" +msgstr "" + - #: git-gui.sh:1823 git-gui.sh:1831 ++#: git-gui.sh:1917 git-gui.sh:1925 +msgid "Portions staged for commit" +msgstr "" + - #: git-gui.sh:1824 git-gui.sh:1832 ++#: git-gui.sh:1918 git-gui.sh:1926 +msgid "Staged for commit, missing" +msgstr "" + - #: git-gui.sh:1826 ++#: git-gui.sh:1920 +msgid "File type changed, not staged" +msgstr "" + - #: git-gui.sh:1827 ++#: git-gui.sh:1921 +msgid "File type changed, staged" +msgstr "" + - #: git-gui.sh:1829 ++#: git-gui.sh:1923 +msgid "Untracked, not staged" +msgstr "" + - #: git-gui.sh:1834 ++#: git-gui.sh:1928 +msgid "Missing" +msgstr "" + - #: git-gui.sh:1835 ++#: git-gui.sh:1929 +msgid "Staged for removal" +msgstr "" + - #: git-gui.sh:1836 ++#: git-gui.sh:1930 +msgid "Staged for removal, still present" +msgstr "" + - #: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 - #: git-gui.sh:1842 git-gui.sh:1843 ++#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 ++#: git-gui.sh:1936 git-gui.sh:1937 +msgid "Requires merge resolution" +msgstr "" + - #: git-gui.sh:1878 ++#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." +msgstr "" + - #: git-gui.sh:1887 ++#: git-gui.sh:1984 +msgid "Couldn't find gitk in PATH" +msgstr "" + - #: git-gui.sh:2280 lib/choose_repository.tcl:36 ++#: git-gui.sh:2043 ++msgid "Couldn't find git gui in PATH" ++msgstr "" ++ ++#: git-gui.sh:2455 lib/choose_repository.tcl:36 +msgid "Repository" +msgstr "" + - #: git-gui.sh:2281 ++#: git-gui.sh:2456 +msgid "Edit" +msgstr "" + - #: git-gui.sh:2283 lib/choose_rev.tcl:561 ++#: git-gui.sh:2458 lib/choose_rev.tcl:561 +msgid "Branch" +msgstr "" + - #: git-gui.sh:2286 lib/choose_rev.tcl:548 ++#: git-gui.sh:2461 lib/choose_rev.tcl:548 +msgid "Commit@@noun" +msgstr "" + - #: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "" + - #: git-gui.sh:2290 lib/choose_rev.tcl:557 ++#: git-gui.sh:2465 lib/choose_rev.tcl:557 +msgid "Remote" +msgstr "" + - #: git-gui.sh:2293 ++#: git-gui.sh:2468 +msgid "Tools" +msgstr "" + - #: git-gui.sh:2302 ++#: git-gui.sh:2477 +msgid "Explore Working Copy" +msgstr "" + - #: git-gui.sh:2307 ++#: git-gui.sh:2483 +msgid "Browse Current Branch's Files" +msgstr "" + - #: git-gui.sh:2311 ++#: git-gui.sh:2487 +msgid "Browse Branch Files..." +msgstr "" + - #: git-gui.sh:2316 ++#: git-gui.sh:2492 +msgid "Visualize Current Branch's History" +msgstr "" + - #: git-gui.sh:2320 ++#: git-gui.sh:2496 +msgid "Visualize All Branch History" +msgstr "" + - #: git-gui.sh:2327 ++#: git-gui.sh:2503 +#, tcl-format +msgid "Browse %s's Files" +msgstr "" + - #: git-gui.sh:2329 ++#: git-gui.sh:2505 +#, tcl-format +msgid "Visualize %s's History" +msgstr "" + - #: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "" + - #: git-gui.sh:2337 lib/database.tcl:34 ++#: git-gui.sh:2513 lib/database.tcl:34 +msgid "Compress Database" +msgstr "" + - #: git-gui.sh:2340 ++#: git-gui.sh:2516 +msgid "Verify Database" +msgstr "" + - #: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 - #: lib/shortcut.tcl:39 lib/shortcut.tcl:71 ++#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 ++#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +msgid "Create Desktop Icon" +msgstr "" + - #: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 ++#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +msgid "Quit" +msgstr "" + - #: git-gui.sh:2371 ++#: git-gui.sh:2547 +msgid "Undo" +msgstr "" + - #: git-gui.sh:2374 ++#: git-gui.sh:2550 +msgid "Redo" +msgstr "" + - #: git-gui.sh:2378 git-gui.sh:2937 ++#: git-gui.sh:2554 git-gui.sh:3109 +msgid "Cut" +msgstr "" + - #: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096 ++#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "" + - #: git-gui.sh:2384 git-gui.sh:2943 ++#: git-gui.sh:2560 git-gui.sh:3115 +msgid "Paste" +msgstr "" + - #: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26 ++#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "" + - #: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71 ++#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +msgid "Select All" +msgstr "" + - #: git-gui.sh:2400 ++#: git-gui.sh:2576 +msgid "Create..." +msgstr "" + - #: git-gui.sh:2406 ++#: git-gui.sh:2582 +msgid "Checkout..." +msgstr "" + - #: git-gui.sh:2412 ++#: git-gui.sh:2588 +msgid "Rename..." +msgstr "" + - #: git-gui.sh:2417 ++#: git-gui.sh:2593 +msgid "Delete..." +msgstr "" + - #: git-gui.sh:2422 ++#: git-gui.sh:2598 +msgid "Reset..." +msgstr "" + - #: git-gui.sh:2432 ++#: git-gui.sh:2608 +msgid "Done" +msgstr "" + - #: git-gui.sh:2434 ++#: git-gui.sh:2610 +msgid "Commit@@verb" +msgstr "" + - #: git-gui.sh:2443 git-gui.sh:2878 ++#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "" + - #: git-gui.sh:2451 git-gui.sh:2885 ++#: git-gui.sh:2627 git-gui.sh:3057 +msgid "Amend Last Commit" +msgstr "" + - #: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "" + - #: git-gui.sh:2467 ++#: git-gui.sh:2643 +msgid "Stage To Commit" +msgstr "" + - #: git-gui.sh:2473 ++#: git-gui.sh:2649 +msgid "Stage Changed Files To Commit" +msgstr "" + - #: git-gui.sh:2479 ++#: git-gui.sh:2655 +msgid "Unstage From Commit" +msgstr "" + - #: git-gui.sh:2484 lib/index.tcl:410 ++#: git-gui.sh:2661 lib/index.tcl:412 +msgid "Revert Changes" +msgstr "" + - #: git-gui.sh:2491 git-gui.sh:3083 ++#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +msgid "Show Less Context" +msgstr "" + - #: git-gui.sh:2495 git-gui.sh:3087 ++#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +msgid "Show More Context" +msgstr "" + - #: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961 ++#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +msgid "Sign Off" +msgstr "" + - #: git-gui.sh:2518 ++#: git-gui.sh:2696 +msgid "Local Merge..." +msgstr "" + - #: git-gui.sh:2523 ++#: git-gui.sh:2701 +msgid "Abort Merge..." +msgstr "" + - #: git-gui.sh:2535 git-gui.sh:2575 ++#: git-gui.sh:2713 git-gui.sh:2741 +msgid "Add..." +msgstr "" + - #: git-gui.sh:2539 ++#: git-gui.sh:2717 +msgid "Push..." +msgstr "" + - #: git-gui.sh:2543 ++#: git-gui.sh:2721 +msgid "Delete Branch..." +msgstr "" + - #: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 - #, tcl-format - msgid "About %s" - msgstr "" - - #: git-gui.sh:2557 - msgid "Preferences..." - msgstr "" - - #: git-gui.sh:2565 git-gui.sh:3129 ++#: git-gui.sh:2731 git-gui.sh:3292 +msgid "Options..." +msgstr "" + - #: git-gui.sh:2576 ++#: git-gui.sh:2742 +msgid "Remove..." +msgstr "" + - #: git-gui.sh:2585 lib/choose_repository.tcl:50 ++#: git-gui.sh:2751 lib/choose_repository.tcl:50 +msgid "Help" +msgstr "" + - #: git-gui.sh:2611 ++#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 ++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 ++#, tcl-format ++msgid "About %s" ++msgstr "" ++ ++#: git-gui.sh:2783 +msgid "Online Documentation" +msgstr "" + - #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 ++#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +msgid "Show SSH Key" +msgstr "" + - #: git-gui.sh:2721 ++#: git-gui.sh:2893 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" + - #: git-gui.sh:2754 ++#: git-gui.sh:2926 +msgid "Current Branch:" +msgstr "" + - #: git-gui.sh:2775 ++#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" +msgstr "" + - #: git-gui.sh:2795 ++#: git-gui.sh:2967 +msgid "Unstaged Changes" +msgstr "" + - #: git-gui.sh:2845 ++#: git-gui.sh:3017 +msgid "Stage Changed" +msgstr "" + - #: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193 ++#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +msgid "Push" +msgstr "" + - #: git-gui.sh:2899 ++#: git-gui.sh:3071 +msgid "Initial Commit Message:" +msgstr "" + - #: git-gui.sh:2900 ++#: git-gui.sh:3072 +msgid "Amended Commit Message:" +msgstr "" + - #: git-gui.sh:2901 ++#: git-gui.sh:3073 +msgid "Amended Initial Commit Message:" +msgstr "" + - #: git-gui.sh:2902 ++#: git-gui.sh:3074 +msgid "Amended Merge Commit Message:" +msgstr "" + - #: git-gui.sh:2903 ++#: git-gui.sh:3075 +msgid "Merge Commit Message:" +msgstr "" + - #: git-gui.sh:2904 ++#: git-gui.sh:3076 +msgid "Commit Message:" +msgstr "" + - #: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73 ++#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +msgid "Copy All" +msgstr "" + - #: git-gui.sh:2977 lib/blame.tcl:104 ++#: git-gui.sh:3149 lib/blame.tcl:104 +msgid "File:" +msgstr "" + - #: git-gui.sh:3092 ++#: git-gui.sh:3255 +msgid "Refresh" +msgstr "" + - #: git-gui.sh:3113 ++#: git-gui.sh:3276 +msgid "Decrease Font Size" +msgstr "" + - #: git-gui.sh:3117 ++#: git-gui.sh:3280 +msgid "Increase Font Size" +msgstr "" + - #: git-gui.sh:3125 lib/blame.tcl:281 ++#: git-gui.sh:3288 lib/blame.tcl:281 +msgid "Encoding" +msgstr "" + - #: git-gui.sh:3136 ++#: git-gui.sh:3299 +msgid "Apply/Reverse Hunk" +msgstr "" + - #: git-gui.sh:3141 ++#: git-gui.sh:3304 +msgid "Apply/Reverse Line" +msgstr "" + - #: git-gui.sh:3151 ++#: git-gui.sh:3323 +msgid "Run Merge Tool" +msgstr "" + - #: git-gui.sh:3156 ++#: git-gui.sh:3328 +msgid "Use Remote Version" +msgstr "" + - #: git-gui.sh:3160 ++#: git-gui.sh:3332 +msgid "Use Local Version" +msgstr "" + - #: git-gui.sh:3164 ++#: git-gui.sh:3336 +msgid "Revert To Base" +msgstr "" + - #: git-gui.sh:3183 ++#: git-gui.sh:3354 ++msgid "Visualize These Changes In The Submodule" ++msgstr "" ++ ++#: git-gui.sh:3358 ++msgid "Visualize Current Branch History In The Submodule" ++msgstr "" ++ ++#: git-gui.sh:3362 ++msgid "Visualize All Branch History In The Submodule" ++msgstr "" ++ ++#: git-gui.sh:3367 ++msgid "Start git gui In The Submodule" ++msgstr "" ++ ++#: git-gui.sh:3389 +msgid "Unstage Hunk From Commit" +msgstr "" + - #: git-gui.sh:3184 ++#: git-gui.sh:3391 ++msgid "Unstage Lines From Commit" ++msgstr "" ++ ++#: git-gui.sh:3393 +msgid "Unstage Line From Commit" +msgstr "" + - #: git-gui.sh:3186 ++#: git-gui.sh:3396 +msgid "Stage Hunk For Commit" +msgstr "" + - #: git-gui.sh:3187 ++#: git-gui.sh:3398 ++msgid "Stage Lines For Commit" ++msgstr "" ++ ++#: git-gui.sh:3400 +msgid "Stage Line For Commit" +msgstr "" + - #: git-gui.sh:3210 ++#: git-gui.sh:3424 +msgid "Initializing..." +msgstr "" + - #: git-gui.sh:3315 ++#: git-gui.sh:3541 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" + - #: git-gui.sh:3345 ++#: git-gui.sh:3570 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" + - #: git-gui.sh:3350 ++#: git-gui.sh:3575 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "" + +#: lib/blame.tcl:72 +msgid "File Viewer" +msgstr "" + +#: lib/blame.tcl:78 +msgid "Commit:" +msgstr "" + +#: lib/blame.tcl:271 +msgid "Copy Commit" +msgstr "" + +#: lib/blame.tcl:275 +msgid "Find Text..." +msgstr "" + +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" +msgstr "" + +#: lib/blame.tcl:288 +msgid "Show History Context" +msgstr "" + +#: lib/blame.tcl:291 +msgid "Blame Parent Commit" +msgstr "" + +#: lib/blame.tcl:450 +#, tcl-format +msgid "Reading %s..." +msgstr "" + +#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." +msgstr "" + +#: lib/blame.tcl:577 +msgid "lines annotated" +msgstr "" + +#: lib/blame.tcl:769 +msgid "Loading original location annotations..." +msgstr "" + +#: lib/blame.tcl:772 +msgid "Annotation complete." +msgstr "" + +#: lib/blame.tcl:802 +msgid "Busy" +msgstr "" + +#: lib/blame.tcl:803 +msgid "Annotation process is already running." +msgstr "" + +#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." +msgstr "" + +#: lib/blame.tcl:910 +msgid "Loading annotation..." +msgstr "" + +#: lib/blame.tcl:963 +msgid "Author:" +msgstr "" + +#: lib/blame.tcl:967 +msgid "Committer:" +msgstr "" + +#: lib/blame.tcl:972 +msgid "Original File:" +msgstr "" + +#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" +msgstr "" + +#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" +msgstr "" + +#: lib/blame.tcl:1090 +msgid "Unable to display parent" +msgstr "" + - #: lib/blame.tcl:1091 lib/diff.tcl:297 ++#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" +msgstr "" + +#: lib/blame.tcl:1231 +msgid "Originally By:" +msgstr "" + +#: lib/blame.tcl:1237 +msgid "In File:" +msgstr "" + +#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" +msgstr "" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 - #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 ++#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 +#: lib/transport.tcl:108 +msgid "Cancel" +msgstr "" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" +msgstr "" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" +msgstr "" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +msgid "Create" +msgstr "" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "" + +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" +msgstr "" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "" + - #: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 ++#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" +msgstr "" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "" + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "" + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "" + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "" + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "" + - #: lib/branch_delete.tcl:54 - msgid "Always (Do not perform merge test.)" ++#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 ++msgid "Always (Do not perform merge checks)" +msgstr "" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "" + ++#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 ++msgid "" ++"Recovering deleted branches is difficult.\n" ++"\n" ++"Delete the selected branches?" ++msgstr "" ++ +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "" + - #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 ++#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "" + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "" + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "" + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "" + +#: lib/browser.tcl:126 lib/browser.tcl:143 +#, tcl-format +msgid "Loading %s..." +msgstr "" + +#: lib/browser.tcl:187 +msgid "[Up To Parent]" +msgstr "" + +#: lib/browser.tcl:267 lib/browser.tcl:273 +msgid "Browse Branch Files" +msgstr "" + - #: lib/browser.tcl:278 lib/choose_repository.tcl:394 - #: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 - #: lib/choose_repository.tcl:995 ++#: lib/browser.tcl:278 lib/choose_repository.tcl:398 ++#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 ++#: lib/choose_repository.tcl:1028 +msgid "Browse" +msgstr "" + - #: lib/checkout_op.tcl:84 ++#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "" + - #: lib/checkout_op.tcl:132 ++#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "" + - #: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 ++#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 +#: lib/sshkey.tcl:53 +msgid "Close" +msgstr "" + - #: lib/checkout_op.tcl:174 ++#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "" + - #: lib/checkout_op.tcl:193 ++#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." +msgstr "" + - #: lib/checkout_op.tcl:228 ++#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" + - #: lib/checkout_op.tcl:242 ++#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "" + - #: lib/checkout_op.tcl:261 ++#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "" + - #: lib/checkout_op.tcl:273 ++#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." +msgstr "" + - #: lib/checkout_op.tcl:288 ++#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" + - #: lib/checkout_op.tcl:344 ++#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "" + - #: lib/checkout_op.tcl:345 ++#: lib/checkout_op.tcl:346 +msgid "files checked out" +msgstr "" + - #: lib/checkout_op.tcl:375 ++#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "" + - #: lib/checkout_op.tcl:376 ++#: lib/checkout_op.tcl:377 +msgid "File level merge required." +msgstr "" + - #: lib/checkout_op.tcl:380 ++#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "" + - #: lib/checkout_op.tcl:451 ++#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" + - #: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472 ++#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#, tcl-format +msgid "Checked out '%s'." +msgstr "" + - #: lib/checkout_op.tcl:500 ++#: lib/checkout_op.tcl:535 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "" + - #: lib/checkout_op.tcl:522 ++#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." +msgstr "" + - #: lib/checkout_op.tcl:527 ++#: lib/checkout_op.tcl:562 +#, tcl-format +msgid "Reset '%s'?" +msgstr "" + - #: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 ++#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +msgid "Visualize" +msgstr "" + - #: lib/checkout_op.tcl:600 ++#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "" + +#: lib/choose_font.tcl:74 +msgid "Font Size" +msgstr "" + +#: lib/choose_font.tcl:91 +msgid "Font Example" +msgstr "" + +#: lib/choose_font.tcl:103 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" + +#: lib/choose_repository.tcl:28 +msgid "Git Gui" +msgstr "" + - #: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 ++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +msgid "Create New Repository" +msgstr "" + +#: lib/choose_repository.tcl:93 +msgid "New..." +msgstr "" + - #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 ++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +msgid "Clone Existing Repository" +msgstr "" + +#: lib/choose_repository.tcl:106 +msgid "Clone..." +msgstr "" + - #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 ++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +msgid "Open Existing Repository" +msgstr "" + +#: lib/choose_repository.tcl:119 +msgid "Open..." +msgstr "" + +#: lib/choose_repository.tcl:132 +msgid "Recent Repositories" +msgstr "" + +#: lib/choose_repository.tcl:138 +msgid "Open Recent Repository:" +msgstr "" + - #: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 - #: lib/choose_repository.tcl:316 ++#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 ++#: lib/choose_repository.tcl:320 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "" + - #: lib/choose_repository.tcl:387 ++#: lib/choose_repository.tcl:391 +msgid "Directory:" +msgstr "" + - #: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 - #: lib/choose_repository.tcl:1017 ++#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 ++#: lib/choose_repository.tcl:1052 +msgid "Git Repository" +msgstr "" + - #: lib/choose_repository.tcl:442 ++#: lib/choose_repository.tcl:448 +#, tcl-format +msgid "Directory %s already exists." +msgstr "" + - #: lib/choose_repository.tcl:446 ++#: lib/choose_repository.tcl:452 +#, tcl-format +msgid "File %s already exists." +msgstr "" + - #: lib/choose_repository.tcl:460 ++#: lib/choose_repository.tcl:466 +msgid "Clone" +msgstr "" + - #: lib/choose_repository.tcl:473 ++#: lib/choose_repository.tcl:479 +msgid "Source Location:" +msgstr "" + - #: lib/choose_repository.tcl:484 ++#: lib/choose_repository.tcl:490 +msgid "Target Directory:" +msgstr "" + - #: lib/choose_repository.tcl:496 ++#: lib/choose_repository.tcl:502 +msgid "Clone Type:" +msgstr "" + - #: lib/choose_repository.tcl:502 ++#: lib/choose_repository.tcl:508 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "" + - #: lib/choose_repository.tcl:508 ++#: lib/choose_repository.tcl:514 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "" + - #: lib/choose_repository.tcl:514 ++#: lib/choose_repository.tcl:520 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "" + - #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 - #: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 - #: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 ++#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 ++#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 ++#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "" + - #: lib/choose_repository.tcl:586 ++#: lib/choose_repository.tcl:592 +msgid "Standard only available for local repository." +msgstr "" + - #: lib/choose_repository.tcl:590 ++#: lib/choose_repository.tcl:596 +msgid "Shared only available for local repository." +msgstr "" + - #: lib/choose_repository.tcl:611 ++#: lib/choose_repository.tcl:617 +#, tcl-format +msgid "Location %s already exists." +msgstr "" + - #: lib/choose_repository.tcl:622 ++#: lib/choose_repository.tcl:628 +msgid "Failed to configure origin" +msgstr "" + - #: lib/choose_repository.tcl:634 ++#: lib/choose_repository.tcl:640 +msgid "Counting objects" +msgstr "" + - #: lib/choose_repository.tcl:635 ++#: lib/choose_repository.tcl:641 +msgid "buckets" +msgstr "" + - #: lib/choose_repository.tcl:659 ++#: lib/choose_repository.tcl:665 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "" + - #: lib/choose_repository.tcl:695 ++#: lib/choose_repository.tcl:701 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "" + - #: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 - #: lib/choose_repository.tcl:923 ++#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 ++#: lib/choose_repository.tcl:929 +msgid "The 'master' branch has not been initialized." +msgstr "" + - #: lib/choose_repository.tcl:710 ++#: lib/choose_repository.tcl:716 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "" + - #: lib/choose_repository.tcl:722 ++#: lib/choose_repository.tcl:728 +#, tcl-format +msgid "Cloning from %s" +msgstr "" + - #: lib/choose_repository.tcl:753 ++#: lib/choose_repository.tcl:759 +msgid "Copying objects" +msgstr "" + - #: lib/choose_repository.tcl:754 ++#: lib/choose_repository.tcl:760 +msgid "KiB" +msgstr "" + - #: lib/choose_repository.tcl:778 ++#: lib/choose_repository.tcl:784 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "" + - #: lib/choose_repository.tcl:788 ++#: lib/choose_repository.tcl:794 +msgid "Linking objects" +msgstr "" + - #: lib/choose_repository.tcl:789 ++#: lib/choose_repository.tcl:795 +msgid "objects" +msgstr "" + - #: lib/choose_repository.tcl:797 ++#: lib/choose_repository.tcl:803 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "" + - #: lib/choose_repository.tcl:852 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "" + - #: lib/choose_repository.tcl:863 ++#: lib/choose_repository.tcl:869 +msgid "Cannot fetch tags. See console output for details." +msgstr "" + - #: lib/choose_repository.tcl:887 ++#: lib/choose_repository.tcl:893 +msgid "Cannot determine HEAD. See console output for details." +msgstr "" + - #: lib/choose_repository.tcl:896 ++#: lib/choose_repository.tcl:902 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "" + - #: lib/choose_repository.tcl:902 ++#: lib/choose_repository.tcl:908 +msgid "Clone failed." +msgstr "" + - #: lib/choose_repository.tcl:909 ++#: lib/choose_repository.tcl:915 +msgid "No default branch obtained." +msgstr "" + - #: lib/choose_repository.tcl:920 ++#: lib/choose_repository.tcl:926 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "" + - #: lib/choose_repository.tcl:932 ++#: lib/choose_repository.tcl:938 +msgid "Creating working directory" +msgstr "" + - #: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 - #: lib/index.tcl:196 ++#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 ++#: lib/index.tcl:198 +msgid "files" +msgstr "" + - #: lib/choose_repository.tcl:962 ++#: lib/choose_repository.tcl:968 +msgid "Initial file checkout failed." +msgstr "" + - #: lib/choose_repository.tcl:978 ++#: lib/choose_repository.tcl:1011 +msgid "Open" +msgstr "" + - #: lib/choose_repository.tcl:988 ++#: lib/choose_repository.tcl:1021 +msgid "Repository:" +msgstr "" + - #: lib/choose_repository.tcl:1037 ++#: lib/choose_repository.tcl:1072 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +msgid "Tag" +msgstr "" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "" + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "" + +#: lib/choose_rev.tcl:531 +msgid "Updated" +msgstr "" + +#: lib/choose_rev.tcl:559 +msgid "URL" +msgstr "" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" + +#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "" + +#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "" + +#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "" + - #: lib/commit.tcl:132 ++#: lib/commit.tcl:129 ++#, tcl-format ++msgid "warning: Tcl does not support encoding '%s'." ++msgstr "" ++ ++#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" + - #: lib/commit.tcl:155 ++#: lib/commit.tcl:172 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" + - #: lib/commit.tcl:163 ++#: lib/commit.tcl:180 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" + - #: lib/commit.tcl:171 ++#: lib/commit.tcl:188 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" + - #: lib/commit.tcl:186 ++#: lib/commit.tcl:203 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" + - #: lib/commit.tcl:210 - #, tcl-format - msgid "warning: Tcl does not support encoding '%s'." - msgstr "" - - #: lib/commit.tcl:226 ++#: lib/commit.tcl:234 +msgid "Calling pre-commit hook..." +msgstr "" + - #: lib/commit.tcl:241 ++#: lib/commit.tcl:249 +msgid "Commit declined by pre-commit hook." +msgstr "" + - #: lib/commit.tcl:264 ++#: lib/commit.tcl:272 +msgid "Calling commit-msg hook..." +msgstr "" + - #: lib/commit.tcl:279 ++#: lib/commit.tcl:287 +msgid "Commit declined by commit-msg hook." +msgstr "" + - #: lib/commit.tcl:292 ++#: lib/commit.tcl:300 +msgid "Committing changes..." +msgstr "" + - #: lib/commit.tcl:308 ++#: lib/commit.tcl:316 +msgid "write-tree failed:" +msgstr "" + - #: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373 ++#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +msgid "Commit failed." +msgstr "" + - #: lib/commit.tcl:326 ++#: lib/commit.tcl:334 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "" + - #: lib/commit.tcl:331 ++#: lib/commit.tcl:339 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" + - #: lib/commit.tcl:338 ++#: lib/commit.tcl:346 +msgid "No changes to commit." +msgstr "" + - #: lib/commit.tcl:352 ++#: lib/commit.tcl:360 +msgid "commit-tree failed:" +msgstr "" + - #: lib/commit.tcl:372 ++#: lib/commit.tcl:381 +msgid "update-ref failed:" +msgstr "" + - #: lib/commit.tcl:460 ++#: lib/commit.tcl:469 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "" + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "" + +#: lib/console.tcl:186 +msgid "Success" +msgstr "" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "" + - #: lib/database.tcl:108 ++#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " - "the database when more than %i loose objects exist.\n" ++"the database.\n" +"\n" +"Compress the database now?" +msgstr "" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "" + - #: lib/diff.tcl:59 ++#: lib/diff.tcl:64 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" + - #: lib/diff.tcl:99 ++#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "" + - #: lib/diff.tcl:120 ++#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" + - #: lib/diff.tcl:125 ++#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" + - #: lib/diff.tcl:132 ++#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "" + - #: lib/diff.tcl:135 ++#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "" + - #: lib/diff.tcl:197 lib/diff.tcl:296 ++#: lib/diff.tcl:202 lib/diff.tcl:319 +#, tcl-format +msgid "Unable to display %s" +msgstr "" + - #: lib/diff.tcl:198 ++#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "" + - #: lib/diff.tcl:205 ++#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "" + - #: lib/diff.tcl:217 ++#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." +msgstr "" + - #: lib/diff.tcl:222 ++#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" + - #: lib/diff.tcl:228 ++#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" + - #: lib/diff.tcl:436 ++#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." +msgstr "" + - #: lib/diff.tcl:443 ++#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." +msgstr "" + - #: lib/diff.tcl:509 ++#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." +msgstr "" + - #: lib/diff.tcl:517 ++#: lib/diff.tcl:576 +msgid "Failed to stage selected line." +msgstr "" + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "" + +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" +msgstr "" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "" + +#: lib/error.tcl:94 +msgid "You must correct the above errors before committing." +msgstr "" + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "" + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "" + - #: lib/index.tcl:21 ++#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" + - #: lib/index.tcl:27 ++#: lib/index.tcl:28 +msgid "Continue" +msgstr "" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "" + - #: lib/index.tcl:287 ++#: lib/index.tcl:289 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "" + - #: lib/index.tcl:326 ++#: lib/index.tcl:328 +msgid "Ready to commit." +msgstr "" + - #: lib/index.tcl:339 ++#: lib/index.tcl:341 +#, tcl-format +msgid "Adding %s" +msgstr "" + - #: lib/index.tcl:396 ++#: lib/index.tcl:398 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "" + - #: lib/index.tcl:398 ++#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "" + - #: lib/index.tcl:406 ++#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" + - #: lib/index.tcl:409 ++#: lib/index.tcl:411 +msgid "Do Nothing" +msgstr "" + - #: lib/index.tcl:427 ++#: lib/index.tcl:429 +msgid "Reverting selected files" +msgstr "" + - #: lib/index.tcl:431 ++#: lib/index.tcl:433 +#, tcl-format +msgid "Reverting %s" +msgstr "" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" + +#: lib/merge.tcl:45 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" + +#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" + +#: lib/merge.tcl:107 +#, tcl-format +msgid "%s of %s" +msgstr "" + +#: lib/merge.tcl:120 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "" + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "" + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "" + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "" + +#: lib/merge.tcl:239 +msgid "files reset" +msgstr "" + +#: lib/merge.tcl:267 +msgid "Abort failed." +msgstr "" + +#: lib/merge.tcl:269 +msgid "Abort completed. Ready." +msgstr "" + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "" + +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "" + +#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "" + +#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "" + +#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" +msgstr "" + +#: lib/mergetool.tcl:323 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" + +#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" + +#: lib/mergetool.tcl:347 +msgid "Running merge tool..." +msgstr "" + +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." +msgstr "" + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "" + +#: lib/option.tcl:117 +msgid "Restore Defaults" +msgstr "" + +#: lib/option.tcl:121 +msgid "Save" +msgstr "" + +#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" +msgstr "" + +#: lib/option.tcl:132 +msgid "Global (All Repositories)" +msgstr "" + +#: lib/option.tcl:138 +msgid "User Name" +msgstr "" + +#: lib/option.tcl:139 +msgid "Email Address" +msgstr "" + +#: lib/option.tcl:141 +msgid "Summarize Merge Commits" +msgstr "" + +#: lib/option.tcl:142 +msgid "Merge Verbosity" +msgstr "" + +#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" +msgstr "" + +#: lib/option.tcl:144 +msgid "Use Merge Tool" +msgstr "" + +#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" +msgstr "" + +#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" +msgstr "" + +#: lib/option.tcl:148 +msgid "Match Tracking Branches" +msgstr "" + +#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" +msgstr "" + +#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" +msgstr "" + +#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" +msgstr "" + +#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" +msgstr "" + +#: lib/option.tcl:153 +msgid "Commit Message Text Width" +msgstr "" + +#: lib/option.tcl:154 +msgid "New Branch Name Template" +msgstr "" + +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" +msgstr "" + +#: lib/option.tcl:203 +msgid "Change" +msgstr "" + +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" +msgstr "" + +#: lib/option.tcl:254 +msgid "Change Font" +msgstr "" + +#: lib/option.tcl:258 +#, tcl-format +msgid "Choose %s" +msgstr "" + +#: lib/option.tcl:264 +msgid "pt." +msgstr "" + +#: lib/option.tcl:278 +msgid "Preferences" +msgstr "" + +#: lib/option.tcl:314 +msgid "Failed to completely save options:" +msgstr "" + +#: lib/remote.tcl:163 +msgid "Remove Remote" +msgstr "" + +#: lib/remote.tcl:168 +msgid "Prune from" +msgstr "" + +#: lib/remote.tcl:173 +msgid "Fetch from" +msgstr "" + +#: lib/remote.tcl:215 +msgid "Push to" +msgstr "" + +#: lib/remote_add.tcl:19 +msgid "Add Remote" +msgstr "" + +#: lib/remote_add.tcl:24 +msgid "Add New Remote" +msgstr "" + +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" +msgstr "" + +#: lib/remote_add.tcl:37 +msgid "Remote Details" +msgstr "" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "" + +#: lib/remote_add.tcl:62 +msgid "Further Action" +msgstr "" + +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" +msgstr "" + +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" +msgstr "" + +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" +msgstr "" + +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." +msgstr "" + +#: lib/remote_add.tcl:114 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "" + +#: lib/remote_add.tcl:125 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "" + +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "" + +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" +msgstr "" + +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "" + +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 +#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" +msgstr "" + +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" +msgstr "" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" +msgstr "" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "" + - #: lib/remote_branch_delete.tcl:119 - msgid "Always (Do not perform merge checks)" - msgstr "" - +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "" + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "" + - #: lib/remote_branch_delete.tcl:216 - msgid "" - "Recovering deleted branches is difficult.\n" - "\n" - "Delete the selected branches?" - msgstr "" - +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "" + - #: lib/remote_branch_delete.tcl:286 ++#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." +msgstr "" + - #: lib/remote_branch_delete.tcl:291 ++#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." +msgstr "" + +#: lib/search.tcl:21 +msgid "Find:" +msgstr "" + +#: lib/search.tcl:23 +msgid "Next" +msgstr "" + +#: lib/search.tcl:24 +msgid "Prev" +msgstr "" + +#: lib/search.tcl:25 +msgid "Case-Sensitive" +msgstr "" + - #: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "" + - #: lib/shortcut.tcl:136 ++#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "" + +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "" + +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "" + +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "" + +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "" + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "" + +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" +msgstr "" + +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" +msgstr "" + +#: lib/sshkey.tcl:78 +msgid "Generating..." +msgstr "" + +#: lib/sshkey.tcl:84 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" + +#: lib/sshkey.tcl:111 +msgid "Generation failed." +msgstr "" + +#: lib/sshkey.tcl:118 +msgid "Generation succeded, but no keys found." +msgstr "" + +#: lib/sshkey.tcl:121 +#, tcl-format +msgid "Your key is in: %s" +msgstr "" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "" + +#: lib/tools.tcl:90 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "" + +#: lib/tools.tcl:110 +#, tcl-format +msgid "Tool: %s" +msgstr "" + +#: lib/tools.tcl:111 +#, tcl-format +msgid "Running: %s" +msgstr "" + +#: lib/tools.tcl:149 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "" + +#: lib/tools.tcl:151 +#, tcl-format +msgid "Tool failed: %s" +msgstr "" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "" + +#: lib/tools_dlg.tcl:33 +msgid "Add globally" +msgstr "" + +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" +msgstr "" + +#: lib/tools_dlg.tcl:48 +msgid "Use '/' separators to create a submenu tree:" +msgstr "" + +#: lib/tools_dlg.tcl:61 +msgid "Command:" +msgstr "" + +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" +msgstr "" + +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "" + +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "" + +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" +msgstr "" + +#: lib/tools_dlg.tcl:97 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "" + +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." +msgstr "" + +#: lib/tools_dlg.tcl:129 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "" + +#: lib/tools_dlg.tcl:151 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" + +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" +msgstr "" + +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" +msgstr "" + +#: lib/tools_dlg.tcl:200 +msgid "Remove" +msgstr "" + +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" +msgstr "" + +#: lib/tools_dlg.tcl:297 +#, tcl-format +msgid "Run Command: %s" +msgstr "" + +#: lib/tools_dlg.tcl:311 +msgid "Arguments" +msgstr "" + +#: lib/tools_dlg.tcl:348 +msgid "OK" +msgstr "" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "" + +#: lib/transport.tcl:64 +#, tcl-format +msgid "Mirroring to %s" +msgstr "" + +#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "" + +#: lib/transport.tcl:100 +msgid "Push Branches" +msgstr "" + +#: lib/transport.tcl:114 +msgid "Source Branches" +msgstr "" + +#: lib/transport.tcl:131 +msgid "Destination Repository" +msgstr "" + +#: lib/transport.tcl:169 +msgid "Transfer Options" +msgstr "" + +#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "" + +#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" +msgstr "" + +#: lib/transport.tcl:179 +msgid "Include tags" +msgstr "" diff --cc git-gui/po/it.po index 762632c22,000000000..aa15a204d mode 100644,000000..100644 --- a/git-gui/po/it.po +++ b/git-gui/po/it.po @@@ -1,2567 -1,0 +1,2591 @@@ +# Translation of git-gui to Italian +# Copyright (C) 2007 Shawn Pearce +# This file is distributed under the same license as the git-gui package. +# Paolo Ciarrocchi , 2007 +# Michele Ballabio , 2007. +# +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-12-08 08:31-0800\n" - "PO-Revision-Date: 2008-12-09 13:04+0100\n" ++"POT-Creation-Date: 2010-01-26 15:47-0800\n" ++"PO-Revision-Date: 2010-01-28 10:04+0100\n" +"Last-Translator: Michele Ballabio \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + - #: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 - #: git-gui.sh:866 ++#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 ++#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "git-gui: errore grave" + - #: git-gui.sh:689 ++#: git-gui.sh:743 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Caratteri non validi specificati in %s:" + - #: git-gui.sh:723 ++#: git-gui.sh:779 +msgid "Main Font" +msgstr "Caratteri principali" + - #: git-gui.sh:724 ++#: git-gui.sh:780 +msgid "Diff/Console Font" +msgstr "Caratteri per confronti e terminale" + - #: git-gui.sh:738 ++#: git-gui.sh:794 +msgid "Cannot find git in PATH." +msgstr "Impossibile trovare git nel PATH" + - #: git-gui.sh:765 ++#: git-gui.sh:821 +msgid "Cannot parse Git version string:" +msgstr "Impossibile determinare la versione di Git:" + - #: git-gui.sh:783 ++#: git-gui.sh:839 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"La versione di Git non può essere determinata.\n" +"\n" +"%s riporta che la versione è '%s'.\n" +"\n" +"%s richiede almeno Git 1.5.0 o superiore.\n" +"\n" +"Assumere che '%s' sia alla versione 1.5.0?\n" + - #: git-gui.sh:1062 ++#: git-gui.sh:1128 +msgid "Git directory not found:" +msgstr "Non trovo la directory di git: " + - #: git-gui.sh:1069 ++#: git-gui.sh:1146 +msgid "Cannot move to top of working directory:" +msgstr "Impossibile spostarsi sulla directory principale del progetto:" + - #: git-gui.sh:1076 - msgid "Cannot use funny .git directory:" - msgstr "Impossibile usare una .git directory strana:" ++#: git-gui.sh:1154 ++msgid "Cannot use bare repository:" ++msgstr "Impossibile usare un archivio senza directory di lavoro:" + - #: git-gui.sh:1081 ++#: git-gui.sh:1162 +msgid "No working directory" +msgstr "Nessuna directory di lavoro" + - #: git-gui.sh:1247 lib/checkout_op.tcl:305 ++#: git-gui.sh:1334 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "Controllo dello stato dei file in corso..." + - #: git-gui.sh:1303 ++#: git-gui.sh:1390 +msgid "Scanning for modified files ..." +msgstr "Ricerca di file modificati in corso..." + - #: git-gui.sh:1367 ++#: git-gui.sh:1454 +msgid "Calling prepare-commit-msg hook..." +msgstr "Avvio prepare-commit-msg hook..." + - #: git-gui.sh:1384 ++#: git-gui.sh:1471 +msgid "Commit declined by prepare-commit-msg hook." +msgstr "Revisione rifiutata dal prepare-commit-msg hook." + - #: git-gui.sh:1542 lib/browser.tcl:246 ++#: git-gui.sh:1629 lib/browser.tcl:246 +msgid "Ready." +msgstr "Pronto." + - #: git-gui.sh:1819 ++#: git-gui.sh:1787 ++#, tcl-format ++msgid "Displaying only %s of %s files." ++msgstr "Saranno mostrati solo %s file su %s." ++ ++#: git-gui.sh:1913 +msgid "Unmodified" +msgstr "Non modificato" + - #: git-gui.sh:1821 ++#: git-gui.sh:1915 +msgid "Modified, not staged" +msgstr "Modificato, non preparato per una nuova revisione" + - #: git-gui.sh:1822 git-gui.sh:1830 ++#: git-gui.sh:1916 git-gui.sh:1924 +msgid "Staged for commit" +msgstr "Preparato per una nuova revisione" + - #: git-gui.sh:1823 git-gui.sh:1831 ++#: git-gui.sh:1917 git-gui.sh:1925 +msgid "Portions staged for commit" +msgstr "Parti preparate per una nuova revisione" + - #: git-gui.sh:1824 git-gui.sh:1832 ++#: git-gui.sh:1918 git-gui.sh:1926 +msgid "Staged for commit, missing" +msgstr "Preparato per una nuova revisione, mancante" + - #: git-gui.sh:1826 ++#: git-gui.sh:1920 +msgid "File type changed, not staged" +msgstr "Tipo di file modificato, non preparato per una nuova revisione" + - #: git-gui.sh:1827 ++#: git-gui.sh:1921 +msgid "File type changed, staged" +msgstr "Tipo di file modificato, preparato per una nuova revisione" + - #: git-gui.sh:1829 ++#: git-gui.sh:1923 +msgid "Untracked, not staged" +msgstr "Non tracciato, non preparato per una nuova revisione" + - #: git-gui.sh:1834 ++#: git-gui.sh:1928 +msgid "Missing" +msgstr "Mancante" + - #: git-gui.sh:1835 ++#: git-gui.sh:1929 +msgid "Staged for removal" +msgstr "Preparato per la rimozione" + - #: git-gui.sh:1836 ++#: git-gui.sh:1930 +msgid "Staged for removal, still present" +msgstr "Preparato alla rimozione, ancora presente" + - #: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 - #: git-gui.sh:1842 git-gui.sh:1843 ++#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 ++#: git-gui.sh:1936 git-gui.sh:1937 +msgid "Requires merge resolution" +msgstr "Richiede risoluzione dei conflitti" + - #: git-gui.sh:1878 ++#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." +msgstr "Avvio di gitk... attendere..." + - #: git-gui.sh:1887 ++#: git-gui.sh:1984 +msgid "Couldn't find gitk in PATH" +msgstr "Impossibile trovare gitk nel PATH" + - #: git-gui.sh:2280 lib/choose_repository.tcl:36 ++#: git-gui.sh:2043 ++msgid "Couldn't find git gui in PATH" ++msgstr "Impossibile trovare git gui nel PATH" ++ ++#: git-gui.sh:2455 lib/choose_repository.tcl:36 +msgid "Repository" +msgstr "Archivio" + - #: git-gui.sh:2281 ++#: git-gui.sh:2456 +msgid "Edit" +msgstr "Modifica" + - #: git-gui.sh:2283 lib/choose_rev.tcl:561 ++#: git-gui.sh:2458 lib/choose_rev.tcl:561 +msgid "Branch" +msgstr "Ramo" + - #: git-gui.sh:2286 lib/choose_rev.tcl:548 ++#: git-gui.sh:2461 lib/choose_rev.tcl:548 +msgid "Commit@@noun" +msgstr "Revisione" + - #: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Fusione (Merge)" + - #: git-gui.sh:2290 lib/choose_rev.tcl:557 ++#: git-gui.sh:2465 lib/choose_rev.tcl:557 +msgid "Remote" +msgstr "Remoto" + - #: git-gui.sh:2293 ++#: git-gui.sh:2468 +msgid "Tools" - msgstr "Strumenti" ++msgstr "Accessori" + - #: git-gui.sh:2302 ++#: git-gui.sh:2477 +msgid "Explore Working Copy" +msgstr "Esplora copia di lavoro" + - #: git-gui.sh:2307 ++#: git-gui.sh:2483 +msgid "Browse Current Branch's Files" +msgstr "Esplora i file del ramo attuale" + - #: git-gui.sh:2311 ++#: git-gui.sh:2487 +msgid "Browse Branch Files..." +msgstr "Esplora i file del ramo..." + - #: git-gui.sh:2316 ++#: git-gui.sh:2492 +msgid "Visualize Current Branch's History" +msgstr "Visualizza la cronologia del ramo attuale" + - #: git-gui.sh:2320 ++#: git-gui.sh:2496 +msgid "Visualize All Branch History" +msgstr "Visualizza la cronologia di tutti i rami" + - #: git-gui.sh:2327 ++#: git-gui.sh:2503 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Esplora i file di %s" + - #: git-gui.sh:2329 ++#: git-gui.sh:2505 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Visualizza la cronologia di %s" + - #: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Statistiche dell'archivio" + - #: git-gui.sh:2337 lib/database.tcl:34 ++#: git-gui.sh:2513 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Comprimi l'archivio" + - #: git-gui.sh:2340 ++#: git-gui.sh:2516 +msgid "Verify Database" +msgstr "Verifica l'archivio" + - #: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 - #: lib/shortcut.tcl:39 lib/shortcut.tcl:71 ++#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 ++#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +msgid "Create Desktop Icon" +msgstr "Crea icona desktop" + - #: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 ++#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +msgid "Quit" +msgstr "Esci" + - #: git-gui.sh:2371 ++#: git-gui.sh:2547 +msgid "Undo" +msgstr "Annulla" + - #: git-gui.sh:2374 ++#: git-gui.sh:2550 +msgid "Redo" +msgstr "Ripeti" + - #: git-gui.sh:2378 git-gui.sh:2937 ++#: git-gui.sh:2554 git-gui.sh:3109 +msgid "Cut" +msgstr "Taglia" + - #: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096 ++#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "Copia" + - #: git-gui.sh:2384 git-gui.sh:2943 ++#: git-gui.sh:2560 git-gui.sh:3115 +msgid "Paste" +msgstr "Incolla" + - #: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26 ++#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Elimina" + - #: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71 ++#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +msgid "Select All" +msgstr "Seleziona tutto" + - #: git-gui.sh:2400 ++#: git-gui.sh:2576 +msgid "Create..." +msgstr "Crea..." + - #: git-gui.sh:2406 ++#: git-gui.sh:2582 +msgid "Checkout..." +msgstr "Attiva..." + - #: git-gui.sh:2412 ++#: git-gui.sh:2588 +msgid "Rename..." +msgstr "Rinomina" + - #: git-gui.sh:2417 ++#: git-gui.sh:2593 +msgid "Delete..." +msgstr "Elimina..." + - #: git-gui.sh:2422 ++#: git-gui.sh:2598 +msgid "Reset..." +msgstr "Ripristina..." + - #: git-gui.sh:2432 ++#: git-gui.sh:2608 +msgid "Done" +msgstr "Fatto" + - #: git-gui.sh:2434 ++#: git-gui.sh:2610 +msgid "Commit@@verb" +msgstr "Nuova revisione" + - #: git-gui.sh:2443 git-gui.sh:2878 ++#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "Nuova revisione" + - #: git-gui.sh:2451 git-gui.sh:2885 ++#: git-gui.sh:2627 git-gui.sh:3057 +msgid "Amend Last Commit" +msgstr "Correggi l'ultima revisione" + - #: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Analizza nuovamente" + - #: git-gui.sh:2467 ++#: git-gui.sh:2643 +msgid "Stage To Commit" +msgstr "Prepara per una nuova revisione" + - #: git-gui.sh:2473 ++#: git-gui.sh:2649 +msgid "Stage Changed Files To Commit" +msgstr "Prepara i file modificati per una nuova revisione" + - #: git-gui.sh:2479 ++#: git-gui.sh:2655 +msgid "Unstage From Commit" +msgstr "Annulla preparazione" + - #: git-gui.sh:2484 lib/index.tcl:410 ++#: git-gui.sh:2661 lib/index.tcl:412 +msgid "Revert Changes" +msgstr "Annulla modifiche" + - #: git-gui.sh:2491 git-gui.sh:3083 ++#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +msgid "Show Less Context" +msgstr "Mostra meno contesto" + - #: git-gui.sh:2495 git-gui.sh:3087 ++#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +msgid "Show More Context" +msgstr "Mostra più contesto" + - #: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961 ++#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +msgid "Sign Off" +msgstr "Sign Off" + - #: git-gui.sh:2518 ++#: git-gui.sh:2696 +msgid "Local Merge..." +msgstr "Fusione locale..." + - #: git-gui.sh:2523 ++#: git-gui.sh:2701 +msgid "Abort Merge..." +msgstr "Interrompi fusione..." + - #: git-gui.sh:2535 git-gui.sh:2575 ++#: git-gui.sh:2713 git-gui.sh:2741 +msgid "Add..." +msgstr "Aggiungi..." + - #: git-gui.sh:2539 ++#: git-gui.sh:2717 +msgid "Push..." +msgstr "Propaga..." + - #: git-gui.sh:2543 ++#: git-gui.sh:2721 +msgid "Delete Branch..." +msgstr "Elimina ramo..." + - #: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 - #, tcl-format - msgid "About %s" - msgstr "Informazioni su %s" - - #: git-gui.sh:2557 - msgid "Preferences..." - msgstr "Preferenze..." - - #: git-gui.sh:2565 git-gui.sh:3129 ++#: git-gui.sh:2731 git-gui.sh:3292 +msgid "Options..." +msgstr "Opzioni..." + - #: git-gui.sh:2576 ++#: git-gui.sh:2742 +msgid "Remove..." +msgstr "Rimuovi..." + - #: git-gui.sh:2585 lib/choose_repository.tcl:50 ++#: git-gui.sh:2751 lib/choose_repository.tcl:50 +msgid "Help" +msgstr "Aiuto" + - #: git-gui.sh:2611 ++#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 ++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 ++#, tcl-format ++msgid "About %s" ++msgstr "Informazioni su %s" ++ ++#: git-gui.sh:2783 +msgid "Online Documentation" +msgstr "Documentazione sul web" + - #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 ++#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +msgid "Show SSH Key" +msgstr "Mostra chave SSH" + - #: git-gui.sh:2721 ++#: git-gui.sh:2893 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"errore grave: impossibile effettuare lo stat del path %s: file o directory " +"non trovata" + - #: git-gui.sh:2754 ++#: git-gui.sh:2926 +msgid "Current Branch:" +msgstr "Ramo attuale:" + - #: git-gui.sh:2775 ++#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" +msgstr "Modifiche preparate (saranno nella nuova revisione)" + - #: git-gui.sh:2795 ++#: git-gui.sh:2967 +msgid "Unstaged Changes" +msgstr "Modifiche non preparate" + - #: git-gui.sh:2845 ++#: git-gui.sh:3017 +msgid "Stage Changed" +msgstr "Prepara modificati" + - #: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193 ++#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +msgid "Push" +msgstr "Propaga (Push)" + - #: git-gui.sh:2899 ++#: git-gui.sh:3071 +msgid "Initial Commit Message:" +msgstr "Messaggio di revisione iniziale:" + - #: git-gui.sh:2900 ++#: git-gui.sh:3072 +msgid "Amended Commit Message:" +msgstr "Messaggio di revisione corretto:" + - #: git-gui.sh:2901 ++#: git-gui.sh:3073 +msgid "Amended Initial Commit Message:" +msgstr "Messaggio iniziale di revisione corretto:" + - #: git-gui.sh:2902 ++#: git-gui.sh:3074 +msgid "Amended Merge Commit Message:" +msgstr "Messaggio di fusione corretto:" + - #: git-gui.sh:2903 ++#: git-gui.sh:3075 +msgid "Merge Commit Message:" +msgstr "Messaggio di fusione:" + - #: git-gui.sh:2904 ++#: git-gui.sh:3076 +msgid "Commit Message:" +msgstr "Messaggio di revisione:" + - #: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73 ++#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +msgid "Copy All" +msgstr "Copia tutto" + - #: git-gui.sh:2977 lib/blame.tcl:104 ++#: git-gui.sh:3149 lib/blame.tcl:104 +msgid "File:" +msgstr "File:" + - #: git-gui.sh:3092 ++#: git-gui.sh:3255 +msgid "Refresh" +msgstr "Rinfresca" + - #: git-gui.sh:3113 ++#: git-gui.sh:3276 +msgid "Decrease Font Size" +msgstr "Diminuisci dimensione caratteri" + - #: git-gui.sh:3117 ++#: git-gui.sh:3280 +msgid "Increase Font Size" +msgstr "Aumenta dimensione caratteri" + - #: git-gui.sh:3125 lib/blame.tcl:281 ++#: git-gui.sh:3288 lib/blame.tcl:281 +msgid "Encoding" +msgstr "Codifica" + - #: git-gui.sh:3136 ++#: git-gui.sh:3299 +msgid "Apply/Reverse Hunk" +msgstr "Applica/Inverti sezione" + - #: git-gui.sh:3141 ++#: git-gui.sh:3304 +msgid "Apply/Reverse Line" +msgstr "Applica/Inverti riga" + - #: git-gui.sh:3151 ++#: git-gui.sh:3323 +msgid "Run Merge Tool" +msgstr "Avvia programma esterno per la risoluzione dei conflitti" + - #: git-gui.sh:3156 ++#: git-gui.sh:3328 +msgid "Use Remote Version" +msgstr "Usa versione remota" + - #: git-gui.sh:3160 ++#: git-gui.sh:3332 +msgid "Use Local Version" +msgstr "Usa versione locale" + - #: git-gui.sh:3164 ++#: git-gui.sh:3336 +msgid "Revert To Base" +msgstr "Ritorna alla revisione comune" + - #: git-gui.sh:3183 ++#: git-gui.sh:3354 ++msgid "Visualize These Changes In The Submodule" ++msgstr "Visualizza queste modifiche nel sottomodulo" ++ ++#: git-gui.sh:3358 ++msgid "Visualize Current Branch History In The Submodule" ++msgstr "Visualizza la cronologia del ramo attuale nel sottomodulo" ++ ++#: git-gui.sh:3362 ++msgid "Visualize All Branch History In The Submodule" ++msgstr "Visualizza la cronologia di tutti i rami nel sottomodulo" ++ ++#: git-gui.sh:3367 ++msgid "Start git gui In The Submodule" ++msgstr "Avvia git gui nel sottomodulo" ++ ++#: git-gui.sh:3389 +msgid "Unstage Hunk From Commit" +msgstr "Annulla preparazione della sezione per una nuova revisione" + - #: git-gui.sh:3184 ++#: git-gui.sh:3391 ++msgid "Unstage Lines From Commit" ++msgstr "Annulla preparazione delle linee per una nuova revisione" ++ ++#: git-gui.sh:3393 +msgid "Unstage Line From Commit" +msgstr "Annulla preparazione della linea per una nuova revisione" + - #: git-gui.sh:3186 ++#: git-gui.sh:3396 +msgid "Stage Hunk For Commit" +msgstr "Prepara sezione per una nuova revisione" + - #: git-gui.sh:3187 ++#: git-gui.sh:3398 ++msgid "Stage Lines For Commit" ++msgstr "Prepara linee per una nuova revisione" ++ ++#: git-gui.sh:3400 +msgid "Stage Line For Commit" +msgstr "Prepara linea per una nuova revisione" + - #: git-gui.sh:3210 ++#: git-gui.sh:3424 +msgid "Initializing..." +msgstr "Inizializzazione..." + - #: git-gui.sh:3315 ++#: git-gui.sh:3541 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"Possibili problemi con le variabili d'ambiente.\n" +"\n" +"Le seguenti variabili d'ambiente saranno probabilmente\n" +"ignorate da tutti i sottoprocessi di Git avviati\n" +"da %s:\n" +"\n" + - #: git-gui.sh:3345 ++#: git-gui.sh:3570 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"Ciò è dovuto a un problema conosciuto\n" +"causato dall'eseguibile Tcl distribuito da Cygwin." + - #: git-gui.sh:3350 ++#: git-gui.sh:3575 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"Una buona alternativa a %s\n" +"consiste nell'assegnare valori alle variabili di configurazione\n" +"user.name e user.email nel tuo file ~/.gitconfig personale.\n" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - un'interfaccia grafica per Git." + +#: lib/blame.tcl:72 +msgid "File Viewer" +msgstr "Mostra file" + +#: lib/blame.tcl:78 +msgid "Commit:" +msgstr "Revisione:" + +#: lib/blame.tcl:271 +msgid "Copy Commit" +msgstr "Copia revisione" + +#: lib/blame.tcl:275 +msgid "Find Text..." +msgstr "Trova testo..." + +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" +msgstr "Ricerca accurata delle copie" + +#: lib/blame.tcl:288 +msgid "Show History Context" +msgstr "Mostra contesto nella cronologia" + +#: lib/blame.tcl:291 +msgid "Blame Parent Commit" +msgstr "Annota la revisione precedente" + +#: lib/blame.tcl:450 +#, tcl-format +msgid "Reading %s..." +msgstr "Lettura di %s..." + +#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." +msgstr "Caricamento annotazioni per copie/spostamenti..." + +#: lib/blame.tcl:577 +msgid "lines annotated" +msgstr "linee annotate" + +#: lib/blame.tcl:769 +msgid "Loading original location annotations..." +msgstr "Caricamento annotazioni per posizione originaria..." + +#: lib/blame.tcl:772 +msgid "Annotation complete." +msgstr "Annotazione completata." + +#: lib/blame.tcl:802 +msgid "Busy" +msgstr "Occupato" + +#: lib/blame.tcl:803 +msgid "Annotation process is already running." +msgstr "Il processo di annotazione è già in corso." + +#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." +msgstr "Ricerca accurata delle copie in corso..." + +#: lib/blame.tcl:910 +msgid "Loading annotation..." +msgstr "Caricamento annotazioni..." + +#: lib/blame.tcl:963 +msgid "Author:" +msgstr "Autore:" + +#: lib/blame.tcl:967 +msgid "Committer:" +msgstr "Revisione creata da:" + +#: lib/blame.tcl:972 +msgid "Original File:" +msgstr "File originario:" + +#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" +msgstr "Impossibile trovare la revisione HEAD:" + +#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" +msgstr "Impossibile trovare la revisione precedente:" + +#: lib/blame.tcl:1090 +msgid "Unable to display parent" +msgstr "Impossibile visualizzare la revisione precedente" + - #: lib/blame.tcl:1091 lib/diff.tcl:297 ++#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" +msgstr "Errore nel caricamento delle differenze:" + +#: lib/blame.tcl:1231 +msgid "Originally By:" +msgstr "In origine da:" + +#: lib/blame.tcl:1237 +msgid "In File:" +msgstr "Nel file:" + +#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" +msgstr "Copiato o spostato qui da:" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Attiva ramo" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Attiva" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 - #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 ++#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 +#: lib/transport.tcl:108 +msgid "Cancel" +msgstr "Annulla" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" +msgstr "Revisione" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" +msgstr "Opzioni" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Recupera duplicato locale di ramo remoto" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Stacca da ramo locale" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Crea ramo" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Crea nuovo ramo" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +msgid "Create" +msgstr "Crea" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Nome del ramo" + +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" +msgstr "Nome:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Appaia nome del duplicato locale di ramo remoto" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Revisione iniziale" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Aggiorna ramo esistente:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "No" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Solo fast forward" + - #: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 ++#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" +msgstr "Ripristina" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Attiva dopo la creazione" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Scegliere un duplicato locale di ramo remoto" + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "" +"Il duplicato locale del ramo remoto %s non è un ramo nell'archivio remoto." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Inserire un nome per il ramo." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "'%s' non è utilizzabile come nome di ramo." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Elimina ramo" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Elimina ramo locale" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Rami locali" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Cancella solo se fuso con un altro ramo" + - #: lib/branch_delete.tcl:54 - msgid "Always (Do not perform merge test.)" - msgstr "Sempre (Non effettuare verifiche di fusione)." ++#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 ++msgid "Always (Do not perform merge checks)" ++msgstr "Sempre (non verificare le fusioni)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +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 lib/remote_branch_delete.tcl:217 ++msgid "" ++"Recovering deleted branches is difficult.\n" ++"\n" ++"Delete the selected branches?" ++msgstr "" ++"Ripristinare rami cancellati è difficile.\n" ++"\n" ++"Cancellare i rami selezionati?" ++ +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Impossibile cancellare i rami:\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Rinomina ramo" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Rinomina" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Ramo:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Nuovo Nome:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Scegliere un ramo da rinominare." + - #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 ++#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "Il ramo '%s' esiste già." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Impossibile rinominare '%s'." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Avvio in corso..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "File browser" + +#: lib/browser.tcl:126 lib/browser.tcl:143 +#, tcl-format +msgid "Loading %s..." +msgstr "Caricamento %s..." + +#: lib/browser.tcl:187 +msgid "[Up To Parent]" +msgstr "[Directory superiore]" + +#: lib/browser.tcl:267 lib/browser.tcl:273 +msgid "Browse Branch Files" +msgstr "Esplora i file del ramo" + - #: lib/browser.tcl:278 lib/choose_repository.tcl:394 - #: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 - #: lib/choose_repository.tcl:995 ++#: lib/browser.tcl:278 lib/choose_repository.tcl:398 ++#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 ++#: lib/choose_repository.tcl:1028 +msgid "Browse" +msgstr "Esplora" + - #: lib/checkout_op.tcl:84 ++#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Recupero %s da %s" + - #: lib/checkout_op.tcl:132 ++#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "errore grave: impossibile risolvere %s" + - #: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 ++#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 +#: lib/sshkey.tcl:53 +msgid "Close" +msgstr "Chiudi" + - #: lib/checkout_op.tcl:174 ++#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "Il ramo '%s' non esiste." + - #: lib/checkout_op.tcl:193 ++#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." +msgstr "Impossibile configurare git-pull semplificato per '%s'." + - #: lib/checkout_op.tcl:228 ++#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"Il ramo '%s' esiste già.\n" +"\n" +"Non può effettuare un 'fast-forward' a %s.\n" +"E' necessaria una fusione." + - #: lib/checkout_op.tcl:242 ++#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "La strategia di fusione '%s' non è supportata." + - #: lib/checkout_op.tcl:261 ++#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "Impossibile aggiornare '%s'." + - #: lib/checkout_op.tcl:273 ++#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." +msgstr "" +"L'area di preparazione per una nuova revisione (indice) è già bloccata." + - #: lib/checkout_op.tcl:288 ++#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" +"\n" +"Un altro programma Git ha modificato questo archivio dall'ultima analisi. " +"Bisogna effettuare una nuova analisi prima di poter cambiare il ramo " +"attuale.\n" +"\n" +"La nuova analisi comincerà ora.\n" + - #: lib/checkout_op.tcl:344 ++#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Aggiornamento della directory di lavoro a '%s' in corso..." + - #: lib/checkout_op.tcl:345 ++#: lib/checkout_op.tcl:346 +msgid "files checked out" +msgstr "file presenti nella directory di lavoro" + - #: lib/checkout_op.tcl:375 ++#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "Attivazione di '%s' fallita (richiesta una fusione a livello file)." + - #: lib/checkout_op.tcl:376 ++#: lib/checkout_op.tcl:377 +msgid "File level merge required." +msgstr "E' richiesta una fusione a livello file." + - #: lib/checkout_op.tcl:380 ++#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Si rimarrà sul ramo '%s'." + - #: lib/checkout_op.tcl:451 ++#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Non si è più su un ramo locale\n" +"\n" +"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questa " +"revisione attiva staccata'." + - #: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472 ++#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#, tcl-format +msgid "Checked out '%s'." +msgstr "Attivazione di '%s' completata." + - #: lib/checkout_op.tcl:500 ++#: lib/checkout_op.tcl:535 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "" +"Ripristinare '%s' a '%s' comporterà la perdita delle seguenti revisioni:" + - #: lib/checkout_op.tcl:522 ++#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." +msgstr "Ricomporre le revisioni perdute potrebbe non essere semplice." + - #: lib/checkout_op.tcl:527 ++#: lib/checkout_op.tcl:562 +#, tcl-format +msgid "Reset '%s'?" +msgstr "Ripristinare '%s'?" + - #: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 ++#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +msgid "Visualize" +msgstr "Visualizza" + - #: lib/checkout_op.tcl:600 ++#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"Impossibile preparare il ramo attuale.\n" +"\n" +"Questa directory di lavoro è stata convertita solo parzialmente. I file sono " +"stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha " +"prodotto degli errori.\n" +"\n" +"Questo non sarebbe dovuto succedere. %s ora terminerà senza altre azioni." + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "Seleziona" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "Famiglia di caratteri" + +#: lib/choose_font.tcl:74 +msgid "Font Size" +msgstr "Dimensione caratteri" + +#: lib/choose_font.tcl:91 +msgid "Font Example" +msgstr "Esempio caratteri" + +#: lib/choose_font.tcl:103 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"Questo è un testo d'esempio.\n" +"Se ti piace questo testo, scegli questo carattere." + +#: lib/choose_repository.tcl:28 +msgid "Git Gui" +msgstr "Git Gui" + - #: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 ++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +msgid "Create New Repository" +msgstr "Crea nuovo archivio" + +#: lib/choose_repository.tcl:93 +msgid "New..." +msgstr "Nuovo..." + - #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 ++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +msgid "Clone Existing Repository" +msgstr "Clona archivio esistente" + +#: lib/choose_repository.tcl:106 +msgid "Clone..." +msgstr "Clona..." + - #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 ++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +msgid "Open Existing Repository" +msgstr "Apri archivio esistente" + +#: lib/choose_repository.tcl:119 +msgid "Open..." +msgstr "Apri..." + +#: lib/choose_repository.tcl:132 +msgid "Recent Repositories" +msgstr "Archivi recenti" + +#: lib/choose_repository.tcl:138 +msgid "Open Recent Repository:" +msgstr "Apri archivio recente:" + - #: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 - #: lib/choose_repository.tcl:316 ++#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 ++#: lib/choose_repository.tcl:320 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "Impossibile creare l'archivio %s:" + - #: lib/choose_repository.tcl:387 ++#: lib/choose_repository.tcl:391 +msgid "Directory:" +msgstr "Directory:" + - #: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 - #: lib/choose_repository.tcl:1017 ++#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 ++#: lib/choose_repository.tcl:1052 +msgid "Git Repository" +msgstr "Archivio Git" + - #: lib/choose_repository.tcl:442 ++#: lib/choose_repository.tcl:448 +#, tcl-format +msgid "Directory %s already exists." +msgstr "La directory %s esiste già." + - #: lib/choose_repository.tcl:446 ++#: lib/choose_repository.tcl:452 +#, tcl-format +msgid "File %s already exists." +msgstr "Il file %s esiste già." + - #: lib/choose_repository.tcl:460 ++#: lib/choose_repository.tcl:466 +msgid "Clone" +msgstr "Clona" + - #: lib/choose_repository.tcl:473 ++#: lib/choose_repository.tcl:479 +msgid "Source Location:" +msgstr "Posizione sorgente:" + - #: lib/choose_repository.tcl:484 ++#: lib/choose_repository.tcl:490 +msgid "Target Directory:" +msgstr "Directory di destinazione:" + - #: lib/choose_repository.tcl:496 ++#: lib/choose_repository.tcl:502 +msgid "Clone Type:" +msgstr "Tipo di clone:" + - #: lib/choose_repository.tcl:502 ++#: lib/choose_repository.tcl:508 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Standard (veloce, semi-ridondante, con hardlink)" + - #: lib/choose_repository.tcl:508 ++#: lib/choose_repository.tcl:514 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Copia completa (più lento, backup ridondante)" + - #: lib/choose_repository.tcl:514 ++#: lib/choose_repository.tcl:520 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Shared (il più veloce, non raccomandato, nessun backup)" + - #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 - #: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 - #: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 ++#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 ++#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 ++#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "%s non è un archivio Git." + - #: lib/choose_repository.tcl:586 ++#: lib/choose_repository.tcl:592 +msgid "Standard only available for local repository." +msgstr "Standard è disponibile solo per archivi locali." + - #: lib/choose_repository.tcl:590 ++#: lib/choose_repository.tcl:596 +msgid "Shared only available for local repository." +msgstr "Shared è disponibile solo per archivi locali." + - #: lib/choose_repository.tcl:611 ++#: lib/choose_repository.tcl:617 +#, tcl-format +msgid "Location %s already exists." +msgstr "Il file/directory %s esiste già." + - #: lib/choose_repository.tcl:622 ++#: lib/choose_repository.tcl:628 +msgid "Failed to configure origin" +msgstr "Impossibile configurare origin" + - #: lib/choose_repository.tcl:634 ++#: lib/choose_repository.tcl:640 +msgid "Counting objects" +msgstr "Calcolo oggetti" + - #: lib/choose_repository.tcl:635 ++#: lib/choose_repository.tcl:641 +msgid "buckets" +msgstr "" + - #: lib/choose_repository.tcl:659 ++#: lib/choose_repository.tcl:665 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "Impossibile copiare oggetti/info/alternate: %s" + - #: lib/choose_repository.tcl:695 ++#: lib/choose_repository.tcl:701 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Niente da clonare da %s." + - #: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 - #: lib/choose_repository.tcl:923 ++#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 ++#: lib/choose_repository.tcl:929 +msgid "The 'master' branch has not been initialized." +msgstr "Il ramo 'master' non è stato inizializzato." + - #: lib/choose_repository.tcl:710 ++#: lib/choose_repository.tcl:716 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "Impossibile utilizzare gli hardlink. Si ricorrerà alla copia." + - #: lib/choose_repository.tcl:722 ++#: lib/choose_repository.tcl:728 +#, tcl-format +msgid "Cloning from %s" +msgstr "Clonazione da %s" + - #: lib/choose_repository.tcl:753 ++#: lib/choose_repository.tcl:759 +msgid "Copying objects" +msgstr "Copia degli oggetti" + - #: lib/choose_repository.tcl:754 ++#: lib/choose_repository.tcl:760 +msgid "KiB" +msgstr "KiB" + - #: lib/choose_repository.tcl:778 ++#: lib/choose_repository.tcl:784 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Impossibile copiare oggetto: %s" + - #: lib/choose_repository.tcl:788 ++#: lib/choose_repository.tcl:794 +msgid "Linking objects" +msgstr "Collegamento oggetti" + - #: lib/choose_repository.tcl:789 ++#: lib/choose_repository.tcl:795 +msgid "objects" +msgstr "oggetti" + - #: lib/choose_repository.tcl:797 ++#: lib/choose_repository.tcl:803 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "Hardlink impossibile sull'oggetto: %s" + - #: lib/choose_repository.tcl:852 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "" +"Impossibile recuperare rami e oggetti. Controllare i dettagli forniti dalla " +"console." + - #: lib/choose_repository.tcl:863 ++#: lib/choose_repository.tcl:869 +msgid "Cannot fetch tags. See console output for details." +msgstr "" +"Impossibile recuperare le etichette. Controllare i dettagli forniti dalla " +"console." + - #: lib/choose_repository.tcl:887 ++#: lib/choose_repository.tcl:893 +msgid "Cannot determine HEAD. See console output for details." +msgstr "" +"Impossibile determinare HEAD. Controllare i dettagli forniti dalla console." + - #: lib/choose_repository.tcl:896 ++#: lib/choose_repository.tcl:902 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "Impossibile ripulire %s" + - #: lib/choose_repository.tcl:902 ++#: lib/choose_repository.tcl:908 +msgid "Clone failed." +msgstr "Clonazione non riuscita." + - #: lib/choose_repository.tcl:909 ++#: lib/choose_repository.tcl:915 +msgid "No default branch obtained." +msgstr "Non è stato trovato un ramo predefinito." + - #: lib/choose_repository.tcl:920 ++#: lib/choose_repository.tcl:926 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "Impossibile risolvere %s come una revisione." + - #: lib/choose_repository.tcl:932 ++#: lib/choose_repository.tcl:938 +msgid "Creating working directory" +msgstr "Creazione directory di lavoro" + - #: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 - #: lib/index.tcl:196 ++#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 ++#: lib/index.tcl:198 +msgid "files" +msgstr "file" + - #: lib/choose_repository.tcl:962 ++#: lib/choose_repository.tcl:968 +msgid "Initial file checkout failed." +msgstr "Attivazione iniziale non riuscita." + - #: lib/choose_repository.tcl:978 ++#: lib/choose_repository.tcl:1011 +msgid "Open" +msgstr "Apri" + - #: lib/choose_repository.tcl:988 ++#: lib/choose_repository.tcl:1021 +msgid "Repository:" +msgstr "Archivio:" + - #: lib/choose_repository.tcl:1037 ++#: lib/choose_repository.tcl:1072 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Impossibile accedere all'archivio %s:" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "Questa revisione attiva staccata" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Espressione di revisione:" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "Ramo locale" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "Duplicato locale di ramo remoto" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +msgid "Tag" +msgstr "Etichetta" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Revisione non valida: %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "Nessuna revisione selezionata." + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "L'espressione di revisione è vuota." + +#: lib/choose_rev.tcl:531 +msgid "Updated" +msgstr "Aggiornato" + +#: lib/choose_rev.tcl:559 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Non c'è niente da correggere.\n" +"\n" +"Stai per creare la revisione iniziale. Non esiste una revisione precedente " +"da correggere.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Non è possibile effettuare una correzione durante una fusione.\n" +"\n" +"In questo momento si sta effettuando una fusione che non è stata del tutto " +"completata. Non puoi correggere la revisione precedente a meno che prima tu " +"non interrompa l'operazione di fusione in corso.\n" + +#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "Errore durante il caricamento dei dati della revisione da correggere:" + +#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "Impossibile ottenere la tua identità:" + +#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "GIT_COMMITTER_IDENT non valida:" + - #: lib/commit.tcl:132 ++#: lib/commit.tcl:129 ++#, tcl-format ++msgid "warning: Tcl does not support encoding '%s'." ++msgstr "attenzione: Tcl non supporta la codifica '%s'." ++ ++#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" +"\n" +"Un altro programma Git ha modificato questo archivio dall'ultima analisi. " +"Bisogna effettuare una nuova analisi prima di poter creare una nuova " +"revisione.\n" +"\n" +"La nuova analisi comincerà ora.\n" + - #: lib/commit.tcl:155 ++#: lib/commit.tcl:172 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Non è possibile creare una revisione con file non sottoposti a fusione.\n" +"\n" +"Il file %s presenta dei conflitti. Devi risolverli e preparare il file per " +"creare una nuova revisione prima di effettuare questa azione.\n" + - #: lib/commit.tcl:163 ++#: lib/commit.tcl:180 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Stato di file %s sconosciuto.\n" +"\n" +"Questo programma non può creare una revisione contenente il file %s.\n" + - #: lib/commit.tcl:171 ++#: lib/commit.tcl:188 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Nessuna modifica per la nuova revisione.\n" +"\n" +"Devi preparare per una nuova revisione almeno 1 file prima di effettuare " +"questa operazione.\n" + - #: lib/commit.tcl:186 ++#: lib/commit.tcl:203 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Bisogna fornire un messaggio di revisione.\n" +"\n" +"Un buon messaggio di revisione ha il seguente formato:\n" +"\n" +"- Prima linea: descrivi in una frase ciò che hai fatto.\n" +"- Seconda linea: vuota.\n" +"- Terza linea: spiega a cosa serve la tua modifica.\n" + - #: lib/commit.tcl:210 - #, tcl-format - msgid "warning: Tcl does not support encoding '%s'." - msgstr "attenzione: Tcl non supporta la codifica '%s'." - - #: lib/commit.tcl:226 ++#: lib/commit.tcl:234 +msgid "Calling pre-commit hook..." +msgstr "Avvio pre-commit hook..." + - #: lib/commit.tcl:241 ++#: lib/commit.tcl:249 +msgid "Commit declined by pre-commit hook." +msgstr "Revisione rifiutata dal pre-commit hook." + - #: lib/commit.tcl:264 ++#: lib/commit.tcl:272 +msgid "Calling commit-msg hook..." +msgstr "Avvio commit-msg hook..." + - #: lib/commit.tcl:279 ++#: lib/commit.tcl:287 +msgid "Commit declined by commit-msg hook." +msgstr "Revisione rifiutata dal commit-msg hook." + - #: lib/commit.tcl:292 ++#: lib/commit.tcl:300 +msgid "Committing changes..." +msgstr "Archiviazione modifiche..." + - #: lib/commit.tcl:308 ++#: lib/commit.tcl:316 +msgid "write-tree failed:" +msgstr "write-tree non riuscito:" + - #: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373 ++#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +msgid "Commit failed." +msgstr "Impossibile creare una nuova revisione." + - #: lib/commit.tcl:326 ++#: lib/commit.tcl:334 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "La revisione %s sembra essere danneggiata" + - #: lib/commit.tcl:331 ++#: lib/commit.tcl:339 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Nessuna modifica per la nuova revisione.\n" +"\n" +"Questa revisione non modifica alcun file e non effettua alcuna fusione.\n" +"\n" +"Si procederà subito ad una nuova analisi.\n" + - #: lib/commit.tcl:338 ++#: lib/commit.tcl:346 +msgid "No changes to commit." +msgstr "Nessuna modifica per la nuova revisione." + - #: lib/commit.tcl:352 ++#: lib/commit.tcl:360 +msgid "commit-tree failed:" +msgstr "commit-tree non riuscito:" + - #: lib/commit.tcl:372 ++#: lib/commit.tcl:381 +msgid "update-ref failed:" +msgstr "update-ref non riuscito:" + - #: lib/commit.tcl:460 ++#: lib/commit.tcl:469 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Creata revisione %s: %s" + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Elaborazione in corso... attendere..." + +#: lib/console.tcl:186 +msgid "Success" +msgstr "Successo" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "Errore: comando non riuscito" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "Numero di oggetti slegati" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "Spazio su disco utilizzato da oggetti slegati" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "Numero di oggetti impacchettati" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "Numero di pacchetti" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "Spazio su disco utilizzato da oggetti impacchettati" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "Oggetti impacchettati che attendono la potatura" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "File inutili" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Compressione dell'archivio in corso" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Verifica dell'archivio con fsck-objects in corso" + - #: lib/database.tcl:108 ++#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " - "the database when more than %i loose objects exist.\n" ++"the database.\n" +"\n" +"Compress the database now?" +msgstr "" +"Questo archivio attualmente ha circa %i oggetti slegati.\n" +"\n" - "Per mantenere buone prestazioni si raccomanda di comprimere l'archivio " - "quando sono presenti più di %i oggetti slegati.\n" ++"Per mantenere buone prestazioni si raccomanda di comprimere l'archivio.\n" +"\n" +"Comprimere l'archivio ora?" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Git ha restituito una data non valida: %s" + - #: lib/diff.tcl:59 ++#: lib/diff.tcl:64 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Non sono state trovate differenze.\n" +"\n" +"%s non ha modifiche.\n" +"\n" +"La data di modifica di questo file è stata cambiata da un'altra " +"applicazione, ma il contenuto del file è rimasto invariato.\n" +"\n" +"Si procederà automaticamente ad una nuova analisi per trovare altri file che " +"potrebbero avere lo stesso stato." + - #: lib/diff.tcl:99 ++#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Caricamento delle differenze di %s..." + - #: lib/diff.tcl:120 ++#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"LOCALE: cancellato\n" +"REMOTO:\n" + - #: lib/diff.tcl:125 ++#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"REMOTO: cancellato\n" +"LOCALE:\n" + - #: lib/diff.tcl:132 ++#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "LOCALE:\n" + - #: lib/diff.tcl:135 ++#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "REMOTO:\n" + - #: lib/diff.tcl:197 lib/diff.tcl:296 ++#: lib/diff.tcl:202 lib/diff.tcl:319 +#, tcl-format +msgid "Unable to display %s" +msgstr "Impossibile visualizzare %s" + - #: lib/diff.tcl:198 ++#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "Errore nel caricamento del file:" + - #: lib/diff.tcl:205 ++#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "Archivio Git (sottoprogetto)" + - #: lib/diff.tcl:217 ++#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." +msgstr "* File binario (il contenuto non sarà mostrato)." + - #: lib/diff.tcl:222 ++#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* Il file non tracciato è di %d byte.\n" +"* Saranno visualizzati solo i primi %d byte.\n" + - #: lib/diff.tcl:228 ++#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"* %s non visualizza completamente questo file non tracciato.\n" +"* Per visualizzare il file completo, usare un programma esterno.\n" + - #: lib/diff.tcl:436 ++#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." +msgstr "Impossibile rimuovere la sezione scelta dalla nuova revisione." + - #: lib/diff.tcl:443 ++#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." +msgstr "Impossibile preparare la sezione scelta per una nuova revisione." + - #: lib/diff.tcl:509 ++#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." +msgstr "Impossibile rimuovere la riga scelta dalla nuova revisione." + - #: lib/diff.tcl:517 ++#: lib/diff.tcl:576 +msgid "Failed to stage selected line." +msgstr "Impossibile preparare la riga scelta per una nuova revisione." + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Predefinito" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "Codifica di sistema (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Altro" + +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" +msgstr "errore" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "attenzione" + +#: lib/error.tcl:94 +msgid "You must correct the above errors before committing." +msgstr "" +"Bisogna correggere gli errori suddetti prima di creare una nuova revisione." + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Impossibile sbloccare l'accesso all'indice" + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Errore nell'indice" + - #: lib/index.tcl:21 ++#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Impossibile aggiornare l'indice. Ora sarà avviata una nuova analisi che " +"aggiornerà git-gui." + - #: lib/index.tcl:27 ++#: lib/index.tcl:28 +msgid "Continue" +msgstr "Continua" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Sblocca l'accesso all'indice" + - #: lib/index.tcl:287 ++#: lib/index.tcl:289 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "%s non farà parte della prossima revisione" + - #: lib/index.tcl:326 ++#: lib/index.tcl:328 +msgid "Ready to commit." +msgstr "Pronto per creare una nuova revisione." + - #: lib/index.tcl:339 ++#: lib/index.tcl:341 +#, tcl-format +msgid "Adding %s" +msgstr "Aggiunta di %s in corso" + - #: lib/index.tcl:396 ++#: lib/index.tcl:398 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Annullare le modifiche nel file %s?" + - #: lib/index.tcl:398 ++#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Annullare le modifiche in questi %i file?" + - #: lib/index.tcl:406 ++#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Tutte le modifiche non preparate per una nuova revisione saranno perse per " +"sempre." + - #: lib/index.tcl:409 ++#: lib/index.tcl:411 +msgid "Do Nothing" +msgstr "Non fare niente" + - #: lib/index.tcl:427 ++#: lib/index.tcl:429 +msgid "Reverting selected files" +msgstr "Annullo le modifiche nei file selezionati" + - #: lib/index.tcl:431 ++#: lib/index.tcl:433 +#, tcl-format +msgid "Reverting %s" +msgstr "Annullo le modifiche in %s" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Non posso effettuare fusioni durante una correzione.\n" +"\n" +"Bisogna finire di correggere questa revisione prima di iniziare una " +"qualunque fusione.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" +"\n" +"Un altro programma Git ha modificato questo archivio dall'ultima analisi." +"Bisogna effettuare una nuova analisi prima di poter effettuare una fusione.\n" +"\n" +"La nuova analisi comincerà ora.\n" + +#: lib/merge.tcl:45 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Sei nel mezzo di una fusione con conflitti.\n" +"\n" +"Il file %s ha dei conflitti.\n" +"\n" +"Bisogna risolvere i conflitti, preparare il file per una nuova revisione ed " +"infine crearla per completare la fusione attuale. Solo a questo punto potrai " +"iniziare un'altra fusione.\n" + +#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Sei nel mezzo di una modifica.\n" +"\n" +"Il file %s è stato modificato.\n" +"\n" +"Bisogna completare la creazione della revisione attuale prima di iniziare " +"una fusione. In questo modo sarà più facile interrompere una fusione non " +"riuscita, nel caso ce ne fosse bisogno.\n" + +#: lib/merge.tcl:107 +#, tcl-format +msgid "%s of %s" +msgstr "%s di %s" + +#: lib/merge.tcl:120 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "Fusione di %s e %s in corso..." + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "Fusione completata con successo." + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "Fusione non riuscita. Bisogna risolvere i conflitti." + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "Fusione in %s" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "Revisione da fondere" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"Interruzione impossibile durante una correzione.\n" +"\n" +"Bisogna finire di correggere questa revisione.\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Interrompere fusione?\n" +"\n" +"L'interruzione della fusione attuale causerà la perdita di *TUTTE* le " +"modifiche non ancora presenti nell'archivio.\n" +"\n" +"Continuare con l'interruzione della fusione attuale?" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Ripristinare la revisione attuale e annullare le modifiche?\n" +"\n" +"L'annullamento delle modifiche causerà la perdita di *TUTTE* le modifiche " +"non ancora presenti nell'archivio.\n" +"\n" +"Continuare con l'annullamento delle modifiche attuali?" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "Interruzione" + +#: lib/merge.tcl:239 +msgid "files reset" +msgstr "ripristino file" + +#: lib/merge.tcl:267 +msgid "Abort failed." +msgstr "Interruzione non riuscita." + +#: lib/merge.tcl:269 +msgid "Abort completed. Ready." +msgstr "Interruzione completata. Pronto." + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "Imporre la risoluzione alla revisione comune?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "Imporre la risoluzione al ramo attuale?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "Imporre la risoluzione all'altro ramo?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"Si stanno mostrando solo le modifiche con conflitti.\n" +"\n" +"%s sarà sovrascritto.\n" +"\n" +"Questa operazione può essere modificata solo ricominciando la fusione." + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "" +"Il file %s sembra contenere conflitti non risolti, preparare per la prossima " +"revisione?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "" +"La risoluzione dei conflitti per %s è preparata per la prossima revisione" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "" +"Non è possibile risolvere i conflitti per cancellazioni o link con un " +"programma esterno" + +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "Non esiste un file con conflitti." + +#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "'%s' non è una GUI per la risoluzione dei conflitti." + +#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "Il programma '%s' non è supportato" + +#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" +msgstr "La risoluzione dei conflitti è già avviata, terminarla?" + +#: lib/mergetool.tcl:323 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" +"Errore: revisione non trovata:\n" +"%s" + +#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" +"Impossibile avviare la risoluzione dei conflitti:\n" +"\n" +"%s" + +#: lib/mergetool.tcl:347 +msgid "Running merge tool..." +msgstr "Avvio del programma per la risoluzione dei conflitti in corso..." + +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." +msgstr "Risoluzione dei conflitti non riuscita." + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "" +"La codifica dei caratteri '%s' specificata per tutti gli archivi non è valida" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "" +"La codifica dei caratteri '%s' specificata per l'archivio attuale non è " +"valida" + +#: lib/option.tcl:117 +msgid "Restore Defaults" +msgstr "Ripristina valori predefiniti" + +#: lib/option.tcl:121 +msgid "Save" +msgstr "Salva" + +#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" +msgstr "Archivio di %s" + +#: lib/option.tcl:132 +msgid "Global (All Repositories)" +msgstr "Tutti gli archivi" + +#: lib/option.tcl:138 +msgid "User Name" +msgstr "Nome utente" + +#: lib/option.tcl:139 +msgid "Email Address" +msgstr "Indirizzo Email" + +#: lib/option.tcl:141 +msgid "Summarize Merge Commits" +msgstr "Riepilogo nelle revisioni di fusione" + +#: lib/option.tcl:142 +msgid "Merge Verbosity" +msgstr "Prolissità della fusione" + +#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" +msgstr "Mostra statistiche delle differenze dopo la fusione" + +#: lib/option.tcl:144 +msgid "Use Merge Tool" +msgstr "Programma da utilizzare per la risoluzione dei conflitti" + +#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" +msgstr "Fidati delle date di modifica dei file" + +#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" +msgstr "" +"Effettua potatura dei duplicati locali di rami remoti durante il recupero" + +#: lib/option.tcl:148 +msgid "Match Tracking Branches" +msgstr "Appaia duplicati locali di rami remoti" + +#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" +msgstr "Ricerca copie solo nei file modificati" + +#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" +msgstr "Numero minimo di lettere che attivano la ricerca delle copie" + +#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" +msgstr "Giorni di contesto nella cronologia delle annotazioni" + +#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" +msgstr "Numero di linee di contesto nelle differenze" + +#: lib/option.tcl:153 +msgid "Commit Message Text Width" +msgstr "Larghezza del messaggio di revisione" + +#: lib/option.tcl:154 +msgid "New Branch Name Template" +msgstr "Modello per il nome di un nuovo ramo" + +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" +msgstr "Codifica predefinita per il contenuto dei file" + +#: lib/option.tcl:203 +msgid "Change" +msgstr "Cambia" + +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" +msgstr "Lingua dizionario:" + +#: lib/option.tcl:254 +msgid "Change Font" +msgstr "Cambia caratteri" + +#: lib/option.tcl:258 +#, tcl-format +msgid "Choose %s" +msgstr "Scegli %s" + +#: lib/option.tcl:264 +msgid "pt." +msgstr "pt." + +#: lib/option.tcl:278 +msgid "Preferences" +msgstr "Preferenze" + +#: lib/option.tcl:314 +msgid "Failed to completely save options:" +msgstr "Impossibile salvare completamente le opzioni:" + +#: lib/remote.tcl:163 +msgid "Remove Remote" +msgstr "Rimuovi archivio remoto" + +#: lib/remote.tcl:168 +msgid "Prune from" +msgstr "Effettua potatura da" + +#: lib/remote.tcl:173 +msgid "Fetch from" +msgstr "Recupera da" + +#: lib/remote.tcl:215 +msgid "Push to" +msgstr "Propaga verso" + +#: lib/remote_add.tcl:19 +msgid "Add Remote" +msgstr "Aggiungi archivio remoto" + +#: lib/remote_add.tcl:24 +msgid "Add New Remote" +msgstr "Aggiungi nuovo archivio remoto" + +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" +msgstr "Aggiungi" + +#: lib/remote_add.tcl:37 +msgid "Remote Details" +msgstr "Dettagli sull'archivio remoto" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "Posizione:" + +#: lib/remote_add.tcl:62 +msgid "Further Action" +msgstr "Altra azione" + +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" +msgstr "Recupera subito" + +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" +msgstr "Inizializza l'archivio remoto e propaga" + +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" +msgstr "Non fare altro" + +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." +msgstr "Inserire un nome per l'archivio remoto." + +#: lib/remote_add.tcl:114 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "'%s' non è utilizzabile come nome di archivio remoto." + +#: lib/remote_add.tcl:125 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "Impossibile aggiungere l'archivio remoto '%s' posto in '%s'." + +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "recupera da %s" + +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" +msgstr "Recupero %s" + +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "Impossibile inizializzare l'archivio posto in '%s'." + +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 +#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" +msgstr "propaga verso %s" + +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "Imposto %s (in %s)" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "Elimina ramo remoto" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "Da archivio" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" +msgstr "Remoto:" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" +msgstr "Posizione specifica:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Rami" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Elimina solo se" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Fuso in:" + - #: lib/remote_branch_delete.tcl:119 - msgid "Always (Do not perform merge checks)" - msgstr "Sempre (non verificare le fusioni)" - +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "Si richiede un ramo per 'Fuso in'." + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"I rami seguenti non sono stati fusi completamente in %s:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"Impossibile verificare una o più fusioni: mancano le revisioni necessarie. " +"Prova prima a recuperarle da %s." + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "Scegliere uno o più rami da cancellare." + - #: lib/remote_branch_delete.tcl:216 - msgid "" - "Recovering deleted branches is difficult.\n" - "\n" - "Delete the selected branches?" - msgstr "" - "Ricomporre rami cancellati è difficile.\n" - "\n" - "Cancellare i rami selezionati?" - +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Cancellazione rami da %s" + - #: lib/remote_branch_delete.tcl:286 ++#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." +msgstr "Nessun archivio selezionato." + - #: lib/remote_branch_delete.tcl:291 ++#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." +msgstr "Analisi in corso %s..." + +#: lib/search.tcl:21 +msgid "Find:" +msgstr "Trova:" + +#: lib/search.tcl:23 +msgid "Next" +msgstr "Succ" + +#: lib/search.tcl:24 +msgid "Prev" +msgstr "Prec" + +#: lib/search.tcl:25 +msgid "Case-Sensitive" +msgstr "Distingui maiuscole" + - #: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "Impossibile scrivere shortcut:" + - #: lib/shortcut.tcl:136 ++#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "Impossibile scrivere icona:" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Correttore ortografico non supportato" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "Correzione ortografica indisponibile" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "La configurazione del correttore ortografico non è valida" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "Il dizionario è stato reimpostato su %s." + +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "Il correttore ortografico ha riportato un errore all'avvio" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Correttore ortografico non riconosciuto" + +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Nessun suggerimento" + +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "Il correttore ortografico ha mandato un EOF inaspettato" + +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Errore nel correttore ortografico" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "Chiavi non trovate." + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "Chiave pubblica trovata in: %s" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "Crea chiave" + +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" +msgstr "Copia negli appunti" + +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" +msgstr "La tua chiave pubblica OpenSSH" + +#: lib/sshkey.tcl:78 +msgid "Generating..." +msgstr "Creazione chiave in corso..." + +#: lib/sshkey.tcl:84 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"Impossibile avviare ssh-keygen:\n" +"\n" +"%s" + +#: lib/sshkey.tcl:111 +msgid "Generation failed." +msgstr "Errore durante la creazione della chiave." + +#: lib/sshkey.tcl:118 +msgid "Generation succeded, but no keys found." +msgstr "La chiave è stata creata con successo, ma non è stata trovata." + +#: lib/sshkey.tcl:121 +#, tcl-format +msgid "Your key is in: %s" +msgstr "La chiave è in: %s" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%1$s ... %6$s: %2$*i di %4$*i (%7$3i%%)" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "Bisogna selezionare un file prima di eseguire %s." + +#: lib/tools.tcl:90 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "Vuoi davvero eseguire %s?" + +#: lib/tools.tcl:110 +#, tcl-format +msgid "Tool: %s" - msgstr "Strumento: %s" ++msgstr "Accessorio: %s" + +#: lib/tools.tcl:111 +#, tcl-format +msgid "Running: %s" +msgstr "Eseguo: %s" + +#: lib/tools.tcl:149 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "Il programma esterno è terminato con successo: %s" + +#: lib/tools.tcl:151 +#, tcl-format +msgid "Tool failed: %s" +msgstr "Il programma esterno ha riportato un errore: %s" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" - msgstr "Aggiungi strumento" ++msgstr "Aggiungi accessorio" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "Aggiungi un nuovo comando" + +#: lib/tools_dlg.tcl:33 +msgid "Add globally" +msgstr "Aggiungi per tutti gli archivi" + +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" - msgstr "Dettagli sullo strumento" ++msgstr "Dettagli sull'accessorio" + +#: lib/tools_dlg.tcl:48 +msgid "Use '/' separators to create a submenu tree:" +msgstr "Utilizza il separatore '/' per creare un albero di sottomenu:" + +#: lib/tools_dlg.tcl:61 +msgid "Command:" +msgstr "Comando:" + +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" +msgstr "Mostra una finestra di dialogo prima dell'avvio" + +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "Chiedi all'utente di scegliere una revisione (imposta $REVISION)" + +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "Chiedi all'utente di fornire argomenti aggiuntivi (imposta $ARGS)" + +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" +msgstr "Non mostrare la finestra di comando" + +#: lib/tools_dlg.tcl:97 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "Avvia solo se è selezionata una differenza ($FILENAME non è vuoto)" + +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." - msgstr "Bisogna dare un nome allo strumento." ++msgstr "Bisogna dare un nome all'accessorio." + +#: lib/tools_dlg.tcl:129 +#, tcl-format +msgid "Tool '%s' already exists." - msgstr "Lo strumento '%s' esiste già." ++msgstr "L'accessorio '%s' esiste già." + +#: lib/tools_dlg.tcl:151 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" - "Impossibile aggiungere lo strumento:\n" ++"Impossibile aggiungere l'accessorio:\n" +"\n" +"%s" + +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" - msgstr "Rimuovi strumento" ++msgstr "Rimuovi accessorio" + +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" - msgstr "Rimuovi i comandi dello strumento" ++msgstr "Rimuovi i comandi accessori" + +#: lib/tools_dlg.tcl:200 +msgid "Remove" +msgstr "Rimuovi" + +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" - msgstr "(Il colore blu indica strumenti per l'archivio locale)" ++msgstr "(Il colore blu indica accessori per l'archivio locale)" + +#: lib/tools_dlg.tcl:297 +#, tcl-format +msgid "Run Command: %s" +msgstr "Avvia il comando: %s" + +#: lib/tools_dlg.tcl:311 +msgid "Arguments" +msgstr "Argomenti" + +#: lib/tools_dlg.tcl:348 +msgid "OK" +msgstr "OK" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Recupero nuove modifiche da %s" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "potatura remota di %s" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Effettua potatura dei duplicati locali di rami remoti cancellati da %s" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Propagazione modifiche a %s" + +#: lib/transport.tcl:64 +#, tcl-format +msgid "Mirroring to %s" +msgstr "Mirroring verso %s" + +#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "Propagazione %s %s a %s" + +#: lib/transport.tcl:100 +msgid "Push Branches" +msgstr "Propaga rami" + +#: lib/transport.tcl:114 +msgid "Source Branches" +msgstr "Rami di origine" + +#: lib/transport.tcl:131 +msgid "Destination Repository" +msgstr "Archivio di destinazione" + +#: lib/transport.tcl:169 +msgid "Transfer Options" +msgstr "Opzioni di trasferimento" + +#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "Sovrascrivi ramo esistente (alcune modifiche potrebbero essere perse)" + +#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" +msgstr "Utilizza 'thin pack' (per connessioni lente)" + +#: lib/transport.tcl:179 +msgid "Include tags" +msgstr "Includi etichette" diff --cc git-gui/po/ja.po index 63c469510,000000000..15017985e mode 100644,000000..100644 --- a/git-gui/po/ja.po +++ b/git-gui/po/ja.po @@@ -1,2530 -1,0 +1,2555 @@@ +# Translation of git-gui to Japanese +# Copyright (C) 2007 Shawn Pearce +# This file is distributed under the same license as the git-gui package. +# しらいし ななこ , 2007. +# - #, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-12-08 08:31-0800\n" - "PO-Revision-Date: 2008-12-09 06:27+0900\n" ++"POT-Creation-Date: 2010-01-26 15:47-0800\n" ++"PO-Revision-Date: 2010-02-02 19:03+0900\n" +"Last-Translator: しらいし ななこ \n" +"Language-Team: Japanese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + - #: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 - #: git-gui.sh:866 ++#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 ++#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "git-gui: 致命的なエラー" + - #: git-gui.sh:689 ++#: git-gui.sh:743 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "%s に無効なフォントが指定されています:" + - #: git-gui.sh:723 ++#: git-gui.sh:779 +msgid "Main Font" +msgstr "主フォント" + - #: git-gui.sh:724 ++#: git-gui.sh:780 +msgid "Diff/Console Font" +msgstr "diff/コンソール・フォント" + - #: git-gui.sh:738 ++#: git-gui.sh:794 +msgid "Cannot find git in PATH." +msgstr "PATH 中に git が見つかりません" + - #: git-gui.sh:765 ++#: git-gui.sh:821 +msgid "Cannot parse Git version string:" +msgstr "Git バージョン名が理解できません:" + - #: git-gui.sh:783 ++#: git-gui.sh:839 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Git のバージョンが確認できません。\n" +"\n" +"%s はバージョン '%s' とのことです。\n" +"\n" +"%s は最低でも 1.5.0 かそれ以降の Git が必要です\n" +"\n" +"'%s' はバージョン 1.5.0 と思って良いですか？\n" + - #: git-gui.sh:1062 ++#: git-gui.sh:1128 +msgid "Git directory not found:" +msgstr "Git ディレクトリが見つかりません:" + - #: git-gui.sh:1069 ++#: git-gui.sh:1146 +msgid "Cannot move to top of working directory:" +msgstr "作業ディレクトリの最上位に移動できません" + - #: git-gui.sh:1076 - msgid "Cannot use funny .git directory:" - msgstr "変な .git ディレクトリは使えません" ++#: git-gui.sh:1154 ++msgid "Cannot use bare repository:" ++msgstr "裸のリポジトリは使えません:" + - #: git-gui.sh:1081 ++#: git-gui.sh:1162 +msgid "No working directory" +msgstr "作業ディレクトリがありません" + - #: git-gui.sh:1247 lib/checkout_op.tcl:305 ++#: git-gui.sh:1334 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "ファイル状態を更新しています…" + - #: git-gui.sh:1303 ++#: git-gui.sh:1390 +msgid "Scanning for modified files ..." +msgstr "変更されたファイルをスキャンしています…" + - #: git-gui.sh:1367 ++#: git-gui.sh:1454 +msgid "Calling prepare-commit-msg hook..." +msgstr "prepare-commit-msg フックを実行中・・・" + - #: git-gui.sh:1384 ++#: git-gui.sh:1471 +msgid "Commit declined by prepare-commit-msg hook." +msgstr "prepare-commit-msg フックがコミットを拒否しました" + - #: git-gui.sh:1542 lib/browser.tcl:246 ++#: git-gui.sh:1629 lib/browser.tcl:246 +msgid "Ready." +msgstr "準備完了" + - #: git-gui.sh:1819 ++#: git-gui.sh:1787 ++#, tcl-format ++msgid "Displaying only %s of %s files." ++msgstr "全体で%s個の内の%sファイルだけ表示しています" ++ ++#: git-gui.sh:1913 +msgid "Unmodified" +msgstr "変更無し" + - #: git-gui.sh:1821 ++#: git-gui.sh:1915 +msgid "Modified, not staged" +msgstr "変更あり、コミット未予定" + - #: git-gui.sh:1822 git-gui.sh:1830 ++#: git-gui.sh:1916 git-gui.sh:1924 +msgid "Staged for commit" +msgstr "コミット予定済" + - #: git-gui.sh:1823 git-gui.sh:1831 ++#: git-gui.sh:1917 git-gui.sh:1925 +msgid "Portions staged for commit" +msgstr "部分的にコミット予定済" + - #: git-gui.sh:1824 git-gui.sh:1832 ++#: git-gui.sh:1918 git-gui.sh:1926 +msgid "Staged for commit, missing" +msgstr "コミット予定済、ファイル無し" + - #: git-gui.sh:1826 ++#: git-gui.sh:1920 +msgid "File type changed, not staged" +msgstr "ファイル型変更、コミット未予定" + - #: git-gui.sh:1827 ++#: git-gui.sh:1921 +msgid "File type changed, staged" +msgstr "ファイル型変更、コミット予定済" + - #: git-gui.sh:1829 ++#: git-gui.sh:1923 +msgid "Untracked, not staged" +msgstr "管理外、コミット未予定" + - #: git-gui.sh:1834 ++#: git-gui.sh:1928 +msgid "Missing" +msgstr "ファイル無し" + - #: git-gui.sh:1835 ++#: git-gui.sh:1929 +msgid "Staged for removal" +msgstr "削除予定済" + - #: git-gui.sh:1836 ++#: git-gui.sh:1930 +msgid "Staged for removal, still present" +msgstr "削除予定済、ファイル未削除" + - #: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 - #: git-gui.sh:1842 git-gui.sh:1843 ++#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 ++#: git-gui.sh:1936 git-gui.sh:1937 +msgid "Requires merge resolution" +msgstr "要マージ解決" + - #: git-gui.sh:1878 ++#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." +msgstr "gitk を起動中…お待ち下さい…" + - #: git-gui.sh:1887 ++#: git-gui.sh:1984 +msgid "Couldn't find gitk in PATH" +msgstr "PATH 中に gitk が見つかりません" + - #: git-gui.sh:2280 lib/choose_repository.tcl:36 ++#: git-gui.sh:2043 ++msgid "Couldn't find git gui in PATH" ++msgstr "PATH 中に git gui が見つかりません" ++ ++#: git-gui.sh:2455 lib/choose_repository.tcl:36 +msgid "Repository" +msgstr "リポジトリ" + - #: git-gui.sh:2281 ++#: git-gui.sh:2456 +msgid "Edit" +msgstr "編集" + - #: git-gui.sh:2283 lib/choose_rev.tcl:561 ++#: git-gui.sh:2458 lib/choose_rev.tcl:561 +msgid "Branch" +msgstr "ブランチ" + - #: git-gui.sh:2286 lib/choose_rev.tcl:548 ++#: git-gui.sh:2461 lib/choose_rev.tcl:548 +msgid "Commit@@noun" +msgstr "コミット" + - #: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "マージ" + - #: git-gui.sh:2290 lib/choose_rev.tcl:557 ++#: git-gui.sh:2465 lib/choose_rev.tcl:557 +msgid "Remote" +msgstr "リモート" + - #: git-gui.sh:2293 ++#: git-gui.sh:2468 +msgid "Tools" +msgstr "ツール" + - #: git-gui.sh:2302 ++#: git-gui.sh:2477 +msgid "Explore Working Copy" +msgstr "ワーキングコピーをブラウズ" + - #: git-gui.sh:2307 ++#: git-gui.sh:2483 +msgid "Browse Current Branch's Files" +msgstr "現在のブランチのファイルを見る" + - #: git-gui.sh:2311 ++#: git-gui.sh:2487 +msgid "Browse Branch Files..." +msgstr "ブランチのファイルを見る…" + - #: git-gui.sh:2316 ++#: git-gui.sh:2492 +msgid "Visualize Current Branch's History" +msgstr "現在のブランチの履歴を見る" + - #: git-gui.sh:2320 ++#: git-gui.sh:2496 +msgid "Visualize All Branch History" +msgstr "全てのブランチの履歴を見る" + - #: git-gui.sh:2327 ++#: git-gui.sh:2503 +#, tcl-format +msgid "Browse %s's Files" +msgstr "ブランチ %s のファイルを見る" + - #: git-gui.sh:2329 ++#: git-gui.sh:2505 +#, tcl-format +msgid "Visualize %s's History" +msgstr "ブランチ %s の履歴を見る" + - #: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "データベース統計" + - #: git-gui.sh:2337 lib/database.tcl:34 ++#: git-gui.sh:2513 lib/database.tcl:34 +msgid "Compress Database" +msgstr "データベース圧縮" + - #: git-gui.sh:2340 ++#: git-gui.sh:2516 +msgid "Verify Database" +msgstr "データベース検証" + - #: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 - #: lib/shortcut.tcl:39 lib/shortcut.tcl:71 ++#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 ++#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +msgid "Create Desktop Icon" +msgstr "デスクトップ・アイコンを作る" + - #: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 ++#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +msgid "Quit" +msgstr "終了" + - #: git-gui.sh:2371 ++#: git-gui.sh:2547 +msgid "Undo" +msgstr "元に戻す" + - #: git-gui.sh:2374 ++#: git-gui.sh:2550 +msgid "Redo" +msgstr "やり直し" + - #: git-gui.sh:2378 git-gui.sh:2923 ++#: git-gui.sh:2554 git-gui.sh:3109 +msgid "Cut" +msgstr "切り取り" + - #: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082 ++#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "コピー" + - #: git-gui.sh:2384 git-gui.sh:2929 ++#: git-gui.sh:2560 git-gui.sh:3115 +msgid "Paste" +msgstr "貼り付け" + - #: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26 ++#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "削除" + - #: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71 ++#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +msgid "Select All" +msgstr "全て選択" + - #: git-gui.sh:2400 ++#: git-gui.sh:2576 +msgid "Create..." +msgstr "作成…" + - #: git-gui.sh:2406 ++#: git-gui.sh:2582 +msgid "Checkout..." +msgstr "チェックアウト" + - #: git-gui.sh:2412 ++#: git-gui.sh:2588 +msgid "Rename..." +msgstr "名前変更…" + - #: git-gui.sh:2417 ++#: git-gui.sh:2593 +msgid "Delete..." +msgstr "削除…" + - #: git-gui.sh:2422 ++#: git-gui.sh:2598 +msgid "Reset..." +msgstr "リセット…" + - #: git-gui.sh:2432 ++#: git-gui.sh:2608 +msgid "Done" +msgstr "完了" + - #: git-gui.sh:2434 ++#: git-gui.sh:2610 +msgid "Commit@@verb" +msgstr "コミット" + - #: git-gui.sh:2443 git-gui.sh:2864 ++#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "新規コミット" + - #: git-gui.sh:2451 git-gui.sh:2871 ++#: git-gui.sh:2627 git-gui.sh:3057 +msgid "Amend Last Commit" +msgstr "最新コミットを訂正" + - #: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "再スキャン" + - #: git-gui.sh:2467 ++#: git-gui.sh:2643 +msgid "Stage To Commit" +msgstr "コミット予定する" + - #: git-gui.sh:2473 ++#: git-gui.sh:2649 +msgid "Stage Changed Files To Commit" +msgstr "変更されたファイルをコミット予定" + - #: git-gui.sh:2479 ++#: git-gui.sh:2655 +msgid "Unstage From Commit" +msgstr "コミットから降ろす" + - #: git-gui.sh:2484 lib/index.tcl:410 ++#: git-gui.sh:2661 lib/index.tcl:412 +msgid "Revert Changes" +msgstr "変更を元に戻す" + - #: git-gui.sh:2491 git-gui.sh:3069 ++#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +msgid "Show Less Context" +msgstr "文脈を少なく" + - #: git-gui.sh:2495 git-gui.sh:3073 ++#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +msgid "Show More Context" +msgstr "文脈を多く" + - #: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947 ++#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +msgid "Sign Off" +msgstr "署名" + - #: git-gui.sh:2518 ++#: git-gui.sh:2696 +msgid "Local Merge..." +msgstr "ローカル・マージ…" + - #: git-gui.sh:2523 ++#: git-gui.sh:2701 +msgid "Abort Merge..." +msgstr "マージ中止…" + - #: git-gui.sh:2535 git-gui.sh:2575 ++#: git-gui.sh:2713 git-gui.sh:2741 +msgid "Add..." +msgstr "追加" + - #: git-gui.sh:2539 ++#: git-gui.sh:2717 +msgid "Push..." +msgstr "プッシュ…" + - #: git-gui.sh:2543 ++#: git-gui.sh:2721 +msgid "Delete Branch..." +msgstr "ブランチ削除..." + - #: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 - #, tcl-format - msgid "About %s" - msgstr "%s について" - - #: git-gui.sh:2557 - msgid "Preferences..." - msgstr "設定…" - - #: git-gui.sh:2565 git-gui.sh:3115 ++#: git-gui.sh:2731 git-gui.sh:3292 +msgid "Options..." +msgstr "オプション…" + - #: git-gui.sh:2576 ++#: git-gui.sh:2742 +msgid "Remove..." +msgstr "削除..." + - #: git-gui.sh:2585 lib/choose_repository.tcl:50 ++#: git-gui.sh:2751 lib/choose_repository.tcl:50 +msgid "Help" +msgstr "ヘルプ" + - #: git-gui.sh:2611 ++#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 ++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 ++#, tcl-format ++msgid "About %s" ++msgstr "%s について" ++ ++#: git-gui.sh:2783 +msgid "Online Documentation" +msgstr "オンライン・ドキュメント" + - #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 ++#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +msgid "Show SSH Key" +msgstr "SSH キーを表示" + - #: git-gui.sh:2707 ++#: git-gui.sh:2893 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま" +"せん" + - #: git-gui.sh:2740 ++#: git-gui.sh:2926 +msgid "Current Branch:" +msgstr "現在のブランチ" + - #: git-gui.sh:2761 ++#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" +msgstr "ステージングされた（コミット予定済の）変更" + - #: git-gui.sh:2781 ++#: git-gui.sh:2967 +msgid "Unstaged Changes" +msgstr "コミット予定に入っていない変更" + - #: git-gui.sh:2831 ++#: git-gui.sh:3017 +msgid "Stage Changed" +msgstr "変更をコミット予定に入れる" + - #: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182 ++#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +msgid "Push" +msgstr "プッシュ" + - #: git-gui.sh:2885 ++#: git-gui.sh:3071 +msgid "Initial Commit Message:" +msgstr "最初のコミットメッセージ:" + - #: git-gui.sh:2886 ++#: git-gui.sh:3072 +msgid "Amended Commit Message:" +msgstr "訂正したコミットメッセージ:" + - #: git-gui.sh:2887 ++#: git-gui.sh:3073 +msgid "Amended Initial Commit Message:" +msgstr "訂正した最初のコミットメッセージ:" + - #: git-gui.sh:2888 ++#: git-gui.sh:3074 +msgid "Amended Merge Commit Message:" +msgstr "訂正したマージコミットメッセージ:" + - #: git-gui.sh:2889 ++#: git-gui.sh:3075 +msgid "Merge Commit Message:" +msgstr "マージコミットメッセージ:" + - #: git-gui.sh:2890 ++#: git-gui.sh:3076 +msgid "Commit Message:" +msgstr "コミットメッセージ:" + - #: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73 ++#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +msgid "Copy All" +msgstr "全てコピー" + - #: git-gui.sh:2963 lib/blame.tcl:104 ++#: git-gui.sh:3149 lib/blame.tcl:104 +msgid "File:" +msgstr "ファイル:" + - #: git-gui.sh:3078 ++#: git-gui.sh:3255 +msgid "Refresh" +msgstr "再読み込み" + - #: git-gui.sh:3099 ++#: git-gui.sh:3276 +msgid "Decrease Font Size" +msgstr "フォントを小さく" + - #: git-gui.sh:3103 ++#: git-gui.sh:3280 +msgid "Increase Font Size" +msgstr "フォントを大きく" + - #: git-gui.sh:3111 lib/blame.tcl:281 ++#: git-gui.sh:3288 lib/blame.tcl:281 +msgid "Encoding" +msgstr "エンコーディング" + - #: git-gui.sh:3122 ++#: git-gui.sh:3299 +msgid "Apply/Reverse Hunk" +msgstr "パッチを適用/取り消す" + - #: git-gui.sh:3127 ++#: git-gui.sh:3304 +msgid "Apply/Reverse Line" +msgstr "パッチ行を適用/取り消す" + - #: git-gui.sh:3137 ++#: git-gui.sh:3323 +msgid "Run Merge Tool" +msgstr "マージツールを起動" + - #: git-gui.sh:3142 ++#: git-gui.sh:3328 +msgid "Use Remote Version" +msgstr "リモートの方を採用" + - #: git-gui.sh:3146 ++#: git-gui.sh:3332 +msgid "Use Local Version" +msgstr "ローカルの方を採用" + - #: git-gui.sh:3150 ++#: git-gui.sh:3336 +msgid "Revert To Base" +msgstr "ベース版を採用" + - #: git-gui.sh:3169 ++#: git-gui.sh:3354 ++msgid "Visualize These Changes In The Submodule" ++msgstr "サブモジュール内のこれらの変更を見る" ++ ++#: git-gui.sh:3358 ++msgid "Visualize Current Branch History In The Submodule" ++msgstr "サブモジュール内で現在のブランチの履歴を見る" ++ ++#: git-gui.sh:3362 ++msgid "Visualize All Branch History In The Submodule" ++msgstr "サブモジュール内で全てのブランチの履歴を見る" ++ ++#: git-gui.sh:3367 ++msgid "Start git gui In The Submodule" ++msgstr "サブモジュール内でgit guiを起動する" ++ ++#: git-gui.sh:3389 +msgid "Unstage Hunk From Commit" +msgstr "パッチをコミット予定から外す" + - #: git-gui.sh:3170 ++#: git-gui.sh:3391 ++msgid "Unstage Lines From Commit" ++msgstr "コミット予定から行を外す" ++ ++#: git-gui.sh:3393 +msgid "Unstage Line From Commit" +msgstr "コミット予定から行を外す" + - #: git-gui.sh:3172 ++#: git-gui.sh:3396 +msgid "Stage Hunk For Commit" +msgstr "パッチをコミット予定に加える" + - #: git-gui.sh:3173 ++#: git-gui.sh:3398 ++msgid "Stage Lines For Commit" ++msgstr "パッチ行をコミット予定に加える" ++ ++#: git-gui.sh:3400 +msgid "Stage Line For Commit" +msgstr "パッチ行をコミット予定に加える" + - #: git-gui.sh:3196 ++#: git-gui.sh:3424 +msgid "Initializing..." +msgstr "初期化しています…" + - #: git-gui.sh:3301 ++#: git-gui.sh:3541 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"環境に問題がある可能性があります\n" +"\n" +"以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n" +"\n" + - #: git-gui.sh:3331 ++#: git-gui.sh:3570 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"これは Cygwin で配布されている Tcl バイナリに\n" +"関しての既知の問題によります" + - #: git-gui.sh:3336 ++#: git-gui.sh:3575 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"個人的な ~/.gitconfig ファイル内で user.name と user.email の値を設定\n" +"するのが、%s の良い代用となります\n" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "Git のグラフィカルUI git-gui" + +#: lib/blame.tcl:72 +msgid "File Viewer" +msgstr "ファイルピューワ" + +#: lib/blame.tcl:78 +msgid "Commit:" +msgstr "コミット:" + +#: lib/blame.tcl:271 +msgid "Copy Commit" +msgstr "コミットをコピー" + +#: lib/blame.tcl:275 +msgid "Find Text..." +msgstr "テキストを検索" + +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" +msgstr "コピー検知" + +#: lib/blame.tcl:288 +msgid "Show History Context" +msgstr "文脈を見せる" + +#: lib/blame.tcl:291 +msgid "Blame Parent Commit" +msgstr "親コミットを註釈" + +#: lib/blame.tcl:450 +#, tcl-format +msgid "Reading %s..." +msgstr "%s を読んでいます…" + +#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." +msgstr "コピー・移動追跡データを読んでいます…" + +#: lib/blame.tcl:577 +msgid "lines annotated" +msgstr "行を注釈しました" + +#: lib/blame.tcl:769 +msgid "Loading original location annotations..." +msgstr "元位置行の注釈データを読んでいます…" + +#: lib/blame.tcl:772 +msgid "Annotation complete." +msgstr "注釈完了しました" + +#: lib/blame.tcl:802 +msgid "Busy" +msgstr "実行中" + +#: lib/blame.tcl:803 +msgid "Annotation process is already running." +msgstr "すでに blame プロセスを実行中です。" + +#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." +msgstr "コピー検知を実行中…" + +#: lib/blame.tcl:910 +msgid "Loading annotation..." +msgstr "注釈を読み込んでいます…" + - #: lib/blame.tcl:964 ++#: lib/blame.tcl:963 +msgid "Author:" +msgstr "作者:" + - #: lib/blame.tcl:968 ++#: lib/blame.tcl:967 +msgid "Committer:" +msgstr "コミット者:" + - #: lib/blame.tcl:973 ++#: lib/blame.tcl:972 +msgid "Original File:" +msgstr "元ファイル" + - #: lib/blame.tcl:1021 ++#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" +msgstr "HEAD コミットが見つかりません" + - #: lib/blame.tcl:1076 ++#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" +msgstr "親コミットが見つかりません:" + - #: lib/blame.tcl:1091 ++#: lib/blame.tcl:1090 +msgid "Unable to display parent" +msgstr "親を表示できません" + - #: lib/blame.tcl:1092 lib/diff.tcl:297 ++#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" +msgstr "diff を読む際のエラーです:" + - #: lib/blame.tcl:1232 ++#: lib/blame.tcl:1231 +msgid "Originally By:" +msgstr "原作者:" + - #: lib/blame.tcl:1238 ++#: lib/blame.tcl:1237 +msgid "In File:" +msgstr "ファイル:" + - #: lib/blame.tcl:1243 ++#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" +msgstr "複写・移動者:" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "ブランチをチェックアウト" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "チェックアウト" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 - #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 ++#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 - #: lib/transport.tcl:97 ++#: lib/transport.tcl:108 +msgid "Cancel" +msgstr "中止" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" +msgstr "リビジョン" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" +msgstr "オプション" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "トラッキング・ブランチをフェッチ" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "ローカル・ブランチから削除" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "ブランチを作成" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "ブランチを新規作成" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +msgid "Create" +msgstr "作成" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "ブランチ名" + +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" +msgstr "名前:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "トラッキング・ブランチ名を合わせる" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "初期リビジョン" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "既存のブランチを更新:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "いいえ" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "早送りのみ" + - #: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 ++#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" +msgstr "リセット" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "作成してすぐチェックアウト" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "トラッキング・ブランチを選択して下さい。" + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。" + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "ブランチ名を指定して下さい。" + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "'%s' はブランチ名に使えません。" + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "ブランチ削除" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "ローカル・ブランチを削除" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "ローカル・ブランチ" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "マージ済みの時のみ削除" + - #: lib/branch_delete.tcl:54 - msgid "Always (Do not perform merge test.)" - msgstr "無条件(マージテストしない)" ++#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 ++msgid "Always (Do not perform merge checks)" ++msgstr "無条件（マージ検査をしない）" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "以下のブランチは %s に完全にマージされていません:" + ++#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 ++msgid "" ++"Recovering deleted branches is difficult.\n" ++"\n" ++"Delete the selected branches?" ++msgstr "" ++"削除したブランチを回復するのは困難です。\n" ++"\n" ++"選択したブランチを削除して良いですか？" ++ +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"以下のブランチを削除できません:\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "ブランチの名前変更" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "名前変更" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "ブランチ:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "新しい名前:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "名前を変更するブランチを選んで下さい。" + - #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 ++#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "'%s'というブランチは既に存在します。" + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "'%s'の名前変更に失敗しました。" + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "起動中…" + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "ファイル・ブラウザ" + +#: lib/browser.tcl:126 lib/browser.tcl:143 +#, tcl-format +msgid "Loading %s..." +msgstr "%s をロード中…" + +#: lib/browser.tcl:187 +msgid "[Up To Parent]" +msgstr "[上位フォルダへ]" + +#: lib/browser.tcl:267 lib/browser.tcl:273 +msgid "Browse Branch Files" +msgstr "現在のブランチのファイルを見る" + - #: lib/browser.tcl:278 lib/choose_repository.tcl:394 - #: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 - #: lib/choose_repository.tcl:995 ++#: lib/browser.tcl:278 lib/choose_repository.tcl:398 ++#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 ++#: lib/choose_repository.tcl:1028 +msgid "Browse" +msgstr "ブラウズ" + - #: lib/checkout_op.tcl:84 ++#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "%s から %s をフェッチしています" + - #: lib/checkout_op.tcl:132 ++#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "致命的エラー: %s を解決できません" + - #: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 ++#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 +#: lib/sshkey.tcl:53 +msgid "Close" +msgstr "閉じる" + - #: lib/checkout_op.tcl:174 ++#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "ブランチ'%s'は存在しません。" + - #: lib/checkout_op.tcl:193 ++#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." +msgstr "'%s' に簡易 git-pull を設定できませんでした" + - #: lib/checkout_op.tcl:228 ++#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"ブランチ '%s' は既に存在します。\n" +"\n" +"%s に早送りできません。\n" +"マージが必要です。" + - #: lib/checkout_op.tcl:242 ++#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "'%s' マージ戦略はサポートされていません。" + - #: lib/checkout_op.tcl:261 ++#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "'%s' の更新に失敗しました。" + - #: lib/checkout_op.tcl:273 ++#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." +msgstr "インデックスは既にロックされています。" + - #: lib/checkout_op.tcl:288 ++#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"最後にスキャンした状態はリポジトリの状態と合致しません。\n" +"\n" +"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。現在" +"のブランチを変更する前に、再スキャンが必要です。\n" +"\n" +"自動的に再スキャンを開始します。\n" + - #: lib/checkout_op.tcl:344 ++#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "作業ディレクトリを '%s' に更新しています…" + - #: lib/checkout_op.tcl:345 ++#: lib/checkout_op.tcl:346 +msgid "files checked out" +msgstr "チェックアウトされたファイル" + - #: lib/checkout_op.tcl:375 ++#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "'%s' のチェックアウトを中止しました（ファイル毎のマージが必要です）。" + - #: lib/checkout_op.tcl:376 ++#: lib/checkout_op.tcl:377 +msgid "File level merge required." +msgstr "ファイル毎のマージが必要です。" + - #: lib/checkout_op.tcl:380 ++#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "ブランチ '%s' に滞まります。" + - #: lib/checkout_op.tcl:451 ++#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"ローカル・ブランチから離れます。\n" +"\n" +"ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン" +"チを開始してください。" + - #: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472 ++#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#, tcl-format +msgid "Checked out '%s'." +msgstr "'%s' をチェックアウトしました" + - #: lib/checkout_op.tcl:500 ++#: lib/checkout_op.tcl:535 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "'%s' を '%s' にリセットすると、以下のコミットが失なわれます:" + - #: lib/checkout_op.tcl:522 ++#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." +msgstr "失なわれたコミットを回復するのは簡単ではありません。" + - #: lib/checkout_op.tcl:527 ++#: lib/checkout_op.tcl:562 +#, tcl-format +msgid "Reset '%s'?" +msgstr "'%s' をリセットしますか？" + - #: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 ++#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +msgid "Visualize" +msgstr "可視化" + - #: lib/checkout_op.tcl:600 ++#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"現在のブランチを設定できません。\n" +"\n" +"作業ディレクトリは部分的にしか切り替わっていません。ファイルの更新には成功し" +"ましたが、 Git の内部データを更新できませんでした。\n" +"起こるはずのないエラーです。あきらめて %s を終了します。" + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "選択" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "フォント・ファミリー" + +#: lib/choose_font.tcl:74 +msgid "Font Size" +msgstr "フォントの大きさ" + +#: lib/choose_font.tcl:91 +msgid "Font Example" +msgstr "フォント・サンプル" + +#: lib/choose_font.tcl:103 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"これはサンプル文です。\n" +"このフォントが気に入ればお使いになれます。" + +#: lib/choose_repository.tcl:28 +msgid "Git Gui" +msgstr "Git GUI" + - #: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 ++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +msgid "Create New Repository" +msgstr "新しいリポジトリを作る" + +#: lib/choose_repository.tcl:93 +msgid "New..." +msgstr "新規…" + - #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 ++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +msgid "Clone Existing Repository" +msgstr "既存リポジトリを複製する" + +#: lib/choose_repository.tcl:106 +msgid "Clone..." +msgstr "複製…" + - #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 ++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +msgid "Open Existing Repository" +msgstr "既存リポジトリを開く" + +#: lib/choose_repository.tcl:119 +msgid "Open..." +msgstr "開く…" + +#: lib/choose_repository.tcl:132 +msgid "Recent Repositories" +msgstr "最近使ったリポジトリ" + +#: lib/choose_repository.tcl:138 +msgid "Open Recent Repository:" +msgstr "最近使ったリポジトリを開く" + - #: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 - #: lib/choose_repository.tcl:316 ++#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 ++#: lib/choose_repository.tcl:320 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "リポジトリ %s を作製できません:" + - #: lib/choose_repository.tcl:387 ++#: lib/choose_repository.tcl:391 +msgid "Directory:" +msgstr "ディレクトリ:" + - #: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 - #: lib/choose_repository.tcl:1017 ++#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 ++#: lib/choose_repository.tcl:1052 +msgid "Git Repository" +msgstr "GIT リポジトリ" + - #: lib/choose_repository.tcl:442 ++#: lib/choose_repository.tcl:448 +#, tcl-format +msgid "Directory %s already exists." +msgstr "ディレクトリ '%s' は既に存在します。" + - #: lib/choose_repository.tcl:446 ++#: lib/choose_repository.tcl:452 +#, tcl-format +msgid "File %s already exists." +msgstr "ファイル '%s' は既に存在します。" + - #: lib/choose_repository.tcl:460 ++#: lib/choose_repository.tcl:466 +msgid "Clone" +msgstr "複製" + - #: lib/choose_repository.tcl:473 ++#: lib/choose_repository.tcl:479 +msgid "Source Location:" +msgstr "ソースの位置" + - #: lib/choose_repository.tcl:484 ++#: lib/choose_repository.tcl:490 +msgid "Target Directory:" +msgstr "先ディレクトリ:" + - #: lib/choose_repository.tcl:496 ++#: lib/choose_repository.tcl:502 +msgid "Clone Type:" +msgstr "複製方式:" + - #: lib/choose_repository.tcl:502 ++#: lib/choose_repository.tcl:508 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "標準(高速・中冗長度・ハードリンク)" + - #: lib/choose_repository.tcl:508 ++#: lib/choose_repository.tcl:514 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "全複写(低速・冗長バックアップ)" + - #: lib/choose_repository.tcl:514 ++#: lib/choose_repository.tcl:520 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "共有(最高速・非推奨・バックアップ無し)" + - #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 - #: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 - #: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 ++#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 ++#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 ++#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "Git リポジトリではありません: %s" + - #: lib/choose_repository.tcl:586 ++#: lib/choose_repository.tcl:592 +msgid "Standard only available for local repository." +msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。" + - #: lib/choose_repository.tcl:590 ++#: lib/choose_repository.tcl:596 +msgid "Shared only available for local repository." +msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。" + - #: lib/choose_repository.tcl:611 ++#: lib/choose_repository.tcl:617 +#, tcl-format +msgid "Location %s already exists." +msgstr "'%s' は既に存在します。" + - #: lib/choose_repository.tcl:622 ++#: lib/choose_repository.tcl:628 +msgid "Failed to configure origin" +msgstr "origin を設定できませんでした" + - #: lib/choose_repository.tcl:634 ++#: lib/choose_repository.tcl:640 +msgid "Counting objects" +msgstr "オブジェクトを数えています" + - #: lib/choose_repository.tcl:635 ++#: lib/choose_repository.tcl:641 +msgid "buckets" +msgstr "バケツ" + - #: lib/choose_repository.tcl:659 ++#: lib/choose_repository.tcl:665 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "objects/info/alternates を複写できません: %s" + - #: lib/choose_repository.tcl:695 ++#: lib/choose_repository.tcl:701 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "%s から複製する内容はありません" + - #: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 - #: lib/choose_repository.tcl:923 ++#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 ++#: lib/choose_repository.tcl:929 +msgid "The 'master' branch has not been initialized." +msgstr "'master' ブランチが初期化されていません" + - #: lib/choose_repository.tcl:710 ++#: lib/choose_repository.tcl:716 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "ハードリンクが作れないので、コピーします" + - #: lib/choose_repository.tcl:722 ++#: lib/choose_repository.tcl:728 +#, tcl-format +msgid "Cloning from %s" +msgstr "%s から複製しています" + - #: lib/choose_repository.tcl:753 ++#: lib/choose_repository.tcl:759 +msgid "Copying objects" +msgstr "オブジェクトを複写しています" + - #: lib/choose_repository.tcl:754 ++#: lib/choose_repository.tcl:760 +msgid "KiB" +msgstr "KiB" + - #: lib/choose_repository.tcl:778 ++#: lib/choose_repository.tcl:784 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "オブジェクトを複写できません: %s" + - #: lib/choose_repository.tcl:788 ++#: lib/choose_repository.tcl:794 +msgid "Linking objects" +msgstr "オブジェクトを連結しています" + - #: lib/choose_repository.tcl:789 ++#: lib/choose_repository.tcl:795 +msgid "objects" +msgstr "オブジェクト" + - #: lib/choose_repository.tcl:797 ++#: lib/choose_repository.tcl:803 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "オブジェクトをハードリンクできません: %s" + - #: lib/choose_repository.tcl:852 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい" + - #: lib/choose_repository.tcl:863 ++#: lib/choose_repository.tcl:869 +msgid "Cannot fetch tags. See console output for details." +msgstr "タグを取得できません。コンソール出力を見て下さい" + - #: lib/choose_repository.tcl:887 ++#: lib/choose_repository.tcl:893 +msgid "Cannot determine HEAD. See console output for details." +msgstr "HEAD を確定できません。コンソール出力を見て下さい" + - #: lib/choose_repository.tcl:896 ++#: lib/choose_repository.tcl:902 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "%s を掃除できません" + - #: lib/choose_repository.tcl:902 ++#: lib/choose_repository.tcl:908 +msgid "Clone failed." +msgstr "複写に失敗しました。" + - #: lib/choose_repository.tcl:909 ++#: lib/choose_repository.tcl:915 +msgid "No default branch obtained." +msgstr "デフォールト・ブランチが取得されませんでした" + - #: lib/choose_repository.tcl:920 ++#: lib/choose_repository.tcl:926 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "%s をコミットとして解釈できません" + - #: lib/choose_repository.tcl:932 ++#: lib/choose_repository.tcl:938 +msgid "Creating working directory" +msgstr "作業ディレクトリを作成しています" + - #: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 - #: lib/index.tcl:196 ++#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 ++#: lib/index.tcl:198 +msgid "files" +msgstr "ファイル" + - #: lib/choose_repository.tcl:962 ++#: lib/choose_repository.tcl:968 +msgid "Initial file checkout failed." +msgstr "初期チェックアウトに失敗しました" + - #: lib/choose_repository.tcl:978 ++#: lib/choose_repository.tcl:1011 +msgid "Open" +msgstr "開く" + - #: lib/choose_repository.tcl:988 ++#: lib/choose_repository.tcl:1021 +msgid "Repository:" +msgstr "リポジトリ:" + - #: lib/choose_repository.tcl:1037 ++#: lib/choose_repository.tcl:1072 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "リポジトリ %s を開けません:" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "分離されたチェックアウト" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "リビジョン式:" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "ローカル・ブランチ" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "トラッキング・ブランチ" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +msgid "Tag" +msgstr "タグ" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "無効なリビジョン: %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "リビジョンが未選択です。" + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "リビジョン式が空です。" + +#: lib/choose_rev.tcl:531 +msgid "Updated" +msgstr "更新しました" + +#: lib/choose_rev.tcl:559 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"訂正するコミットがそもそもありません。\n" +"\n" +"これから作るのは最初のコミットです。その前にはまだ訂正するようなコミットはあ" +"りません。\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"マージ中にコミットの訂正はできません。\n" +"\n" +"現在はまだマージの途中です。先にこのマージを中止しないと、前のコミットの訂正" +"はできません\n" + - #: lib/commit.tcl:49 ++#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "訂正するコミットのデータを読めません:" + - #: lib/commit.tcl:76 ++#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "ユーザの正体を確認できません:" + - #: lib/commit.tcl:81 ++#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "GIT_COMMITTER_IDENT が無効です:" + - #: lib/commit.tcl:133 ++#: lib/commit.tcl:129 ++#, tcl-format ++msgid "warning: Tcl does not support encoding '%s'." ++msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません" ++ ++#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"最後にスキャンした状態はリポジトリの状態と合致しません。\n" +"\n" +"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。新し" +"くコミットする前に、再スキャンが必要です。\n" +"\n" +"自動的に再スキャンを開始します。\n" + - #: lib/commit.tcl:156 ++#: lib/commit.tcl:172 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"マージしていないファイルはコミットできません。\n" +"\n" +"ファイル %s にはマージ衝突が残っています。まず解決してコミット予定に加える必" +"要があります。\n" + - #: lib/commit.tcl:164 ++#: lib/commit.tcl:180 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"不明なファイル状態 %s です。\n" +"\n" +"ファイル %s は本プログラムではコミットできません。\n" + - #: lib/commit.tcl:172 ++#: lib/commit.tcl:188 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"コミットする変更がありません。\n" +"\n" +"最低一つの変更をコミット予定に加えてからコミットして下さい。\n" + - #: lib/commit.tcl:187 ++#: lib/commit.tcl:203 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"コミット・メッセージを入力して下さい。\n" +"\n" +"正しいコミット・メッセージは:\n" +"\n" +"- 第１行: 何をしたか、を１行で要約。\n" +"- 第２行: 空白\n" +"- 残りの行: なぜ、この変更が良い変更か、の説明。\n" + - #: lib/commit.tcl:211 - #, tcl-format - msgid "warning: Tcl does not support encoding '%s'." - msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません" - - #: lib/commit.tcl:227 ++#: lib/commit.tcl:234 +msgid "Calling pre-commit hook..." +msgstr "コミット前フックを実行中・・・" + - #: lib/commit.tcl:242 ++#: lib/commit.tcl:249 +msgid "Commit declined by pre-commit hook." +msgstr "コミット前フックがコミットを拒否しました" + - #: lib/commit.tcl:265 ++#: lib/commit.tcl:272 +msgid "Calling commit-msg hook..." +msgstr "コミット・メッセージ・フックを実行中・・・" + - #: lib/commit.tcl:280 ++#: lib/commit.tcl:287 +msgid "Commit declined by commit-msg hook." +msgstr "コミット・メッセージ・フックがコミットを拒否しました" + - #: lib/commit.tcl:293 ++#: lib/commit.tcl:300 +msgid "Committing changes..." +msgstr "変更点をコミット中・・・" + - #: lib/commit.tcl:309 ++#: lib/commit.tcl:316 +msgid "write-tree failed:" +msgstr "write-tree が失敗しました:" + - #: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374 ++#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +msgid "Commit failed." +msgstr "コミットに失敗しました。" + - #: lib/commit.tcl:327 ++#: lib/commit.tcl:334 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "コミット %s は壊れています" + - #: lib/commit.tcl:332 ++#: lib/commit.tcl:339 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"コミットする変更がありません。\n" +"\n" +"マージでなく、また、一つも変更点がありません。\n" +"\n" +"自動的に再スキャンを開始します。\n" + - #: lib/commit.tcl:339 ++#: lib/commit.tcl:346 +msgid "No changes to commit." +msgstr "コミットする変更がありません。" + - #: lib/commit.tcl:353 ++#: lib/commit.tcl:360 +msgid "commit-tree failed:" +msgstr "commit-tree が失敗しました:" + - #: lib/commit.tcl:373 ++#: lib/commit.tcl:381 +msgid "update-ref failed:" +msgstr "update-ref が失敗しました:" + - #: lib/commit.tcl:461 ++#: lib/commit.tcl:469 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "コミット %s を作成しました: %s" + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "実行中…お待ち下さい…" + +#: lib/console.tcl:186 +msgid "Success" +msgstr "成功" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "エラー: コマンドが失敗しました" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "ばらばらなオブジェクトの数" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "ばらばらなオブジェクトの使用するディスク量" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "パックされたオブジェクトの数" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "パックの数" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "パックされたオブジェクトの使用するディスク量" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "パックに存在するので捨てて良いオブジェクトの数" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "ゴミファイル" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "データベース圧縮" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "fsck-objects でオブジェクト・データベースを検証しています" + - #: lib/database.tcl:108 ++#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " - "the database when more than %i loose objects exist.\n" ++"the database.\n" +"\n" +"Compress the database now?" +msgstr "" +"このリポジトリにはおおよそ %i 個の個別オブジェクトがあります\n" +"\n" - "最適な性能を保つために、%i 個以上の個別オブジェクトを作る毎にデータベースを圧" - "縮することを推奨します\n" ++"最適な性能を保つために、データベースを圧縮することを推奨します\n" +"\n" +"データベースを圧縮しますか？" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Git から出た無効な日付: %s" + - #: lib/diff.tcl:59 ++#: lib/diff.tcl:64 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"変更がありません。\n" +"\n" +"%s には変更がありません。\n" +"\n" +"このファイルの変更時刻は他のアプリケーションによって更新されていますがファイ" +"ル内容には変更がありません。\n" +"\n" +"同様な状態のファイルを探すために、自動的に再スキャンを開始します。" + - #: lib/diff.tcl:99 ++#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "%s の変更点をロード中…" + - #: lib/diff.tcl:120 ++#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"LOCAL: 削除\n" +"Remote:\n" + - #: lib/diff.tcl:125 ++#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"REMOTE: 削除\n" +"LOCAL:\n" + - #: lib/diff.tcl:132 ++#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "LOCAL:\n" + - #: lib/diff.tcl:135 ++#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "REMOTE\n" + - #: lib/diff.tcl:197 lib/diff.tcl:296 ++#: lib/diff.tcl:202 lib/diff.tcl:319 +#, tcl-format +msgid "Unable to display %s" +msgstr "%s を表示できません" + - #: lib/diff.tcl:198 ++#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "ファイルを読む際のエラーです:" + - #: lib/diff.tcl:205 ++#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "Git リポジトリ(サブプロジェクト)" + - #: lib/diff.tcl:217 ++#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." +msgstr "* バイナリファイル(内容は表示しません)" + - #: lib/diff.tcl:222 ++#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* 管理外のファイルの大きさは %d バイトです。\n" +"* 最初の %d バイトだけ表示しています。\n" + - #: lib/diff.tcl:228 ++#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"\n" +"* %s は管理外のファイルをここで切りおとしました。\n" +"* 全体を見るには外部エディタを使ってください。\n" + - #: lib/diff.tcl:436 ++#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." +msgstr "選択されたパッチをコミット予定から外せません。" + - #: lib/diff.tcl:443 ++#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." +msgstr "選択されたパッチをコミット予定に加えられません。" + - #: lib/diff.tcl:509 ++#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." +msgstr "選択されたパッチ行をコミット予定から外せません。" + - #: lib/diff.tcl:517 ++#: lib/diff.tcl:576 +msgid "Failed to stage selected line." +msgstr "選択されたパッチ行をコミット予定に加えられません。" + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "デフォールト" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "システム (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "その他" + +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" +msgstr "エラー" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "警告" + +#: lib/error.tcl:94 +msgid "You must correct the above errors before committing." +msgstr "コミットする前に、以上のエラーを修正して下さい" + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "インデックスをロックできません" + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "索引エラー" + - #: lib/index.tcl:21 ++#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンし" +"ます。" + - #: lib/index.tcl:27 ++#: lib/index.tcl:28 +msgid "Continue" +msgstr "続行" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "インデックスのロック解除" + - #: lib/index.tcl:287 ++#: lib/index.tcl:289 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "コミットから '%s' を降ろす" + - #: lib/index.tcl:326 ++#: lib/index.tcl:328 +msgid "Ready to commit." +msgstr "コミット準備完了" + - #: lib/index.tcl:339 ++#: lib/index.tcl:341 +#, tcl-format +msgid "Adding %s" +msgstr "コミットに %s を加えています" + - #: lib/index.tcl:396 ++#: lib/index.tcl:398 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "ファイル %s にした変更を元に戻しますか？" + - #: lib/index.tcl:398 ++#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "これら %i 個のファイルにした変更を元に戻しますか？" + - #: lib/index.tcl:406 ++#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。" + - #: lib/index.tcl:409 ++#: lib/index.tcl:411 +msgid "Do Nothing" +msgstr "何もしない" + - #: lib/index.tcl:427 ++#: lib/index.tcl:429 +msgid "Reverting selected files" +msgstr "選択されたファイルにした変更を元に戻します" + - #: lib/index.tcl:431 ++#: lib/index.tcl:433 +#, tcl-format +msgid "Reverting %s" +msgstr "%s にした変更を元に戻します" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"訂正中にはマージできません。\n" +"\n" +"訂正処理を完了するまでは新たにマージを開始できません。\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"最後にスキャンした状態はリポジトリの状態と合致しません。\n" +"\n" +"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。マー" +"ジを開始する前に、再スキャンが必要です。\n" +"\n" +"自動的に再スキャンを開始します。\n" + +#: lib/merge.tcl:45 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"衝突のあったマージの途中です。\n" +"\n" +"ファイル %s にはマージ中の衝突が残っています。\n" +"\n" +"このファイルの衝突を解決し、コミット予定に加えて、コミットすることでマージを" +"完了します。そうやって始めて、新たなマージを開始できるようになります。\n" + +#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"変更の途中です。\n" +"\n" +"ファイル %s は変更中です。\n" +"\n" +"現在のコミットを完了してからマージを開始して下さい。そうする方がマージに失敗" +"したときの回復が楽です。\n" + +#: lib/merge.tcl:107 +#, tcl-format +msgid "%s of %s" +msgstr "%s の %s ブランチ" + +#: lib/merge.tcl:120 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "%s と %s をマージ中・・・" + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "マージが完了しました" + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "マージが失敗しました。衝突の解決が必要です。" + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "%s にマージ" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "マージするリビジョン" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"訂正中には中止できません。\n" +"\n" +"まず今のコミット訂正を完了させて下さい。\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"マージを中断しますか？\n" +"\n" +"現在のマージを中断すると、コミットしていない全ての変更が失われます。\n" +"\n" +"マージを中断してよろしいですか？" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"変更点をリセットしますか？\n" +"\n" +"変更点をリセットすると、コミットしていない全ての変更が失われます。\n" +"\n" +"リセットしてよろしいですか？" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "中断しています" + +#: lib/merge.tcl:239 +msgid "files reset" +msgstr "リセットしたファイル" + +#: lib/merge.tcl:267 +msgid "Abort failed." +msgstr "中断に失敗しました。" + +#: lib/merge.tcl:269 +msgid "Abort completed. Ready." +msgstr "中断完了。" + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "共通の版を使いますか?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "自分の側の版を使いますか?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "相手制の版を使いますか?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"競合する変更点だけが表示されていることに注意してください。\n" +"\n" +"%s は上書きされます。\n" +"\n" +"やり直すにはマージ全体をやり直してください。" + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" - msgstr "ファイル %s には解決していない競合部分がまだあるようですが、いいですか?" ++msgstr "" ++"ファイル %s には解決していない競合部分がまだあるようですが、いいですか?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "%s への解決をステージします" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "ツールでは削除やリンク競合は扱えません" + +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "競合ファイルは存在しません。" + +#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "GUI マージツールではありません: %s" + +#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "マージツール '%s' はサポートしていません" + +#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" +msgstr "マージツールはすでに起動しています。終了しますか?" + +#: lib/mergetool.tcl:323 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" +"版の取り出し時にエラーが出ました:\n" +"%s" + +#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" +"マージツールが起動できません:\n" +"\n" +"%s" + +#: lib/mergetool.tcl:347 +msgid "Running merge tool..." +msgstr "マージツールを実行しています..." + +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." +msgstr "マージツールが失敗しました。" + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "全体エンコーディングに 無効な %s が指定されています" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "リポジトリエンコーディングに 無効な %s が指定されています" + +#: lib/option.tcl:117 +msgid "Restore Defaults" +msgstr "既定値に戻す" + +#: lib/option.tcl:121 +msgid "Save" +msgstr "保存" + +#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" +msgstr "%s リポジトリ" + +#: lib/option.tcl:132 +msgid "Global (All Repositories)" +msgstr "大域（全てのリポジトリ）" + +#: lib/option.tcl:138 +msgid "User Name" +msgstr "ユーザ名" + +#: lib/option.tcl:139 +msgid "Email Address" +msgstr "電子メールアドレス" + +#: lib/option.tcl:141 +msgid "Summarize Merge Commits" +msgstr "マージコミットの要約" + +#: lib/option.tcl:142 +msgid "Merge Verbosity" +msgstr "マージの冗長度" + +#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" +msgstr "マージ後に diffstat を表示" + +#: lib/option.tcl:144 +msgid "Use Merge Tool" +msgstr "マージツールを使用" + +#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" +msgstr "ファイル変更時刻を信頼する" + +#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" +msgstr "フェッチ中にトラッキングブランチを刈る" + +#: lib/option.tcl:148 +msgid "Match Tracking Branches" +msgstr "トラッキングブランチを合わせる" + +#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" +msgstr "変更されたファイルのみコピー検知を行なう" + +#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" +msgstr "コピーを検知する最少文字数" + +#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" +msgstr "註釈する履歴半径（日数）" + +#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" +msgstr "diff の文脈行数" + +#: lib/option.tcl:153 +msgid "Commit Message Text Width" +msgstr "コミットメッセージのテキスト幅" + +#: lib/option.tcl:154 +msgid "New Branch Name Template" +msgstr "新しいブランチ名のテンプレート" + +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" +msgstr "ファイル内容のデフォールトエンコーディング" + +#: lib/option.tcl:203 +msgid "Change" +msgstr "変更" + +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" +msgstr "スペルチェック辞書" + +#: lib/option.tcl:254 +msgid "Change Font" +msgstr "フォントを変更" + +#: lib/option.tcl:258 +#, tcl-format +msgid "Choose %s" +msgstr "%s を選択" + +#: lib/option.tcl:264 +msgid "pt." +msgstr "ポイント" + +#: lib/option.tcl:278 +msgid "Preferences" +msgstr "設定" + +#: lib/option.tcl:314 +msgid "Failed to completely save options:" +msgstr "完全にオプションを保存できません:" + +#: lib/remote.tcl:163 +msgid "Remove Remote" +msgstr "リモートを削除" + +#: lib/remote.tcl:168 +msgid "Prune from" +msgstr "から刈込む…" + +#: lib/remote.tcl:173 +msgid "Fetch from" +msgstr "取得元" + +#: lib/remote.tcl:215 +msgid "Push to" +msgstr "プッシュ先" + +#: lib/remote_add.tcl:19 +msgid "Add Remote" +msgstr "リモートを追加" + +#: lib/remote_add.tcl:24 +msgid "Add New Remote" +msgstr "リモートを新規に追加" + +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" +msgstr "追加" + +#: lib/remote_add.tcl:37 +msgid "Remote Details" +msgstr "リモートの詳細" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "場所:" + +#: lib/remote_add.tcl:62 +msgid "Further Action" +msgstr "その他の動作" + +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" +msgstr "即座に取得" + +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" +msgstr "リモートレポジトリを初期化してプッシュ" + +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" +msgstr "何もしない" + +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." +msgstr "リモート名を指定して下さい。" + +#: lib/remote_add.tcl:114 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "'%s' はリモート名に使えません。" + +#: lib/remote_add.tcl:125 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "場所 '%2$s' のリモート '%1$s'の名前変更に失敗しました。" + +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "%s を取得" + +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" +msgstr "%s からフェッチしています" + +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "リポジトリ '%s' を初期化できません。" + - #: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71 ++#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 ++#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" +msgstr "%s をプッシュ" + +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "%2$s にある %1$s をセットアップします" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "遠隔でブランチ削除" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "元のリポジトリ" + - #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 ++#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" +msgstr "リモート:" + - #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 ++#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" +msgstr "任意の位置:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "ブランチ" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "条件付で削除" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "マージ先:" + - #: lib/remote_branch_delete.tcl:119 - msgid "Always (Do not perform merge checks)" - msgstr "無条件（マージ検査をしない）" - +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "'マージ先' にはブランチが必要です。" + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"以下のブランチは %s に完全にマージされていません:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"必要なコミットが不足しているために、マージ検査が失敗しました。まず %s から" +"フェッチして下さい。" + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "削除するブランチを選択して下さい。" + - #: lib/remote_branch_delete.tcl:216 - msgid "" - "Recovering deleted branches is difficult.\n" - "\n" - "Delete the selected branches?" - msgstr "" - "削除したブランチを回復するのは困難です。\n" - "\n" - "選択したブランチを削除して良いですか？" - +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "%s からブランチを削除しています。" + - #: lib/remote_branch_delete.tcl:286 ++#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." +msgstr "リポジトリが選択されていません。" + - #: lib/remote_branch_delete.tcl:291 ++#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." +msgstr "%s をスキャンしています…" + +#: lib/search.tcl:21 +msgid "Find:" +msgstr "検索:" + +#: lib/search.tcl:23 +msgid "Next" +msgstr "次" + +#: lib/search.tcl:24 +msgid "Prev" +msgstr "前" + +#: lib/search.tcl:25 +msgid "Case-Sensitive" +msgstr "大文字小文字を区別" + - #: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "ショートカットが書けません:" + - #: lib/shortcut.tcl:136 ++#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "アイコンが書けません:" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "サポートされていないスペルチェッカーです" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "スペルチェック機能は使えません" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "スペルチェックの設定が不正です" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "辞書を %s に巻き戻します" + +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "スペルチェッカーの起動に失敗しました" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "スペルチェッカーが判別できません" + +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "提案なし" + +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "スペルチェッカーが予想外の EOF を返しました" + +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "スペルチェック失敗" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "キーがありません。" + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "公開鍵がありました: %s" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "鍵を生成" + +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" +msgstr "クリップボードにコピー" + +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" +msgstr "あなたの OpenSSH 公開鍵" + +#: lib/sshkey.tcl:78 +msgid "Generating..." +msgstr "生成中..." + +#: lib/sshkey.tcl:84 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"ssh-keygen を起動できません:\n" +"\n" +"%s" + +#: lib/sshkey.tcl:111 +msgid "Generation failed." +msgstr "生成に失敗しました。" + +#: lib/sshkey.tcl:118 +msgid "Generation succeded, but no keys found." +msgstr "生成には成功しましたが、鍵が見つかりません。" + +#: lib/sshkey.tcl:121 +#, tcl-format +msgid "Your key is in: %s" +msgstr "あなたの鍵は %s にあります" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%1$s ... %4$*i %6$s 中の %2$*i (%7$3i%%)" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "ファイルを選択してから %s を起動してください。" + +#: lib/tools.tcl:90 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "本当に %s を起動しますか?" + +#: lib/tools.tcl:110 +#, tcl-format +msgid "Tool: %s" +msgstr "ツール: %s" + +#: lib/tools.tcl:111 +#, tcl-format +msgid "Running: %s" +msgstr "実行中: %s" + +#: lib/tools.tcl:149 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "ツールが完了しました: %s" + +#: lib/tools.tcl:151 +#, tcl-format +msgid "Tool failed: %s" +msgstr "ツールが失敗しました: %s" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "ツールの追加" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "新規ツールコマンドの追加" + +#: lib/tools_dlg.tcl:33 +msgid "Add globally" +msgstr "全体に追加" + +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" +msgstr "ツールの詳細" + +#: lib/tools_dlg.tcl:48 +msgid "Use '/' separators to create a submenu tree:" +msgstr "'/' でサブメニューを区切ります:" + +#: lib/tools_dlg.tcl:61 +msgid "Command:" +msgstr "コマンド:" + +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" +msgstr "起動する前にダイアログを表示" + +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "ユーザにコミットを一つ選ばせる ($REVISION にセットします)" + +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "ユーザに他の引数を追加させる ($ARGS にセットします)" + +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" +msgstr "コマンドからの出力ウィンドウを見せない" + +#: lib/tools_dlg.tcl:97 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "パッチが選ばれているときだけ動かす($FILENAME が空でない)" + +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." +msgstr "ツール名を指定して下さい。" + +#: lib/tools_dlg.tcl:129 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "ツール '%s' は既に存在します。" + +#: lib/tools_dlg.tcl:151 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" +"ツールを追加できません:\n" +"%s" + +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" +msgstr "ツールの削除" + +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" +msgstr "ツールコマンドの削除" + +#: lib/tools_dlg.tcl:200 +msgid "Remove" +msgstr "削除" + +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" +msgstr "(青色はローカルレポジトリのツールです)" + +#: lib/tools_dlg.tcl:297 +#, tcl-format +msgid "Run Command: %s" +msgstr "コマンドを起動: %s" + +#: lib/tools_dlg.tcl:311 +msgid "Arguments" +msgstr "引数" + +#: lib/tools_dlg.tcl:348 +msgid "OK" +msgstr "OK" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "%s から新しい変更をフェッチしています" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "遠隔刈込 %s" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "%s から削除されたトラッキング・ブランチを刈っています" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "%s へ変更をプッシュしています" + +#: lib/transport.tcl:64 +#, tcl-format +msgid "Mirroring to %s" +msgstr "%s へミラーしています" + +#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "%3$s へ %1$s %2$s をプッシュしています" + - #: lib/transport.tcl:89 ++#: lib/transport.tcl:100 +msgid "Push Branches" +msgstr "ブランチをプッシュ" + - #: lib/transport.tcl:103 ++#: lib/transport.tcl:114 +msgid "Source Branches" +msgstr "元のブランチ" + - #: lib/transport.tcl:120 ++#: lib/transport.tcl:131 +msgid "Destination Repository" +msgstr "送り先リポジトリ" + - #: lib/transport.tcl:158 ++#: lib/transport.tcl:169 +msgid "Transfer Options" +msgstr "通信オプション" + - #: lib/transport.tcl:160 ++#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "既存ブランチを上書き(変更を破棄する可能性があります)" + - #: lib/transport.tcl:164 ++#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" +msgstr "Thin Pack を使う（遅いネットワーク接続）" + - #: lib/transport.tcl:168 ++#: lib/transport.tcl:179 +msgid "Include tags" +msgstr "タグを含める" diff --cc git-gui/po/sv.po index c1535f94e,000000000..d8d73acf2 mode 100644,000000..100644 --- a/git-gui/po/sv.po +++ b/git-gui/po/sv.po @@@ -1,2567 -1,0 +1,2601 @@@ +# Swedish translation of git-gui. +# Copyright (C) 2007-2008 Shawn Pearce, et al. +# This file is distributed under the same license as the git-gui package. +# +# Peter Krefting , 2007-2008. +# Mikael Magnusson , 2008. +msgid "" +msgstr "" +"Project-Id-Version: sv\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-12-08 08:31-0800\n" - "PO-Revision-Date: 2008-12-10 09:49+0100\n" ++"POT-Creation-Date: 2010-01-26 15:47-0800\n" ++"PO-Revision-Date: 2010-01-28 13:57+0100\n" +"Last-Translator: Peter Krefting \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" ++"Content-Transfer-Encoding: 8bit" + - #: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 - #: git-gui.sh:866 ++#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 ++#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "git-gui: ödesdigert fel" + - #: git-gui.sh:689 ++#: git-gui.sh:743 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Ogiltigt teckensnitt angivet i %s:" + - #: git-gui.sh:723 ++#: git-gui.sh:779 +msgid "Main Font" +msgstr "Huvudteckensnitt" + - #: git-gui.sh:724 ++#: git-gui.sh:780 +msgid "Diff/Console Font" +msgstr "Diff/konsolteckensnitt" + - #: git-gui.sh:738 ++#: git-gui.sh:794 +msgid "Cannot find git in PATH." +msgstr "Hittar inte git i PATH." + - #: git-gui.sh:765 ++#: git-gui.sh:821 +msgid "Cannot parse Git version string:" +msgstr "Kan inte tolka versionssträng från Git:" + - #: git-gui.sh:783 ++#: git-gui.sh:839 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Kan inte avgöra Gits version.\n" +"\n" +"%s säger att dess version är \"%s\".\n" +"\n" +"%s kräver minst Git 1.5.0 eller senare.\n" +"\n" +"Anta att \"%s\" är version 1.5.0?\n" + - #: git-gui.sh:1062 ++#: git-gui.sh:1128 +msgid "Git directory not found:" +msgstr "Git-katalogen hittades inte:" + - #: git-gui.sh:1069 ++#: git-gui.sh:1146 +msgid "Cannot move to top of working directory:" +msgstr "Kan inte gå till början på arbetskatalogen:" + - #: git-gui.sh:1076 - msgid "Cannot use funny .git directory:" - msgstr "Kan inte använda underlig .git-katalog:" ++#: git-gui.sh:1154 ++msgid "Cannot use bare repository:" ++msgstr "Kan inte använda naket arkiv:" + - #: git-gui.sh:1081 ++#: git-gui.sh:1162 +msgid "No working directory" +msgstr "Ingen arbetskatalog" + - #: git-gui.sh:1247 lib/checkout_op.tcl:305 ++#: git-gui.sh:1334 lib/checkout_op.tcl:306 +msgid "Refreshing file status..." +msgstr "Uppdaterar filstatus..." + - #: git-gui.sh:1303 ++#: git-gui.sh:1390 +msgid "Scanning for modified files ..." +msgstr "Söker efter ändrade filer..." + - #: git-gui.sh:1367 ++#: git-gui.sh:1454 +msgid "Calling prepare-commit-msg hook..." +msgstr "" +"Anropar kroken för förberedelse av incheckningsmeddelande (prepare-commit-" +"msg)..." + - #: git-gui.sh:1384 ++#: git-gui.sh:1471 +msgid "Commit declined by prepare-commit-msg hook." +msgstr "" +"Incheckningen avvisades av kroken för förberedelse av incheckningsmeddelande " +"(prepare-commit-msg)." + - #: git-gui.sh:1542 lib/browser.tcl:246 ++#: git-gui.sh:1629 lib/browser.tcl:246 +msgid "Ready." +msgstr "Klar." + - #: git-gui.sh:1819 ++#: git-gui.sh:1787 ++#, tcl-format ++msgid "Displaying only %s of %s files." ++msgstr "Visar endast %s av %s filer." ++ ++#: git-gui.sh:1913 +msgid "Unmodified" +msgstr "Oförändrade" + - #: git-gui.sh:1821 ++#: git-gui.sh:1915 +msgid "Modified, not staged" +msgstr "Förändrade, ej köade" + - #: git-gui.sh:1822 git-gui.sh:1830 ++#: git-gui.sh:1916 git-gui.sh:1924 +msgid "Staged for commit" +msgstr "Köade för incheckning" + - #: git-gui.sh:1823 git-gui.sh:1831 ++#: git-gui.sh:1917 git-gui.sh:1925 +msgid "Portions staged for commit" +msgstr "Delar köade för incheckning" + - #: git-gui.sh:1824 git-gui.sh:1832 ++#: git-gui.sh:1918 git-gui.sh:1926 +msgid "Staged for commit, missing" +msgstr "Köade för incheckning, saknade" + - #: git-gui.sh:1826 ++#: git-gui.sh:1920 +msgid "File type changed, not staged" +msgstr "Filtyp ändrad, ej köade" + - #: git-gui.sh:1827 ++#: git-gui.sh:1921 +msgid "File type changed, staged" +msgstr "Filtyp ändrad, köade" + - #: git-gui.sh:1829 ++#: git-gui.sh:1923 +msgid "Untracked, not staged" +msgstr "Ej spårade, ej köade" + - #: git-gui.sh:1834 ++#: git-gui.sh:1928 +msgid "Missing" +msgstr "Saknade" + - #: git-gui.sh:1835 ++#: git-gui.sh:1929 +msgid "Staged for removal" +msgstr "Köade för borttagning" + - #: git-gui.sh:1836 ++#: git-gui.sh:1930 +msgid "Staged for removal, still present" +msgstr "Köade för borttagning, fortfarande närvarande" + - #: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 - #: git-gui.sh:1842 git-gui.sh:1843 ++#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 ++#: git-gui.sh:1936 git-gui.sh:1937 +msgid "Requires merge resolution" +msgstr "Kräver konflikthantering efter sammanslagning" + - #: git-gui.sh:1878 ++#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." +msgstr "Startar gitk... vänta..." + - #: git-gui.sh:1887 ++#: git-gui.sh:1984 +msgid "Couldn't find gitk in PATH" - msgstr "Hittar inte gitk i PATH." ++msgstr "Hittade inte gitk i PATH." ++ ++#: git-gui.sh:2043 ++msgid "Couldn't find git gui in PATH" ++msgstr "Hittade inte git gui i PATH." + - #: git-gui.sh:2280 lib/choose_repository.tcl:36 ++#: git-gui.sh:2455 lib/choose_repository.tcl:36 +msgid "Repository" +msgstr "Arkiv" + - #: git-gui.sh:2281 ++#: git-gui.sh:2456 +msgid "Edit" +msgstr "Redigera" + - #: git-gui.sh:2283 lib/choose_rev.tcl:561 ++#: git-gui.sh:2458 lib/choose_rev.tcl:561 +msgid "Branch" +msgstr "Gren" + - #: git-gui.sh:2286 lib/choose_rev.tcl:548 ++#: git-gui.sh:2461 lib/choose_rev.tcl:548 +msgid "Commit@@noun" +msgstr "Incheckning" + - #: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Slå ihop" + - #: git-gui.sh:2290 lib/choose_rev.tcl:557 ++#: git-gui.sh:2465 lib/choose_rev.tcl:557 +msgid "Remote" +msgstr "Fjärrarkiv" + - #: git-gui.sh:2293 ++#: git-gui.sh:2468 +msgid "Tools" +msgstr "Verktyg" + - #: git-gui.sh:2302 ++#: git-gui.sh:2477 +msgid "Explore Working Copy" +msgstr "Utforska arbetskopia" + - #: git-gui.sh:2307 ++#: git-gui.sh:2483 +msgid "Browse Current Branch's Files" +msgstr "Bläddra i grenens filer" + - #: git-gui.sh:2311 ++#: git-gui.sh:2487 +msgid "Browse Branch Files..." +msgstr "Bläddra filer på gren..." + - #: git-gui.sh:2316 ++#: git-gui.sh:2492 +msgid "Visualize Current Branch's History" +msgstr "Visualisera grenens historik" + - #: git-gui.sh:2320 ++#: git-gui.sh:2496 +msgid "Visualize All Branch History" +msgstr "Visualisera alla grenars historik" + - #: git-gui.sh:2327 ++#: git-gui.sh:2503 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Bläddra i filer för %s" + - #: git-gui.sh:2329 ++#: git-gui.sh:2505 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Visualisera historik för %s" + - #: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Databasstatistik" + - #: git-gui.sh:2337 lib/database.tcl:34 ++#: git-gui.sh:2513 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Komprimera databas" + - #: git-gui.sh:2340 ++#: git-gui.sh:2516 +msgid "Verify Database" +msgstr "Verifiera databas" + - #: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 - #: lib/shortcut.tcl:39 lib/shortcut.tcl:71 ++#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 ++#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +msgid "Create Desktop Icon" +msgstr "Skapa skrivbordsikon" + - #: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 ++#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +msgid "Quit" +msgstr "Avsluta" + - #: git-gui.sh:2371 ++#: git-gui.sh:2547 +msgid "Undo" +msgstr "Ångra" + - #: git-gui.sh:2374 ++#: git-gui.sh:2550 +msgid "Redo" +msgstr "Gör om" + - #: git-gui.sh:2378 git-gui.sh:2937 ++#: git-gui.sh:2554 git-gui.sh:3109 +msgid "Cut" +msgstr "Klipp ut" + - #: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096 ++#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: lib/console.tcl:69 +msgid "Copy" +msgstr "Kopiera" + - #: git-gui.sh:2384 git-gui.sh:2943 ++#: git-gui.sh:2560 git-gui.sh:3115 +msgid "Paste" +msgstr "Klistra in" + - #: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26 ++#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Ta bort" + - #: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71 ++#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +msgid "Select All" +msgstr "Markera alla" + - #: git-gui.sh:2400 ++#: git-gui.sh:2576 +msgid "Create..." +msgstr "Skapa..." + - #: git-gui.sh:2406 ++#: git-gui.sh:2582 +msgid "Checkout..." +msgstr "Checka ut..." + - #: git-gui.sh:2412 ++#: git-gui.sh:2588 +msgid "Rename..." +msgstr "Byt namn..." + - #: git-gui.sh:2417 ++#: git-gui.sh:2593 +msgid "Delete..." +msgstr "Ta bort..." + - #: git-gui.sh:2422 ++#: git-gui.sh:2598 +msgid "Reset..." +msgstr "Återställ..." + - #: git-gui.sh:2432 ++#: git-gui.sh:2608 +msgid "Done" +msgstr "Färdig" + - #: git-gui.sh:2434 ++#: git-gui.sh:2610 +msgid "Commit@@verb" +msgstr "Checka in" + - #: git-gui.sh:2443 git-gui.sh:2878 ++#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "Ny incheckning" + - #: git-gui.sh:2451 git-gui.sh:2885 ++#: git-gui.sh:2627 git-gui.sh:3057 +msgid "Amend Last Commit" +msgstr "Lägg till föregående incheckning" + - #: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Sök på nytt" + - #: git-gui.sh:2467 ++#: git-gui.sh:2643 +msgid "Stage To Commit" +msgstr "Köa för incheckning" + - #: git-gui.sh:2473 ++#: git-gui.sh:2649 +msgid "Stage Changed Files To Commit" +msgstr "Köa ändrade filer för incheckning" + - #: git-gui.sh:2479 ++#: git-gui.sh:2655 +msgid "Unstage From Commit" +msgstr "Ta bort från incheckningskö" + - #: git-gui.sh:2484 lib/index.tcl:410 ++#: git-gui.sh:2661 lib/index.tcl:412 +msgid "Revert Changes" +msgstr "Återställ ändringar" + - #: git-gui.sh:2491 git-gui.sh:3083 ++#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +msgid "Show Less Context" +msgstr "Visa mindre sammanhang" + - #: git-gui.sh:2495 git-gui.sh:3087 ++#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +msgid "Show More Context" +msgstr "Visa mer sammanhang" + - #: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961 ++#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +msgid "Sign Off" +msgstr "Skriv under" + - #: git-gui.sh:2518 ++#: git-gui.sh:2696 +msgid "Local Merge..." +msgstr "Lokal sammanslagning..." + - #: git-gui.sh:2523 ++#: git-gui.sh:2701 +msgid "Abort Merge..." +msgstr "Avbryt sammanslagning..." + - #: git-gui.sh:2535 git-gui.sh:2575 ++#: git-gui.sh:2713 git-gui.sh:2741 +msgid "Add..." +msgstr "Lägg till..." + - #: git-gui.sh:2539 ++#: git-gui.sh:2717 +msgid "Push..." +msgstr "Sänd..." + - #: git-gui.sh:2543 ++#: git-gui.sh:2721 +msgid "Delete Branch..." +msgstr "Ta bort gren..." + - #: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 - #, tcl-format - msgid "About %s" - msgstr "Om %s" - - #: git-gui.sh:2557 - msgid "Preferences..." - msgstr "Inställningar..." - - #: git-gui.sh:2565 git-gui.sh:3129 ++#: git-gui.sh:2731 git-gui.sh:3292 +msgid "Options..." +msgstr "Alternativ..." + - #: git-gui.sh:2576 ++#: git-gui.sh:2742 +msgid "Remove..." +msgstr "Ta bort..." + - #: git-gui.sh:2585 lib/choose_repository.tcl:50 ++#: git-gui.sh:2751 lib/choose_repository.tcl:50 +msgid "Help" +msgstr "Hjälp" + - #: git-gui.sh:2611 ++#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 ++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 ++#, tcl-format ++msgid "About %s" ++msgstr "Om %s" ++ ++#: git-gui.sh:2783 +msgid "Online Documentation" +msgstr "Webbdokumentation" + - #: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 ++#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +msgid "Show SSH Key" +msgstr "Visa SSH-nyckel" + - #: git-gui.sh:2721 ++#: git-gui.sh:2893 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas" + - #: git-gui.sh:2754 ++#: git-gui.sh:2926 +msgid "Current Branch:" +msgstr "Aktuell gren:" + - #: git-gui.sh:2775 ++#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" +msgstr "Köade ändringar (kommer att checkas in)" + - #: git-gui.sh:2795 ++#: git-gui.sh:2967 +msgid "Unstaged Changes" +msgstr "Oköade ändringar" + - #: git-gui.sh:2845 ++#: git-gui.sh:3017 +msgid "Stage Changed" +msgstr "Köa ändrade" + - #: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193 ++#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +msgid "Push" +msgstr "Sänd" + - #: git-gui.sh:2899 ++#: git-gui.sh:3071 +msgid "Initial Commit Message:" +msgstr "Inledande incheckningsmeddelande:" + - #: git-gui.sh:2900 ++#: git-gui.sh:3072 +msgid "Amended Commit Message:" +msgstr "Utökat incheckningsmeddelande:" + - #: git-gui.sh:2901 ++#: git-gui.sh:3073 +msgid "Amended Initial Commit Message:" +msgstr "Utökat inledande incheckningsmeddelande:" + - #: git-gui.sh:2902 ++#: git-gui.sh:3074 +msgid "Amended Merge Commit Message:" +msgstr "Utökat incheckningsmeddelande för sammanslagning:" + - #: git-gui.sh:2903 ++#: git-gui.sh:3075 +msgid "Merge Commit Message:" +msgstr "Incheckningsmeddelande för sammanslagning:" + - #: git-gui.sh:2904 ++#: git-gui.sh:3076 +msgid "Commit Message:" +msgstr "Incheckningsmeddelande:" + - #: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73 ++#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +msgid "Copy All" +msgstr "Kopiera alla" + - #: git-gui.sh:2977 lib/blame.tcl:104 ++#: git-gui.sh:3149 lib/blame.tcl:104 +msgid "File:" +msgstr "Fil:" + - #: git-gui.sh:3092 ++#: git-gui.sh:3255 +msgid "Refresh" +msgstr "Uppdatera" + - #: git-gui.sh:3113 ++#: git-gui.sh:3276 +msgid "Decrease Font Size" +msgstr "Minska teckensnittsstorlek" + - #: git-gui.sh:3117 ++#: git-gui.sh:3280 +msgid "Increase Font Size" +msgstr "Öka teckensnittsstorlek" + - #: git-gui.sh:3125 lib/blame.tcl:281 ++#: git-gui.sh:3288 lib/blame.tcl:281 +msgid "Encoding" +msgstr "Teckenkodning" + - #: git-gui.sh:3136 ++#: git-gui.sh:3299 +msgid "Apply/Reverse Hunk" +msgstr "Använd/återställ del" + - #: git-gui.sh:3141 ++#: git-gui.sh:3304 +msgid "Apply/Reverse Line" +msgstr "Använd/återställ rad" + - #: git-gui.sh:3151 ++#: git-gui.sh:3323 +msgid "Run Merge Tool" +msgstr "Starta verktyg för sammanslagning" + - #: git-gui.sh:3156 ++#: git-gui.sh:3328 +msgid "Use Remote Version" +msgstr "Använd versionen från fjärrarkivet" + - #: git-gui.sh:3160 ++#: git-gui.sh:3332 +msgid "Use Local Version" +msgstr "Använd lokala versionen" + - #: git-gui.sh:3164 ++#: git-gui.sh:3336 +msgid "Revert To Base" +msgstr "Återställ till basversionen" + - #: git-gui.sh:3183 ++#: git-gui.sh:3354 ++msgid "Visualize These Changes In The Submodule" ++msgstr "Visualisera ändringarna i undermodulen" ++ ++#: git-gui.sh:3358 ++msgid "Visualize Current Branch History In The Submodule" ++msgstr "Visualisera grenens historik i undermodulen" ++ ++#: git-gui.sh:3362 ++msgid "Visualize All Branch History In The Submodule" ++msgstr "Visualisera alla grenars historik i undermodulen" ++ ++#: git-gui.sh:3367 ++msgid "Start git gui In The Submodule" ++msgstr "Starta git gui i undermodulen" ++ ++#: git-gui.sh:3389 +msgid "Unstage Hunk From Commit" +msgstr "Ta bort del ur incheckningskö" + - #: git-gui.sh:3184 ++#: git-gui.sh:3391 ++msgid "Unstage Lines From Commit" ++msgstr "Ta bort rader ur incheckningskö" ++ ++#: git-gui.sh:3393 +msgid "Unstage Line From Commit" +msgstr "Ta bort rad ur incheckningskö" + - #: git-gui.sh:3186 ++#: git-gui.sh:3396 +msgid "Stage Hunk For Commit" +msgstr "Ställ del i incheckningskö" + - #: git-gui.sh:3187 ++#: git-gui.sh:3398 ++msgid "Stage Lines For Commit" ++msgstr "Ställ rader i incheckningskö" ++ ++#: git-gui.sh:3400 +msgid "Stage Line For Commit" +msgstr "Ställ rad i incheckningskö" + - #: git-gui.sh:3210 ++#: git-gui.sh:3424 +msgid "Initializing..." +msgstr "Initierar..." + - #: git-gui.sh:3315 ++#: git-gui.sh:3541 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"Det finns möjliga problem med miljövariabler.\n" +"\n" +"Följande miljövariabler kommer troligen att\n" +"ignoreras av alla Git-underprocesser som körs\n" +"av %s:\n" +"\n" + - #: git-gui.sh:3345 ++#: git-gui.sh:3570 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"Detta beror på ett känt problem med\n" +"Tcl-binären som följer med Cygwin." + - #: git-gui.sh:3350 ++#: git-gui.sh:3575 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"Du kan ersätta %s\n" +"med att lägga in värden för inställningarna\n" +"user.name och user.email i din personliga\n" +"~/.gitconfig-fil.\n" + +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - ett grafiskt användargränssnitt för Git." + +#: lib/blame.tcl:72 +msgid "File Viewer" +msgstr "Filvisare" + +#: lib/blame.tcl:78 +msgid "Commit:" +msgstr "Incheckning:" + +#: lib/blame.tcl:271 +msgid "Copy Commit" +msgstr "Kopiera incheckning" + +#: lib/blame.tcl:275 +msgid "Find Text..." +msgstr "Sök text..." + +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" +msgstr "Gör full kopieringsigenkänning" + +#: lib/blame.tcl:288 +msgid "Show History Context" +msgstr "Visa historiksammanhang" + +#: lib/blame.tcl:291 +msgid "Blame Parent Commit" +msgstr "Klandra föräldraincheckning" + +#: lib/blame.tcl:450 +#, tcl-format +msgid "Reading %s..." +msgstr "Läser %s..." + +#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." +msgstr "Läser annoteringar för kopiering/flyttning..." + +#: lib/blame.tcl:577 +msgid "lines annotated" +msgstr "rader annoterade" + +#: lib/blame.tcl:769 +msgid "Loading original location annotations..." +msgstr "Läser in annotering av originalplacering..." + +#: lib/blame.tcl:772 +msgid "Annotation complete." +msgstr "Annotering fullbordad." + +#: lib/blame.tcl:802 +msgid "Busy" +msgstr "Upptagen" + +#: lib/blame.tcl:803 +msgid "Annotation process is already running." +msgstr "Annoteringsprocess körs redan." + +#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." +msgstr "Kör grundlig kopieringsigenkänning..." + +#: lib/blame.tcl:910 +msgid "Loading annotation..." +msgstr "Läser in annotering..." + +#: lib/blame.tcl:963 +msgid "Author:" +msgstr "Författare:" + +#: lib/blame.tcl:967 +msgid "Committer:" +msgstr "Incheckare:" + +#: lib/blame.tcl:972 +msgid "Original File:" +msgstr "Ursprunglig fil:" + +#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" +msgstr "Hittar inte incheckning för HEAD:" + +#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" +msgstr "Hittar inte föräldraincheckning:" + +#: lib/blame.tcl:1090 +msgid "Unable to display parent" +msgstr "Kan inte visa förälder" + - #: lib/blame.tcl:1091 lib/diff.tcl:297 ++#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" +msgstr "Fel vid inläsning av differens:" + +#: lib/blame.tcl:1231 +msgid "Originally By:" +msgstr "Ursprungligen av:" + +#: lib/blame.tcl:1237 +msgid "In File:" +msgstr "I filen:" + +#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" +msgstr "Kopierad eller flyttad hit av:" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Checka ut gren" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Checka ut" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 - #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 ++#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 +#: lib/transport.tcl:108 +msgid "Cancel" +msgstr "Avbryt" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" +msgstr "Revision" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" +msgstr "Alternativ" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Hämta spårande gren" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Koppla bort från lokal gren" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Skapa gren" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Skapa ny gren" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +msgid "Create" +msgstr "Skapa" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Namn på gren" + +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" +msgstr "Namn:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Använd namn på spårad gren" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Inledande revision" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Uppdatera befintlig gren:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Nej" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Endast snabbspolning" + - #: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 ++#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" +msgstr "Återställ" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Checka ut när skapad" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Välj en gren att spåra." + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "Den spårade grenen %s är inte en gren i fjärrarkivet." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Ange ett namn för grenen." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "\"%s\" kan inte användas som namn på grenen." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Ta bort gren" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Ta bort lokal gren" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Lokala grenar" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Ta bara bort om sammanslagen med" + - #: lib/branch_delete.tcl:54 - msgid "Always (Do not perform merge test.)" - msgstr "Alltid (utför inte sammanslagningstest)." ++#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 ++msgid "Always (Do not perform merge checks)" ++msgstr "Alltid (utför inte sammanslagningstest)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +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 lib/remote_branch_delete.tcl:217 ++msgid "" ++"Recovering deleted branches is difficult.\n" ++"\n" ++"Delete the selected branches?" ++msgstr "" ++"Det kan vara svårt att återställa borttagna grenar.\n" ++"\n" ++"Ta bort de valda grenarna?" ++ +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Kunde inte ta bort grenar:\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Byt namn på gren" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Byt namn" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Gren:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Nytt namn:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Välj en gren att byta namn på." + - #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 ++#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "Grenen \"%s\" finns redan." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Kunde inte byta namn på \"%s\"." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Startar..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "Filbläddrare" + +#: lib/browser.tcl:126 lib/browser.tcl:143 +#, tcl-format +msgid "Loading %s..." +msgstr "Läser %s..." + +#: lib/browser.tcl:187 +msgid "[Up To Parent]" +msgstr "[Upp till förälder]" + +#: lib/browser.tcl:267 lib/browser.tcl:273 +msgid "Browse Branch Files" +msgstr "Bläddra filer på grenen" + - #: lib/browser.tcl:278 lib/choose_repository.tcl:394 - #: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 - #: lib/choose_repository.tcl:995 ++#: lib/browser.tcl:278 lib/choose_repository.tcl:398 ++#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 ++#: lib/choose_repository.tcl:1028 +msgid "Browse" +msgstr "Bläddra" + - #: lib/checkout_op.tcl:84 ++#: lib/checkout_op.tcl:85 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Hämtar %s från %s" + - #: lib/checkout_op.tcl:132 ++#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "ödesdigert: Kunde inte slå upp %s" + - #: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 ++#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 +#: lib/sshkey.tcl:53 +msgid "Close" +msgstr "Stäng" + - #: lib/checkout_op.tcl:174 ++#: lib/checkout_op.tcl:175 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "Grenen \"%s\" finns inte." + - #: lib/checkout_op.tcl:193 ++#: lib/checkout_op.tcl:194 +#, tcl-format +msgid "Failed to configure simplified git-pull for '%s'." +msgstr "Kunde inte konfigurera förenklad git-pull för '%s'." + - #: lib/checkout_op.tcl:228 ++#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"Grenen \"%s\" finns redan.\n" +"\n" +"Den kan inte snabbspolas till %s.\n" +"En sammanslagning krävs." + - #: lib/checkout_op.tcl:242 ++#: lib/checkout_op.tcl:243 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "Sammanslagningsstrategin \"%s\" stöds inte." + - #: lib/checkout_op.tcl:261 ++#: lib/checkout_op.tcl:262 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "Misslyckades med att uppdatera \"%s\"." + - #: lib/checkout_op.tcl:273 ++#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." +msgstr "Köområdet (index) är redan låst." + - #: lib/checkout_op.tcl:288 ++#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" +"\n" +"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " +"utföra en ny sökning innan den aktuella grenen kan ändras.\n" +"\n" +"Sökningen kommer att startas automatiskt nu.\n" + - #: lib/checkout_op.tcl:344 ++#: lib/checkout_op.tcl:345 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Uppdaterar arbetskatalogen till \"%s\"..." + - #: lib/checkout_op.tcl:345 ++#: lib/checkout_op.tcl:346 +msgid "files checked out" +msgstr "filer utcheckade" + - #: lib/checkout_op.tcl:375 ++#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "Avbryter utcheckning av \"%s\" (sammanslagning på filnivå krävs)." + - #: lib/checkout_op.tcl:376 ++#: lib/checkout_op.tcl:377 +msgid "File level merge required." +msgstr "Sammanslagning på filnivå krävs." + - #: lib/checkout_op.tcl:380 ++#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Stannar på grenen \"%s\"." + - #: lib/checkout_op.tcl:451 ++#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Du är inte längre på en lokal gren.\n" +"\n" +"Om du ville vara på en gren skapar du en nu, baserad på \"Denna frånkopplade " +"utcheckning\"." + - #: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472 ++#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#, tcl-format +msgid "Checked out '%s'." +msgstr "Checkade ut \"%s\"." + - #: lib/checkout_op.tcl:500 ++#: lib/checkout_op.tcl:535 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "" +"Om du återställer \"%s\" till \"%s\" går följande incheckningar förlorade:" + - #: lib/checkout_op.tcl:522 ++#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." +msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar." + - #: lib/checkout_op.tcl:527 ++#: lib/checkout_op.tcl:562 +#, tcl-format +msgid "Reset '%s'?" +msgstr "Återställa \"%s\"?" + - #: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 ++#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +msgid "Visualize" +msgstr "Visualisera" + - #: lib/checkout_op.tcl:600 ++#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"Kunde inte ställa in aktuell gren.\n" +"\n" +"Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna utan " +"problem, men kunde inte uppdatera en intern fil i Git.\n" +"\n" +"Detta skulle inte ha hänt. %s kommer nu stängas och ge upp." + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "Välj" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "Teckensnittsfamilj" + +#: lib/choose_font.tcl:74 +msgid "Font Size" +msgstr "Storlek" + +#: lib/choose_font.tcl:91 +msgid "Font Example" +msgstr "Exempel" + +#: lib/choose_font.tcl:103 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"Detta är en exempeltext.\n" +"Om du tycker om den här texten kan den vara ditt teckensnitt." + +#: lib/choose_repository.tcl:28 +msgid "Git Gui" +msgstr "Git Gui" + - #: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 ++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +msgid "Create New Repository" +msgstr "Skapa nytt arkiv" + +#: lib/choose_repository.tcl:93 +msgid "New..." +msgstr "Nytt..." + - #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 ++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +msgid "Clone Existing Repository" +msgstr "Klona befintligt arkiv" + +#: lib/choose_repository.tcl:106 +msgid "Clone..." +msgstr "Klona..." + - #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 ++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +msgid "Open Existing Repository" +msgstr "Öppna befintligt arkiv" + +#: lib/choose_repository.tcl:119 +msgid "Open..." +msgstr "Öppna..." + +#: lib/choose_repository.tcl:132 +msgid "Recent Repositories" +msgstr "Senaste arkiven" + +#: lib/choose_repository.tcl:138 +msgid "Open Recent Repository:" +msgstr "Öppna tidigare arkiv:" + - #: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 - #: lib/choose_repository.tcl:316 ++#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 ++#: lib/choose_repository.tcl:320 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "Kunde inte skapa arkivet %s:" + - #: lib/choose_repository.tcl:387 ++#: lib/choose_repository.tcl:391 +msgid "Directory:" +msgstr "Katalog:" + - #: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 - #: lib/choose_repository.tcl:1017 ++#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 ++#: lib/choose_repository.tcl:1052 +msgid "Git Repository" +msgstr "Gitarkiv" + - #: lib/choose_repository.tcl:442 ++#: lib/choose_repository.tcl:448 +#, tcl-format +msgid "Directory %s already exists." +msgstr "Katalogen %s finns redan." + - #: lib/choose_repository.tcl:446 ++#: lib/choose_repository.tcl:452 +#, tcl-format +msgid "File %s already exists." +msgstr "Filen %s finns redan." + - #: lib/choose_repository.tcl:460 ++#: lib/choose_repository.tcl:466 +msgid "Clone" +msgstr "Klona" + - #: lib/choose_repository.tcl:473 ++#: lib/choose_repository.tcl:479 +msgid "Source Location:" +msgstr "Plats för källkod:" + - #: lib/choose_repository.tcl:484 ++#: lib/choose_repository.tcl:490 +msgid "Target Directory:" +msgstr "Målkatalog:" + - #: lib/choose_repository.tcl:496 ++#: lib/choose_repository.tcl:502 +msgid "Clone Type:" +msgstr "Typ av klon:" + - #: lib/choose_repository.tcl:502 ++#: lib/choose_repository.tcl:508 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Standard (snabb, semiredundant, hårda länkar)" + - #: lib/choose_repository.tcl:508 ++#: lib/choose_repository.tcl:514 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Full kopia (långsammare, redundant säkerhetskopia)" + - #: lib/choose_repository.tcl:514 ++#: lib/choose_repository.tcl:520 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)" + - #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 - #: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 - #: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 ++#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 ++#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 ++#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "Inte ett Gitarkiv: %s" + - #: lib/choose_repository.tcl:586 ++#: lib/choose_repository.tcl:592 +msgid "Standard only available for local repository." +msgstr "Standard är endast tillgängligt för lokala arkiv." + - #: lib/choose_repository.tcl:590 ++#: lib/choose_repository.tcl:596 +msgid "Shared only available for local repository." +msgstr "Delat är endast tillgängligt för lokala arkiv." + - #: lib/choose_repository.tcl:611 ++#: lib/choose_repository.tcl:617 +#, tcl-format +msgid "Location %s already exists." +msgstr "Platsen %s finns redan." + - #: lib/choose_repository.tcl:622 ++#: lib/choose_repository.tcl:628 +msgid "Failed to configure origin" +msgstr "Kunde inte konfigurera ursprung" + - #: lib/choose_repository.tcl:634 ++#: lib/choose_repository.tcl:640 +msgid "Counting objects" +msgstr "Räknar objekt" + - #: lib/choose_repository.tcl:635 ++#: lib/choose_repository.tcl:641 +msgid "buckets" +msgstr "hinkar" + - #: lib/choose_repository.tcl:659 ++#: lib/choose_repository.tcl:665 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "Kunde inte kopiera objekt/info/alternativ: %s" + - #: lib/choose_repository.tcl:695 ++#: lib/choose_repository.tcl:701 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Ingenting att klona från %s." + - #: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 - #: lib/choose_repository.tcl:923 ++#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 ++#: lib/choose_repository.tcl:929 +msgid "The 'master' branch has not been initialized." +msgstr "Grenen \"master\" har inte initierats." + - #: lib/choose_repository.tcl:710 ++#: lib/choose_repository.tcl:716 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "Hårda länkar är inte tillgängliga. Faller tillbaka på kopiering." + - #: lib/choose_repository.tcl:722 ++#: lib/choose_repository.tcl:728 +#, tcl-format +msgid "Cloning from %s" +msgstr "Klonar från %s" + - #: lib/choose_repository.tcl:753 ++#: lib/choose_repository.tcl:759 +msgid "Copying objects" +msgstr "Kopierar objekt" + - #: lib/choose_repository.tcl:754 ++#: lib/choose_repository.tcl:760 +msgid "KiB" +msgstr "KiB" + - #: lib/choose_repository.tcl:778 ++#: lib/choose_repository.tcl:784 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Kunde inte kopiera objekt: %s" + - #: lib/choose_repository.tcl:788 ++#: lib/choose_repository.tcl:794 +msgid "Linking objects" +msgstr "Länkar objekt" + - #: lib/choose_repository.tcl:789 ++#: lib/choose_repository.tcl:795 +msgid "objects" +msgstr "objekt" + - #: lib/choose_repository.tcl:797 ++#: lib/choose_repository.tcl:803 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "Kunde inte hårdlänka objekt: %s" + - #: lib/choose_repository.tcl:852 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer." + - #: lib/choose_repository.tcl:863 ++#: lib/choose_repository.tcl:869 +msgid "Cannot fetch tags. See console output for details." +msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer." + - #: lib/choose_repository.tcl:887 ++#: lib/choose_repository.tcl:893 +msgid "Cannot determine HEAD. See console output for details." +msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer." + - #: lib/choose_repository.tcl:896 ++#: lib/choose_repository.tcl:902 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "Kunde inte städa upp %s" + - #: lib/choose_repository.tcl:902 ++#: lib/choose_repository.tcl:908 +msgid "Clone failed." +msgstr "Kloning misslyckades." + - #: lib/choose_repository.tcl:909 ++#: lib/choose_repository.tcl:915 +msgid "No default branch obtained." +msgstr "Hämtade ingen standardgren." + - #: lib/choose_repository.tcl:920 ++#: lib/choose_repository.tcl:926 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "Kunde inte slå upp %s till någon incheckning." + - #: lib/choose_repository.tcl:932 ++#: lib/choose_repository.tcl:938 +msgid "Creating working directory" +msgstr "Skapar arbetskatalog" + - #: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 - #: lib/index.tcl:196 ++#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 ++#: lib/index.tcl:198 +msgid "files" +msgstr "filer" + - #: lib/choose_repository.tcl:962 ++#: lib/choose_repository.tcl:968 +msgid "Initial file checkout failed." +msgstr "Inledande filutcheckning misslyckades." + - #: lib/choose_repository.tcl:978 ++#: lib/choose_repository.tcl:1011 +msgid "Open" +msgstr "Öppna" + - #: lib/choose_repository.tcl:988 ++#: lib/choose_repository.tcl:1021 +msgid "Repository:" +msgstr "Arkiv:" + - #: lib/choose_repository.tcl:1037 ++#: lib/choose_repository.tcl:1072 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Kunde inte öppna arkivet %s:" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "Denna frånkopplade utcheckning" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Revisionsuttryck:" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "Lokal gren" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "Spårande gren" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +msgid "Tag" +msgstr "Tagg" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Ogiltig revision: %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "Ingen revision vald." + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "Revisionsuttrycket är tomt." + +#: lib/choose_rev.tcl:531 +msgid "Updated" +msgstr "Uppdaterad" + +#: lib/choose_rev.tcl:559 +msgid "URL" +msgstr "Webbadress" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Det finns ingenting att utöka.\n" +"\n" +"Du håller på att skapa den inledande incheckningen. Det finns ingen tidigare " +"incheckning att utöka.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Kan inte utöka vid sammanslagning.\n" +"\n" +"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte " +"utöka tidigare incheckningar om du inte först avbryter den pågående " +"sammanslagningen.\n" + +#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" +msgstr "Fel vid inläsning av incheckningsdata för utökning:" + +#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" +msgstr "Kunde inte hämta din identitet:" + +#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "Felaktig GIT_COMMITTER_IDENT:" + - #: lib/commit.tcl:132 ++#: lib/commit.tcl:129 ++#, tcl-format ++msgid "warning: Tcl does not support encoding '%s'." ++msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"." ++ ++#: lib/commit.tcl:149 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" +"\n" +"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " +"utföra en ny sökning innan du kan göra en ny incheckning.\n" +"\n" +"Sökningen kommer att startas automatiskt nu.\n" + - #: lib/commit.tcl:155 ++#: lib/commit.tcl:172 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Osammanslagna filer kan inte checkas in.\n" +"\n" +"Filen %s har sammanslagningskonflikter. Du måste lösa dem och köa filen " +"innan du checkar in den.\n" + - #: lib/commit.tcl:163 ++#: lib/commit.tcl:180 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Okänd filstatus %s upptäckt.\n" +"\n" +"Filen %s kan inte checkas in av programmet.\n" + - #: lib/commit.tcl:171 ++#: lib/commit.tcl:188 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Inga ändringar att checka in.\n" +"\n" +"Du måste köa åtminstone en fil innan du kan checka in.\n" + - #: lib/commit.tcl:186 ++#: lib/commit.tcl:203 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Ange ett incheckningsmeddelande.\n" +"\n" +"Ett bra incheckningsmeddelande har följande format:\n" +"\n" +"- Första raden: Beskriv i en mening vad du gjorde.\n" +"- Andra raden: Tom\n" +"- Följande rader: Beskriv varför det här är en bra ändring.\n" + - #: lib/commit.tcl:210 - #, tcl-format - msgid "warning: Tcl does not support encoding '%s'." - msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"." - - #: lib/commit.tcl:226 ++#: lib/commit.tcl:234 +msgid "Calling pre-commit hook..." +msgstr "Anropar kroken före incheckning (pre-commit)..." + - #: lib/commit.tcl:241 ++#: lib/commit.tcl:249 +msgid "Commit declined by pre-commit hook." +msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)." + - #: lib/commit.tcl:264 ++#: lib/commit.tcl:272 +msgid "Calling commit-msg hook..." +msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..." + - #: lib/commit.tcl:279 ++#: lib/commit.tcl:287 +msgid "Commit declined by commit-msg hook." +msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)." + - #: lib/commit.tcl:292 ++#: lib/commit.tcl:300 +msgid "Committing changes..." +msgstr "Checkar in ändringar..." + - #: lib/commit.tcl:308 ++#: lib/commit.tcl:316 +msgid "write-tree failed:" +msgstr "write-tree misslyckades:" + - #: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373 ++#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +msgid "Commit failed." +msgstr "Incheckningen misslyckades." + - #: lib/commit.tcl:326 ++#: lib/commit.tcl:334 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "Incheckningen %s verkar vara trasig" + - #: lib/commit.tcl:331 ++#: lib/commit.tcl:339 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Inga ändringar att checka in.\n" +"\n" +"Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n" +"\n" +"En sökning kommer att startas automatiskt nu.\n" + - #: lib/commit.tcl:338 ++#: lib/commit.tcl:346 +msgid "No changes to commit." +msgstr "Inga ändringar att checka in." + - #: lib/commit.tcl:352 ++#: lib/commit.tcl:360 +msgid "commit-tree failed:" +msgstr "commit-tree misslyckades:" + - #: lib/commit.tcl:372 ++#: lib/commit.tcl:381 +msgid "update-ref failed:" +msgstr "update-ref misslyckades:" + - #: lib/commit.tcl:460 ++#: lib/commit.tcl:469 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Skapade incheckningen %s: %s" + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Arbetar... vänta..." + +#: lib/console.tcl:186 +msgid "Success" +msgstr "Lyckades" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "Fel: Kommando misslyckades" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "Antal lösa objekt" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "Diskutrymme använt av lösa objekt" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "Antal packade objekt" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "Antal paket" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "Diskutrymme använt av packade objekt" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "Packade objekt som väntar på städning" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "Skräpfiler" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Komprimerar objektdatabasen" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Verifierar objektdatabasen med fsck-objects" + - #: lib/database.tcl:108 ++#: lib/database.tcl:107 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " - "the database when more than %i loose objects exist.\n" ++"the database.\n" +"\n" +"Compress the database now?" +msgstr "" +"Arkivet har för närvarande omkring %i lösa objekt.\n" +"\n" +"För att bibehålla optimal prestanda rekommenderas det å det bestämdaste att " - "du komprimerar databasen när den innehåller mer än %i lösa objekt.\n" ++"du komprimerar databasen.\n" +"\n" +"Komprimera databasen nu?" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Ogiltigt datum från Git: %s" + - #: lib/diff.tcl:59 ++#: lib/diff.tcl:64 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Hittade inga skillnader.\n" +"\n" +"%s innehåller inga ändringar.\n" +"\n" +"Modifieringsdatum för filen uppdaterades av ett annat program, men " +"innehållet i filen har inte ändrats.\n" +"\n" +"En sökning kommer automatiskt att startas för att hitta andra filer som kan " +"vara i samma tillstånd." + - #: lib/diff.tcl:99 ++#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Läser differens för %s..." + - #: lib/diff.tcl:120 ++#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"LOKAL: borttagen\n" +"FJÄRR:\n" + - #: lib/diff.tcl:125 ++#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"FJÄRR: borttagen\n" +"LOKAL:\n" + - #: lib/diff.tcl:132 ++#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "LOKAL:\n" + - #: lib/diff.tcl:135 ++#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "FJÄRR:\n" + - #: lib/diff.tcl:197 lib/diff.tcl:296 ++#: lib/diff.tcl:202 lib/diff.tcl:319 +#, tcl-format +msgid "Unable to display %s" +msgstr "Kan inte visa %s" + - #: lib/diff.tcl:198 ++#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "Fel vid läsning av fil:" + - #: lib/diff.tcl:205 ++#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "Gitarkiv (underprojekt)" + - #: lib/diff.tcl:217 ++#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." +msgstr "* Binärfil (visar inte innehållet)." + - #: lib/diff.tcl:222 ++#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* Den ospårade filen är %d byte.\n" +"* Visar endast inledande %d byte.\n" + - #: lib/diff.tcl:228 ++#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"* Den ospårade filen klipptes här av %s.\n" +"* För att se hela filen, använd ett externt redigeringsprogram.\n" + - #: lib/diff.tcl:436 ++#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." +msgstr "Kunde inte ta bort den valda delen från kön." + - #: lib/diff.tcl:443 ++#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." +msgstr "Kunde inte lägga till den valda delen till kön." + - #: lib/diff.tcl:509 ++#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." +msgstr "Kunde inte ta bort den valda raden från kön." + - #: lib/diff.tcl:517 ++#: lib/diff.tcl:576 +msgid "Failed to stage selected line." +msgstr "Kunde inte lägga till den valda raden till kön." + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Standard" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "Systemets (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Annan" + +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" +msgstr "fel" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "varning" + +#: lib/error.tcl:94 +msgid "You must correct the above errors before committing." +msgstr "Du måste rätta till felen ovan innan du checkar in." + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Kunde inte låsa upp indexet." + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Indexfel" + - #: lib/index.tcl:21 ++#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas " +"automatiskt för att synkronisera om git-gui." + - #: lib/index.tcl:27 ++#: lib/index.tcl:28 +msgid "Continue" +msgstr "Forstätt" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Lås upp index" + - #: lib/index.tcl:287 ++#: lib/index.tcl:289 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "Tar bort %s för incheckningskön" + - #: lib/index.tcl:326 ++#: lib/index.tcl:328 +msgid "Ready to commit." +msgstr "Redo att checka in." + - #: lib/index.tcl:339 ++#: lib/index.tcl:341 +#, tcl-format +msgid "Adding %s" +msgstr "Lägger till %s" + - #: lib/index.tcl:396 ++#: lib/index.tcl:398 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Återställ ändringarna i filen %s?" + - #: lib/index.tcl:398 ++#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Återställ ändringarna i dessa %i filer?" + - #: lib/index.tcl:406 ++#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Alla oköade ändringar kommer permanent gå förlorade vid återställningen." + - #: lib/index.tcl:409 ++#: lib/index.tcl:411 +msgid "Do Nothing" +msgstr "Gör ingenting" + - #: lib/index.tcl:427 ++#: lib/index.tcl:429 +msgid "Reverting selected files" +msgstr "Återställer valda filer" + - #: lib/index.tcl:431 ++#: lib/index.tcl:433 +#, tcl-format +msgid "Reverting %s" +msgstr "Återställer %s" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Kan inte slå ihop vid utökning.\n" +"\n" +"Du måste göra färdig utökningen av incheckningen innan du påbörjar någon " +"slags sammanslagning.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" +"\n" +"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " +"utföra en ny sökning innan du kan utföra en sammanslagning.\n" +"\n" +"Sökningen kommer att startas automatiskt nu.\n" + +#: lib/merge.tcl:45 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Du är mitt i en sammanslagning med konflikter.\n" +"\n" +"Filen %s har sammanslagningskonflikter.\n" +"\n" +"Du måste lösa dem, köa filen och checka in för att fullborda den aktuella " +"sammanslagningen. När du gjort det kan du påbörja en ny sammanslagning.\n" + +#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Du är mitt i en ändring.\n" +"\n" +"Filen %s har ändringar.\n" +"\n" +"Du bör fullborda den aktuella incheckningen innan du påbörjar en " +"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad " +"sammanslagning, om det skulle vara nödvändigt.\n" + +#: lib/merge.tcl:107 +#, tcl-format +msgid "%s of %s" +msgstr "%s av %s" + +#: lib/merge.tcl:120 +#, tcl-format +msgid "Merging %s and %s..." +msgstr "Slår ihop %s och %s..." + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "Sammanslagningen avslutades framgångsrikt." + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "Sammanslagningen misslyckades. Du måste lösa konflikterna." + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "Slå ihop i %s" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "Revisioner att slå ihop" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"Kan inte avbryta vid utökning.\n" +"\n" +"Du måste göra dig färdig med att utöka incheckningen.\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Avbryt sammanslagning?\n" +"\n" +"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gå " +"förlorade.\n" +"\n" +"Gå vidare med att avbryta den aktuella sammanslagningen?" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Återställ ändringar?\n" +"\n" +"Om du återställer ändringarna kommer *ALLA* ej incheckade ändringar att gå " +"förlorade.\n" +"\n" +"Gå vidare med att återställa de aktuella ändringarna?" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "Avbryter" + +#: lib/merge.tcl:239 +msgid "files reset" +msgstr "filer återställda" + +#: lib/merge.tcl:267 +msgid "Abort failed." +msgstr "Misslyckades avbryta." + +#: lib/merge.tcl:269 +msgid "Abort completed. Ready." +msgstr "Avbrytning fullbordad. Redo." + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "Tvinga lösning att använda basversionen?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "Tvinga lösning att använda den aktuella grenen?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "Tvinga lösning att använda den andra grenen?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"Observera att diffen endast visar de ändringar som står i konflikt.\n" +"\n" +"%s kommer att skrivas över.\n" +"\n" +"Du måste starta om sammanslagningen för att göra den här operationen ogjord." + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "Filen %s verkar innehålla olösta konflikter. Vill du köa ändå?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "Lägger till lösning för %s" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "Kan inte lösa borttagnings- eller länkkonflikter med ett verktyg" + +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "Konfliktfil existerar inte" + +#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "Inte ett grafiskt verktyg för sammanslagning: %s" + +#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "Verktyget \"%s\" för sammanslagning stöds inte" + +#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" +msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?" + +#: lib/mergetool.tcl:323 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" +"Fel vid hämtning av versioner:\n" +"%s" + +#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" +"Kunde inte starta verktyg för sammanslagning:\n" +"\n" +"%s" + +#: lib/mergetool.tcl:347 +msgid "Running merge tool..." +msgstr "Kör verktyg för sammanslagning..." + +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." +msgstr "Verktyget för sammanslagning misslyckades." + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "Den globala teckenkodningen \"%s\" är ogiltig" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "Arkivets teckenkodning \"%s\" är ogiltig" + +#: lib/option.tcl:117 +msgid "Restore Defaults" +msgstr "Återställ standardvärden" + +#: lib/option.tcl:121 +msgid "Save" +msgstr "Spara" + +#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" +msgstr "Arkivet %s" + +#: lib/option.tcl:132 +msgid "Global (All Repositories)" +msgstr "Globalt (alla arkiv)" + +#: lib/option.tcl:138 +msgid "User Name" +msgstr "Användarnamn" + +#: lib/option.tcl:139 +msgid "Email Address" +msgstr "E-postadress" + +#: lib/option.tcl:141 +msgid "Summarize Merge Commits" +msgstr "Summera sammanslagningsincheckningar" + +#: lib/option.tcl:142 +msgid "Merge Verbosity" +msgstr "Pratsamhet för sammanslagningar" + +#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" +msgstr "Visa diffstatistik efter sammanslagning" + +#: lib/option.tcl:144 +msgid "Use Merge Tool" +msgstr "Använd verktyg för sammanslagning" + +#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" +msgstr "Lita på filändringstidsstämplar" + +#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" +msgstr "Städa spårade grenar vid hämtning" + +#: lib/option.tcl:148 +msgid "Match Tracking Branches" +msgstr "Matcha spårade grenar" + +#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" +msgstr "Klandra kopiering bara i ändrade filer" + +#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" +msgstr "Minsta antal tecken att klandra kopiering för" + +#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" +msgstr "Historikradie för klandring (dagar)" + +#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" +msgstr "Antal rader sammanhang i differenser" + +#: lib/option.tcl:153 +msgid "Commit Message Text Width" +msgstr "Textbredd för incheckningsmeddelande" + +#: lib/option.tcl:154 +msgid "New Branch Name Template" +msgstr "Mall för namn på nya grenar" + +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" +msgstr "Standardteckenkodning för filinnehåll" + +#: lib/option.tcl:203 +msgid "Change" +msgstr "Ändra" + +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" +msgstr "Stavningsordlista:" + +#: lib/option.tcl:254 +msgid "Change Font" +msgstr "Byt teckensnitt" + +#: lib/option.tcl:258 +#, tcl-format +msgid "Choose %s" +msgstr "Välj %s" + +#: lib/option.tcl:264 +msgid "pt." +msgstr "p." + +#: lib/option.tcl:278 +msgid "Preferences" +msgstr "Inställningar" + +#: lib/option.tcl:314 +msgid "Failed to completely save options:" +msgstr "Misslyckades med att helt spara alternativ:" + +#: lib/remote.tcl:163 +msgid "Remove Remote" +msgstr "Ta bort fjärrarkiv" + +#: lib/remote.tcl:168 +msgid "Prune from" +msgstr "Ta bort från" + +#: lib/remote.tcl:173 +msgid "Fetch from" +msgstr "Hämta från" + +#: lib/remote.tcl:215 +msgid "Push to" +msgstr "Sänd till" + +#: lib/remote_add.tcl:19 +msgid "Add Remote" +msgstr "Lägg till fjärrarkiv" + +#: lib/remote_add.tcl:24 +msgid "Add New Remote" +msgstr "Lägg till nytt fjärrarkiv" + +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" +msgstr "Lägg till" + +#: lib/remote_add.tcl:37 +msgid "Remote Details" +msgstr "Detaljer för fjärrarkiv" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "Plats:" + +#: lib/remote_add.tcl:62 +msgid "Further Action" +msgstr "Ytterligare åtgärd" + +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" +msgstr "Hämta omedelbart" + +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" +msgstr "Initiera fjärrarkiv och sänd till" + +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" +msgstr "Gör ingent mer nu" + +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." +msgstr "Ange ett namn för fjärrarkivet." + +#: lib/remote_add.tcl:114 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "\"%s\" kan inte användas som namn på fjärrarkivet." + +#: lib/remote_add.tcl:125 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "Kunde inte lägga till fjärrarkivet \"%s\" på platsen \"%s\"." + +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "hämta %s" + +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" +msgstr "Hämtar %s" + +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "Vet inte hur arkivet på platsen \"%s\" skall initieras." + +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 +#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" +msgstr "sänd %s" + +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "Konfigurerar %s (på %s)" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "Ta bort gren från fjärrarkiv" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "Från arkiv" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" +msgstr "Fjärrarkiv:" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" +msgstr "Godtycklig plats:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Grenar" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Ta endast bort om" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Sammanslagen i:" + - #: lib/remote_branch_delete.tcl:119 - msgid "Always (Do not perform merge checks)" - msgstr "Alltid (utför inte sammanslagningstest)" - +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "En gren krävs för \"Sammanslagen i\"." + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"Följande grenar har inte helt slagits samman i %s:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"En eller flera av sammanslagningstesterna misslyckades eftersom du inte har " +"hämtat de nödvändiga incheckningarna. Försök hämta från %s först." + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "Välj en eller flera grenar att ta bort." + - #: lib/remote_branch_delete.tcl:216 - msgid "" - "Recovering deleted branches is difficult.\n" - "\n" - "Delete the selected branches?" - msgstr "" - "Det kan vara svårt att återställa borttagna grenar.\n" - "\n" - "Ta bort de valda grenarna?" - +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Tar bort grenar från %s" + - #: lib/remote_branch_delete.tcl:286 ++#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." +msgstr "Inget arkiv markerat." + - #: lib/remote_branch_delete.tcl:291 ++#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." +msgstr "Söker %s..." + +#: lib/search.tcl:21 +msgid "Find:" +msgstr "Sök:" + +#: lib/search.tcl:23 +msgid "Next" +msgstr "Nästa" + +#: lib/search.tcl:24 +msgid "Prev" +msgstr "Föreg" + +#: lib/search.tcl:25 +msgid "Case-Sensitive" +msgstr "Skilj på VERSALER/gemener" + - #: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "Kan inte skriva genväg:" + - #: lib/shortcut.tcl:136 ++#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "Kan inte skriva ikon:" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Stavningskontrollprogrammet stöds inte" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "Stavningskontroll är ej tillgänglig" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "Ogiltig inställning för stavningskontroll" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "Återställer ordlistan till %s." + +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "Stavningskontroll misslyckades tyst vid start" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Stavningskontrollprogrammet känns inte igen" + +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Inga förslag" + +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "Oväntat filslut från stavningskontroll" + +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Stavningskontroll misslyckades" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "Inga nycklar hittades." + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "Hittade öppen nyckel i: %s" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "Skapa nyckel" + +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" +msgstr "Kopiera till Urklipp" + +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" +msgstr "Din öppna OpenSSH-nyckel" + +#: lib/sshkey.tcl:78 +msgid "Generating..." +msgstr "Skapar..." + +#: lib/sshkey.tcl:84 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"Kunde inte starta ssh-keygen:\n" +"\n" +"%s" + +#: lib/sshkey.tcl:111 +msgid "Generation failed." +msgstr "Misslyckades med att skapa." + +#: lib/sshkey.tcl:118 +msgid "Generation succeded, but no keys found." +msgstr "Lyckades skapa nyckeln, men hittar inte någon nyckel." + +#: lib/sshkey.tcl:121 +#, tcl-format +msgid "Your key is in: %s" +msgstr "Din nyckel finns i: %s" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s... %*i av %*i %s (%3i%%)" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "För att starta %s måste du välja en fil." + +#: lib/tools.tcl:90 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "Är du säker på att du vill starta %s?" + +#: lib/tools.tcl:110 +#, tcl-format +msgid "Tool: %s" +msgstr "Verktyg: %s" + +#: lib/tools.tcl:111 +#, tcl-format +msgid "Running: %s" +msgstr "Exekverar: %s" + +#: lib/tools.tcl:149 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "Verktyget avslutades framgångsrikt: %s" + +#: lib/tools.tcl:151 +#, tcl-format +msgid "Tool failed: %s" +msgstr "Verktyget misslyckades: %s" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "Lägg till verktyg" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "Lägg till nytt verktygskommando" + +#: lib/tools_dlg.tcl:33 +msgid "Add globally" +msgstr "Lägg till globalt" + +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" +msgstr "Detaljer för verktyg" + +#: lib/tools_dlg.tcl:48 +msgid "Use '/' separators to create a submenu tree:" +msgstr "Använd \"/\"-avdelare för att skapa ett undermenyträd:" + +#: lib/tools_dlg.tcl:61 +msgid "Command:" +msgstr "Kommando:" + +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" +msgstr "Visa dialog innan programmet startas" + +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "Be användaren välja en version (sätter $REVISION)" + +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)" + +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" +msgstr "Visa inte kommandots utdatafönster" + +#: lib/tools_dlg.tcl:97 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)" + +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." +msgstr "Ange ett namn för verktyget." + +#: lib/tools_dlg.tcl:129 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "Verktyget \"%s\" finns redan." + +#: lib/tools_dlg.tcl:151 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" +"Kunde inte lägga till verktyget:\n" +"%s" + +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" +msgstr "Ta bort verktyg" + +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" +msgstr "Ta bort verktygskommandon" + +#: lib/tools_dlg.tcl:200 +msgid "Remove" +msgstr "Ta bort" + +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" +msgstr "(Blått anger verktyg lokala för arkivet)" + +#: lib/tools_dlg.tcl:297 +#, tcl-format +msgid "Run Command: %s" +msgstr "Kör kommandot: %s" + +#: lib/tools_dlg.tcl:311 +msgid "Arguments" +msgstr "Argument" + +#: lib/tools_dlg.tcl:348 +msgid "OK" +msgstr "OK" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Hämtar nya ändringar från %s" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "fjärrborttagning %s" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Tar bort spårande grenar som tagits bort från %s" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Sänder ändringar till %s" + +#: lib/transport.tcl:64 +#, tcl-format +msgid "Mirroring to %s" +msgstr "Speglar till %s" + +#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "Sänder %s %s till %s" + +#: lib/transport.tcl:100 +msgid "Push Branches" +msgstr "Sänd grenar" + +#: lib/transport.tcl:114 +msgid "Source Branches" +msgstr "Källgrenar" + +#: lib/transport.tcl:131 +msgid "Destination Repository" +msgstr "Destinationsarkiv" + +#: lib/transport.tcl:169 +msgid "Transfer Options" +msgstr "Överföringsalternativ" + +#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)" + +#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" +msgstr "Använd tunt paket (för långsamma nätverksanslutningar)" + +#: lib/transport.tcl:179 +msgid "Include tags" +msgstr "Ta med taggar" + ++#~ msgid "Cannot use funny .git directory:" ++#~ msgstr "Kan inte använda underlig .git-katalog:" ++ ++#~ msgid "Preferences..." ++#~ msgstr "Inställningar..." ++ ++#~ msgid "Always (Do not perform merge test.)" ++#~ msgstr "Alltid (utför inte sammanslagningstest)." ++ +#~ msgid "URL:" +#~ msgstr "Webbadress:" + +#~ msgid "Delete Remote Branch" +#~ msgstr "Ta bort fjärrgren" + +#~ msgid "" +#~ "Unable to start gitk:\n" +#~ "\n" +#~ "%s does not exist" +#~ msgstr "" +#~ "Kan inte starta gitk:\n" +#~ "\n" +#~ "%s finns inte" + +#~ msgid "Apple" +#~ msgstr "Äpple" + +#~ msgid "Not connected to aspell" +#~ msgstr "Inte ansluten till aspell"