From: Junio C Hamano Date: Tue, 21 Jan 2014 21:16:17 +0000 (-0800) Subject: Merge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui X-Git-Tag: v1.9-rc1~30 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d9bb4be53bc5185244b4be9860562a012803bacb Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui git-gui 0.19.0 * tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui: git-gui 0.19 git-gui: chmod +x po2msg, windows/git-gui.sh git-gui: fallback right pane to packed widgets with Tk 8.4 git-gui i18n: Added Bulgarian translation git-gui l10n: Add 29 more terms to glossary git-gui i18n: Initial glossary in Bulgarian --- d9bb4be53bc5185244b4be9860562a012803bacb diff --cc git-gui/GIT-VERSION-GEN index 0a1f8d4f8a,0000000000..a9ea21826a mode 100755,000000..100755 --- a/git-gui/GIT-VERSION-GEN +++ b/git-gui/GIT-VERSION-GEN @@@ -1,80 -1,0 +1,80 @@@ +#!/bin/sh + +GVF=GIT-VERSION-FILE - DEF_VER=0.18.GITGUI ++DEF_VER=0.19.GITGUI + +LF=' +' + +tree_search () +{ + head=$1 + tree=$2 + for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null) + do + test $tree = $(git rev-parse $p^{tree} 2>/dev/null) && + vn=$(git describe --abbrev=4 $p 2>/dev/null) && + case "$vn" in + gitgui-[0-9]*) echo $vn; break;; + esac + done +} + +# Always use the tarball version file if found, just +# in case we are somehow contained in a larger git +# repository that doesn't actually track our state. +# (At least one package manager is doing this.) +# +# We may be a subproject, so try looking for the merge +# commit that supplied this directory content if we are +# not at the toplevel. We probably will always be the +# second parent in the commit, but we shouldn't rely on +# that fact. +# +# If we are at the toplevel or the merge assumption fails +# try looking for a gitgui-* tag. + +if test -f version && + VN=$(cat version) +then + : happy +elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" + test -n "$prefix" && + head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) && + tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) && + VN=$(tree_search $head $tree) + case "$VN" in + gitgui-[0-9]*) : happy ;; + *) (exit 1) ;; + esac +then + VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'); +elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && + case "$VN" in + gitgui-[0-9]*) : happy ;; + *) (exit 1) ;; + esac +then + VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'); +else + VN="$DEF_VER" +fi + +dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty= +case "$dirty" in +'') + ;; +*) + VN="$VN-dirty" ;; +esac + +if test -r $GVF +then + VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF) +else + VC=unset +fi +test "$VN" = "$VC" || { + echo >&2 "GITGUI_VERSION = $VN" + echo "GITGUI_VERSION = $VN" >$GVF +} diff --cc git-gui/git-gui.sh index db46ac50bf,0000000000..cf2209b4f2 mode 100755,000000..100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@@ -1,4001 -1,0 +1,4011 @@@ +#!/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 [string map [list (c) \u00a9] { +Copyright (c) 2006-2010 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 "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 + } + if {[tk windowingsystem] eq "win32"} { console show } +} + +###################################################################### +## +## Internationalization (i18n) through msgcat and gettext. See +## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html + +package require msgcat + +# Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4) +if {[tk windowingsystem] eq "win32" + && [package vcompare [package provide msgcat] 1.4.4] < 0 +} then { + proc _mc_update_locale {} { + set key {HKEY_CURRENT_USER\Control Panel\Desktop} + if {![catch { + package require registry + set uilocale [registry get $key "PreferredUILanguages"] + msgcat::ConvertLocale [string map {- _} [lindex $uilocale 0]] + } uilocale]} { + if {[string length $uilocale] > 0} { + msgcat::mclocale $uilocale + } + } + } + _mc_update_locale +} + +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 + +###################################################################### +## +## On Mac, bring the current Wish process window to front + +if {[tk windowingsystem] eq "aqua"} { + catch { + exec osascript -e [format { + tell application "System Events" + set frontmost of processes whose unix id is %d to true + end tell + } [pid]] + } +} + +###################################################################### +## +## 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 _shellpath {@@SHELL_PATH@@} + +set _trace [lsearch -exact $argv --trace] +if {$_trace >= 0} { + set argv [lreplace $argv $_trace $_trace] + set _trace 1 + if {[tk windowingsystem] eq "win32"} { console show } +} else { + set _trace 0 +} + +# variable for the last merged branch (useful for a default when deleting +# branches). +set _last_merged_branch {} + +proc shellpath {} { + global _shellpath env + if {[string match @@* $_shellpath]} { + if {[info exists env(SHELL)]} { + return $env(SHELL) + } else { + return /bin/sh + } + } + return $_shellpath +} + +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 + } + set v [string tolower $v] + if {$v eq {} || $v eq {true} || $v eq {1} || $v eq {yes} || $v eq {on}} { + return 1 + } else { + return 0 + } +} + +proc is_config_false {name} { + global repo_config + if {[catch {set v $repo_config($name)}]} { + return 0 + } + set v [string tolower $v] + if {$v eq {false} || $v eq {0} || $v eq {no} || $v eq {off}} { + 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 +} + +#'" fix poor old emacs font-lock mode + +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 {} +} + +# Test a file for a hashbang to identify executable scripts on Windows. +proc is_shellscript {filename} { + if {![file exists $filename]} {return 0} + set f [open $filename r] + fconfigure $f -encoding binary + set magic [read $f 2] + close $f + return [expr {$magic eq "#!"}] +} + +# Run a command connected via pipes on stdout. +# This is for use with textconv filters and uses sh -c "..." to allow it to +# contain a command with arguments. On windows we must check for shell +# scripts specifically otherwise just call the filter command. +proc open_cmd_pipe {cmd path} { + global env + if {![file executable [shellpath]]} { + set exe [auto_execok [lindex $cmd 0]] + if {[is_shellscript [lindex $exe 0]]} { + set run [linsert [auto_execok sh] end -c "$cmd \"\$0\"" $path] + } else { + set run [concat $exe [lrange $cmd 1 end] $path] + } + } else { + set run [list [shellpath] -c "$cmd \"\$0\"" $path] + } + return [open |$run r] +} + +proc _lappend_nice {cmd_var} { + global _nice + upvar $cmd_var cmd + + if {![info exists _nice]} { + set _nice [_which nice] + if {[catch {exec $_nice git version}]} { + set _nice {} + } elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} { + set _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 +} + +wm withdraw . +set root_exists 0 +bind . { + bind . {} + set root_exists 1 +} + +if {[is_Windows]} { + wm iconbitmap . -default $oguilib/git-gui.ico + set ::tk::AlwaysShowSelection 1 + bind . {console show} + + # 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 + + image create photo gitlogo32 -width 32 -height 32 + gitlogo32 copy gitlogo -zoom 2 2 + + wm iconphoto . -default gitlogo gitlogo32 + } +} + +###################################################################### +## +## config defaults + +set cursor_ptr arrow +font create font_ui +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.textconv) true +set default_config(gui.pruneduringfetch) false +set default_config(gui.trustmtime) false +set default_config(gui.fastcopyblame) false +set default_config(gui.maxrecentrepo) 10 +set default_config(gui.copyblamethreshold) 40 +set default_config(gui.blamehistoryctx) 7 +set default_config(gui.diffcontext) 5 +set default_config(gui.diffopts) {} +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 default_config(gui.warndetachedcommit) 1 +set font_descs { + {fontui font_ui {mc "Main Font"}} + {fontdiff font_diff {mc "Diff/Console Font"}} +} +set default_config(gui.stageuntracked) ask +set default_config(gui.displayuntracked) true + +###################################################################### +## +## 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 +} + +proc get_trimmed_version {s} { + set r {} + foreach x [split $s -._] { + if {[string is integer -strict $x]} { + lappend r $x + } else { + break + } + } + return [join $r .] +} +set _real_git_version $_git_version +set _git_version [get_trimmed_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 + } + } elseif {[regexp {^([^\n]+)$} $line line name]} { + # no value given, but interpreting them as + # boolean will be handled as true + set arr($name) {} + } + } + } + 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 + } + } elseif {[regexp {^([^=]+)$} $line line name]} { + # no value given, but interpreting them as + # boolean will be handled as true + set arr($name) {} + } + } + 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 + +# v1.7.0 introduced --show-toplevel to return the canonical work-tree +if {[package vsatisfies $_git_version 1.7.0]} { + if { [is_Cygwin] } { + catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]} + } else { + set _gitworktree [git rev-parse --show-toplevel] + } +} else { + # try to set work tree from environment, core.worktree or use + # cdup to obtain a relative path to the top of the worktree. If + # run from the top, the ./ prefix ensures normalize expands pwd. + if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} { + set _gitworktree [get_config core.worktree] + if {$_gitworktree eq ""} { + set _gitworktree [file normalize ./[git rev-parse --show-cdup]] + } + } +} + +if {$_prefix ne {}} { + 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 {[is_bare]} { + catch {wm withdraw .} + error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"] + exit 1 + } + if {$_gitworktree eq {}} { + set _gitworktree [file dirname $_gitdir] + } + if {[catch {cd $_gitworktree} err]} { + catch {wm withdraw .} + 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 utf-8]} { + } 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 + } + + if {[package vsatisfies $::_git_version 1.6.3]} { + set ls_others [list --exclude-standard] + } else { + 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=[file normalize $user_exclude]" + } + } + + set buf_rdi {} + set buf_rdf {} + set buf_rlo {} + + set rescan_active 2 + 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] + + fconfigure $fd_di -blocking 0 -translation binary -encoding binary + fconfigure $fd_df -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] + + if {[is_config_true gui.displayuntracked]} { + set fd_lo [eval git_read ls-files --others -z $ls_others] + fconfigure $fd_lo -blocking 0 -translation binary -encoding binary + fileevent $fd_lo readable [list read_ls_others $fd_lo $after] + incr rescan_active + } +} + +proc load_message {file {encoding {}}} { + global ui_comm + + set f [gitdir $file] + if {[file isfile $f]} { + if {[catch {set fd [open $f r]}]} { + return 0 + } + fconfigure $fd -eofchar {} + if {$encoding ne {}} { + fconfigure $fd -encoding $encoding + } + 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 existent 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_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_statechange_width 14 +#define file_statechange_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_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"}} + {MT {mc "File type changed, old type staged for commit"}} + {AT {mc "File type changed, old type staged for commit"}} + {T_ {mc "File type changed, staged"}} + {TM {mc "File type change staged, modification not staged"}} + {TD {mc "File type change staged, file missing"}} + + {_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 {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 + + set pwd [pwd] + + if {!$is_submodule} { + if {![is_bare]} { + cd $_gitworktree + } + } else { + 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 $current_diff_path + + eval exec $exe gui & + + 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 $_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 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] + fconfigure $fd -encoding utf-8 + 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 .] + 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 { + set selected_paths($path) 1 + 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 + +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 + +if {![is_bare]} { + .mbar.repository add command \ + -label [mc "Explore Working Copy"] \ + -command {do_explore} +} + +if {[is_Windows]} { + .mbar.repository add command \ + -label [mc "Git Bash"] \ + -command {eval exec [auto_execok start] \ + [list "Git Bash" bash --login -l &]} +} + +if {[is_Windows] || ![is_bare]} { + .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 {} { + set s "usage: $::argv0 $::subcommand $::subcommand_args" + if {[tk windowingsystem] eq "win32"} { + wm withdraw . + tk_messageBox -icon info -message $s \ + -title [mc "Usage"] + } else { + puts stderr $s + } + 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 { + set p [file join $_prefix $a] + + if {$is_path || [file exists $p]} { + if {$path ne {}} usage + set path [normalize_relpath $p] + 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 {}} { + if {[string index $head 0] eq {/}} { + set path [normalize_relpath $head] + set head {} + } else { + 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]} { + if {[tk windowingsystem] eq "win32"} { + tk_messageBox -icon error -title [mc Error] -message $err + } else { + puts stderr $err + } + exit 1 + } + } + set current_branch $head + } + + wm deiconify . + 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]} { + catch {wm withdraw .} + tk_messageBox \ + -icon error \ + -type ok \ + -title [mc "git-gui: fatal error"] \ + -message [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} { + usage + } + # fall through to setup UI for commits +} +default { + set err "usage: $argv0 \[{blame|browser|citool}\]" + if {[tk windowingsystem] eq "win32"} { + wm withdraw . + tk_messageBox -icon error -message $err \ + -title [mc "Usage"] + } else { + puts stderr $err + } + exit 1 +} +} + +# -- Branch Control +# +${NS}::frame .branch +if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken} +${NS}::label .branch.l1 \ + -text [mc "Current Branch:"] \ + -anchor w \ + -justify left +${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 +# +${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 +# +${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 +${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 +# +${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 +${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 +.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 +# - ${NS}::panedwindow .vpane.lower -orient vertical - ${NS}::frame .vpane.lower.commarea - ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500 - .vpane.lower add .vpane.lower.diff - .vpane.lower add .vpane.lower.commarea - .vpane add .vpane.lower - if {$use_ttk} { - .vpane.lower pane .vpane.lower.diff -weight 1 - .vpane.lower pane .vpane.lower.commarea -weight 0 ++if {$have_tk85} { ++ ${NS}::panedwindow .vpane.lower -orient vertical ++ ${NS}::frame .vpane.lower.commarea ++ ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500 ++ .vpane.lower add .vpane.lower.diff ++ .vpane.lower add .vpane.lower.commarea ++ .vpane add .vpane.lower ++ if {$use_ttk} { ++ .vpane.lower pane .vpane.lower.diff -weight 1 ++ .vpane.lower pane .vpane.lower.commarea -weight 0 ++ } else { ++ .vpane.lower paneconfigure .vpane.lower.diff -stretch always ++ .vpane.lower paneconfigure .vpane.lower.commarea -stretch never ++ } +} else { - .vpane.lower paneconfigure .vpane.lower.diff -stretch always - .vpane.lower paneconfigure .vpane.lower.commarea -stretch never ++ frame .vpane.lower -height 300 -width 400 ++ frame .vpane.lower.commarea ++ 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 ++ .vpane paneconfigure .vpane.lower -sticky nsew +} + +# -- Commit Area Buttons +# +${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 + +${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} + +${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]} { + ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \ + -command do_signoff + pack .vpane.lower.commarea.buttons.signoff -side top -fill x +} + +${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]} { + ${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 +# +${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]} { + ${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] + ${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] +} + +${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} +${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 + +gold_frame .vpane.lower.diff.header +tlabel .vpane.lower.diff.header.status \ + -background gold \ + -foreground black \ + -width $max_status_desc \ + -anchor w \ + -justify left +tlabel .vpane.lower.diff.header.file \ + -background gold \ + -foreground black \ + -anchor w \ + -justify left +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 +# +${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 +catch {$ui_diff configure -tabstyle wordprocessor} +${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ + -command [list $ui_diff xview] +${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 + +foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 grey60} { + $ui_diff tag configure clr4$n -background $c + $ui_diff tag configure clri4$n -foreground $c + $ui_diff tag configure clr3$n -foreground $c + $ui_diff tag configure clri3$n -background $c +} +$ui_diff tag configure clr1 -font font_diffbold +$ui_diff tag configure clr4 -underline 1 + +$ui_diff tag conf d_info -foreground blue -font font_diffbold + +$ui_diff tag conf d_cr -elide true +$ui_diff tag conf d_@ -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 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_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 + +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 has_textconv {path} { + if {[is_config_false gui.textconv]} { + return 0 + } + set filter [gitattr $path diff set] + set textconv [get_config [join [list diff $filter textconv] .]] + if {$filter ne {set} && $textconv ne {}} { + return 1 + } else { + return 0 + } +} + +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"] + 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"] + if {$has_range} { + set t [mc "Stage Lines For Commit"] + } else { + set t [mc "Stage Line For Commit"] + } + } + if {$::is_3way_diff + || $current_diff_path eq {} + || {__} eq $state + || {_O} eq $state + || [string match {?T} $state] + || [string match {T?} $state] + || [has_textconv $current_diff_path]} { + 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 $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 +# +proc on_ttk_pane_mapped {w pane pos} { + bind $w {} + after 0 [list after idle [list $w sashpos $pane $pos]] +} +proc on_tk_pane_mapped {w pane x y} { + bind $w {} + after 0 [list after idle [list $w sash place $pane $x $y]] +} +proc on_application_mapped {} { + global repo_config use_ttk + bind . {} + set gm $repo_config(gui.geometry) + if {$use_ttk} { + bind .vpane \ + [list on_ttk_pane_mapped %W 0 [lindex $gm 1]] + bind .vpane.files \ + [list on_ttk_pane_mapped %W 0 [lindex $gm 2]] + } else { + bind .vpane \ + [list on_tk_pane_mapped %W 0 \ + [lindex $gm 1] \ + [lindex [.vpane sash coord 0] 1]] + bind .vpane.files \ + [list on_tk_pane_mapped %W 0 \ + [lindex [.vpane.files sash coord 0] 0] \ + [lindex $gm 2]] + } + wm geometry . [lindex $gm 0] +} +if {[info exists repo_config(gui.geometry)]} { + bind . [list on_application_mapped] + wm geometry . [lindex $repo_config(gui.geometry) 0] +} + +# -- Load window state +# +if {[info exists repo_config(gui.wmstate)]} { + catch {wm state . $repo_config(gui.wmstate)} +} + +# -- 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 <$M1B-Key-j> {do_revert_selection;break} +bind $ui_diff <$M1B-Key-J> {do_revert_selection;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-u> do_unstage_selection +bind . <$M1B-Key-U> do_unstage_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 $_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 utf-8] + + # -- 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] + fconfigure $fd -encoding utf-8 + 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] && ![is_config_false gui.gcwarning]} { + 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/po/bg.po index 0000000000,0000000000..89b3a4e53d new file mode 100644 --- /dev/null +++ b/git-gui/po/bg.po @@@ -1,0 -1,0 +1,2694 @@@ ++# Bulgarian translation of git-gui po-file. ++# Copyright (C) 2012, 2013, 2014 Alexander Shopov . ++# This file is distributed under the same license as the git package. ++# Alexander Shopov , 2012, 2013, 2014. ++# ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: git-gui master\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2014-01-13 20:45+0200\n" ++"PO-Revision-Date: 2014-01-13 21:31+0200\n" ++"Last-Translator: Alexander Shopov \n" ++"Language-Team: Bulgarian \n" ++"Language: bg\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: git-gui.sh:859 ++#, tcl-format ++msgid "Invalid font specified in %s:" ++msgstr "Указан е неправилен шрифт в %s:" ++ ++#: git-gui.sh:912 ++msgid "Main Font" ++msgstr "Основен шрифт" ++ ++#: git-gui.sh:913 ++msgid "Diff/Console Font" ++msgstr "Шрифт за разликите/конзолата" ++ ++#: git-gui.sh:928 git-gui.sh:942 git-gui.sh:955 git-gui.sh:1045 ++#: git-gui.sh:1064 git-gui.sh:3115 ++msgid "git-gui: fatal error" ++msgstr "git-gui: фатална грешка" ++ ++#: git-gui.sh:929 ++msgid "Cannot find git in PATH." ++msgstr "Командата git липсва в пътя (PATH)." ++ ++#: git-gui.sh:956 ++msgid "Cannot parse Git version string:" ++msgstr "Низът с версията на Git не може да бъде интерпретиран:" ++ ++#: git-gui.sh:981 ++#, 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 изисква Git, версия поне 1.5.0.\n" ++"\n" ++"Да се приеме ли, че „%s“ е версия 1.5.0?\n" ++ ++#: git-gui.sh:1278 ++msgid "Git directory not found:" ++msgstr "Директорията на Git не е открита:" ++ ++#: git-gui.sh:1312 ++msgid "Cannot move to top of working directory:" ++msgstr "Не може да се премине към родителската директория." ++ ++#: git-gui.sh:1320 ++msgid "Cannot use bare repository:" ++msgstr "Голо хранилище не може да се използва:" ++ ++#: git-gui.sh:1328 ++msgid "No working directory" ++msgstr "Работната директория липсва" ++ ++#: git-gui.sh:1500 lib/checkout_op.tcl:306 ++msgid "Refreshing file status..." ++msgstr "Обновяване на състоянието на файла…" ++ ++#: git-gui.sh:1560 ++msgid "Scanning for modified files ..." ++msgstr "Проверка за променени файлове…" ++ ++#: git-gui.sh:1632 ++msgid "Calling prepare-commit-msg hook..." ++msgstr "Куката prepare-commit-msg се изпълнява в момента…" ++ ++#: git-gui.sh:1649 ++msgid "Commit declined by prepare-commit-msg hook." ++msgstr "Подаването е отхвърлено от куката prepare-commit-msg." ++ ++#: git-gui.sh:1807 lib/browser.tcl:252 ++msgid "Ready." ++msgstr "Готово." ++ ++#: git-gui.sh:1965 ++#, tcl-format ++msgid "Displaying only %s of %s files." ++msgstr "Показване на само %s от %s файла." ++ ++#: git-gui.sh:2091 ++msgid "Unmodified" ++msgstr "Непроменен" ++ ++#: git-gui.sh:2093 ++msgid "Modified, not staged" ++msgstr "Променен, но не е в индекса" ++ ++#: git-gui.sh:2094 git-gui.sh:2106 ++msgid "Staged for commit" ++msgstr "В индекса за подаване" ++ ++#: git-gui.sh:2095 git-gui.sh:2107 ++msgid "Portions staged for commit" ++msgstr "Части са в индекса за подаване" ++ ++#: git-gui.sh:2096 git-gui.sh:2108 ++msgid "Staged for commit, missing" ++msgstr "В индекса за подаване, но липсва" ++ ++#: git-gui.sh:2098 ++msgid "File type changed, not staged" ++msgstr "Видът на файла е сменен, но не е в индекса" ++ ++#: git-gui.sh:2099 git-gui.sh:2100 ++msgid "File type changed, old type staged for commit" ++msgstr "Видът на файла е сменен, в индекса е старият" ++ ++#: git-gui.sh:2101 ++msgid "File type changed, staged" ++msgstr "Видът на файла е сменен и е в индекса" ++ ++#: git-gui.sh:2102 ++msgid "File type change staged, modification not staged" ++msgstr "Видът на файла е сменен, промяната не е в индекса" ++ ++#: git-gui.sh:2103 ++msgid "File type change staged, file missing" ++msgstr "Видът на файла е сменен, файлът липсва" ++ ++#: git-gui.sh:2105 ++msgid "Untracked, not staged" ++msgstr "Неследен" ++ ++#: git-gui.sh:2110 ++msgid "Missing" ++msgstr "Липсващ" ++ ++#: git-gui.sh:2111 ++msgid "Staged for removal" ++msgstr "В индекса за изтриване" ++ ++#: git-gui.sh:2112 ++msgid "Staged for removal, still present" ++msgstr "В индекса за изтриване, но още го има" ++ ++#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 ++#: git-gui.sh:2118 git-gui.sh:2119 ++msgid "Requires merge resolution" ++msgstr "Изисква коригиране при сливане" ++ ++#: git-gui.sh:2154 ++msgid "Starting gitk... please wait..." ++msgstr "Стартиране на gitk…, изчакайте…" ++ ++#: git-gui.sh:2166 ++msgid "Couldn't find gitk in PATH" ++msgstr "В пътищата, определени от променливата PATH, липсва изпълним gitk" ++ ++#: git-gui.sh:2225 ++msgid "Couldn't find git gui in PATH" ++msgstr "В пътищата, определени от променливата PATH, липсва изпълним git gui" ++ ++#: git-gui.sh:2644 lib/choose_repository.tcl:40 ++msgid "Repository" ++msgstr "Хранилище" ++ ++#: git-gui.sh:2645 ++msgid "Edit" ++msgstr "Редактиране" ++ ++#: git-gui.sh:2647 lib/choose_rev.tcl:567 ++msgid "Branch" ++msgstr "Клон" ++ ++#: git-gui.sh:2650 lib/choose_rev.tcl:554 ++msgid "Commit@@noun" ++msgstr "Подаване" ++ ++#: git-gui.sh:2653 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 ++msgid "Merge" ++msgstr "Сливане" ++ ++#: git-gui.sh:2654 lib/choose_rev.tcl:563 ++msgid "Remote" ++msgstr "Отдалечено хранилище" ++ ++#: git-gui.sh:2657 ++msgid "Tools" ++msgstr "Команди" ++ ++#: git-gui.sh:2666 ++msgid "Explore Working Copy" ++msgstr "Разглеждане на работното копие" ++ ++#: git-gui.sh:2672 ++msgid "Git Bash" ++msgstr "Bash на Git" ++ ++#: git-gui.sh:2682 ++msgid "Browse Current Branch's Files" ++msgstr "Разглеждане на файловете в текущия клон" ++ ++#: git-gui.sh:2686 ++msgid "Browse Branch Files..." ++msgstr "Разглеждане на текущия клон" ++ ++#: git-gui.sh:2691 ++msgid "Visualize Current Branch's History" ++msgstr "Визуализация на историята на текущия клон" ++ ++#: git-gui.sh:2695 ++msgid "Visualize All Branch History" ++msgstr "Визуализация на историята на всички клонове" ++ ++#: git-gui.sh:2702 ++#, tcl-format ++msgid "Browse %s's Files" ++msgstr "Разглеждане на файловете в %s" ++ ++#: git-gui.sh:2704 ++#, tcl-format ++msgid "Visualize %s's History" ++msgstr "Визуализация на историята на %s" ++ ++#: git-gui.sh:2709 lib/database.tcl:40 lib/database.tcl:66 ++msgid "Database Statistics" ++msgstr "Статистика на базата от данни" ++ ++#: git-gui.sh:2712 lib/database.tcl:33 ++msgid "Compress Database" ++msgstr "Компресиране на базата от данни" ++ ++#: git-gui.sh:2715 ++msgid "Verify Database" ++msgstr "Проверка на базата от данни" ++ ++#: git-gui.sh:2722 git-gui.sh:2726 git-gui.sh:2730 lib/shortcut.tcl:8 ++#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 ++msgid "Create Desktop Icon" ++msgstr "Добавяне на икона на работния плот" ++ ++#: git-gui.sh:2738 lib/choose_repository.tcl:192 lib/choose_repository.tcl:200 ++msgid "Quit" ++msgstr "Спиране на програмата" ++ ++#: git-gui.sh:2746 ++msgid "Undo" ++msgstr "Отмяна" ++ ++#: git-gui.sh:2749 ++msgid "Redo" ++msgstr "Повторение" ++ ++#: git-gui.sh:2753 git-gui.sh:3348 ++msgid "Cut" ++msgstr "Отрязване" ++ ++#: git-gui.sh:2756 git-gui.sh:3351 git-gui.sh:3425 git-gui.sh:3510 ++#: lib/console.tcl:69 ++msgid "Copy" ++msgstr "Копиране" ++ ++#: git-gui.sh:2759 git-gui.sh:3354 ++msgid "Paste" ++msgstr "Поставяне" ++ ++#: git-gui.sh:2762 git-gui.sh:3357 lib/remote_branch_delete.tcl:39 ++#: lib/branch_delete.tcl:28 ++msgid "Delete" ++msgstr "Изтриване" ++ ++#: git-gui.sh:2766 git-gui.sh:3361 git-gui.sh:3514 lib/console.tcl:71 ++msgid "Select All" ++msgstr "Избиране на всичко" ++ ++#: git-gui.sh:2775 ++msgid "Create..." ++msgstr "Създаване…" ++ ++#: git-gui.sh:2781 ++msgid "Checkout..." ++msgstr "Изтегляне…" ++ ++#: git-gui.sh:2787 ++msgid "Rename..." ++msgstr "Преименуване…" ++ ++#: git-gui.sh:2792 ++msgid "Delete..." ++msgstr "Изтриване…" ++ ++#: git-gui.sh:2797 ++msgid "Reset..." ++msgstr "Отмяна на промените…" ++ ++#: git-gui.sh:2807 ++msgid "Done" ++msgstr "Готово" ++ ++#: git-gui.sh:2809 ++msgid "Commit@@verb" ++msgstr "Подаване" ++ ++#: git-gui.sh:2818 git-gui.sh:3289 ++msgid "New Commit" ++msgstr "Подаване" ++ ++#: git-gui.sh:2826 git-gui.sh:3296 ++msgid "Amend Last Commit" ++msgstr "Поправяне на последното подаване" ++ ++#: git-gui.sh:2836 git-gui.sh:3250 lib/remote_branch_delete.tcl:101 ++msgid "Rescan" ++msgstr "Обновяване" ++ ++#: git-gui.sh:2842 ++msgid "Stage To Commit" ++msgstr "Към индекса за подаване" ++ ++#: git-gui.sh:2848 ++msgid "Stage Changed Files To Commit" ++msgstr "Всички променени файлове към индекса за подаване" ++ ++#: git-gui.sh:2854 ++msgid "Unstage From Commit" ++msgstr "Изваждане от индекса за подаване" ++ ++#: git-gui.sh:2860 lib/index.tcl:442 ++msgid "Revert Changes" ++msgstr "Връщане на оригинала" ++ ++#: git-gui.sh:2868 git-gui.sh:3561 git-gui.sh:3592 ++msgid "Show Less Context" ++msgstr "По-малко контекст" ++ ++#: git-gui.sh:2872 git-gui.sh:3565 git-gui.sh:3596 ++msgid "Show More Context" ++msgstr "Повече контекст" ++ ++#: git-gui.sh:2879 git-gui.sh:3263 git-gui.sh:3372 ++msgid "Sign Off" ++msgstr "Подписване" ++ ++#: git-gui.sh:2895 ++msgid "Local Merge..." ++msgstr "Локално сливане…" ++ ++#: git-gui.sh:2900 ++msgid "Abort Merge..." ++msgstr "Преустановяване на сливане…" ++ ++#: git-gui.sh:2912 git-gui.sh:2940 ++msgid "Add..." ++msgstr "Добавяне…" ++ ++#: git-gui.sh:2916 ++msgid "Push..." ++msgstr "Избутване…" ++ ++#: git-gui.sh:2920 ++msgid "Delete Branch..." ++msgstr "Изтриване на клон…" ++ ++#: git-gui.sh:2930 git-gui.sh:3543 ++msgid "Options..." ++msgstr "Опции…" ++ ++#: git-gui.sh:2941 ++msgid "Remove..." ++msgstr "Премахване…" ++ ++#: git-gui.sh:2950 lib/choose_repository.tcl:54 ++msgid "Help" ++msgstr "Помощ" ++ ++#: git-gui.sh:2954 git-gui.sh:2958 lib/choose_repository.tcl:48 ++#: lib/choose_repository.tcl:57 lib/about.tcl:14 ++#, tcl-format ++msgid "About %s" ++msgstr "Относно %s" ++ ++#: git-gui.sh:2982 ++msgid "Online Documentation" ++msgstr "Документация в Интернет" ++ ++#: git-gui.sh:2985 lib/choose_repository.tcl:51 lib/choose_repository.tcl:60 ++msgid "Show SSH Key" ++msgstr "Показване на ключа за SSH" ++ ++#: git-gui.sh:3004 git-gui.sh:3136 ++msgid "Usage" ++msgstr "Употреба" ++ ++#: git-gui.sh:3085 lib/blame.tcl:573 ++msgid "Error" ++msgstr "Грешка" ++ ++#: git-gui.sh:3116 ++#, tcl-format ++msgid "fatal: cannot stat path %s: No such file or directory" ++msgstr "" ++"фатално: пътят %s не може да бъде открит: такъв файл или директория няма" ++ ++#: git-gui.sh:3149 ++msgid "Current Branch:" ++msgstr "Текущ клон:" ++ ++#: git-gui.sh:3175 ++msgid "Staged Changes (Will Commit)" ++msgstr "Промени в индекса (за подаване)" ++ ++#: git-gui.sh:3195 ++msgid "Unstaged Changes" ++msgstr "Промени извън индекса" ++ ++#: git-gui.sh:3256 ++msgid "Stage Changed" ++msgstr "Индексът е променен" ++ ++#: git-gui.sh:3275 lib/transport.tcl:137 lib/transport.tcl:229 ++msgid "Push" ++msgstr "Изтласкване" ++ ++#: git-gui.sh:3310 ++msgid "Initial Commit Message:" ++msgstr "Първоначално съобщение при подаване:" ++ ++#: git-gui.sh:3311 ++msgid "Amended Commit Message:" ++msgstr "Поправено съобщение при подаване:" ++ ++#: git-gui.sh:3312 ++msgid "Amended Initial Commit Message:" ++msgstr "Поправено първоначално съобщение при подаване:" ++ ++#: git-gui.sh:3313 ++msgid "Amended Merge Commit Message:" ++msgstr "Поправено съобщение при подаване със сливане:" ++ ++#: git-gui.sh:3314 ++msgid "Merge Commit Message:" ++msgstr "Съобщение при подаване със сливане:" ++ ++#: git-gui.sh:3315 ++msgid "Commit Message:" ++msgstr "Съобщение при подаване:" ++ ++#: git-gui.sh:3364 git-gui.sh:3518 lib/console.tcl:73 ++msgid "Copy All" ++msgstr "Копиране на всичко" ++ ++#: git-gui.sh:3388 lib/blame.tcl:105 ++msgid "File:" ++msgstr "Файл:" ++ ++#: git-gui.sh:3506 ++msgid "Refresh" ++msgstr "Обновяване" ++ ++#: git-gui.sh:3527 ++msgid "Decrease Font Size" ++msgstr "По-едър шрифт" ++ ++#: git-gui.sh:3531 ++msgid "Increase Font Size" ++msgstr "По-дребен шрифт" ++ ++#: git-gui.sh:3539 lib/blame.tcl:294 ++msgid "Encoding" ++msgstr "Кодиране" ++ ++#: git-gui.sh:3550 ++msgid "Apply/Reverse Hunk" ++msgstr "Прилагане/връщане на парче" ++ ++#: git-gui.sh:3555 ++msgid "Apply/Reverse Line" ++msgstr "Прилагане/връщане на ред" ++ ++#: git-gui.sh:3574 ++msgid "Run Merge Tool" ++msgstr "Изпълнение на програмата за сливане" ++ ++#: git-gui.sh:3579 ++msgid "Use Remote Version" ++msgstr "Версия от отдалеченото хранилище" ++ ++#: git-gui.sh:3583 ++msgid "Use Local Version" ++msgstr "Локална версия" ++ ++#: git-gui.sh:3587 ++msgid "Revert To Base" ++msgstr "Връщане към родителската версия" ++ ++#: git-gui.sh:3605 ++msgid "Visualize These Changes In The Submodule" ++msgstr "Визуализиране на промените в подмодула" ++ ++#: git-gui.sh:3609 ++msgid "Visualize Current Branch History In The Submodule" ++msgstr "Визуализация на историята на текущия клон в историята за подмодула" ++ ++#: git-gui.sh:3613 ++msgid "Visualize All Branch History In The Submodule" ++msgstr "Визуализация на историята на всички клони в историята за подмодула" ++ ++#: git-gui.sh:3618 ++msgid "Start git gui In The Submodule" ++msgstr "Стартиране на „git gui“ за подмодула" ++ ++#: git-gui.sh:3653 ++msgid "Unstage Hunk From Commit" ++msgstr "Изваждане на парчето от подаването" ++ ++#: git-gui.sh:3655 ++msgid "Unstage Lines From Commit" ++msgstr "Изваждане на редовете от подаването" ++ ++#: git-gui.sh:3657 ++msgid "Unstage Line From Commit" ++msgstr "Изваждане на реда от подаването" ++ ++#: git-gui.sh:3660 ++msgid "Stage Hunk For Commit" ++msgstr "Добавяне на парчето за подаване" ++ ++#: git-gui.sh:3662 ++msgid "Stage Lines For Commit" ++msgstr "Добавяне на редовете за подаване" ++ ++#: git-gui.sh:3664 ++msgid "Stage Line For Commit" ++msgstr "Добавяне на реда за подаване" ++ ++#: git-gui.sh:3689 ++msgid "Initializing..." ++msgstr "Инициализиране…" ++ ++#: git-gui.sh:3832 ++#, 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" ++"Най-вероятно следните променливи няма да бъдат\n" ++"взети под внимание от подпроцесите Git изпълнени\n" ++"от %s:\n" ++"\n" ++ ++#: git-gui.sh:3861 ++msgid "" ++"\n" ++"This is due to a known issue with the\n" ++"Tcl binary distributed by Cygwin." ++msgstr "" ++"\n" ++"Това е познат проблем и се дължи на\n" ++"версията на Tcl включена в Cygwin." ++ ++#: git-gui.sh:3866 ++#, 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" ++"Добър заместител на %s\n" ++"е да поставите настройките user.name и\n" ++"user.email в личния си файл ~/.gitconfig.\n" ++ ++#: 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 "Неочакван край на файл от програмата за проверка на правописа" ++ ++#: lib/spellcheck.tcl:392 ++msgid "Spell Checker Failed" ++msgstr "Грешка в програмата за проверка на правописа" ++ ++#: lib/remote_add.tcl:20 ++msgid "Add Remote" ++msgstr "Добавяне на отдалечено хранилище" ++ ++#: lib/remote_add.tcl:25 ++msgid "Add New Remote" ++msgstr "Добавяне на отдалечено хранилище" ++ ++#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 ++msgid "Add" ++msgstr "Добавяне" ++ ++#: lib/remote_add.tcl:34 lib/browser.tcl:292 lib/branch_checkout.tcl:30 ++#: lib/transport.tcl:141 lib/branch_rename.tcl:32 lib/choose_font.tcl:45 ++#: lib/option.tcl:127 lib/tools_dlg.tcl:41 lib/tools_dlg.tcl:202 ++#: lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 ++#: lib/checkout_op.tcl:579 lib/branch_create.tcl:37 lib/branch_delete.tcl:34 ++#: lib/merge.tcl:174 ++msgid "Cancel" ++msgstr "Отказване" ++ ++#: lib/remote_add.tcl:39 ++msgid "Remote Details" ++msgstr "Данни за отдалеченото хранилище" ++ ++#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 ++msgid "Name:" ++msgstr "Име:" ++ ++#: lib/remote_add.tcl:50 ++msgid "Location:" ++msgstr "Местоположение:" ++ ++#: lib/remote_add.tcl:60 ++msgid "Further Action" ++msgstr "Следващо действие" ++ ++#: lib/remote_add.tcl:63 ++msgid "Fetch Immediately" ++msgstr "Незабавно доставяне" ++ ++#: lib/remote_add.tcl:69 ++msgid "Initialize Remote Repository and Push" ++msgstr "Инициализиране на отдалеченото хранилище и изтласкване на промените" ++ ++#: lib/remote_add.tcl:75 ++msgid "Do Nothing Else Now" ++msgstr "Да не се прави нищо" ++ ++#: lib/remote_add.tcl:100 ++msgid "Please supply a remote name." ++msgstr "Задайте име за отдалеченото хранилище." ++ ++#: lib/remote_add.tcl:113 ++#, tcl-format ++msgid "'%s' is not an acceptable remote name." ++msgstr "Отдалечено хранилище не може да се казва „%s“." ++ ++#: lib/remote_add.tcl:124 ++#, tcl-format ++msgid "Failed to add remote '%s' of location '%s'." ++msgstr "Неуспешно добавяне на отдалеченото хранилище „%s“ от адрес „%s“." ++ ++#: lib/remote_add.tcl:132 lib/transport.tcl:6 ++#, tcl-format ++msgid "fetch %s" ++msgstr "доставяне на „%s“" ++ ++#: lib/remote_add.tcl:133 ++#, tcl-format ++msgid "Fetching the %s" ++msgstr "Доставяне на „%s“" ++ ++#: lib/remote_add.tcl:156 ++#, tcl-format ++msgid "Do not know how to initialize repository at location '%s'." ++msgstr "Хранилището с местоположение „%s“ не може да бъде инициализирано." ++ ++#: lib/remote_add.tcl:162 lib/transport.tcl:54 lib/transport.tcl:92 ++#: lib/transport.tcl:110 ++#, tcl-format ++msgid "push %s" ++msgstr "изтласкване на „%s“" ++ ++#: lib/remote_add.tcl:163 ++#, tcl-format ++msgid "Setting up the %s (at %s)" ++msgstr "Добавяне на хранилище „%s“ (с адрес „%s“)" ++ ++#: lib/browser.tcl:17 ++msgid "Starting..." ++msgstr "Стартиране…" ++ ++#: lib/browser.tcl:27 ++msgid "File Browser" ++msgstr "Файлов браузър" ++ ++#: lib/browser.tcl:132 lib/browser.tcl:149 ++#, tcl-format ++msgid "Loading %s..." ++msgstr "Зареждане на „%s“…" ++ ++#: lib/browser.tcl:193 ++msgid "[Up To Parent]" ++msgstr "[Към родителя]" ++ ++#: lib/browser.tcl:275 lib/browser.tcl:282 ++msgid "Browse Branch Files" ++msgstr "Разглеждане на файловете в клона" ++ ++#: lib/browser.tcl:288 lib/choose_repository.tcl:406 ++#: lib/choose_repository.tcl:493 lib/choose_repository.tcl:502 ++#: lib/choose_repository.tcl:1029 ++msgid "Browse" ++msgstr "Разглеждане" ++ ++#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 ++msgid "Revision" ++msgstr "Версия" ++ ++#: lib/tools.tcl:75 ++#, tcl-format ++msgid "Running %s requires a selected file." ++msgstr "За изпълнението на „%s“ трябва да изберете файл." ++ ++#: lib/tools.tcl:91 ++#, tcl-format ++msgid "Are you sure you want to run %1$s on file \"%2$s\"?" ++msgstr "Сигурни ли сте, че искате да стартирате „%1$s“ върху „%2$s“?" ++ ++#: lib/tools.tcl:95 ++#, tcl-format ++msgid "Are you sure you want to run %s?" ++msgstr "Сигурни ли сте, че искате да стартирате „%s“?" ++ ++#: lib/tools.tcl:116 ++#, tcl-format ++msgid "Tool: %s" ++msgstr "Команда: %s" ++ ++#: lib/tools.tcl:117 ++#, tcl-format ++msgid "Running: %s" ++msgstr "Изпълнение: %s" ++ ++#: lib/tools.tcl:155 ++#, tcl-format ++msgid "Tool completed successfully: %s" ++msgstr "Командата завърши успешно: %s" ++ ++#: lib/tools.tcl:157 ++#, tcl-format ++msgid "Tool failed: %s" ++msgstr "Командата върна грешка: %s" ++ ++#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 ++msgid "Checkout Branch" ++msgstr "Клон за изтегляне" ++ ++#: lib/branch_checkout.tcl:26 ++msgid "Checkout" ++msgstr "Изтегляне" ++ ++#: lib/branch_checkout.tcl:39 lib/option.tcl:309 lib/branch_create.tcl:69 ++msgid "Options" ++msgstr "Опции" ++ ++#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 ++msgid "Fetch Tracking Branch" ++msgstr "Изтегляне на промените от следения клон" ++ ++#: lib/branch_checkout.tcl:47 ++msgid "Detach From Local Branch" ++msgstr "Изтриване от локалния клон" ++ ++#: 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:25 ++msgid "fetch all remotes" ++msgstr "доставяне на всички хранилища" ++ ++#: lib/transport.tcl:26 ++msgid "Fetching new changes from all remotes" ++msgstr "Доставяне на промените от всички отдалечени хранилища" ++ ++#: lib/transport.tcl:40 ++msgid "remote prune all remotes" ++msgstr "окастряне на всички клони следящи изтрити клони" ++ ++#: lib/transport.tcl:41 ++msgid "Pruning tracking branches deleted from all remotes" ++msgstr "" ++"Окастряне на следящите клони на изтритите клони от всички отдалечени " ++"хранилища" ++ ++#: lib/transport.tcl:55 ++#, tcl-format ++msgid "Pushing changes to %s" ++msgstr "Изтласкване на промените към %s" ++ ++#: lib/transport.tcl:93 ++#, tcl-format ++msgid "Mirroring to %s" ++msgstr "Изтласкване на всичко към „%s“" ++ ++#: lib/transport.tcl:111 ++#, tcl-format ++msgid "Pushing %s %s to %s" ++msgstr "Изтласкване на %s %s към %s" ++ ++#: lib/transport.tcl:132 ++msgid "Push Branches" ++msgstr "Клони за изтласкване" ++ ++#: lib/transport.tcl:147 ++msgid "Source Branches" ++msgstr "Клони-източници" ++ ++#: lib/transport.tcl:162 ++msgid "Destination Repository" ++msgstr "Целево хранилище" ++ ++#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 ++msgid "Remote:" ++msgstr "Отдалечено хранилище:" ++ ++#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 ++msgid "Arbitrary Location:" ++msgstr "Произволно местоположение:" ++ ++#: lib/transport.tcl:205 ++msgid "Transfer Options" ++msgstr "Настройки при пренасянето" ++ ++#: lib/transport.tcl:207 ++msgid "Force overwrite existing branch (may discard changes)" ++msgstr "" ++"Изрично презаписване на съществуващ клон (някои промени може да бъдат " ++"загубени)" ++ ++#: lib/transport.tcl:211 ++msgid "Use thin pack (for slow network connections)" ++msgstr "Максимална компресия (за бавни мрежови връзки)" ++ ++#: lib/transport.tcl:215 ++msgid "Include tags" ++msgstr "Включване на етикетите" ++ ++#: lib/status_bar.tcl:87 ++#, tcl-format ++msgid "%s ... %*i of %*i %s (%3i%%)" ++msgstr "%s… %*i от общо %*i %s (%3i%%)" ++ ++#: lib/remote.tcl:200 ++msgid "Push to" ++msgstr "Изтласкване към" ++ ++#: lib/remote.tcl:218 ++msgid "Remove Remote" ++msgstr "Премахване на отдалечено хранилище" ++ ++#: lib/remote.tcl:223 ++msgid "Prune from" ++msgstr "Окастряне от" ++ ++#: lib/remote.tcl:228 ++msgid "Fetch from" ++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:55 lib/checkout_op.tcl:146 lib/console.tcl:81 ++#: lib/database.tcl:30 ++msgid "Close" ++msgstr "Затваряне" ++ ++#: lib/sshkey.tcl:58 ++msgid "Copy To Clipboard" ++msgstr "Копиране към системния буфер" ++ ++#: lib/sshkey.tcl:72 ++msgid "Your OpenSSH Public Key" ++msgstr "Публичният ви ключ за OpenSSH" ++ ++#: lib/sshkey.tcl:80 ++msgid "Generating..." ++msgstr "Генериране…" ++ ++#: lib/sshkey.tcl:86 ++#, tcl-format ++msgid "" ++"Could not start ssh-keygen:\n" ++"\n" ++"%s" ++msgstr "" ++"Програмата „ssh-keygen“ не може да бъде стартирана:\n" ++"\n" ++"%s" ++ ++#: lib/sshkey.tcl:113 ++msgid "Generation failed." ++msgstr "Неуспешно генериране." ++ ++#: lib/sshkey.tcl:120 ++msgid "Generation succeeded, but no keys found." ++msgstr "Генерирането завърши успешно, а не са намерени ключове." ++ ++#: lib/sshkey.tcl:123 ++#, tcl-format ++msgid "Your key is in: %s" ++msgstr "Ключът ви е в „%s“" ++ ++#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 ++msgid "Rename Branch" ++msgstr "Преименуване на клон" ++ ++#: lib/branch_rename.tcl:28 ++msgid "Rename" ++msgstr "Преименуване" ++ ++#: lib/branch_rename.tcl:38 ++msgid "Branch:" ++msgstr "Клон:" ++ ++#: lib/branch_rename.tcl:46 ++msgid "New Name:" ++msgstr "Ново име:" ++ ++#: lib/branch_rename.tcl:81 ++msgid "Please select a branch to rename." ++msgstr "Изберете клон за преименуване." ++ ++#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 ++msgid "Please supply a branch name." ++msgstr "Дайте име на клона." ++ ++#: lib/branch_rename.tcl:102 lib/checkout_op.tcl:202 ++#, tcl-format ++msgid "Branch '%s' already exists." ++msgstr "Клонът „%s“ вече съществува." ++ ++#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 ++#, tcl-format ++msgid "'%s' is not an acceptable branch name." ++msgstr "„%s“ не може да се използва за име на клон." ++ ++#: lib/branch_rename.tcl:123 ++#, tcl-format ++msgid "Failed to rename '%s'." ++msgstr "Неуспешно преименуване на „%s“." ++ ++#: lib/choose_font.tcl:41 ++msgid "Select" ++msgstr "Избор" ++ ++#: lib/choose_font.tcl:55 ++msgid "Font Family" ++msgstr "Шрифт" ++ ++#: lib/choose_font.tcl:76 ++msgid "Font Size" ++msgstr "Размер" ++ ++#: lib/choose_font.tcl:93 ++msgid "Font Example" ++msgstr "Мостра" ++ ++#: lib/choose_font.tcl:105 ++msgid "" ++"This is example text.\n" ++"If you like this text, it can be your font." ++msgstr "" ++"Това е примерен текст.\n" ++"Ако ви харесва как изглежда, изберете този шрифт." ++ ++#: 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:119 ++msgid "Restore Defaults" ++msgstr "Стандартни настройки" ++ ++#: lib/option.tcl:123 ++msgid "Save" ++msgstr "Запазване" ++ ++#: lib/option.tcl:133 ++#, tcl-format ++msgid "%s Repository" ++msgstr "Хранилище „%s“" ++ ++#: lib/option.tcl:134 ++msgid "Global (All Repositories)" ++msgstr "Глобално (за всички хранилища)" ++ ++#: lib/option.tcl:140 ++msgid "User Name" ++msgstr "Потребителско име" ++ ++#: lib/option.tcl:141 ++msgid "Email Address" ++msgstr "Адрес на е-поща" ++ ++#: lib/option.tcl:143 ++msgid "Summarize Merge Commits" ++msgstr "Обобщаване на подаванията при сливане" ++ ++#: lib/option.tcl:144 ++msgid "Merge Verbosity" ++msgstr "Подробности при сливанията" ++ ++#: lib/option.tcl:145 ++msgid "Show Diffstat After Merge" ++msgstr "Извеждане на статистика след сливанията" ++ ++#: lib/option.tcl:146 ++msgid "Use Merge Tool" ++msgstr "Използване на програма за сливане" ++ ++#: lib/option.tcl:148 ++msgid "Trust File Modification Timestamps" ++msgstr "Доверие във времето на промяна на файловете" ++ ++#: lib/option.tcl:149 ++msgid "Prune Tracking Branches During Fetch" ++msgstr "Окастряне на следящите клонове при доставяне" ++ ++#: lib/option.tcl:150 ++msgid "Match Tracking Branches" ++msgstr "Напасване на следящите клонове" ++ ++#: lib/option.tcl:151 ++msgid "Use Textconv For Diffs and Blames" ++msgstr "Използване на „textconv“ за разликите и анотациите" ++ ++#: lib/option.tcl:152 ++msgid "Blame Copy Only On Changed Files" ++msgstr "Анотиране на копието само по променените файлове" ++ ++#: lib/option.tcl:153 ++msgid "Maximum Length of Recent Repositories List" ++msgstr "Максимален брой скоро ползвани хранилища" ++ ++#: lib/option.tcl:154 ++msgid "Minimum Letters To Blame Copy On" ++msgstr "Минимален брой знаци за анотиране на копието" ++ ++#: lib/option.tcl:155 ++msgid "Blame History Context Radius (days)" ++msgstr "Исторически обхват за анотиране в дни" ++ ++#: lib/option.tcl:156 ++msgid "Number of Diff Context Lines" ++msgstr "Брой редове за контекста при извеждане на разликите" ++ ++#: lib/option.tcl:157 ++msgid "Additional Diff Parameters" ++msgstr "Допълнителни параметри за разликите" ++ ++#: lib/option.tcl:158 ++msgid "Commit Message Text Width" ++msgstr "Широчина на текста на съобщението при подаване" ++ ++#: lib/option.tcl:159 ++msgid "New Branch Name Template" ++msgstr "Шаблон за името на новите клони" ++ ++#: lib/option.tcl:160 ++msgid "Default File Contents Encoding" ++msgstr "Стандартно кодиране на файловете" ++ ++#: lib/option.tcl:161 ++msgid "Warn before committing to a detached head" ++msgstr "Предупреждение при подаване към несвързан връх" ++ ++#: lib/option.tcl:162 ++msgid "Staging of untracked files" ++msgstr "Добавяне на неследените файлове към индекса" ++ ++#: lib/option.tcl:163 ++msgid "Show untracked files" ++msgstr "Показване на неследените файлове" ++ ++#: lib/option.tcl:209 ++msgid "Change" ++msgstr "Смяна" ++ ++#: lib/option.tcl:253 ++msgid "Spelling Dictionary:" ++msgstr "Правописен речник:" ++ ++#: lib/option.tcl:283 ++msgid "Change Font" ++msgstr "Смяна на шрифта" ++ ++#: lib/option.tcl:287 ++#, tcl-format ++msgid "Choose %s" ++msgstr "Избор на „%s“" ++ ++#: lib/option.tcl:293 ++msgid "pt." ++msgstr "тчк." ++ ++#: lib/option.tcl:307 ++msgid "Preferences" ++msgstr "Настройки" ++ ++#: lib/option.tcl:344 ++msgid "Failed to completely save options:" ++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“ все още има некоригирани конфликти. Да се добави " ++"ли файлът към индекса?" ++ ++#: 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:246 ++#, tcl-format ++msgid "Not a GUI merge tool: '%s'" ++msgstr "Това не е графична програма за сливане: „%s“" ++ ++#: lib/mergetool.tcl:275 ++#, tcl-format ++msgid "Unsupported merge tool '%s'" ++msgstr "Неподдържана програма за сливане: „%s“" ++ ++#: lib/mergetool.tcl:310 ++msgid "Merge tool is already running, terminate it?" ++msgstr "Програмата за сливане вече е стартирана. Да бъде ли изключена?" ++ ++#: lib/mergetool.tcl:330 ++#, tcl-format ++msgid "" ++"Error retrieving versions:\n" ++"%s" ++msgstr "" ++"Грешка при изтеглянето на версии:\n" ++"%s" ++ ++#: lib/mergetool.tcl:350 ++#, tcl-format ++msgid "" ++"Could not start the merge tool:\n" ++"\n" ++"%s" ++msgstr "" ++"Програмата за сливане не може да бъде стартирана:\n" ++"\n" ++"%s" ++ ++#: lib/mergetool.tcl:354 ++msgid "Running merge tool..." ++msgstr "Стартиране на програмата за сливане…" ++ ++#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 ++msgid "Merge tool failed." ++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:34 ++msgid "Add globally" ++msgstr "Глобално добавяне" ++ ++#: lib/tools_dlg.tcl:46 ++msgid "Tool Details" ++msgstr "Подробности за командата" ++ ++#: lib/tools_dlg.tcl:49 ++msgid "Use '/' separators to create a submenu tree:" ++msgstr "За създаване на подменюта използвайте за разделител знака „/“:" ++ ++#: lib/tools_dlg.tcl:60 ++msgid "Command:" ++msgstr "Команда:" ++ ++#: lib/tools_dlg.tcl:71 ++msgid "Show a dialog before running" ++msgstr "Преди изпълнение да се извежда диалогов прозорец" ++ ++#: lib/tools_dlg.tcl:77 ++msgid "Ask the user to select a revision (sets $REVISION)" ++msgstr "Потребителят да укаже версия (задаване на променливата $REVISION)" ++ ++#: lib/tools_dlg.tcl:82 ++msgid "Ask the user for additional arguments (sets $ARGS)" ++msgstr "" ++"Потребителят да укаже допълнителни аргументи (задаване на променливата $ARGS)" ++ ++#: lib/tools_dlg.tcl:89 ++msgid "Don't show the command output window" ++msgstr "Без показване на прозорец с изхода от командата" ++ ++#: lib/tools_dlg.tcl:94 ++msgid "Run only if a diff is selected ($FILENAME not empty)" ++msgstr "" ++"Стартиране само след избор на разлика (променливата $FILENAME не е празна)" ++ ++#: lib/tools_dlg.tcl:118 ++msgid "Please supply a name for the tool." ++msgstr "Задайте име за командата." ++ ++#: lib/tools_dlg.tcl:126 ++#, tcl-format ++msgid "Tool '%s' already exists." ++msgstr "Командата „%s“ вече съществува." ++ ++#: lib/tools_dlg.tcl:148 ++#, tcl-format ++msgid "" ++"Could not add tool:\n" ++"%s" ++msgstr "" ++"Командата не може да бъде добавена:\n" ++"%s" ++ ++#: lib/tools_dlg.tcl:187 ++msgid "Remove Tool" ++msgstr "Премахване на команда" ++ ++#: lib/tools_dlg.tcl:193 ++msgid "Remove Tool Commands" ++msgstr "Премахване на команди" ++ ++#: lib/tools_dlg.tcl:198 ++msgid "Remove" ++msgstr "Премахване" ++ ++#: lib/tools_dlg.tcl:231 ++msgid "(Blue denotes repository-local tools)" ++msgstr "(команди към локалното хранилище са обозначени в синьо)" ++ ++#: lib/tools_dlg.tcl:292 ++#, tcl-format ++msgid "Run Command: %s" ++msgstr "Изпълнение на командата „%s“" ++ ++#: lib/tools_dlg.tcl:306 ++msgid "Arguments" ++msgstr "Аргументи" ++ ++#: lib/tools_dlg.tcl:336 lib/checkout_op.tcl:567 lib/merge.tcl:166 ++msgid "Visualize" ++msgstr "Визуализация" ++ ++#: lib/tools_dlg.tcl:341 ++msgid "OK" ++msgstr "Добре" ++ ++#: lib/search.tcl:48 ++msgid "Find:" ++msgstr "Търсене:" ++ ++#: lib/search.tcl:50 ++msgid "Next" ++msgstr "Следваща поява" ++ ++#: lib/search.tcl:51 ++msgid "Prev" ++msgstr "Предишна поява" ++ ++#: lib/search.tcl:52 ++msgid "RegExp" ++msgstr "Рег. изр." ++ ++#: lib/search.tcl:54 ++msgid "Case" ++msgstr "Регистър" ++ ++#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 ++msgid "Cannot write shortcut:" ++msgstr "Клавишната комбинация не може да бъде запазена:" ++ ++#: lib/shortcut.tcl:137 ++msgid "Cannot write icon:" ++msgstr "Иконата не може да бъде запазена:" ++ ++#: 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:104 ++#, tcl-format ++msgid "Loading diff of %s..." ++msgstr "Зареждане на разликите в „%s“…" ++ ++#: lib/diff.tcl:125 ++msgid "" ++"LOCAL: deleted\n" ++"REMOTE:\n" ++msgstr "" ++"ЛОКАЛНО: изтрит\n" ++"ОТДАЛЕЧЕНО:\n" ++ ++#: lib/diff.tcl:130 ++msgid "" ++"REMOTE: deleted\n" ++"LOCAL:\n" ++msgstr "" ++"ОТДАЛЕЧЕНО: изтрит\n" ++"ЛОКАЛНО:\n" ++ ++#: lib/diff.tcl:137 ++msgid "LOCAL:\n" ++msgstr "ЛОКАЛНО:\n" ++ ++#: lib/diff.tcl:140 ++msgid "REMOTE:\n" ++msgstr "ОТДАЛЕЧЕНО:\n" ++ ++#: lib/diff.tcl:202 lib/diff.tcl:337 ++#, tcl-format ++msgid "Unable to display %s" ++msgstr "Не може да бъде показан файлът „%s“" ++ ++#: lib/diff.tcl:203 ++msgid "Error loading file:" ++msgstr "Грешка при зареждане на файл:" ++ ++#: lib/diff.tcl:210 ++msgid "Git Repository (subproject)" ++msgstr "Хранилище на Git (подпроект)" ++ ++#: lib/diff.tcl:222 ++msgid "* Binary file (not showing content)." ++msgstr "⁃ Двоичен файл (съдържанието не се показва)." ++ ++#: 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: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.\n" ++"⁃ Използвайте външен редактор, за да видите целия файл.\n" ++ ++#: lib/diff.tcl:338 lib/blame.tcl:1128 ++msgid "Error loading diff:" ++msgstr "Грешка при зареждане на разлика:" ++ ++#: lib/diff.tcl:557 ++msgid "Failed to unstage selected hunk." ++msgstr "Избраното парче не може да бъде извадено от индекса." ++ ++#: lib/diff.tcl:564 ++msgid "Failed to stage selected hunk." ++msgstr "Избраното парче не може да бъде добавен към индекса." ++ ++#: lib/diff.tcl:643 ++msgid "Failed to unstage selected line." ++msgstr "Избраният ред не може да бъде изваден от индекса." ++ ++#: lib/diff.tcl:651 ++msgid "Failed to stage selected line." ++msgstr "Избраният ред не може да бъде добавен към индекса." ++ ++#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 ++msgid "Delete Branch Remotely" ++msgstr "Изтриване на отдалечения клон" ++ ++#: lib/remote_branch_delete.tcl:48 ++msgid "From Repository" ++msgstr "От хранилище" ++ ++#: lib/remote_branch_delete.tcl:88 ++msgid "Branches" ++msgstr "Клонове" ++ ++#: lib/remote_branch_delete.tcl:110 ++msgid "Delete Only If" ++msgstr "Изтриване, само ако" ++ ++#: lib/remote_branch_delete.tcl:112 ++msgid "Merged Into:" ++msgstr "Слят в:" ++ ++#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 ++msgid "Always (Do not perform merge checks)" ++msgstr "Винаги (без проверка за сливане)" ++ ++#: lib/remote_branch_delete.tcl:153 ++msgid "A branch is required for 'Merged Into'." ++msgstr "За данните „Слят в“ е необходимо да зададете клон." ++ ++#: lib/remote_branch_delete.tcl:185 ++#, 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:190 ++#, 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:208 ++msgid "Please select one or more branches to delete." ++msgstr "Изберете поне един клон за изтриване." ++ ++#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 ++msgid "" ++"Recovering deleted branches is difficult.\n" ++"\n" ++"Delete the selected branches?" ++msgstr "" ++"Възстановяването на изтрити клони може да е трудно.\n" ++"\n" ++"Сигурни ли сте, че искате да триете?" ++ ++#: lib/remote_branch_delete.tcl:227 ++#, tcl-format ++msgid "Deleting branches from %s" ++msgstr "Изтриване на клони от „%s“" ++ ++#: lib/remote_branch_delete.tcl:300 ++msgid "No repository selected." ++msgstr "Не е избрано хранилище." ++ ++#: lib/remote_branch_delete.tcl:305 ++#, tcl-format ++msgid "Scanning %s..." ++msgstr "Претърсване на „%s“…" ++ ++#: lib/choose_repository.tcl:32 ++msgid "Git Gui" ++msgstr "ГПИ на Git" ++ ++#: lib/choose_repository.tcl:91 lib/choose_repository.tcl:396 ++msgid "Create New Repository" ++msgstr "Създаване на ново хранилище" ++ ++#: lib/choose_repository.tcl:97 ++msgid "New..." ++msgstr "Ново…" ++ ++#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:480 ++msgid "Clone Existing Repository" ++msgstr "Клониране на съществуващо хранилище" ++ ++#: lib/choose_repository.tcl:115 ++msgid "Clone..." ++msgstr "Клониране…" ++ ++#: lib/choose_repository.tcl:122 lib/choose_repository.tcl:1019 ++msgid "Open Existing Repository" ++msgstr "Отваряне на съществуващо хранилище" ++ ++#: lib/choose_repository.tcl:128 ++msgid "Open..." ++msgstr "Отваряне…" ++ ++#: lib/choose_repository.tcl:141 ++msgid "Recent Repositories" ++msgstr "Скоро ползвани" ++ ++#: lib/choose_repository.tcl:147 ++msgid "Open Recent Repository:" ++msgstr "Отваряне на хранилище ползвано наскоро:" ++ ++#: lib/choose_repository.tcl:315 lib/choose_repository.tcl:322 ++#: lib/choose_repository.tcl:329 ++#, tcl-format ++msgid "Failed to create repository %s:" ++msgstr "Неуспешно създаване на хранилището „%s“:" ++ ++#: lib/choose_repository.tcl:391 lib/branch_create.tcl:33 ++msgid "Create" ++msgstr "Създаване" ++ ++#: lib/choose_repository.tcl:401 ++msgid "Directory:" ++msgstr "Директория:" ++ ++#: lib/choose_repository.tcl:431 lib/choose_repository.tcl:552 ++#: lib/choose_repository.tcl:1053 ++msgid "Git Repository" ++msgstr "Хранилище на Git" ++ ++#: lib/choose_repository.tcl:456 ++#, tcl-format ++msgid "Directory %s already exists." ++msgstr "Вече съществува директория „%s“." ++ ++#: lib/choose_repository.tcl:460 ++#, tcl-format ++msgid "File %s already exists." ++msgstr "Вече съществува файл „%s“." ++ ++#: lib/choose_repository.tcl:475 ++msgid "Clone" ++msgstr "Клониране" ++ ++#: lib/choose_repository.tcl:488 ++msgid "Source Location:" ++msgstr "Адрес на източника:" ++ ++#: lib/choose_repository.tcl:497 ++msgid "Target Directory:" ++msgstr "Целева директория:" ++ ++#: lib/choose_repository.tcl:507 ++msgid "Clone Type:" ++msgstr "Вид клониране:" ++ ++#: lib/choose_repository.tcl:512 ++msgid "Standard (Fast, Semi-Redundant, Hardlinks)" ++msgstr "Стандартно (бързо, частично споделяне на файлове, твърди връзки)" ++ ++#: lib/choose_repository.tcl:517 ++msgid "Full Copy (Slower, Redundant Backup)" ++msgstr "Пълно (бавно, пълноценно резервно копие)" ++ ++#: lib/choose_repository.tcl:522 ++msgid "Shared (Fastest, Not Recommended, No Backup)" ++msgstr "Споделено (най-бързо, не се препоръчва, не прави резервно копие)" ++ ++#: lib/choose_repository.tcl:558 lib/choose_repository.tcl:605 ++#: lib/choose_repository.tcl:751 lib/choose_repository.tcl:821 ++#: lib/choose_repository.tcl:1059 lib/choose_repository.tcl:1067 ++#, tcl-format ++msgid "Not a Git repository: %s" ++msgstr "Това не е хранилище на Git: %s" ++ ++#: lib/choose_repository.tcl:594 ++msgid "Standard only available for local repository." ++msgstr "Само локални хранилища могат да се клонират стандартно" ++ ++#: lib/choose_repository.tcl:598 ++msgid "Shared only available for local repository." ++msgstr "Само локални хранилища могат да се клонират споделено" ++ ++#: lib/choose_repository.tcl:619 ++#, tcl-format ++msgid "Location %s already exists." ++msgstr "Вече съществува местоположението „%s“." ++ ++#: lib/choose_repository.tcl:630 ++msgid "Failed to configure origin" ++msgstr "Неуспешно настройване на хранилището-източник" ++ ++#: lib/choose_repository.tcl:642 ++msgid "Counting objects" ++msgstr "Преброяване на обекти" ++ ++#: lib/choose_repository.tcl:643 ++msgid "buckets" ++msgstr "клетки" ++ ++#: lib/choose_repository.tcl:667 ++#, tcl-format ++msgid "Unable to copy objects/info/alternates: %s" ++msgstr "Обектите/информацията/синонимите не могат да бъдат копирани: %s" ++ ++#: lib/choose_repository.tcl:703 ++#, tcl-format ++msgid "Nothing to clone from %s." ++msgstr "Няма какво да се клонира от „%s“." ++ ++#: lib/choose_repository.tcl:705 lib/choose_repository.tcl:919 ++#: lib/choose_repository.tcl:931 ++msgid "The 'master' branch has not been initialized." ++msgstr "Основният клон — „master“ не е инициализиран." ++ ++#: lib/choose_repository.tcl:718 ++msgid "Hardlinks are unavailable. Falling back to copying." ++msgstr "Не се поддържат твърди връзки. Преминава се към копиране." ++ ++#: lib/choose_repository.tcl:730 ++#, tcl-format ++msgid "Cloning from %s" ++msgstr "Клониране на „%s“" ++ ++#: lib/choose_repository.tcl:761 ++msgid "Copying objects" ++msgstr "Копиране на обекти" ++ ++#: lib/choose_repository.tcl:762 ++msgid "KiB" ++msgstr "KiB" ++ ++#: lib/choose_repository.tcl:786 ++#, tcl-format ++msgid "Unable to copy object: %s" ++msgstr "Неуспешно копиране на обект: %s" ++ ++#: lib/choose_repository.tcl:796 ++msgid "Linking objects" ++msgstr "Създаване на връзки към обектите" ++ ++#: lib/choose_repository.tcl:797 ++msgid "objects" ++msgstr "обекти" ++ ++#: lib/choose_repository.tcl:805 ++#, tcl-format ++msgid "Unable to hardlink object: %s" ++msgstr "Неуспешно създаване на твърда връзка към обект: %s" ++ ++#: lib/choose_repository.tcl:860 ++msgid "Cannot fetch branches and objects. See console output for details." ++msgstr "" ++"Клоните и обектите не могат да бъдат изтеглени. За повече информация " ++"погледнете изхода на конзолата." ++ ++#: lib/choose_repository.tcl:871 ++msgid "Cannot fetch tags. See console output for details." ++msgstr "" ++"Етикетите не могат да бъдат изтеглени. За повече информация погледнете " ++"изхода на конзолата." ++ ++#: lib/choose_repository.tcl:895 ++msgid "Cannot determine HEAD. See console output for details." ++msgstr "" ++"Върхът HEAD не може да бъде определен. За повече информация погледнете " ++"изхода на конзолата." ++ ++#: lib/choose_repository.tcl:904 ++#, tcl-format ++msgid "Unable to cleanup %s" ++msgstr "Не може да се зачисти „%s“" ++ ++#: lib/choose_repository.tcl:910 ++msgid "Clone failed." ++msgstr "Неуспешно клониране." ++ ++#: lib/choose_repository.tcl:917 ++msgid "No default branch obtained." ++msgstr "Не е получен клон по подразбиране." ++ ++#: lib/choose_repository.tcl:928 ++#, tcl-format ++msgid "Cannot resolve %s as a commit." ++msgstr "Няма подаване отговарящо на „%s“." ++ ++#: lib/choose_repository.tcl:940 ++msgid "Creating working directory" ++msgstr "Създаване на работната директория" ++ ++#: lib/choose_repository.tcl:941 lib/index.tcl:70 lib/index.tcl:136 ++#: lib/index.tcl:207 ++msgid "files" ++msgstr "файлове" ++ ++#: lib/choose_repository.tcl:970 ++msgid "Initial file checkout failed." ++msgstr "Неуспешно първоначално изтегляне." ++ ++#: lib/choose_repository.tcl:1014 ++msgid "Open" ++msgstr "Отваряне" ++ ++#: lib/choose_repository.tcl:1024 ++msgid "Repository:" ++msgstr "Хранилище:" ++ ++#: lib/choose_repository.tcl:1073 ++#, tcl-format ++msgid "Failed to open repository %s:" ++msgstr "Неуспешно отваряне на хранилището „%s“:" ++ ++#: lib/about.tcl:26 ++msgid "git-gui - a graphical user interface for Git." ++msgstr "git-gui — графичен интерфейс за Git." ++ ++#: lib/checkout_op.tcl:85 ++#, tcl-format ++msgid "Fetching %s from %s" ++msgstr "Доставяне на „%s“ от „%s“" ++ ++#: lib/checkout_op.tcl:133 ++#, tcl-format ++msgid "fatal: Cannot resolve %s" ++msgstr "фатална грешка: „%s“ не може да се открие" ++ ++#: lib/checkout_op.tcl:175 ++#, tcl-format ++msgid "Branch '%s' does not exist." ++msgstr "Клонът „%s“ не съществува." ++ ++#: lib/checkout_op.tcl:194 ++#, tcl-format ++msgid "Failed to configure simplified git-pull for '%s'." ++msgstr "Неуспешно настройване на опростен git-pull за „%s“." ++ ++#: 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:243 ++#, tcl-format ++msgid "Merge strategy '%s' not supported." ++msgstr "Стратегия за сливане „%s“ не се поддържа." ++ ++#: lib/checkout_op.tcl:262 ++#, tcl-format ++msgid "Failed to update '%s'." ++msgstr "Неуспешно обновяване на „%s“." ++ ++#: lib/checkout_op.tcl:274 ++msgid "Staging area (index) is already locked." ++msgstr "Индексът вече е заключен." ++ ++#: 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:345 ++#, tcl-format ++msgid "Updating working directory to '%s'..." ++msgstr "Работната директория се привежда към „%s“…" ++ ++#: lib/checkout_op.tcl:346 ++msgid "files checked out" ++msgstr "файла са изтеглени" ++ ++#: lib/checkout_op.tcl:376 ++#, tcl-format ++msgid "Aborted checkout of '%s' (file level merging is required)." ++msgstr "" ++"Преустановяване на изтеглянето на „%s“ (необходимо е пофайлово сливане)." ++ ++#: lib/checkout_op.tcl:377 ++msgid "File level merge required." ++msgstr "Необходимо е пофайлово сливане." ++ ++#: lib/checkout_op.tcl:381 ++#, tcl-format ++msgid "Staying on branch '%s'." ++msgstr "Оставане върху клона „%s“." ++ ++#: 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:503 lib/checkout_op.tcl:507 ++#, tcl-format ++msgid "Checked out '%s'." ++msgstr "„%s“ е изтеглен." ++ ++#: lib/checkout_op.tcl:535 ++#, tcl-format ++msgid "Resetting '%s' to '%s' will lose the following commits:" ++msgstr "" ++"Зануляването на „%s“ към „%s“ ще доведе до загубването на следните подавания:" ++ ++#: lib/checkout_op.tcl:557 ++msgid "Recovering lost commits may not be easy." ++msgstr "Възстановяването на загубените подавания може да е трудно." ++ ++#: lib/checkout_op.tcl:562 ++#, tcl-format ++msgid "Reset '%s'?" ++msgstr "Зануляване на „%s“?" ++ ++#: lib/checkout_op.tcl:571 lib/branch_create.tcl:85 ++msgid "Reset" ++msgstr "Отначало" ++ ++#: 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" ++"\n" ++"Това състояние е аварийно и не трябва да се случва. Програмата „%s“ ще " ++"преустанови работа." ++ ++#: lib/branch_create.tcl:23 ++msgid "Create Branch" ++msgstr "Създаване на клон" ++ ++#: lib/branch_create.tcl:28 ++msgid "Create New Branch" ++msgstr "Създаване на нов клон" ++ ++#: lib/branch_create.tcl:42 ++msgid "Branch Name" ++msgstr "Име на клона" ++ ++#: lib/branch_create.tcl:57 ++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:97 ++msgid "Checkout After Creation" ++msgstr "Преминаване към клона след създаването му" ++ ++#: lib/branch_create.tcl:132 ++msgid "Please select a tracking branch." ++msgstr "Изберете клон за следени." ++ ++#: lib/branch_create.tcl:141 ++#, tcl-format ++msgid "Tracking branch %s is not a branch in the remote repository." ++msgstr "Клонът, който се следи „%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/choose_rev.tcl:52 ++msgid "This Detached Checkout" ++msgstr "Това несвързано изтегляне" ++ ++#: lib/choose_rev.tcl:60 ++msgid "Revision Expression:" ++msgstr "Израз за версия" ++ ++#: lib/choose_rev.tcl:72 ++msgid "Local Branch" ++msgstr "Локален клон" ++ ++#: lib/choose_rev.tcl:77 ++msgid "Tracking Branch" ++msgstr "Следящ клон" ++ ++#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 ++msgid "Tag" ++msgstr "Етикет" ++ ++#: lib/choose_rev.tcl:321 ++#, tcl-format ++msgid "Invalid revision: %s" ++msgstr "Неправилна версия: %s" ++ ++#: lib/choose_rev.tcl:342 ++msgid "No revision selected." ++msgstr "Не е избрана версия." ++ ++#: lib/choose_rev.tcl:350 ++msgid "Revision expression is empty." ++msgstr "Изразът за версия е празен." ++ ++#: lib/choose_rev.tcl:537 ++msgid "Updated" ++msgstr "Обновен" ++ ++#: lib/choose_rev.tcl:565 ++msgid "URL" ++msgstr "Адрес" ++ ++#: lib/line.tcl:17 ++msgid "Goto Line:" ++msgstr "Към ред:" ++ ++#: lib/line.tcl:23 ++msgid "Go" ++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 "" ++"Няма какво да се поправи.\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: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 "Неправилно поле GIT_COMMITTER_IDENT:" ++ ++#: 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:173 ++#, 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:181 ++#, 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:189 ++msgid "" ++"No changes to commit.\n" ++"\n" ++"You must stage at least 1 file before you can commit.\n" ++msgstr "" ++"Няма промени за подаване.\n" ++"\n" ++"Трябва да добавите поне 1 файл към индекса, преди да подадете.\n" ++ ++#: lib/commit.tcl:204 ++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:235 ++msgid "Calling pre-commit hook..." ++msgstr "Изпълняване на куката преди подаване…" ++ ++#: lib/commit.tcl:250 ++msgid "Commit declined by pre-commit hook." ++msgstr "Подаването е отхвърлено от куката преди подаване." ++ ++#: lib/commit.tcl:269 ++msgid "" ++"You are about to commit on a detached head. This is a potentially dangerous " ++"thing to do because if you switch to another branch you will lose your " ++"changes and it can be difficult to retrieve them later from the reflog. You " ++"should probably cancel this commit and create a new branch to continue.\n" ++" \n" ++" Do you really want to proceed with your Commit?" ++msgstr "" ++"Ще подадете към несвързан връх. Това действие е опасно, защото при " ++"преминаването към който и да е клон ще загубите промените си и не е сигурно, " ++"че ще можете по-късно да ги възстановите чрез журнала на указателите. Най-" ++"вероятно трябва първо да създадете клон базиран на текущото състояние и да " ++"подадете към него.\n" ++" \n" ++"Сигурни ли сте, че искате да подадете точно сега?" ++ ++#: lib/commit.tcl:290 ++msgid "Calling commit-msg hook..." ++msgstr "Изпълняване на куката за съобщението при подаване…" ++ ++#: lib/commit.tcl:305 ++msgid "Commit declined by commit-msg hook." ++msgstr "Подаването е отхвърлено от куката за съобщението при подаване." ++ ++#: lib/commit.tcl:318 ++msgid "Committing changes..." ++msgstr "Подаване на промените." ++ ++#: lib/commit.tcl:334 ++msgid "write-tree failed:" ++msgstr "неуспешно запазване на дървото (write-tree):" ++ ++#: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400 ++msgid "Commit failed." ++msgstr "Неуспешно подаване." ++ ++#: lib/commit.tcl:352 ++#, tcl-format ++msgid "Commit %s appears to be corrupt" ++msgstr "Подаването „%s“ изглежда повредено" ++ ++#: lib/commit.tcl:357 ++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:364 ++msgid "No changes to commit." ++msgstr "Няма промени за подаване." ++ ++#: lib/commit.tcl:378 ++msgid "commit-tree failed:" ++msgstr "неуспешно подаване на дървото (commit-tree):" ++ ++#: lib/commit.tcl:399 ++msgid "update-ref failed:" ++msgstr "неуспешно обновяване на указателите (update-ref):" ++ ++#: lib/commit.tcl:492 ++#, tcl-format ++msgid "Created commit %s: %s" ++msgstr "Успешно подаване %s: %s" ++ ++#: lib/branch_delete.tcl:16 ++msgid "Delete Branch" ++msgstr "Изтриване на клон" ++ ++#: lib/branch_delete.tcl:21 ++msgid "Delete Local Branch" ++msgstr "Изтриване на локален клон" ++ ++#: lib/branch_delete.tcl:39 ++msgid "Local Branches" ++msgstr "Локални клони" ++ ++#: lib/branch_delete.tcl:51 ++msgid "Delete Only If Merged Into" ++msgstr "Изтриване, само ако промените са слети и другаде" ++ ++#: lib/branch_delete.tcl:103 ++#, tcl-format ++msgid "The following branches are not completely merged into %s:" ++msgstr "Не всички промени в клоните са слети в %s:" ++ ++#: lib/branch_delete.tcl:141 ++#, tcl-format ++msgid "" ++"Failed to delete branches:\n" ++"%s" ++msgstr "" ++"Неуспешно триене на клони:\n" ++"%s" ++ ++#: lib/blame.tcl:73 ++msgid "File Viewer" ++msgstr "Преглед на файлове" ++ ++#: lib/blame.tcl:79 ++msgid "Commit:" ++msgstr "Подаване:" ++ ++#: lib/blame.tcl:280 ++msgid "Copy Commit" ++msgstr "Копиране на подаване" ++ ++#: lib/blame.tcl:284 ++msgid "Find Text..." ++msgstr "Търсене на текст…" ++ ++#: lib/blame.tcl:288 ++msgid "Goto Line..." ++msgstr "Към ред…" ++ ++#: lib/blame.tcl:297 ++msgid "Do Full Copy Detection" ++msgstr "Пълно търсене на копиране" ++ ++#: lib/blame.tcl:301 ++msgid "Show History Context" ++msgstr "Показване на контекста от историята" ++ ++#: lib/blame.tcl:304 ++msgid "Blame Parent Commit" ++msgstr "Анотиране на родителското подаване" ++ ++#: lib/blame.tcl:466 ++#, tcl-format ++msgid "Reading %s..." ++msgstr "%s се чете…" ++ ++#: lib/blame.tcl:594 ++msgid "Loading copy/move tracking annotations..." ++msgstr "Зареждане на анотациите за проследяване на копирането/преместването…" ++ ++#: lib/blame.tcl:614 ++msgid "lines annotated" ++msgstr "реда анотирани" ++ ++#: lib/blame.tcl:806 ++msgid "Loading original location annotations..." ++msgstr "Зареждане на анотациите за първоначалното местоположение…" ++ ++#: lib/blame.tcl:809 ++msgid "Annotation complete." ++msgstr "Анотирането завърши." ++ ++#: lib/blame.tcl:839 ++msgid "Busy" ++msgstr "Операцията не е завършила" ++ ++#: lib/blame.tcl:840 ++msgid "Annotation process is already running." ++msgstr "В момента тече процес на анотиране." ++ ++#: lib/blame.tcl:879 ++msgid "Running thorough copy detection..." ++msgstr "Изпълнява се цялостен процес на откриване на копиране…" ++ ++#: lib/blame.tcl:947 ++msgid "Loading annotation..." ++msgstr "Зареждане на анотации…" ++ ++#: lib/blame.tcl:1000 ++msgid "Author:" ++msgstr "Автор:" ++ ++#: lib/blame.tcl:1004 ++msgid "Committer:" ++msgstr "Подал:" ++ ++#: lib/blame.tcl:1009 ++msgid "Original File:" ++msgstr "Първоначален файл:" ++ ++#: lib/blame.tcl:1057 ++msgid "Cannot find HEAD commit:" ++msgstr "Подаването за връх HEAD не може да се открие:" ++ ++#: lib/blame.tcl:1112 ++msgid "Cannot find parent commit:" ++msgstr "Родителското подаване не може да бъде открито" ++ ++#: lib/blame.tcl:1127 ++msgid "Unable to display parent" ++msgstr "Родителят не може да бъде показан" ++ ++#: lib/blame.tcl:1269 ++msgid "Originally By:" ++msgstr "Първоначално от:" ++ ++#: lib/blame.tcl:1275 ++msgid "In File:" ++msgstr "Във файл:" ++ ++#: lib/blame.tcl:1280 ++msgid "Copied Or Moved Here By:" ++msgstr "Копирано или преместено тук от:" ++ ++#: lib/index.tcl:6 ++msgid "Unable to unlock the index." ++msgstr "Индексът не може да бъде отключен." ++ ++#: lib/index.tcl:17 ++msgid "Index Error" ++msgstr "Грешка в индекса" ++ ++#: lib/index.tcl:19 ++msgid "" ++"Updating the Git index failed. A rescan will be automatically started to " ++"resynchronize git-gui." ++msgstr "" ++"Неуспешно обновяване на индекса на Git. Автоматично ще започне нова проверка " ++"за синхронизирането на git-gui." ++ ++#: lib/index.tcl:30 ++msgid "Continue" ++msgstr "Продължаване" ++ ++#: lib/index.tcl:33 ++msgid "Unlock Index" ++msgstr "Отключване на индекса" ++ ++#: lib/index.tcl:298 ++#, tcl-format ++msgid "Unstaging %s from commit" ++msgstr "Изваждане на %s от подаването" ++ ++#: lib/index.tcl:337 ++msgid "Ready to commit." ++msgstr "Готовност за подаване." ++ ++#: lib/index.tcl:350 ++#, tcl-format ++msgid "Adding %s" ++msgstr "Добавяне на „%s“" ++ ++#: lib/index.tcl:380 ++#, tcl-format ++msgid "Stage %d untracked files?" ++msgstr "Да се добавят ли %d на брой неследени файла към индекса?" ++ ++#: lib/index.tcl:428 ++#, tcl-format ++msgid "Revert changes in file %s?" ++msgstr "Да се махнат ли промените във файла „%s“?" ++ ++#: lib/index.tcl:430 ++#, tcl-format ++msgid "Revert changes in these %i files?" ++msgstr "Да се махнат ли промените в тези %i файла?" ++ ++#: lib/index.tcl:438 ++msgid "Any unstaged changes will be permanently lost by the revert." ++msgstr "" ++"Всички промени, които не са били вкарани в индекса, ще бъдат безвъзвратно " ++"загубени." ++ ++#: lib/index.tcl:441 ++msgid "Do Nothing" ++msgstr "Нищо да не се прави" ++ ++#: lib/index.tcl:459 ++msgid "Reverting selected files" ++msgstr "Махане на промените в избраните файлове" ++ ++#: lib/index.tcl:463 ++#, tcl-format ++msgid "Reverting %s" ++msgstr "Махане на промените в „%s“" ++ ++#: 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/date.tcl:25 ++#, tcl-format ++msgid "Invalid date from Git: %s" ++msgstr "Неправилни данни от Git: %s" ++ ++#: lib/database.tcl:42 ++msgid "Number of loose objects" ++msgstr "Брой непакетирани обекти" ++ ++#: lib/database.tcl:43 ++msgid "Disk space used by loose objects" ++msgstr "Дисково пространство заето от непакетирани обекти" ++ ++#: lib/database.tcl:44 ++msgid "Number of packed objects" ++msgstr "Брой пакетирани обекти" ++ ++#: lib/database.tcl:45 ++msgid "Number of packs" ++msgstr "Брой пакети" ++ ++#: lib/database.tcl:46 ++msgid "Disk space used by packed objects" ++msgstr "Дисково пространство заето от пакетирани обекти" ++ ++#: lib/database.tcl:47 ++msgid "Packed objects waiting for pruning" ++msgstr "Пакетирани обекти за окастряне" ++ ++#: lib/database.tcl:48 ++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: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.\n" ++"\n" ++"Compress the database now?" ++msgstr "" ++"В това хранилище в момента има към %i непакетирани обекти.\n" ++"\n" ++"Зd добра производителност се препоръчва да компресирате базата с данни за " ++"обектите.\n" ++"\n" ++"Да се започне ли компресирането?" ++ ++#: lib/error.tcl:20 lib/error.tcl:116 ++msgid "error" ++msgstr "грешка" ++ ++#: lib/error.tcl:36 ++msgid "warning" ++msgstr "предупреждение" ++ ++#: lib/error.tcl:96 ++msgid "You must correct the above errors before committing." ++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 "" ++"По време на поправяне не може да сливане.\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" ++"\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:108 ++#, tcl-format ++msgid "%s of %s" ++msgstr "%s от общо %s" ++ ++#: lib/merge.tcl:122 ++#, tcl-format ++msgid "Merging %s and %s..." ++msgstr "Сливане на „%s“ и „%s“…" ++ ++#: lib/merge.tcl:133 ++msgid "Merge completed successfully." ++msgstr "Сливането завърши успешно." ++ ++#: lib/merge.tcl:135 ++msgid "Merge failed. Conflict resolution is required." ++msgstr "Неуспешно сливане — има конфликти за коригиране." ++ ++#: lib/merge.tcl:160 ++#, tcl-format ++msgid "Merge Into %s" ++msgstr "Сливане в „%s“" ++ ++#: lib/merge.tcl:179 ++msgid "Revision To Merge" ++msgstr "Версия за сливане" ++ ++#: lib/merge.tcl:214 ++msgid "" ++"Cannot abort while amending.\n" ++"\n" ++"You must finish amending this commit.\n" ++msgstr "" ++"Поправянето не може да бъде преустановено.\n" ++"\n" ++"Трябва да завършите поправката на това подаване.\n" ++ ++#: lib/merge.tcl:224 ++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:230 ++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:241 ++msgid "Aborting" ++msgstr "Преустановяване" ++ ++#: lib/merge.tcl:241 ++msgid "files reset" ++msgstr "файла със занулени промени" ++ ++#: lib/merge.tcl:269 ++msgid "Abort failed." ++msgstr "Неуспешно преустановяване." ++ ++#: lib/merge.tcl:271 ++msgid "Abort completed. Ready." ++msgstr "Успешно преустановяване. Готовност за следващо действие." diff --cc git-gui/po/glossary/bg.po index 0000000000,0000000000..8b71fad9a5 new file mode 100644 --- /dev/null +++ b/git-gui/po/glossary/bg.po @@@ -1,0 -1,0 +1,287 @@@ ++# Bulgarian translation of git-gui-glossary po-file. ++# Copyright (C) 2012, 2013, 2014 Alexander Shopov . ++# This file is distributed under the same license as the git package. ++# Alexander Shopov , 2012, 2013, 2014. ++# ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: git-gui-glossary master\n" ++"POT-Creation-Date: 2014-01-13 21:39+0200\n" ++"PO-Revision-Date: 2014-01-13 21:39+0200\n" ++"Last-Translator: Alexander Shopov \n" ++"Language-Team: Bulgarian \n" ++"Language: bg\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" ++msgid "" ++"English Term (Dear translator: This file will never be visible to the user!)" ++msgstr "Термин" ++ ++#. "" ++msgid "amend" ++msgstr "поправям" ++ ++#. "" ++msgid "annotate" ++msgstr "анотирам" ++ ++#. "A 'branch' is an active line of development." ++msgid "branch [noun]" ++msgstr "клон, разклонение [съществително]" ++ ++#. "" ++msgid "branch [verb]" ++msgstr "разклонявам [глагол]" ++ ++#. "" ++msgid "checkout [noun]" ++msgstr "изтегляне [съществително]" ++ ++#. "The action of updating the working tree to a revision which was stored in the object database." ++msgid "checkout [verb]" ++msgstr "изтегляне [глагол]" ++ ++#. "" ++msgid "clone [verb]" ++msgstr "клонирам [глагол]" ++ ++#. "A single point in the git history." ++msgid "commit [noun]" ++msgstr "подаване [съществително]" ++ ++#. "The action of storing a new snapshot of the project's state in the git history." ++msgid "commit [verb]" ++msgstr "подавам [съществително]" ++ ++#. "" ++msgid "diff [noun]" ++msgstr "разлика/промени [съществително]" ++ ++#. "" ++msgid "diff [verb]" ++msgstr "изчислявам разлика/промени [глагол]" ++ ++#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." ++msgid "fast forward merge" ++msgstr "превъртащо/директно/тривиално сливане" ++ ++#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." ++msgid "fetch" ++msgstr "доставяне" ++ ++#. "One context of consecutive lines in a whole patch, which consists of many such hunks" ++msgid "hunk" ++msgstr "парче" ++ ++#. "A collection of files. The index is a stored version of your working tree." ++msgid "index (in git-gui: staging area)" ++msgstr "скеле/индекс/изба" ++ ++#. "A successful merge results in the creation of a new commit representing the result of the merge." ++msgid "merge [noun]" ++msgstr "сливане/обединяване [съществително]" ++ ++#. "To bring the contents of another branch into the current branch." ++msgid "merge [verb]" ++msgstr "сливам/обединявам [глагол]" ++ ++#. "" ++msgid "message" ++msgstr "съобщение" ++ ++#. "Deletes all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." ++msgid "prune" ++msgstr "окастрям" ++ ++#. "Pulling a branch means to fetch it and merge it." ++msgid "pull" ++msgstr "издърпвам" ++ ++#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" ++msgid "push" ++msgstr "изтласквам" ++ ++#. "" ++msgid "redo" ++msgstr "повтарям/правя наново" ++ ++#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." ++msgid "remote" ++msgstr "отдалечено хранилище" ++ ++#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" ++msgid "repository" ++msgstr "хранилище" ++ ++#. "" ++msgid "reset" ++msgstr "занулявам/отменям" ++ ++#. "" ++msgid "revert" ++msgstr "връщам/отменям" ++ ++#. "A particular state of files and directories which was stored in the object database." ++msgid "revision" ++msgstr "версия" ++ ++#. "" ++msgid "sign off" ++msgstr "подписвам" ++ ++#. "" ++msgid "staging area" ++msgstr "скеле/индекс/изба" ++ ++#. "" ++msgid "status" ++msgstr "състояние" ++ ++#. "A ref pointing to a tag or commit object" ++msgid "tag [noun]" ++msgstr "етикет [съществително]" ++ ++#. "" ++msgid "tag [verb]" ++msgstr "задавам етикет [глагол]" ++ ++#. "A regular git branch that is used to follow changes from another repository." ++msgid "tracking branch" ++msgstr "следящ клон" ++ ++#. "" ++msgid "undo" ++msgstr "отменям" ++ ++#. "" ++msgid "update" ++msgstr "обновявам" ++ ++#. "" ++msgid "verify" ++msgstr "проверявам" ++ ++#. "The tree of actual checked out files." ++msgid "working copy, working tree" ++msgstr "работно копие/работно дърво" ++ ++#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" ++msgid "ancestor" ++msgstr "предшественик" ++ ++#. "prematurely stop and abandon an operation" ++msgid "abort" ++msgstr "преустановявам" ++ ++#. "a repository with only .git directory, without working directory" ++msgid "bare repository" ++msgstr "голо хранилище" ++ ++#. "a parent version of the current file" ++msgid "base" ++msgstr "родителска версия" ++ ++#. "get the authors responsible for each line in a file" ++msgid "blame" ++msgstr "анотирам/анотиране" ++ ++#. "to select and apply a single commit without merging" ++msgid "cherry-pick" ++msgstr "отбирам" ++ ++#. "a commit that directly succeeds the current one in git's graph of commits" ++msgid "child" ++msgstr "дете" ++ ++#. "clean the state of the git repository, often after manually stopped operation" ++msgid "cleanup" ++msgstr "зачиствам" ++ ++#. "a message that gets attached with any commit" ++msgid "commit message" ++msgstr "съобщение при подаване" ++ ++#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" ++msgid "descendant" ++msgstr "наследник" ++ ++#. "checkout of a revision rather than a some head" ++msgid "detached checkout" ++msgstr "несвързано изтегляне" ++ ++#. "any merge strategy that works on a file by file basis" ++msgid "file level merging" ++msgstr "пофайлово сливане" ++ ++#. "the last revision in a branch" ++msgid "head" ++msgstr "глава/връх (на клон, разработка)" ++ ++#. "script that gets executed automatically on some event" ++msgid "hook" ++msgstr "кука/автоматичен скрипт" ++ ++#. "the first checkout during a clone operation" ++msgid "initial checkout" ++msgstr "първоначално изтегляне" ++ ++#. "a branch that resides in the local git repository" ++msgid "local branch" ++msgstr "локален клон" ++ ++#. "a Git object that is not part of any pack" ++msgid "loose object" ++msgstr "непакетиран обект" ++ ++#. "a branch called by convention 'master' that exists in a newly created git repository" ++msgid "master branch" ++msgstr "основен клон" ++ ++#. "a remote called by convention 'origin' that the current git repository has been cloned from" ++msgid "origin" ++msgstr "хранилище-източник" ++ ++#. "a file containing many git objects packed together" ++msgid "pack [noun]" ++msgstr "етикет" ++ ++#. "a Git object part of some pack" ++msgid "packed object" ++msgstr "пакетиран обект" ++ ++#. "a commit that directly precedes the current one in git's graph of commits" ++msgid "parent" ++msgstr "родител" ++ ++#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" ++msgid "reflog" ++msgstr "журнал на указателите" ++ ++#. "decide which changes from alternative versions of a file should persist in Git" ++msgid "resolve (a conflict)" ++msgstr "коригирам (конфликт)" ++ ++#. "abandon changes and go to pristine version" ++msgid "revert changes" ++msgstr "връщане на оригинала" ++ ++#. "expression that signifies a revision in git" ++msgid "revision expression" ++msgstr "израз за версия" ++ ++#. "add some content of files and directories to the staging area in preparation for a commit" ++msgid "stage/unstage" ++msgstr "(добавяне) към скелето за подаване/изваждане от скелето за подаване" ++ ++#. "temporarily save changes in a stack without committing" ++msgid "stash" ++msgstr "скатавам промени" ++ ++#. "file whose content is tracked/not tracked by git" ++msgid "tracked/untracked" ++msgstr "следен/неследен" diff --cc git-gui/po/glossary/git-gui-glossary.txt index 9b31f69152,0000000000..409304692d mode 100644,000000..100644 --- a/git-gui/po/glossary/git-gui-glossary.txt +++ b/git-gui/po/glossary/git-gui-glossary.txt @@@ -1,38 -1,0 +1,67 @@@ +"English Term (Dear translator: This file will never be visible to the user!)" "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" +"amend" "" +"annotate" "" +"branch [noun]" "A 'branch' is an active line of development." +"branch [verb]" "" +"checkout [noun]" "" +"checkout [verb]" "The action of updating the working tree to a revision which was stored in the object database." +"clone [verb]" "" +"commit [noun]" "A single point in the git history." +"commit [verb]" "The action of storing a new snapshot of the project's state in the git history." +"diff [noun]" "" +"diff [verb]" "" +"fast forward merge" "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." +"fetch" "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." +"hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks" +"index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree." +"merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge." +"merge [verb]" "To bring the contents of another branch into the current branch." +"message" "" +"prune" "Deletes all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." +"pull" "Pulling a branch means to fetch it and merge it." +"push" "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" +"redo" "" +"remote" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +"repository" "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" +"reset" "" +"revert" "" +"revision" "A particular state of files and directories which was stored in the object database." +"sign off" "" +"staging area" "" +"status" "" +"tag [noun]" "A ref pointing to a tag or commit object" +"tag [verb]" "" +"tracking branch" "A regular git branch that is used to follow changes from another repository." +"undo" "" +"update" "" +"verify" "" +"working copy, working tree" "The tree of actual checked out files." ++"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" ++"abort" "prematurely stop and abandon an operation" ++"bare repository" "a repository with only .git directory, without working directory" ++"base" "a parent version of the current file" ++"blame" "get the authors responsible for each line in a file" ++"cherry-pick" "to select and apply a single commit without merging" ++"child" "a commit that directly succeeds the current one in git's graph of commits" ++"cleanup" "clean the state of the git repository, often after manually stopped operation" ++"commit message" "a message that gets attached with any commit" ++"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)" ++"detached checkout" "checkout of a revision rather than a some head" ++"file level merging" "any merge strategy that works on a file by file basis" ++"head" "the last revision in a branch" ++"hook" "script that gets executed automatically on some event" ++"initial checkout" "the first checkout during a clone operation" ++"local branch" "a branch that resides in the local git repository" ++"loose object" "a Git object that is not part of any pack" ++"master branch" "a branch called by convention 'master' that exists in a newly created git repository" ++"origin" "a remote called by convention 'origin' that the current git repository has been cloned from" ++"pack [noun]" "a file containing many git objects packed together" ++"packed object" "a Git object part of some pack" ++"parent" "a commit that directly precedes the current one in git's graph of commits" ++"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" ++"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git" ++"revert changes" "abandon changes and go to pristine version" ++"revision expression" "expression that signifies a revision in git" ++"stage/unstage" "add some content of files and directories to the staging area in preparation for a commit" ++"stash" "temporarily save changes in a stack without committing" ++"tracked/untracked" "file whose content is tracked/not tracked by git" diff --cc git-gui/po/po2msg.sh index 1e9f992528,0000000000..1e9f992528 mode 100644,000000..100755 --- a/git-gui/po/po2msg.sh +++ b/git-gui/po/po2msg.sh diff --cc git-gui/windows/git-gui.sh index b1845c5055,0000000000..b1845c5055 mode 100644,000000..100755 --- a/git-gui/windows/git-gui.sh +++ b/git-gui/windows/git-gui.sh