From 2441e19d4c675abcb71e02d19f4077738ffb1dbd Mon Sep 17 00:00:00 2001
From: Ori Avtalion <ori@avtalion.name>
Date: Wed, 21 May 2025 20:12:35 +0300
Subject: [PATCH 01/14] gitk: Add user preference to hide specific references

External tools such as Jujutsu may add many references that are of no
interest to the user. This preference allows hiding them.

Signed-off-by: Ori Avtalion <ori@avtalion.name>
---
 gitk | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/gitk b/gitk
index 11ad639d06..e7a848597d 100755
--- a/gitk
+++ b/gitk
@@ -1939,8 +1939,10 @@ proc readrefs {} {
             set tagids($name) $id
             lappend idtags($id) $name
         } else {
-            set otherrefids($name) $id
-            lappend idotherrefs($id) $name
+            if [is_other_ref_visible $name] {
+                set otherrefids($name) $id
+                lappend idotherrefs($id) $name
+            }
         }
     }
     catch {close $refd}
@@ -11696,7 +11698,7 @@ proc prefspage_general {notebook} {
     global NS maxwidth maxgraphpct showneartags showlocalchanges
     global tabstop wrapcomment wrapdefault limitdiffs
     global autocopy autoselect autosellen extdifftool perfile_attrs
-    global hideremotes want_ttk have_ttk maxrefs web_browser
+    global hideremotes refstohide want_ttk have_ttk maxrefs web_browser
 
     set page [create_prefs_page $notebook.general]
 
@@ -11717,6 +11719,13 @@ proc prefspage_general {notebook} {
         -variable hideremotes
     grid x $page.hideremotes -sticky w
 
+    ${NS}::entry $page.refstohide -textvariable refstohide
+    ${NS}::frame $page.refstohidef
+    ${NS}::label $page.refstohidef.l -text [mc "Refs to hide (space-separated)" ]
+    pack $page.refstohidef.l -side left
+    pack configure $page.refstohidef.l -padx 10
+    grid x $page.refstohidef $page.refstohide -sticky ew
+
     ${NS}::checkbutton $page.autocopy -text [mc "Copy commit ID to clipboard"] \
         -variable autocopy
     grid x $page.autocopy -sticky w
@@ -11863,7 +11872,7 @@ proc doprefs {} {
     global oldprefs prefstop showneartags showlocalchanges
     global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
     global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
-    global hideremotes want_ttk have_ttk wrapcomment wrapdefault
+    global hideremotes refstohide want_ttk have_ttk wrapcomment wrapdefault
 
     set top .gitkprefs
     set prefstop $top
@@ -11872,7 +11881,8 @@ proc doprefs {} {
         return
     }
     foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-                   limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} {
+                   limitdiffs tabstop perfile_attrs hideremotes refstohide \
+                   want_ttk wrapcomment wrapdefault} {
         set oldprefs($v) [set $v]
     }
     ttk_toplevel $top
@@ -11998,7 +12008,8 @@ proc prefscan {} {
     global oldprefs prefstop
 
     foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-                   limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} {
+                   limitdiffs tabstop perfile_attrs hideremotes refstohide \
+                   want_ttk wrapcomment wrapdefault} {
         global $v
         set $v $oldprefs($v)
     }
@@ -12012,7 +12023,7 @@ proc prefsok {} {
     global oldprefs prefstop showneartags showlocalchanges
     global fontpref mainfont textfont uifont
     global limitdiffs treediffs perfile_attrs
-    global hideremotes wrapcomment wrapdefault
+    global hideremotes refstohide wrapcomment wrapdefault
     global ctext
 
     catch {destroy $prefstop}
@@ -12059,7 +12070,7 @@ proc prefsok {} {
           $limitdiffs != $oldprefs(limitdiffs)} {
         reselectline
     }
-    if {$hideremotes != $oldprefs(hideremotes)} {
+    if {$hideremotes != $oldprefs(hideremotes) || $refstohide != $oldprefs(refstohide)} {
         rereadrefs
     }
     if {$wrapcomment != $oldprefs(wrapcomment)} {
@@ -12436,6 +12447,23 @@ proc get_path_encoding {path} {
     return $tcl_enc
 }
 
+proc is_other_ref_visible {ref} {
+    global refstohide
+
+    if {$refstohide eq {}} {
+        return 1
+    }
+
+    foreach pat [split $refstohide " "] {
+        if {$pat eq {}} continue
+        if {[string match $pat $ref]} {
+            return 0
+        }
+    }
+
+    return 1
+}
+
 ## For msgcat loading, first locate the installation location.
 if { [info exists ::env(GITK_MSGSDIR)] } {
     ## Msgsdir was manually set in the environment.
@@ -12539,6 +12567,7 @@ set wrapcomment "none"
 set wrapdefault "none"
 set showneartags 1
 set hideremotes 0
+set refstohide ""
 set maxrefs 20
 set visiblerefs {"master"}
 set maxlinelen 200
@@ -12645,7 +12674,7 @@ set config_variables {
     mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth
     cmitmode wrapcomment wrapdefault autocopy autoselect autosellen
     showneartags maxrefs visiblerefs
-    hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk
+    hideremotes refstohide showlocalchanges datetimeformat limitdiffs uicolor want_ttk
     bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors
     markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor
     extdifftool perfile_attrs headbgcolor headfgcolor headoutlinecolor

From 100f597b8833c55bdac70e9c2066d9ee36e0b6cb Mon Sep 17 00:00:00 2001
From: Mark Levedahl <mlevedahl@gmail.com>
Date: Thu, 5 Jun 2025 12:23:37 -0400
Subject: [PATCH 02/14] gitk: set config dialog color swatches in one place

gitk's color selection dialog uses a number of "label" widgets to show
the current value of each selectable color. This uses the -background
color property of label widgets, and this property is overwritten when
the full ui color set is refreshed. The swatch colors are set
individually using code passed into the chooser dialog, so there is no
common routine to set all after updating the global ui colors.

Let's replace this with a single routine that does set all swatches,
removing a key impediment to restoring the ui colors if the dialog is
cancelled.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 gitk | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/gitk b/gitk
index ba112586be..f331d9ccd5 100755
--- a/gitk
+++ b/gitk
@@ -11660,57 +11660,73 @@ proc prefspage_colors {notebook} {
     grid $page.cdisp - -sticky w -pady 10
     label $page.ui -padx 40 -relief sunk -background $uicolor
     ttk::button $page.uibut -text [mc "Interface"] \
-       -command [list choosecolor uicolor {} $page.ui [mc "interface"] setui]
+       -command [list choosecolor uicolor {} $page [mc "interface"] setui]
     grid x $page.uibut $page.ui -sticky w
     label $page.bg -padx 40 -relief sunk -background $bgcolor
     ttk::button $page.bgbut -text [mc "Background"] \
-        -command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg]
+        -command [list choosecolor bgcolor {} $page [mc "background"] setbg]
     grid x $page.bgbut $page.bg -sticky w
     label $page.fg -padx 40 -relief sunk -background $fgcolor
     ttk::button $page.fgbut -text [mc "Foreground"] \
-        -command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg]
+        -command [list choosecolor fgcolor {} $page [mc "foreground"] setfg]
     grid x $page.fgbut $page.fg -sticky w
     label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
     ttk::button $page.diffoldbut -text [mc "Diff: old lines"] \
-        -command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \
+        -command [list choosecolor diffcolors 0 $page [mc "diff old lines"] \
                       [list $ctext tag conf d0 -foreground]]
     grid x $page.diffoldbut $page.diffold -sticky w
     label $page.diffoldbg -padx 40 -relief sunk -background [lindex $diffbgcolors 0]
     ttk::button $page.diffoldbgbut -text [mc "Diff: old lines bg"] \
-        -command [list choosecolor diffbgcolors 0 $page.diffoldbg \
+        -command [list choosecolor diffbgcolors 0 $page \
                       [mc "diff old lines bg"] \
                       [list $ctext tag conf d0 -background]]
     grid x $page.diffoldbgbut $page.diffoldbg -sticky w
     label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
     ttk::button $page.diffnewbut -text [mc "Diff: new lines"] \
-        -command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \
+        -command [list choosecolor diffcolors 1 $page [mc "diff new lines"] \
                       [list $ctext tag conf dresult -foreground]]
     grid x $page.diffnewbut $page.diffnew -sticky w
     label $page.diffnewbg -padx 40 -relief sunk -background [lindex $diffbgcolors 1]
     ttk::button $page.diffnewbgbut -text [mc "Diff: new lines bg"] \
-        -command [list choosecolor diffbgcolors 1 $page.diffnewbg \
+        -command [list choosecolor diffbgcolors 1 $page \
                       [mc "diff new lines bg"] \
                       [list $ctext tag conf dresult -background]]
     grid x $page.diffnewbgbut $page.diffnewbg -sticky w
     label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
     ttk::button $page.hunksepbut -text [mc "Diff: hunk header"] \
-        -command [list choosecolor diffcolors 2 $page.hunksep \
+        -command [list choosecolor diffcolors 2 $page \
                       [mc "diff hunk header"] \
                       [list $ctext tag conf hunksep -foreground]]
     grid x $page.hunksepbut $page.hunksep -sticky w
     label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor
     ttk::button $page.markbgbut -text [mc "Marked line bg"] \
-        -command [list choosecolor markbgcolor {} $page.markbgsep \
+        -command [list choosecolor markbgcolor {} $page \
                       [mc "marked line background"] \
                       [list $ctext tag conf omark -background]]
     grid x $page.markbgbut $page.markbgsep -sticky w
     label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor
     ttk::button $page.selbgbut -text [mc "Select bg"] \
-        -command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg]
+        -command [list choosecolor selectbgcolor {} $page [mc "background"] setselbg]
     grid x $page.selbgbut $page.selbgsep -sticky w
     return $page
 }
 
+proc prefspage_set_colorswatches {page} {
+    global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
+    global diffbgcolors
+
+    $page.ui configure -background $uicolor
+    $page.bg configure -background $bgcolor
+    $page.fg configure -background $fgcolor
+    $page.diffold configure -background [lindex $diffcolors 0]
+    $page.diffoldbg configure -background [lindex $diffbgcolors 0]
+    $page.diffnew configure -background [lindex $diffcolors 1]
+    $page.diffnewbg configure -background [lindex $diffbgcolors 1]
+    $page.hunksep configure -background [lindex $diffcolors 2]
+    $page.markbgsep configure -background $markbgcolor
+    $page.selbgsep configure -background $selectbgcolor
+}
+
 proc prefspage_fonts {notebook} {
     set page [create_prefs_page $notebook.fonts]
     ttk::label $page.cfont -text [mc "Fonts: press to choose"] -font mainfontbold
@@ -11778,15 +11794,15 @@ proc choose_extdiff {} {
     }
 }
 
-proc choosecolor {v vi w x cmd} {
+proc choosecolor {v vi prefspage x cmd} {
     global $v
 
     set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
                -title [mc "Gitk: choose color for %s" $x]]
     if {$c eq {}} return
-    $w conf -background $c
     lset $v $vi $c
     eval $cmd $c
+    prefspage_set_colorswatches $prefspage
 }
 
 proc setselbg {c} {

From fdaba070bcbadd902610c09707802d0a1e2d3201 Mon Sep 17 00:00:00 2001
From: Mark Levedahl <mlevedahl@gmail.com>
Date: Fri, 6 Jun 2025 11:34:04 -0400
Subject: [PATCH 03/14] gitk: restore ui colors after cancelling config dialog

gitk provides a dialog to configure many ui colors. Any color element
changed in the dialog takes immediate effect before closing the dialog.
While cancelling the dialog after changing one or more colors avoids
saving the modified colors, the user must restart gitk to restore the
prior color set. This unfortunate behavior results because gitk does not
have a single routine to update all of the ui colors. The prior commit
eliminated the key impediment to having such a routine. So, let's create
a routine to update all configured colors at once, use this when
modifying colors, and also invoke this after restoring the prior set if
the dialog is cancelled.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 gitk | 55 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/gitk b/gitk
index f331d9ccd5..b5ddfd1c83 100755
--- a/gitk
+++ b/gitk
@@ -11660,53 +11660,43 @@ proc prefspage_colors {notebook} {
     grid $page.cdisp - -sticky w -pady 10
     label $page.ui -padx 40 -relief sunk -background $uicolor
     ttk::button $page.uibut -text [mc "Interface"] \
-       -command [list choosecolor uicolor {} $page [mc "interface"] setui]
+       -command [list choosecolor uicolor {} $page [mc "interface"]]
     grid x $page.uibut $page.ui -sticky w
     label $page.bg -padx 40 -relief sunk -background $bgcolor
     ttk::button $page.bgbut -text [mc "Background"] \
-        -command [list choosecolor bgcolor {} $page [mc "background"] setbg]
+        -command [list choosecolor bgcolor {} $page [mc "background"]]
     grid x $page.bgbut $page.bg -sticky w
     label $page.fg -padx 40 -relief sunk -background $fgcolor
     ttk::button $page.fgbut -text [mc "Foreground"] \
-        -command [list choosecolor fgcolor {} $page [mc "foreground"] setfg]
+        -command [list choosecolor fgcolor {} $page [mc "foreground"]]
     grid x $page.fgbut $page.fg -sticky w
     label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
     ttk::button $page.diffoldbut -text [mc "Diff: old lines"] \
-        -command [list choosecolor diffcolors 0 $page [mc "diff old lines"] \
-                      [list $ctext tag conf d0 -foreground]]
+        -command [list choosecolor diffcolors 0 $page [mc "diff old lines"]]
     grid x $page.diffoldbut $page.diffold -sticky w
     label $page.diffoldbg -padx 40 -relief sunk -background [lindex $diffbgcolors 0]
     ttk::button $page.diffoldbgbut -text [mc "Diff: old lines bg"] \
-        -command [list choosecolor diffbgcolors 0 $page \
-                      [mc "diff old lines bg"] \
-                      [list $ctext tag conf d0 -background]]
+        -command [list choosecolor diffbgcolors 0 $page [mc "diff old lines bg"]]
     grid x $page.diffoldbgbut $page.diffoldbg -sticky w
     label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
     ttk::button $page.diffnewbut -text [mc "Diff: new lines"] \
-        -command [list choosecolor diffcolors 1 $page [mc "diff new lines"] \
-                      [list $ctext tag conf dresult -foreground]]
+        -command [list choosecolor diffcolors 1 $page [mc "diff new lines"]]
     grid x $page.diffnewbut $page.diffnew -sticky w
     label $page.diffnewbg -padx 40 -relief sunk -background [lindex $diffbgcolors 1]
     ttk::button $page.diffnewbgbut -text [mc "Diff: new lines bg"] \
-        -command [list choosecolor diffbgcolors 1 $page \
-                      [mc "diff new lines bg"] \
-                      [list $ctext tag conf dresult -background]]
+        -command [list choosecolor diffbgcolors 1 $page [mc "diff new lines bg"]]
     grid x $page.diffnewbgbut $page.diffnewbg -sticky w
     label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
     ttk::button $page.hunksepbut -text [mc "Diff: hunk header"] \
-        -command [list choosecolor diffcolors 2 $page \
-                      [mc "diff hunk header"] \
-                      [list $ctext tag conf hunksep -foreground]]
+        -command [list choosecolor diffcolors 2 $page [mc "diff hunk header"]]
     grid x $page.hunksepbut $page.hunksep -sticky w
     label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor
     ttk::button $page.markbgbut -text [mc "Marked line bg"] \
-        -command [list choosecolor markbgcolor {} $page \
-                      [mc "marked line background"] \
-                      [list $ctext tag conf omark -background]]
+        -command [list choosecolor markbgcolor {} $page [mc "marked line background"]]
     grid x $page.markbgbut $page.markbgsep -sticky w
     label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor
     ttk::button $page.selbgbut -text [mc "Select bg"] \
-        -command [list choosecolor selectbgcolor {} $page [mc "background"] setselbg]
+        -command [list choosecolor selectbgcolor {} $page [mc "background"]]
     grid x $page.selbgbut $page.selbgsep -sticky w
     return $page
 }
@@ -11794,14 +11784,14 @@ proc choose_extdiff {} {
     }
 }
 
-proc choosecolor {v vi prefspage x cmd} {
+proc choosecolor {v vi prefspage x} {
     global $v
 
     set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
                -title [mc "Gitk: choose color for %s" $x]]
     if {$c eq {}} return
     lset $v $vi $c
-    eval $cmd $c
+    set_gui_colors
     prefspage_set_colorswatches $prefspage
 }
 
@@ -11855,6 +11845,22 @@ proc setfg {c} {
     $canv itemconf markid -outline $c
 }
 
+proc set_gui_colors {} {
+    global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
+    global diffbgcolors
+
+    setui $uicolor
+    setbg $bgcolor
+    setfg $fgcolor
+    $ctext tag conf d0 -foreground [lindex $diffcolors   0]
+    $ctext tag conf d0 -background [lindex $diffbgcolors 0]
+    $ctext tag conf dresult -foreground [lindex $diffcolors   1]
+    $ctext tag conf dresult -background [lindex $diffbgcolors 1]
+    $ctext tag conf hunksep -foreground [lindex $diffcolors   2]
+    $ctext tag conf omark -background $markbgcolor
+    setselbg $selectbgcolor
+}
+
 proc prefscan {} {
     global oldprefs prefstop
     global {*}$::config_variables
@@ -11865,6 +11871,7 @@ proc prefscan {} {
     catch {destroy $prefstop}
     unset prefstop
     fontcan
+    set_gui_colors
 }
 
 proc prefsok {} {
@@ -12567,8 +12574,6 @@ eval font create textfontbold [fontflags textfont 1]
 parsefont uifont $uifont
 eval font create uifont [fontflags uifont]
 
-setui $uicolor
-
 setoptions
 
 # check that we can find a .git directory somewhere...
@@ -12757,6 +12762,8 @@ if {[tk windowingsystem] eq "win32"} {
     focus -force .
 }
 
+set_gui_colors
+
 getcommits {}
 
 # Local variables:

From 6ea3006f96f19787c949ef1e4723991756b5126b Mon Sep 17 00:00:00 2001
From: Mark Levedahl <mlevedahl@gmail.com>
Date: Fri, 6 Jun 2025 12:28:02 -0400
Subject: [PATCH 04/14] gitk: update scrolling for TclTk 8.7+ / TIP 474

TclTk 8.7 (still in alpha), and 9.0 (released), implement TIP 474 that
delivers uniform handling of mouse and touchpad scrolling events on all
platforms, and by default bound to most widgets. TIP 474 also implements
use of the Option- modifier key (Alt- key on PC, Option- key on Macs) to
indicate desire for more motion per scroll wheel event, the
amplification is not defined but seems to be 5x to 10x.

So, for TclTk >= 8.7 we can use identical MouseWheel bindings on all
platforms, and should enable use of the Option- modifier to enable
larger motion. Let's do all of this, and use a 5x multiplier for the
Option- modifier.

This largely follows the prior win32 model, except that Tk 8.6 does not
reliably use the Option- modifier because the Alt- key conflicts with
builtin behavior to activate the main menubar. Presumably this conflict
is addressed in the win32 Tcl9.x package.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 gitk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gitk b/gitk
index ba112586be..700d5d152d 100755
--- a/gitk
+++ b/gitk
@@ -2273,6 +2273,16 @@ proc bind_mousewheel {} {
     bind $cflist <MouseWheel> {$cflist yview scroll [scrollval %D 2] units}
     bind $cflist <Shift-MouseWheel> break
     bind $canv <Shift-MouseWheel> {$canv xview scroll [scrollval %D] units}
+
+    if {[package vcompare $::tcl_version 8.7] >= 0} {
+        bindall <Alt-MouseWheel> {allcanvs yview scroll [scrollval 5*%D] units}
+        bindall <Alt-Shift-MouseWheel> break
+        bind $ctext <Alt-MouseWheel> {$ctext yview scroll [scrollval 5*%D 2] units}
+        bind $ctext <Alt-Shift-MouseWheel> {$ctext xview scroll [scrollval 5*%D 2] units}
+        bind $cflist <Alt-MouseWheel> {$cflist yview scroll [scrollval 5*%D 2] units}
+        bind $cflist <Alt-Shift-MouseWheel> break
+        bind $canv <Alt-Shift-MouseWheel> {$canv xview scroll [scrollval 5*%D] units}
+    }
 }
 
 proc bind_mousewheel_buttons {} {
@@ -2732,7 +2742,7 @@ proc makewindow {} {
     bindall <1> {selcanvline %W %x %y}
 
     #Mouse / touchpad scrolling
-    if {[tk windowingsystem] == "win32"} {
+    if {[tk windowingsystem] == "win32" || [package vcompare $::tcl_version 8.7] >= 0} {
         set scroll_D0 120
         bind_mousewheel
     } elseif {[tk windowingsystem] == "x11"} {

From ab30c04e9c7a5dd61767646a345ba364f70f6977 Mon Sep 17 00:00:00 2001
From: Mark Levedahl <mlevedahl@gmail.com>
Date: Tue, 25 Mar 2025 16:53:20 -0400
Subject: [PATCH 05/14] gitk: switch to -translation binary

gitk uses '-encoding binary' in several places to handle non-text data.
Per TIP 699, this is not recommended as there has been too much
confusion and misconfiguration of binary channels, and this option is
removed in Tcl 9.

Tcl defines a binary channel as one that reproduces the input data
exactly. As Tcl stores all data internally in unicode format, a binary
channel requires 3 things:
-  -encoding iso8859-1 : this causes each byte of input to be translated
   to its unicode equivalent (may be multi-byte).
-  -translation lf : this avoids any translation of line endings, which
   by default are translated to \n on input.
-  -eofchar {} : this avoids any use of an end of file character, which
   is ctrl-z by default on Windows.

The recommended '-translation binary' makes all three settings, but this
is not done in gitk now. Rather, gitk uses '-encoding binary', which is
an alias to '-encoding iso8859-1' removed by TIP 699, in multiple places,
and -eofchar {} in one place but not all. All other files, configured in
non-binary fashion, have -eofchar {}.

Unix and Windows differ on line ending conventions, Tcl by default
converts line endings to \n on input, and to those common on the
platform on output. git emits only \n on Unix or Windows. Also, Tcl's
proc gets recognizes and removes \n, \r, or \r\n as line endings, and
this is used by gitk except in procs selectline and parsecommit. But,
those two procs recognize any combination of \n and \r as terminating a
line. So, there is no need to translate line endings on input, and using
-translation binary avoids any such translation.

Tcl sets eofchar to ctrl-z (ascii \0x1a) only on Windows, otherwise
eofchar is {}. This provides compatibility to old DOS based codes and
files originating when file systems recorded only sectors allocated, and
not bytes used. git does not use ctrl-z to terminate data anywhere. Only
two channels in gitk leave eofchar at the default value, both use
-encoding binary now. A third one was converted in commit 681c3290e3
("gitk: Handle blobs containing a DOS end-of-file marker", 2009-03-16),
fixing such a problem of early data termination. Using eofchar {} is
correct, even if not always necessary.

Tcl 9 forces change, using -translation binary per TIP 699 does what
gitk needs and is backwards compatible to Tcl 8.x. Do it.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 gitk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitk b/gitk
index 700d5d152d..cc6f720163 100755
--- a/gitk
+++ b/gitk
@@ -7783,7 +7783,7 @@ proc gettree {id} {
             set treepending $id
             set treefilelist($id) {}
             set treeidlist($id) {}
-            fconfigure $gtf -blocking 0 -encoding binary
+            fconfigure $gtf -blocking 0 -translation binary
             filerun $gtf [list gettreeline $gtf $id]
         }
     } else {
@@ -8044,7 +8044,7 @@ proc gettreediffs {ids} {
 
     set treepending $ids
     set treediff {}
-    fconfigure $gdtf -blocking 0 -encoding binary
+    fconfigure $gdtf -blocking 0 -translation binary
     filerun $gdtf [list gettreediffline $gdtf $ids]
 }
 
@@ -8155,7 +8155,7 @@ proc getblobdiffs {ids} {
         error_popup [mc "Error getting diffs: %s" $err]
         return
     }
-    fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
+    fconfigure $bdf -blocking 0 -translation binary
     set blobdifffd($ids) $bdf
     initblobdiffvars
     filerun $bdf [list getblobdiffline $bdf $diffids]

From bcf94fe072615b5ca2ecae683fb2bc58876cabdf Mon Sep 17 00:00:00 2001
From: Mark Levedahl <mlevedahl@gmail.com>
Date: Mon, 24 Mar 2025 08:45:32 -0400
Subject: [PATCH 06/14] gitk: Tcl9 doesn't expand ~, use $env(HOME)

gitk looks for configuration files under $(HOME)/.., and uses the
typical shortcut formats to find this, e.g., ~/.config/. This relies
upon Tcl expanding such constructs to replace ~ with $(HOME). But, Tcl 9
has stopped doing that for various reasons, and now supplies [file
tildeexpand ...] to perform this expansion.

There are a very few places that need this expansion, and all must be
modified regardless of approach taken.

POSIX specifies that $HOME be defined at the time of login, and both
Cygwin and MSYS (underlying git for windows) set this variable. Tcl8
uses the POSIX defined pwnam to look up the underlying database record
on Unix, but will get the same result as using $HOME on any POSIX
compliant system. On Windows, Tcl just accesses $HOME, falling back to
other environment variables if $HOME is not set.  Git for Windows has
$HOME defined by MSYS, so this works just as on the others.

As $env(HOME) works in Tcl 8 and 9, while anything using [file
tildeexpand ... ] will not, let's use the simpler approach as doing so
adds no lines of code.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 gitk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gitk b/gitk
index cc6f720163..d9812f2e9c 100755
--- a/gitk
+++ b/gitk
@@ -12469,14 +12469,14 @@ catch {
         set config_file_tmp [file join $env(XDG_CONFIG_HOME) git gitk-tmp]
     } else {
         # default XDG_CONFIG_HOME
-        set config_file "~/.config/git/gitk"
-        set config_file_tmp "~/.config/git/gitk-tmp"
+        set config_file "$env(HOME)/.config/git/gitk"
+        set config_file_tmp "$env(HOME)/.config/git/gitk-tmp"
     }
     if {![file exists $config_file]} {
         # for backward compatibility use the old config file if it exists
-        if {[file exists "~/.gitk"]} {
-            set config_file "~/.gitk"
-            set config_file_tmp "~/.gitk-tmp"
+        if {[file exists "$env(HOME)/.gitk"]} {
+            set config_file "$env(HOME)/.gitk"
+            set config_file_tmp "$env(HOME)/.gitk-tmp"
         } elseif {![file exists [file dirname $config_file]]} {
             file mkdir [file dirname $config_file]
         }

From aa1b8d31acbcc7630e1ca2f2bbd27eeb34b00446 Mon Sep 17 00:00:00 2001
From: Mark Levedahl <mlevedahl@gmail.com>
Date: Fri, 14 Mar 2025 11:45:35 -0400
Subject: [PATCH 07/14] gitk: use -profile tcl8 for file input with Tcl 9

gitk invokes many git commands expecting output in utf-8 encoding, but
git accepts extended ascii (code page unknown) as utf-8 without
validating, so cannot guarantee valid utf-8 on output.  In particular,
using any extended ascii code page, of which there are many, has long
been acceptable given that everyone on a project is aware of and uses
that same code page to view all data. utf-8 accepts only 7-bit ascii
characters in single bytes, and any characters outside of that base set
require at least two bytes.

Tcl is a string based language, and transcodes all input data to an
internal unicode format, and to whatever format is requested on output:
"pure" binary is recoded using iso8859-1.  Tcl8.x silently recodes
invalid utf-8 as binary data, so extended ascii characters maintain
their binary value on output but may not display correctly.

Tcl 8.7 added three profiles to control this behaviour: strict (raises
exceptions), replace (replaces each invalid byte with ?), and the
default tcl8 maintaining the old behavior.  Tcl 9 changes the default
profile to strict, meaning any invalid utf-8 raises an exception that
gitk does not handle.

An example of this in the git repository is commit 7eb93c8965 ("[PATCH]
Simplify git script", 2005-09-07). This includes extended ascii
characters in the author name and commit message. As a result, gitk +
Tcl 9 cannot view the git repository at any point beyond that commit.
Note: Tcl 9.0 has a bug, to be fixed in 9.1, where this particular
condition results in a memory error causing Tcl to crash [1].

The tcl8 profile used so far has acceptable behavior given gitk's
acceptance: this allows gitk to accept extended ascii though it may
display incorrectly.  Let's continue that behavior by overriding open to
use the tcl8 profile on Tcl9 and later: Tcl 8.6 does not understand
fconfigure -profile, and Tcl 8.7 maintains the tcl8 profile.

[1] Per https://core.tcl-lang.org/tcl/tktview/73bb42fb3f35cd613af6fcea465e35bbfd352216

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 gitk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gitk b/gitk
index d9812f2e9c..342b0aba8d 100755
--- a/gitk
+++ b/gitk
@@ -33,6 +33,19 @@ The version of git found is $git_version."
     exit 1
 }
 
+######################################################################
+## Enable Tcl8 profile in Tcl9, allowing consumption of data that has
+## bytes not conforming to the assumed encoding profile.
+
+if {[package vcompare $::tcl_version 9.0] >= 0} {
+    rename open _strict_open
+    proc open args {
+        set f [_strict_open {*}$args]
+        chan configure $f -profile tcl8
+        return $f
+    }
+}
+
 ######################################################################
 ##
 ## Enabling platform-specific code paths

From ac222bc02df9aef49d4a6ee839762c2902961a21 Mon Sep 17 00:00:00 2001
From: Mark Levedahl <mlevedahl@gmail.com>
Date: Sun, 18 May 2025 10:41:30 -0400
Subject: [PATCH 08/14] gitk: use -profile tcl8 on encoding conversions

gitk in the prior commit learned to apply -profile tcl8 to all input
data streams, avoiding errors on non-binary data streams whose encoding
is not utf-8. But, gitk also consumes binary data streams (generally blobs
from commits), and internally decodes this to support various displays.

With Tcl9, errors occur in this decoding for the same reasons described
in the previous commit: basically, the underlying data was not validated
to conform to the given encoding, and this source encoding may not be
utf-8. gitk performs this decoding using Tcl's '[encoding convert from'
operator.

For example, the 7th commit in gitk's history has the extended ascii
value 0xA9, so

	gitk 9a40c50c1e

in gitk's repository raises an exception. The error log has:

unexpected byte sequence starting at index 11: '\xA9'
    while executing
"encoding convertfrom $diffencoding $line"
    (procedure "parseblobdiffline" line 135)
    invoked from within
"parseblobdiffline $ids $line"
    (procedure "getblobdiffline" line 16)
    invoked from within
"getblobdiffline file6 9a40c50c1e05c0658b7a7c68b56d615eb6f170dd"
    ("eval" body line 1)
    invoked from within
"eval $script"
    (procedure "dorunq" line 11)
    invoked from within
"dorunq"
    ("after" script)

This problem has a similar fix to the prior issue: we must use the tlc8
profile when converting this data. Do so, again only on Tcl9 as Tcl8.6
does not recognize -profile, and only Tcl 9.0 makes strict the default.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 gitk | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gitk b/gitk
index 342b0aba8d..09c11041e8 100755
--- a/gitk
+++ b/gitk
@@ -44,6 +44,13 @@ if {[package vcompare $::tcl_version 9.0] >= 0} {
         chan configure $f -profile tcl8
         return $f
     }
+    proc convertfrom args {
+        return [encoding convertfrom -profile tcl8 {*}$args]
+    }
+} else {
+    proc convertfrom args {
+        return [encoding convertfrom {*}$args]
+    }
 }
 
 ######################################################################
@@ -7823,7 +7830,7 @@ proc gettreeline {gtf id} {
         if {[string index $fname 0] eq "\""} {
             set fname [lindex $fname 0]
         }
-        set fname [encoding convertfrom utf-8 $fname]
+        set fname [convertfrom utf-8 $fname]
         lappend treefilelist($id) $fname
     }
     if {![eof $gtf]} {
@@ -8083,7 +8090,7 @@ proc gettreediffline {gdtf ids} {
             if {[string index $file 0] eq "\""} {
                 set file [lindex $file 0]
             }
-            set file [encoding convertfrom utf-8 $file]
+            set file [convertfrom utf-8 $file]
             if {$file ne [lindex $treediff end]} {
                 lappend treediff $file
                 lappend sublist $file
@@ -8219,7 +8226,7 @@ proc makediffhdr {fname ids} {
     global ctext curdiffstart treediffs diffencoding
     global ctext_file_names jump_to_here targetline diffline
 
-    set fname [encoding convertfrom utf-8 $fname]
+    set fname [convertfrom utf-8 $fname]
     set diffencoding [get_path_encoding $fname]
     set i [lsearch -exact $treediffs($ids) $fname]
     if {$i >= 0} {
@@ -8281,7 +8288,7 @@ proc parseblobdiffline {ids line} {
 
     if {![string compare -length 5 "diff " $line]} {
         if {![regexp {^diff (--cc|--git) } $line m type]} {
-            set line [encoding convertfrom utf-8 $line]
+            set line [convertfrom utf-8 $line]
             $ctext insert end "$line\n" hunksep
             continue
         }
@@ -8330,7 +8337,7 @@ proc parseblobdiffline {ids line} {
         makediffhdr $fname $ids
 
     } elseif {![string compare -length 16 "* Unmerged path " $line]} {
-        set fname [encoding convertfrom utf-8 [string range $line 16 end]]
+        set fname [convertfrom utf-8 [string range $line 16 end]]
         $ctext insert end "\n"
         set curdiffstart [$ctext index "end - 1c"]
         lappend ctext_file_names $fname
@@ -8343,7 +8350,7 @@ proc parseblobdiffline {ids line} {
 
     } elseif {![string compare -length 2 "@@" $line]} {
         regexp {^@@+} $line ats
-        set line [encoding convertfrom $diffencoding $line]
+        set line [convertfrom $diffencoding $line]
         $ctext insert end "$line\n" hunksep
         if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
             set diffline $nl
@@ -8372,10 +8379,10 @@ proc parseblobdiffline {ids line} {
             $ctext insert end "$line\n" filesep
         }
     } elseif {$currdiffsubmod != "" && ![string compare -length 3 "  >" $line]} {
-        set line [encoding convertfrom $diffencoding $line]
+        set line [convertfrom $diffencoding $line]
         $ctext insert end "$line\n" dresult
     } elseif {$currdiffsubmod != "" && ![string compare -length 3 "  <" $line]} {
-        set line [encoding convertfrom $diffencoding $line]
+        set line [convertfrom $diffencoding $line]
         $ctext insert end "$line\n" d0
     } elseif {$diffinhdr} {
         if {![string compare -length 12 "rename from " $line]} {
@@ -8383,7 +8390,7 @@ proc parseblobdiffline {ids line} {
             if {[string index $fname 0] eq "\""} {
                 set fname [lindex $fname 0]
             }
-            set fname [encoding convertfrom utf-8 $fname]
+            set fname [convertfrom utf-8 $fname]
             set i [lsearch -exact $treediffs($ids) $fname]
             if {$i >= 0} {
                 setinlist difffilestart $i $curdiffstart
@@ -8402,12 +8409,12 @@ proc parseblobdiffline {ids line} {
             set diffinhdr 0
             return
         }
-        set line [encoding convertfrom utf-8 $line]
+        set line [convertfrom utf-8 $line]
         $ctext insert end "$line\n" filesep
 
     } else {
         set line [string map {\x1A ^Z} \
-                      [encoding convertfrom $diffencoding $line]]
+                      [convertfrom $diffencoding $line]]
         # parse the prefix - one ' ', '-' or '+' for each parent
         set prefix [string range $line 0 [expr {$diffnparents - 1}]]
         set tag [expr {$diffnparents > 1? "m": "d"}]
@@ -12279,7 +12286,7 @@ proc cache_gitattr {attr pathlist} {
             foreach row [split $rlist "\n"] {
                 if {[regexp "(.*): $attr: (.*)" $row m path value]} {
                     if {[string index $path 0] eq "\""} {
-                        set path [encoding convertfrom utf-8 [lindex $path 0]]
+                        set path [convertfrom utf-8 [lindex $path 0]]
                     }
                     set path_attr_cache($attr,$path) $value
                 }

From 4e605b7bc06f3a19ca5c80088d16b2827a855c84 Mon Sep 17 00:00:00 2001
From: Mark Levedahl <mlevedahl@gmail.com>
Date: Thu, 20 Mar 2025 14:16:07 -0400
Subject: [PATCH 09/14] gitk: allow Tcl/Tk 9.0+

Tcl/Tk 9.0 has been released, and has shipped in Fedora 42. Prior
patches in this sequence have addressed known incompatibilities, so gitk
is now operating with Tcl9. So, let's allow Tcl9.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 gitk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitk b/gitk
index 09c11041e8..3752a2c1dc 100755
--- a/gitk
+++ b/gitk
@@ -7,7 +7,7 @@ exec wish "$0" -- "$@"
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
 
-if {[catch {package require Tcl 8.6-8.8} err]} {
+if {[catch {package require Tcl 8.6-} err]} {
     catch {wm withdraw .}
     tk_messageBox \
         -icon error \

From 74d9e38a0d5fbbffde1304c3f6d7cbca7022eab3 Mon Sep 17 00:00:00 2001
From: Alexander Shopov <ash@kambanaria.org>
Date: Mon, 28 Jul 2025 14:06:26 +0200
Subject: [PATCH 10/14] gitk i18n: Update Bulgarian translation (322t)

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
---
 po/bg.po | 700 +++++++++++++++++++++++++++----------------------------
 1 file changed, 338 insertions(+), 362 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 773a049831..0c67bc312f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,15 +1,15 @@
 # Bulgarian translation of gitk po-file.
-# Copyright (C) 2014, 2015, 2019, 2020, 2024 Alexander Shopov <ash@kambanaria.org>.
+# Copyright (C) 2014, 2015, 2019, 2020, 2024, 2025 Alexander Shopov <ash@kambanaria.org>.
 # This file is distributed under the same license as the git package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2019, 2020, 2024.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2019, 2020, 2024, 2025.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gitk master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-24 11:01+0100\n"
-"PO-Revision-Date: 2024-12-24 11:05+0100\n"
+"POT-Creation-Date: 2025-07-22 18:34+0200\n"
+"PO-Revision-Date: 2025-07-28 13:38+0200\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gitk:139
+#: gitk:352
 msgid "Couldn't get list of unmerged files:"
 msgstr "Списъкът с неслети файлове не може да се получи:"
 
-#: gitk:211 gitk:2430
+#: gitk:423 gitk:2617
 msgid "Color words"
 msgstr "Оцветяване на думите"
 
-#: gitk:216 gitk:2430 gitk:8335 gitk:8368
+#: gitk:426 gitk:2617 gitk:8426 gitk:8459
 msgid "Markup words"
 msgstr "Отбелязване на думите"
 
-#: gitk:323
+#: gitk:533
 msgid "Error parsing revisions:"
 msgstr "Грешка при анализ на версиите:"
 
-#: gitk:389
+#: gitk:588
 msgid "Error executing --argscmd command:"
 msgstr "Грешка при изпълнение на командата с „--argscmd“."
 
-#: gitk:402
+#: gitk:601
 msgid "No files selected: --merge specified but no files are unmerged."
 msgstr ""
 "Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове."
 
-#: gitk:405
+#: gitk:604
 msgid ""
 "No files selected: --merge specified but no unmerged files are within file "
 "limit."
@@ -51,326 +51,330 @@ msgstr ""
 "Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове "
 "в ограниченията."
 
-#: gitk:430 gitk:585
+#: gitk:628 gitk:781
 msgid "Error executing git log:"
 msgstr "Грешка при изпълнение на „git log“:"
 
-#: gitk:448 gitk:601
+#: gitk:646 gitk:797
 msgid "Reading"
 msgstr "Прочитане"
 
-#: gitk:508 gitk:4596
+#: gitk:706 gitk:4702
 msgid "Reading commits..."
 msgstr "Прочитане на подаванията…"
 
-#: gitk:511 gitk:1660 gitk:4599
+#: gitk:709 gitk:1857 gitk:4705
 msgid "No commits selected"
 msgstr "Не са избрани подавания"
 
-#: gitk:1468 gitk:4116 gitk:12738
+#: gitk:1665 gitk:4222 gitk:12787
 msgid "Command line"
 msgstr "Команден ред"
 
-#: gitk:1534
+#: gitk:1731
 msgid "Can't parse git log output:"
 msgstr "Изходът от „git log“ не може да се анализира:"
 
-#: gitk:1763
+#: gitk:1960
 msgid "No commit information available"
 msgstr "Липсва информация за подавания"
 
-#: gitk:1930 gitk:1959 gitk:4386 gitk:9875 gitk:11485 gitk:11805
+#: gitk:2126 gitk:2155 gitk:4492 gitk:9967 gitk:11820
 msgid "OK"
 msgstr "Добре"
 
-#: gitk:1961 gitk:4388 gitk:9311 gitk:9390 gitk:9520 gitk:9606 gitk:9877
-#: gitk:11486 gitk:11806
+#: gitk:2157 gitk:4494 gitk:9403 gitk:9480 gitk:9612 gitk:9698 gitk:9969
+#: gitk:11821
 msgid "Cancel"
 msgstr "Отказ"
 
-#: gitk:2114
+#: gitk:2336
 msgid "&Update"
 msgstr "&Обновяване"
 
-#: gitk:2115
+#: gitk:2337
 msgid "&Reload"
 msgstr "&Презареждане"
 
-#: gitk:2116
+#: gitk:2338
 msgid "Reread re&ferences"
 msgstr "Прочитане &наново"
 
-#: gitk:2117
+#: gitk:2339
 msgid "&List references"
 msgstr "&Изброяване на указателите"
 
-#: gitk:2119
+#: gitk:2341
 msgid "Start git &gui"
 msgstr "&Стартиране на „git gui“"
 
-#: gitk:2121
+#: gitk:2343
 msgid "&Quit"
 msgstr "&Спиране на програмата"
 
-#: gitk:2113
+#: gitk:2335
 msgid "&File"
 msgstr "&Файл"
 
-#: gitk:2125
+#: gitk:2347
 msgid "&Preferences"
 msgstr "&Настройки"
 
-#: gitk:2124
+#: gitk:2346
 msgid "&Edit"
 msgstr "&Редактиране"
 
-#: gitk:2129
+#: gitk:2351
 msgid "&New view..."
 msgstr "&Нов изглед…"
 
-#: gitk:2130
+#: gitk:2352
 msgid "&Edit view..."
 msgstr "&Редактиране на изгледа…"
 
-#: gitk:2131
+#: gitk:2353
 msgid "&Delete view"
 msgstr "&Изтриване на изгледа"
 
-#: gitk:2133
+#: gitk:2355
 msgid "&All files"
 msgstr "&Всички файлове"
 
-#: gitk:2128
+#: gitk:2350
 msgid "&View"
 msgstr "&Изглед"
 
-#: gitk:2138 gitk:2148
+#: gitk:2360 gitk:2370
 msgid "&About gitk"
 msgstr "&Относно gitk"
 
-#: gitk:2139 gitk:2153
+#: gitk:2361 gitk:2375
 msgid "&Key bindings"
 msgstr "&Клавишни комбинации"
 
-#: gitk:2137 gitk:2152
+#: gitk:2359 gitk:2374
 msgid "&Help"
 msgstr "Помо&щ"
 
-#: gitk:2230 gitk:8767
+#: gitk:2442 gitk:8859
 msgid "Commit ID:"
 msgstr "Подаване:"
 
-#: gitk:2274
+#: gitk:2478
 msgid "Row"
 msgstr "Ред"
 
-#: gitk:2312
+#: gitk:2504
 msgid "Find"
 msgstr "Търсене"
 
-#: gitk:2340
+#: gitk:2532
 msgid "commit"
 msgstr "подаване"
 
-#: gitk:2344 gitk:2346 gitk:4758 gitk:4781 gitk:4805 gitk:6826 gitk:6898
-#: gitk:6983
+#: gitk:2536 gitk:2538 gitk:4864 gitk:4887 gitk:4911 gitk:6925 gitk:6997
+#: gitk:7082
 msgid "containing:"
 msgstr "съдържащо:"
 
-#: gitk:2347 gitk:3597 gitk:3602 gitk:4834
+#: gitk:2539 gitk:3704 gitk:3709 gitk:4940
 msgid "touching paths:"
 msgstr "в пътищата:"
 
-#: gitk:2348 gitk:4848
+#: gitk:2540 gitk:4954
 msgid "adding/removing string:"
 msgstr "добавящо/премахващо низ"
 
-#: gitk:2349 gitk:4850
+#: gitk:2541 gitk:4956
 msgid "changing lines matching:"
 msgstr "променящо редове напасващи:"
 
-#: gitk:2358 gitk:2360 gitk:4837
+#: gitk:2550 gitk:2552 gitk:4943
 msgid "Exact"
 msgstr "Точно"
 
-#: gitk:2360 gitk:4925 gitk:6794
+#: gitk:2552 gitk:5031 gitk:6893
 msgid "IgnCase"
 msgstr "Без регистър"
 
-#: gitk:2360 gitk:4807 gitk:4923 gitk:6790
+#: gitk:2552 gitk:4913 gitk:5029 gitk:6889
 msgid "Regexp"
 msgstr "Рег. израз"
 
-#: gitk:2362 gitk:2363 gitk:4945 gitk:4975 gitk:4982 gitk:6919 gitk:6987
+#: gitk:2554 gitk:2555 gitk:5051 gitk:5081 gitk:5088 gitk:7018 gitk:7086
 msgid "All fields"
 msgstr "Всички полета"
 
-#: gitk:2363 gitk:4942 gitk:4975 gitk:6857
+#: gitk:2555 gitk:5048 gitk:5081 gitk:6956
 msgid "Headline"
 msgstr "Първи ред"
 
-#: gitk:2364 gitk:4942 gitk:6857 gitk:6987 gitk:7499
+#: gitk:2556 gitk:5048 gitk:6956 gitk:7086 gitk:7600
 msgid "Comments"
 msgstr "Коментари"
 
-#: gitk:2364 gitk:4942 gitk:4947 gitk:4982 gitk:6857 gitk:7434 gitk:8945
-#: gitk:8960
+#: gitk:2556 gitk:5048 gitk:5053 gitk:5088 gitk:6956 gitk:7535 gitk:9038
+#: gitk:9053
 msgid "Author"
 msgstr "Автор"
 
-#: gitk:2364 gitk:4942 gitk:6857 gitk:7436
+#: gitk:2556 gitk:5048 gitk:6956 gitk:7537
 msgid "Committer"
 msgstr "Подаващ"
 
-#: gitk:2398
+#: gitk:2586
 msgid "Search"
 msgstr "Търсене"
 
-#: gitk:2406
+#: gitk:2594
 msgid "Diff"
 msgstr "Разлики"
 
-#: gitk:2408
+#: gitk:2596
 msgid "Old version"
 msgstr "Стара версия"
 
-#: gitk:2410
+#: gitk:2598
 msgid "New version"
 msgstr "Нова версия"
 
-#: gitk:2413
+#: gitk:2601
 msgid "Lines of context"
 msgstr "Контекст в редове"
 
-#: gitk:2423
+#: gitk:2611
 msgid "Ignore space change"
 msgstr "Празните знаци без значение"
 
-#: gitk:2427 gitk:2429 gitk:8069 gitk:8321
+#: gitk:2615 gitk:2616 gitk:8159 gitk:8412
 msgid "Line diff"
 msgstr "Поредови разлики"
 
-#: gitk:2502
+#: gitk:2683
 msgid "Patch"
 msgstr "Кръпка"
 
-#: gitk:2504
+#: gitk:2685
 msgid "Tree"
 msgstr "Дърво"
 
-#: gitk:2674 gitk:2695
+#: gitk:2760
+msgid "Unknown windowing system, cannot bind mouse"
+msgstr "Непозната графична система, не може да се установи връзка с мишка"
+
+#: gitk:2842 gitk:2863
 msgid "Diff this -> selected"
 msgstr "Разлики между това и избраното"
 
-#: gitk:2675 gitk:2696
+#: gitk:2843 gitk:2864
 msgid "Diff selected -> this"
 msgstr "Разлики между избраното и това"
 
-#: gitk:2676 gitk:2697
+#: gitk:2844 gitk:2865
 msgid "Make patch"
 msgstr "Създаване на кръпка"
 
-#: gitk:2677 gitk:9369
+#: gitk:2845 gitk:9459
 msgid "Create tag"
 msgstr "Създаване на етикет"
 
-#: gitk:2678
+#: gitk:2846
 msgid "Copy commit reference"
 msgstr "Копиране на указателя на подаване"
 
-#: gitk:2679 gitk:9500
+#: gitk:2847 gitk:9592
 msgid "Write commit to file"
 msgstr "Запазване на подаването във файл"
 
-#: gitk:2680
+#: gitk:2848
 msgid "Create new branch"
 msgstr "Създаване на нов клон"
 
-#: gitk:2681
+#: gitk:2849
 msgid "Cherry-pick this commit"
 msgstr "Отбиране на това подаване"
 
-#: gitk:2682
+#: gitk:2850
 msgid "Reset HEAD branch to here"
 msgstr "Привеждане на върха на клона към текущото подаване"
 
-#: gitk:2683
+#: gitk:2851
 msgid "Mark this commit"
 msgstr "Отбелязване на това подаване"
 
-#: gitk:2684
+#: gitk:2852
 msgid "Return to mark"
 msgstr "Връщане към отбелязаното подаване"
 
-#: gitk:2685
+#: gitk:2853
 msgid "Find descendant of this and mark"
 msgstr "Откриване и отбелязване на наследниците"
 
-#: gitk:2686
+#: gitk:2854
 msgid "Compare with marked commit"
 msgstr "Сравнение с отбелязаното подаване"
 
-#: gitk:2687 gitk:2698
+#: gitk:2855 gitk:2866
 msgid "Diff this -> marked commit"
 msgstr "Разлики между това и отбелязаното"
 
-#: gitk:2688 gitk:2699
+#: gitk:2856 gitk:2867
 msgid "Diff marked commit -> this"
 msgstr "Разлики между отбелязаното и това"
 
-#: gitk:2689
+#: gitk:2857
 msgid "Revert this commit"
 msgstr "Отмяна на това подаване"
 
-#: gitk:2705
+#: gitk:2873
 msgid "Check out this branch"
 msgstr "Изтегляне на този клон"
 
-#: gitk:2706
+#: gitk:2874
 msgid "Rename this branch"
 msgstr "Преименуване на този клон"
 
-#: gitk:2707
+#: gitk:2875
 msgid "Remove this branch"
 msgstr "Изтриване на този клон"
 
-#: gitk:2708
+#: gitk:2876
 msgid "Copy branch name"
 msgstr "Копиране на името на клона"
 
-#: gitk:2715
+#: gitk:2883
 msgid "Highlight this too"
 msgstr "Отбелязване и на това"
 
-#: gitk:2716
+#: gitk:2884
 msgid "Highlight this only"
 msgstr "Отбелязване само на това"
 
-#: gitk:2717
+#: gitk:2885
 msgid "External diff"
 msgstr "Външна програма за разлики"
 
-#: gitk:2718
+#: gitk:2886
 msgid "Blame parent commit"
 msgstr "Анотиране на родителското подаване"
 
-#: gitk:2719
+#: gitk:2887
 msgid "Copy path"
 msgstr "Копиране на пътя"
 
-#: gitk:2726
+#: gitk:2894
 msgid "Show origin of this line"
 msgstr "Показване на произхода на този ред"
 
-#: gitk:2727
+#: gitk:2895
 msgid "Run git gui blame on this line"
 msgstr "Изпълнение на „git gui blame“ върху този ред"
 
-#: gitk:3081
+#: gitk:3188
 msgid "About gitk"
 msgstr "Относно gitk"
 
-#: gitk:3083
+#: gitk:3190
 msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
@@ -386,324 +390,324 @@ msgstr ""
 "\n"
 "Използвайте и разпространявайте при условията на ОПЛ на ГНУ"
 
-#: gitk:3091 gitk:3158 gitk:10090
+#: gitk:3198 gitk:3265 gitk:10184
 msgid "Close"
 msgstr "Затваряне"
 
-#: gitk:3112
+#: gitk:3219
 msgid "Gitk key bindings"
 msgstr "Клавишни комбинации"
 
-#: gitk:3115
+#: gitk:3222
 msgid "Gitk key bindings:"
 msgstr "Клавишни комбинации:"
 
-#: gitk:3117
+#: gitk:3224
 #, tcl-format
 msgid "<%s-Q>\t\tQuit"
 msgstr "<%s-Q>\t\tСпиране на програмата"
 
-#: gitk:3118
+#: gitk:3225
 #, tcl-format
 msgid "<%s-W>\t\tClose window"
 msgstr "<%s-W>\t\tЗатваряне на прозореца"
 
-#: gitk:3119
+#: gitk:3226
 msgid "<Home>\t\tMove to first commit"
 msgstr "<Home>\t\tКъм първото подаване"
 
-#: gitk:3120
+#: gitk:3227
 msgid "<End>\t\tMove to last commit"
 msgstr "<End>\t\tКъм последното подаване"
 
-#: gitk:3121
+#: gitk:3228
 msgid "<Up>, p, k\tMove up one commit"
 msgstr "<Up>, p, k\tЕдно подаване нагоре"
 
-#: gitk:3122
+#: gitk:3229
 msgid "<Down>, n, j\tMove down one commit"
 msgstr "<Down>, n, j\tЕдно подаване надолу"
 
-#: gitk:3123
+#: gitk:3230
 msgid "<Left>, z, h\tGo back in history list"
 msgstr "<Left>, z, h\tНазад в историята"
 
-#: gitk:3124
+#: gitk:3231
 msgid "<Right>, x, l\tGo forward in history list"
 msgstr "<Right>, x, l\tНапред в историята"
 
-#: gitk:3125
+#: gitk:3232
 #, tcl-format
 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
 msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята"
 
-#: gitk:3126
+#: gitk:3233
 msgid "<PageUp>\tMove up one page in commit list"
 msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията"
 
-#: gitk:3127
+#: gitk:3234
 msgid "<PageDown>\tMove down one page in commit list"
 msgstr "<PageDown>\tСтраница надолу в списъка с подаванията"
 
-#: gitk:3128
+#: gitk:3235
 #, tcl-format
 msgid "<%s-Home>\tScroll to top of commit list"
 msgstr "<%s-Home>\tКъм началото на списъка с подаванията"
 
-#: gitk:3129
+#: gitk:3236
 #, tcl-format
 msgid "<%s-End>\tScroll to bottom of commit list"
 msgstr "<%s-End>\tКъм края на списъка с подаванията"
 
-#: gitk:3130
+#: gitk:3237
 #, tcl-format
 msgid "<%s-Up>\tScroll commit list up one line"
 msgstr "<%s-Up>\tРед нагоре в списъка с подавания"
 
-#: gitk:3131
+#: gitk:3238
 #, tcl-format
 msgid "<%s-Down>\tScroll commit list down one line"
 msgstr "<%s-Down>\tРед надолу в списъка с подавания"
 
-#: gitk:3132
+#: gitk:3239
 #, tcl-format
 msgid "<%s-PageUp>\tScroll commit list up one page"
 msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания"
 
-#: gitk:3133
+#: gitk:3240
 #, tcl-format
 msgid "<%s-PageDown>\tScroll commit list down one page"
 msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания"
 
-#: gitk:3134
+#: gitk:3241
 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
 msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)"
 
-#: gitk:3135
+#: gitk:3242
 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
 msgstr ""
 "<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)"
 
-#: gitk:3136
+#: gitk:3243
 msgid "<Delete>, b\tScroll diff view up one page"
 msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики"
 
-#: gitk:3137
+#: gitk:3244
 msgid "<Backspace>\tScroll diff view up one page"
 msgstr "<Backspace>\tСтраница надолу в изгледа за разлики"
 
-#: gitk:3138
+#: gitk:3245
 msgid "<Space>\t\tScroll diff view down one page"
 msgstr "<Space>\t\tСтраница надолу в изгледа за разлики"
 
-#: gitk:3139
+#: gitk:3246
 msgid "u\t\tScroll diff view up 18 lines"
 msgstr "u\t\t18 реда нагоре в изгледа за разлики"
 
-#: gitk:3140
+#: gitk:3247
 msgid "d\t\tScroll diff view down 18 lines"
 msgstr "d\t\t18 реда надолу в изгледа за разлики"
 
-#: gitk:3141
+#: gitk:3248
 #, tcl-format
 msgid "<%s-F>\t\tFind"
 msgstr "<%s-F>\t\tТърсене"
 
-#: gitk:3142
+#: gitk:3249
 #, tcl-format
 msgid "<%s-G>\t\tMove to next find hit"
 msgstr "<%s-G>\t\tКъм следващата поява"
 
-#: gitk:3143
+#: gitk:3250
 msgid "<Return>\tMove to next find hit"
 msgstr "<Return>\tКъм следващата поява"
 
-#: gitk:3144
+#: gitk:3251
 msgid "g\t\tGo to commit"
 msgstr "g\t\tКъм последното подаване"
 
-#: gitk:3145
+#: gitk:3252
 msgid "/\t\tFocus the search box"
 msgstr "/\t\tФокус върху полето за търсене"
 
-#: gitk:3146
+#: gitk:3253
 msgid "?\t\tMove to previous find hit"
 msgstr "?\t\tКъм предишната поява"
 
-#: gitk:3147
+#: gitk:3254
 msgid "f\t\tScroll diff view to next file"
 msgstr "f\t\tСледващ файл в изгледа за разлики"
 
-#: gitk:3148
+#: gitk:3255
 #, tcl-format
 msgid "<%s-S>\t\tSearch for next hit in diff view"
 msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики"
 
-#: gitk:3149
+#: gitk:3256
 #, tcl-format
 msgid "<%s-R>\t\tSearch for previous hit in diff view"
 msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики"
 
-#: gitk:3150
+#: gitk:3257
 #, tcl-format
 msgid "<%s-KP+>\tIncrease font size"
 msgstr "<%s-KP+>\tПо-голям размер на шрифта"
 
-#: gitk:3151
+#: gitk:3258
 #, tcl-format
 msgid "<%s-plus>\tIncrease font size"
 msgstr "<%s-plus>\tПо-голям размер на шрифта"
 
-#: gitk:3152
+#: gitk:3259
 #, tcl-format
 msgid "<%s-KP->\tDecrease font size"
 msgstr "<%s-KP->\tПо-малък размер на шрифта"
 
-#: gitk:3153
+#: gitk:3260
 #, tcl-format
 msgid "<%s-minus>\tDecrease font size"
 msgstr "<%s-minus>\tПо-малък размер на шрифта"
 
-#: gitk:3154
+#: gitk:3261
 msgid "<F5>\t\tUpdate"
 msgstr "<F5>\t\tОбновяване"
 
-#: gitk:3621 gitk:3630
+#: gitk:3728 gitk:3737
 #, tcl-format
 msgid "Error creating temporary directory %s:"
 msgstr "Грешка при създаването на временната директория „%s“:"
 
-#: gitk:3643
+#: gitk:3750
 #, tcl-format
 msgid "Error getting \"%s\" from %s:"
 msgstr "Грешка при получаването на „%s“ от %s:"
 
-#: gitk:3706
+#: gitk:3813
 msgid "command failed:"
 msgstr "неуспешно изпълнение на команда:"
 
-#: gitk:3855
+#: gitk:3962
 msgid "No such commit"
 msgstr "Такова подаване няма"
 
-#: gitk:3869
+#: gitk:3976
 msgid "git gui blame: command failed:"
 msgstr "„git gui blame“: неуспешно изпълнение на команда:"
 
-#: gitk:3900
+#: gitk:4007
 #, tcl-format
 msgid "Couldn't read merge head: %s"
 msgstr "Върхът за сливане не може да се прочете: %s"
 
-#: gitk:3908
+#: gitk:4015
 #, tcl-format
 msgid "Error reading index: %s"
 msgstr "Грешка при прочитане на индекса: %s"
 
-#: gitk:3933
+#: gitk:4038
 #, tcl-format
 msgid "Couldn't start git blame: %s"
 msgstr "Командата „git blame“ не може да се стартира: %s"
 
-#: gitk:3936 gitk:6825
+#: gitk:4041 gitk:6924
 msgid "Searching"
 msgstr "Търсене"
 
-#: gitk:3968
+#: gitk:4074
 #, tcl-format
 msgid "Error running git blame: %s"
 msgstr "Грешка при изпълнението на „git blame“: %s"
 
-#: gitk:3996
+#: gitk:4102
 #, tcl-format
 msgid "That line comes from commit %s,  which is not in this view"
 msgstr "Този ред идва от подаването %s, което не е в изгледа"
 
-#: gitk:4010
+#: gitk:4116
 msgid "External diff viewer failed:"
 msgstr "Неуспешно изпълнение на външната програма за разлики:"
 
-#: gitk:4114
+#: gitk:4220
 msgid "All files"
 msgstr "Всички файлове"
 
-#: gitk:4138
+#: gitk:4244
 msgid "View"
 msgstr "Изглед"
 
-#: gitk:4141
+#: gitk:4247
 msgid "Gitk view definition"
 msgstr "Дефиниция на изглед в Gitk"
 
-#: gitk:4145
+#: gitk:4251
 msgid "Remember this view"
 msgstr "Запазване на този изглед"
 
-#: gitk:4146
+#: gitk:4252
 msgid "References (space separated list):"
 msgstr "Указатели (списък с разделител интервал):"
 
-#: gitk:4147
+#: gitk:4253
 msgid "Branches & tags:"
 msgstr "Клони и етикети:"
 
-#: gitk:4148
+#: gitk:4254
 msgid "All refs"
 msgstr "Всички указатели"
 
-#: gitk:4149
+#: gitk:4255
 msgid "All (local) branches"
 msgstr "Всички (локални) клони"
 
-#: gitk:4150
+#: gitk:4256
 msgid "All tags"
 msgstr "Всички етикети"
 
-#: gitk:4151
+#: gitk:4257
 msgid "All remote-tracking branches"
 msgstr "Всички следящи клони"
 
-#: gitk:4152
+#: gitk:4258
 msgid "Commit Info (regular expressions):"
 msgstr "Информация за подаване (рег. изр.):"
 
-#: gitk:4153
+#: gitk:4259
 msgid "Author:"
 msgstr "Автор:"
 
-#: gitk:4154
+#: gitk:4260
 msgid "Committer:"
 msgstr "Подал:"
 
-#: gitk:4155
+#: gitk:4261
 msgid "Commit Message:"
 msgstr "Съобщение при подаване:"
 
-#: gitk:4156
+#: gitk:4262
 msgid "Matches all Commit Info criteria"
 msgstr "Съвпадение по всички характеристики на подаването"
 
-#: gitk:4157
+#: gitk:4263
 msgid "Matches no Commit Info criteria"
 msgstr "Не съвпада по никоя от характеристиките на подаването"
 
-#: gitk:4158
+#: gitk:4264
 msgid "Changes to Files:"
 msgstr "Промени по файловете:"
 
-#: gitk:4159
+#: gitk:4265
 msgid "Fixed String"
 msgstr "Дословен низ"
 
-#: gitk:4160
+#: gitk:4266
 msgid "Regular Expression"
 msgstr "Регулярен израз"
 
-#: gitk:4161
+#: gitk:4267
 msgid "Search string:"
 msgstr "Низ за търсене:"
 
-#: gitk:4162
+#: gitk:4268
 msgid ""
 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
 "15:27:38\"):"
@@ -711,208 +715,208 @@ msgstr ""
 "Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, "
 "„March 17, 2009 15:27:38“):"
 
-#: gitk:4163
+#: gitk:4269
 msgid "Since:"
 msgstr "От:"
 
-#: gitk:4164
+#: gitk:4270
 msgid "Until:"
 msgstr "До:"
 
-#: gitk:4165
+#: gitk:4271
 msgid "Limit and/or skip a number of revisions (positive integer):"
 msgstr ""
 "Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло "
 "число):"
 
-#: gitk:4166
+#: gitk:4272
 msgid "Number to show:"
 msgstr "Брой показани:"
 
-#: gitk:4167
+#: gitk:4273
 msgid "Number to skip:"
 msgstr "Брой прескочени:"
 
-#: gitk:4168
+#: gitk:4274
 msgid "Miscellaneous options:"
 msgstr "Разни:"
 
-#: gitk:4169
+#: gitk:4275
 msgid "Strictly sort by date"
 msgstr "Подреждане по дата"
 
-#: gitk:4170
+#: gitk:4276
 msgid "Mark branch sides"
 msgstr "Отбелязване на страните по клона"
 
-#: gitk:4171
+#: gitk:4277
 msgid "Limit to first parent"
 msgstr "Само първия родител"
 
-#: gitk:4172
+#: gitk:4278
 msgid "Simple history"
 msgstr "Опростена история"
 
-#: gitk:4173
+#: gitk:4279
 msgid "Additional arguments to git log:"
 msgstr "Допълнителни аргументи към „git log“:"
 
-#: gitk:4174
+#: gitk:4280
 msgid "Enter files and directories to include, one per line:"
 msgstr "Въведете файловете и директориите за включване, по елемент на ред"
 
-#: gitk:4175
+#: gitk:4281
 msgid "Command to generate more commits to include:"
 msgstr ""
 "Команда за генерирането на допълнителни подавания, които да се включат:"
 
-#: gitk:4299
+#: gitk:4405
 msgid "Gitk: edit view"
 msgstr "Gitk: редактиране на изглед"
 
-#: gitk:4307
+#: gitk:4413
 msgid "-- criteria for selecting revisions"
 msgstr "— критерии за избор на версии"
 
-#: gitk:4312
+#: gitk:4418
 msgid "View Name"
 msgstr "Име на изглед"
 
-#: gitk:4387
+#: gitk:4493
 msgid "Apply (F5)"
 msgstr "Прилагане (F5)"
 
-#: gitk:4425
+#: gitk:4531
 msgid "Error in commit selection arguments:"
 msgstr "Грешка в аргументите за избор на подавания:"
 
-#: gitk:4480 gitk:4533 gitk:4995 gitk:5009 gitk:6279 gitk:12679 gitk:12680
+#: gitk:4586 gitk:4639 gitk:5101 gitk:5115 gitk:6384 gitk:12724 gitk:12725
 msgid "None"
 msgstr "Няма"
 
-#: gitk:5092 gitk:5097
+#: gitk:5198 gitk:5203
 msgid "Descendant"
 msgstr "Наследник"
 
-#: gitk:5093
+#: gitk:5199
 msgid "Not descendant"
 msgstr "Не е наследник"
 
-#: gitk:5100 gitk:5105
+#: gitk:5206 gitk:5211
 msgid "Ancestor"
 msgstr "Предшественик"
 
-#: gitk:5101
+#: gitk:5207
 msgid "Not ancestor"
 msgstr "Не е предшественик"
 
-#: gitk:5395
+#: gitk:5500
 msgid "Local changes checked in to index but not committed"
 msgstr "Локални промени добавени към индекса, но неподадени"
 
-#: gitk:5431
+#: gitk:5536
 msgid "Local uncommitted changes, not checked in to index"
 msgstr "Локални промени извън индекса"
 
-#: gitk:7179
+#: gitk:7280
 msgid "Error starting web browser:"
 msgstr "Грешка при стартирането на уеб браузър:"
 
-#: gitk:7240
+#: gitk:7341
 msgid "and many more"
 msgstr "и още много"
 
-#: gitk:7243
+#: gitk:7344
 msgid "many"
 msgstr "много"
 
-#: gitk:7438
+#: gitk:7539
 msgid "Tags:"
 msgstr "Етикети:"
 
-#: gitk:7455 gitk:7461 gitk:8940
+#: gitk:7556 gitk:7562 gitk:9033
 msgid "Parent"
 msgstr "Родител"
 
-#: gitk:7466
+#: gitk:7567
 msgid "Child"
 msgstr "Дете"
 
-#: gitk:7475
+#: gitk:7576
 msgid "Branch"
 msgstr "Клон"
 
-#: gitk:7478
+#: gitk:7579
 msgid "Follows"
 msgstr "Следва"
 
-#: gitk:7481
+#: gitk:7582
 msgid "Precedes"
 msgstr "Предшества"
 
-#: gitk:8076
+#: gitk:8166
 #, tcl-format
 msgid "Error getting diffs: %s"
 msgstr "Грешка при получаването на разликите: %s"
 
-#: gitk:8765
+#: gitk:8857
 msgid "Goto:"
 msgstr "Към ред:"
 
-#: gitk:8786
+#: gitk:8879
 #, tcl-format
 msgid "Short commit ID %s is ambiguous"
 msgstr "Съкратената контролна сума %s не е еднозначна"
 
-#: gitk:8793
+#: gitk:8886
 #, tcl-format
 msgid "Revision %s is not known"
 msgstr "Непозната версия %s"
 
-#: gitk:8803
+#: gitk:8896
 #, tcl-format
 msgid "Commit ID %s is not known"
 msgstr "Непозната контролна сума %s"
 
-#: gitk:8805
+#: gitk:8898
 #, tcl-format
 msgid "Revision %s is not in the current view"
 msgstr "Версия %s не е в текущия изглед"
 
-#: gitk:8947 gitk:8962
+#: gitk:9040 gitk:9055
 msgid "Date"
 msgstr "Дата"
 
-#: gitk:8950
+#: gitk:9043
 msgid "Children"
 msgstr "Деца"
 
-#: gitk:9013
+#: gitk:9106
 #, tcl-format
 msgid "Reset %s branch to here"
 msgstr "Зануляване на клона „%s“ към текущото подаване"
 
-#: gitk:9015
+#: gitk:9108
 msgid "Detached head: can't reset"
 msgstr "Несвързан връх: невъзможно зануляване"
 
-#: gitk:9120 gitk:9126
+#: gitk:9211 gitk:9217
 msgid "Skipping merge commit "
 msgstr "Пропускане на подаването на сливането"
 
-#: gitk:9135 gitk:9140
+#: gitk:9226 gitk:9231
 msgid "Error getting patch ID for "
 msgstr "Грешка при получаването на идентификатора на "
 
-#: gitk:9136 gitk:9141
+#: gitk:9227 gitk:9232
 msgid " - stopping\n"
 msgstr " — спиране\n"
 
-#: gitk:9146 gitk:9149 gitk:9157 gitk:9171 gitk:9180
+#: gitk:9237 gitk:9240 gitk:9248 gitk:9262 gitk:9271
 msgid "Commit "
 msgstr "Подаване"
 
-#: gitk:9150
+#: gitk:9241
 msgid ""
 " is the same patch as\n"
 "       "
@@ -920,7 +924,7 @@ msgstr ""
 " е същата кръпка като\n"
 "       "
 
-#: gitk:9158
+#: gitk:9249
 msgid ""
 " differs from\n"
 "       "
@@ -928,7 +932,7 @@ msgstr ""
 " се различава от\n"
 "       "
 
-#: gitk:9160
+#: gitk:9251
 msgid ""
 "Diff of commits:\n"
 "\n"
@@ -936,147 +940,147 @@ msgstr ""
 "Разлика между подаванията:\n"
 "\n"
 
-#: gitk:9172 gitk:9181
+#: gitk:9263 gitk:9272
 #, tcl-format
 msgid " has %s children - stopping\n"
 msgstr " има %s деца — спиране\n"
 
-#: gitk:9200
+#: gitk:9291
 #, tcl-format
 msgid "Error writing commit to file: %s"
 msgstr "Грешка при запазването на подаването във файл: %s"
 
-#: gitk:9206
+#: gitk:9297
 #, tcl-format
 msgid "Error diffing commits: %s"
 msgstr "Грешка при изчисляването на разликите между подаванията: %s"
 
-#: gitk:9252
+#: gitk:9343
 msgid "Top"
 msgstr "Най-горе"
 
-#: gitk:9253
+#: gitk:9344
 msgid "From"
 msgstr "От"
 
-#: gitk:9258
+#: gitk:9349
 msgid "To"
 msgstr "До"
 
-#: gitk:9282
+#: gitk:9374
 msgid "Generate patch"
 msgstr "Генериране на кръпка"
 
-#: gitk:9284
+#: gitk:9376
 msgid "From:"
 msgstr "От:"
 
-#: gitk:9293
+#: gitk:9385
 msgid "To:"
 msgstr "До:"
 
-#: gitk:9302
+#: gitk:9394
 msgid "Reverse"
 msgstr "Обръщане"
 
-#: gitk:9304 gitk:9514
+#: gitk:9396 gitk:9606
 msgid "Output file:"
 msgstr "Запазване във файла:"
 
-#: gitk:9310
+#: gitk:9402
 msgid "Generate"
 msgstr "Генериране"
 
-#: gitk:9348
+#: gitk:9437
 msgid "Error creating patch:"
 msgstr "Грешка при създаването на кръпка:"
 
-#: gitk:9371 gitk:9502 gitk:9590
+#: gitk:9461 gitk:9594 gitk:9682
 msgid "ID:"
 msgstr "Идентификатор:"
 
-#: gitk:9380
+#: gitk:9470
 msgid "Tag name:"
 msgstr "Име на етикет:"
 
-#: gitk:9383
+#: gitk:9473
 msgid "Tag message is optional"
 msgstr "Съобщението за етикет е незадължително"
 
-#: gitk:9385
+#: gitk:9475
 msgid "Tag message:"
 msgstr "Съобщение за етикет:"
 
-#: gitk:9389 gitk:9560
+#: gitk:9479 gitk:9652
 msgid "Create"
 msgstr "Създаване"
 
-#: gitk:9407
+#: gitk:9497
 msgid "No tag name specified"
 msgstr "Липсва име на етикет"
 
-#: gitk:9411
+#: gitk:9501
 #, tcl-format
 msgid "Tag \"%s\" already exists"
 msgstr "Етикетът „%s“ вече съществува"
 
-#: gitk:9421
+#: gitk:9511
 msgid "Error creating tag:"
 msgstr "Грешка при създаването на етикет:"
 
-#: gitk:9511
+#: gitk:9603
 msgid "Command:"
 msgstr "Команда:"
 
-#: gitk:9519
+#: gitk:9611
 msgid "Write"
 msgstr "Запазване"
 
-#: gitk:9537
+#: gitk:9629
 msgid "Error writing commit:"
 msgstr "Грешка при запазването на подаването:"
 
-#: gitk:9559
+#: gitk:9651
 msgid "Create branch"
 msgstr "Създаване на клон"
 
-#: gitk:9575
+#: gitk:9666
 #, tcl-format
 msgid "Rename branch %s"
 msgstr "Преименуване на клона „%s“"
 
-#: gitk:9576
+#: gitk:9667
 msgid "Rename"
 msgstr "Преименуване"
 
-#: gitk:9600
+#: gitk:9692
 msgid "Name:"
 msgstr "Име:"
 
-#: gitk:9624
+#: gitk:9716
 msgid "Please specify a name for the new branch"
 msgstr "Укажете име за новия клон"
 
-#: gitk:9629
+#: gitk:9721
 #, tcl-format
 msgid "Branch '%s' already exists. Overwrite?"
 msgstr "Клонът „%s“ вече съществува. Да се презапише ли?"
 
-#: gitk:9673
+#: gitk:9765
 msgid "Please specify a new name for the branch"
 msgstr "Укажете ново име за клона"
 
-#: gitk:9736
+#: gitk:9828
 #, tcl-format
 msgid "Commit %s is already included in branch %s -- really re-apply it?"
 msgstr ""
 "Подаването „%s“ вече е включено в клона „%s“ — да се приложи ли отново?"
 
-#: gitk:9741
+#: gitk:9833
 msgid "Cherry-picking"
 msgstr "Отбиране"
 
-#: gitk:9750
+#: gitk:9842
 #, tcl-format
 msgid ""
 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1085,7 +1089,7 @@ msgstr ""
 "Неуспешно отбиране, защото във файла „%s“ има локални промени.\n"
 "Подайте, занулете или ги скатайте и пробвайте отново."
 
-#: gitk:9756
+#: gitk:9848
 msgid ""
 "Cherry-pick failed because of merge conflict.\n"
 "Do you wish to run git citool to resolve it?"
@@ -1093,20 +1097,20 @@ msgstr ""
 "Неуспешно отбиране поради конфликти при сливане.\n"
 "Искате ли да ги коригирате чрез „git citool“?"
 
-#: gitk:9772 gitk:9830
+#: gitk:9864 gitk:9922
 msgid "No changes committed"
 msgstr "Не са подадени промени"
 
-#: gitk:9799
+#: gitk:9891
 #, tcl-format
 msgid "Commit %s is not included in branch %s -- really revert it?"
 msgstr "Подаването „%s“ не е включено в клона „%s“. Да се отменени ли?"
 
-#: gitk:9804
+#: gitk:9896
 msgid "Reverting"
 msgstr "Отмяна"
 
-#: gitk:9812
+#: gitk:9904
 #, tcl-format
 msgid ""
 "Revert failed because of local changes to the following files:%s Please "
@@ -1115,7 +1119,7 @@ msgstr ""
 "Неуспешна отмяна, защото във файла „%s“ има локални промени.\n"
 "Подайте, занулете или ги скатайте и пробвайте отново."
 
-#: gitk:9816
+#: gitk:9908
 msgid ""
 "Revert failed because of merge conflict.\n"
 " Do you wish to run git citool to resolve it?"
@@ -1123,28 +1127,28 @@ msgstr ""
 "Неуспешно отмяна поради конфликти при сливане.\n"
 "Искате ли да ги коригирате чрез „git citool“?"
 
-#: gitk:9859
+#: gitk:9951
 msgid "Confirm reset"
 msgstr "Потвърждаване на зануляването"
 
-#: gitk:9861
+#: gitk:9953
 #, tcl-format
 msgid "Reset branch %s to %s?"
 msgstr "Да се занули ли клонът „%s“ към „%s“?"
 
-#: gitk:9863
+#: gitk:9955
 msgid "Reset type:"
 msgstr "Вид зануляване:"
 
-#: gitk:9866
+#: gitk:9958
 msgid "Soft: Leave working tree and index untouched"
 msgstr "Слабо: работното дърво и индекса остават същите"
 
-#: gitk:9869
+#: gitk:9961
 msgid "Mixed: Leave working tree untouched, reset index"
 msgstr "Смесено: работното дърво остава същото, индексът се занулява"
 
-#: gitk:9872
+#: gitk:9964
 msgid ""
 "Hard: Reset working tree and index\n"
 "(discard ALL local changes)"
@@ -1152,24 +1156,24 @@ msgstr ""
 "Силно: зануляване и на работното дърво, и на индекса\n"
 "(ВСИЧКИ локални промени ще се загубят безвъзвратно)"
 
-#: gitk:9889
+#: gitk:9981
 msgid "Resetting"
 msgstr "Зануляване"
 
-#: gitk:9962
+#: gitk:10054
 #, tcl-format
 msgid "A local branch named %s exists already"
 msgstr "Вече съществува локален клон „%s“."
 
-#: gitk:9970
+#: gitk:10061
 msgid "Checking out"
 msgstr "Изтегляне"
 
-#: gitk:10029
+#: gitk:10120
 msgid "Cannot delete the currently checked-out branch"
 msgstr "Текущо изтегленият клон не може да се изтрие"
 
-#: gitk:10035
+#: gitk:10126
 #, tcl-format
 msgid ""
 "The commits on branch %s aren't on any other branch.\n"
@@ -1178,16 +1182,20 @@ msgstr ""
 "Подаванията на клона „%s“ не са на никой друг клон.\n"
 "Наистина ли искате да изтриете клона „%s“?"
 
-#: gitk:10066
+#: gitk:10157
 #, tcl-format
 msgid "Tags and heads: %s"
 msgstr "Етикети и върхове: %s"
 
-#: gitk:10083
+#: gitk:10174
 msgid "Filter"
 msgstr "Филтриране"
 
-#: gitk:10390
+#: gitk:10181
+msgid "Sort refs by type"
+msgstr "Подредба на указателите по вид"
+
+#: gitk:10513
 msgid ""
 "Error reading commit topology information; branch and preceding/following "
 "tag information will be incomplete."
@@ -1195,253 +1203,221 @@ msgstr ""
 "Грешка при прочитането на топологията на подаванията. Информацията за клона "
 "и предшестващите/следващите етикети ще е непълна."
 
-#: gitk:11367
+#: gitk:11490
 msgid "Tag"
 msgstr "Етикет"
 
-#: gitk:11371
+#: gitk:11494
 msgid "Id"
 msgstr "Идентификатор"
 
-#: gitk:11454
-msgid "Gitk font chooser"
-msgstr "Избор на шрифт за Gitk"
-
-#: gitk:11471
-msgid "B"
-msgstr "Ч"
-
-#: gitk:11474
-msgid "I"
-msgstr "К"
-
-#: gitk:11593
+#: gitk:11635
 msgid "Commit list display options"
 msgstr "Настройки на списъка с подавания"
 
-#: gitk:11596
+#: gitk:11638
 msgid "Maximum graph width (lines)"
 msgstr "Максимална широчина на графа (в редове)"
 
-#: gitk:11600
+#: gitk:11642
 #, no-tcl-format
 msgid "Maximum graph width (% of pane)"
 msgstr "Максимална широчина на графа (% от панела)"
 
-#: gitk:11603
+#: gitk:11645
 msgid "Show local changes"
 msgstr "Показване на локалните промени"
 
-#: gitk:11606
+#: gitk:11648
 msgid "Hide remote refs"
 msgstr "Скриване на отдалечените указатели"
 
-#: gitk:11610
+#: gitk:11652
 msgid "Copy commit ID to clipboard"
 msgstr "Копиране на контролната сума към буфера за обмен"
 
-#: gitk:11614
+#: gitk:11656
 msgid "Copy commit ID to X11 selection"
 msgstr "Копиране на контролната сума в селекцията на X11"
 
-#: gitk:11619
+#: gitk:11662
 msgid "Length of commit ID to copy"
 msgstr "Дължина на контролната сума, която се копира"
 
-#: gitk:11622
+#: gitk:11664
+msgid "Wheel scrolling multiplier"
+msgstr "Множител за колелцето на мишката"
+
+#: gitk:11668
 msgid "Diff display options"
 msgstr "Настройки на показването на разликите"
 
-#: gitk:11624
+#: gitk:11670
 msgid "Tab spacing"
 msgstr "Широчина на табулатора"
 
-#: gitk:11628
+#: gitk:11674
 msgid "Wrap comment text"
 msgstr "Пренасяне на думите в коментарите"
 
-#: gitk:11633
+#: gitk:11678
 msgid "Wrap other text"
 msgstr "Пренасяне на другия текст"
 
-#: gitk:11638
+#: gitk:11682
 msgid "Display nearby tags/heads"
 msgstr "Извеждане на близките етикети и върхове"
 
-#: gitk:11641
+#: gitk:11685
 msgid "Maximum # tags/heads to show"
 msgstr "Максимален брой етикети/върхове за показване"
 
-#: gitk:11644
+#: gitk:11688
 msgid "Limit diffs to listed paths"
 msgstr "Разлика само в избраните пътища"
 
-#: gitk:11647
+#: gitk:11691
 msgid "Support per-file encodings"
 msgstr "Поддръжка на различни кодирания за всеки файл"
 
-#: gitk:11653 gitk:11820
+#: gitk:11697 gitk:11835
 msgid "External diff tool"
 msgstr "Външен инструмент за разлики"
 
-#: gitk:11654
+#: gitk:11698
 msgid "Choose..."
 msgstr "Избор…"
 
-#: gitk:11661
+#: gitk:11705
 msgid "Web browser"
 msgstr "Уеб браузър"
 
-#: gitk:11666
-msgid "General options"
-msgstr "Общи настройки"
-
-#: gitk:11669
-msgid "Use themed widgets"
-msgstr "Използване на тема за графичните обекти"
-
-#: gitk:11671
-msgid "(change requires restart)"
-msgstr "(промяната изисква рестартиране на Gitk)"
-
-#: gitk:11673
-msgid "(currently unavailable)"
-msgstr "(в момента недостъпно)"
-
-#: gitk:11685
+#: gitk:11719
 msgid "Colors: press to choose"
 msgstr "Цветове: избира се с натискане"
 
-#: gitk:11688
+#: gitk:11722
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: gitk:11689
+#: gitk:11723
 msgid "interface"
 msgstr "интерфейс"
 
-#: gitk:11692
+#: gitk:11726
 msgid "Background"
 msgstr "Фон"
 
-#: gitk:11693 gitk:11735
+#: gitk:11727 gitk:11769
 msgid "background"
 msgstr "фон"
 
-#: gitk:11696
+#: gitk:11730
 msgid "Foreground"
 msgstr "Знаци"
 
-#: gitk:11697
+#: gitk:11731
 msgid "foreground"
 msgstr "знаци"
 
-#: gitk:11700
+#: gitk:11734
 msgid "Diff: old lines"
 msgstr "Разлика: стари редове"
 
-#: gitk:11701
+#: gitk:11735
 msgid "diff old lines"
 msgstr "разлика, стари редове"
 
-#: gitk:11705
+#: gitk:11739
 msgid "Diff: old lines bg"
 msgstr "Разлика: фон на стари редове"
 
-#: gitk:11707
+#: gitk:11741
 msgid "diff old lines bg"
 msgstr "разлика, фон на стари редове"
 
-#: gitk:11711
+#: gitk:11745
 msgid "Diff: new lines"
 msgstr "Разлика: нови редове"
 
-#: gitk:11712
+#: gitk:11746
 msgid "diff new lines"
 msgstr "разлика, нови редове"
 
-#: gitk:11716
+#: gitk:11750
 msgid "Diff: new lines bg"
 msgstr "Разлика: фон на нови редове"
 
-#: gitk:11718
+#: gitk:11752
 msgid "diff new lines bg"
 msgstr "разлика, фон на нови редове"
 
-#: gitk:11722
+#: gitk:11756
 msgid "Diff: hunk header"
 msgstr "Разлика: начало на парче"
 
-#: gitk:11724
+#: gitk:11758
 msgid "diff hunk header"
 msgstr "разлика, начало на парче"
 
-#: gitk:11728
+#: gitk:11762
 msgid "Marked line bg"
 msgstr "Фон на отбелязан ред"
 
-#: gitk:11730
+#: gitk:11764
 msgid "marked line background"
 msgstr "фон на отбелязан ред"
 
-#: gitk:11734
+#: gitk:11768
 msgid "Select bg"
 msgstr "Избор на фон"
 
-#: gitk:11743
+#: gitk:11776
 msgid "Fonts: press to choose"
 msgstr "Шрифтове: избира се с натискане"
 
-#: gitk:11745
+#: gitk:11778
 msgid "Main font"
 msgstr "Основен шрифт"
 
-#: gitk:11746
+#: gitk:11779
 msgid "Diff display font"
 msgstr "Шрифт за разликите"
 
-#: gitk:11747
+#: gitk:11780
 msgid "User interface font"
 msgstr "Шрифт на интерфейса"
 
-#: gitk:11769
+#: gitk:11798
 msgid "Gitk preferences"
 msgstr "Настройки на Gitk"
 
-#: gitk:11778
+#: gitk:11803
 msgid "General"
 msgstr "Общи"
 
-#: gitk:11779
+#: gitk:11804
 msgid "Colors"
 msgstr "Цветове"
 
-#: gitk:11780
+#: gitk:11805
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: gitk:11830
+#: gitk:11845
 #, tcl-format
 msgid "Gitk: choose color for %s"
 msgstr "Gitk: избор на цвят на „%s“"
 
-#: gitk:12350
-msgid ""
-"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
-" Gitk requires at least Tcl/Tk 8.4."
-msgstr ""
-"Тази версия на Tcl/Tk не се поддържа от Gitk.\n"
-" Необходима ви е поне Tcl/Tk 8.4."
-
-#: gitk:12571
+#: gitk:12633
 msgid "Cannot find a git repository here."
 msgstr "Тук липсва хранилище на Git."
 
-#: gitk:12618
+#: gitk:12680
 #, tcl-format
 msgid "Ambiguous argument '%s': both revision and filename"
 msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл"
 
-#: gitk:12630
+#: gitk:12692
 msgid "Bad arguments to gitk:"
 msgstr "Неправилни аргументи на gitk:"

From 79be55fa576aad404cb9846913627ef6556f4a28 Mon Sep 17 00:00:00 2001
From: Alexander Shopov <ash@kambanaria.org>
Date: Tue, 29 Jul 2025 19:50:36 +0200
Subject: [PATCH 11/14] gitk i18n: Remove the locations within the Bulgarian
 translation

This makes sending diffs via mail list easier and
brings the po-file in line with git po-file.

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
---
 po/bg.po | 325 -------------------------------------------------------
 1 file changed, 325 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 0c67bc312f..d1e7d92425 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -18,32 +18,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gitk:352
 msgid "Couldn't get list of unmerged files:"
 msgstr "Списъкът с неслети файлове не може да се получи:"
 
-#: gitk:423 gitk:2617
 msgid "Color words"
 msgstr "Оцветяване на думите"
 
-#: gitk:426 gitk:2617 gitk:8426 gitk:8459
 msgid "Markup words"
 msgstr "Отбелязване на думите"
 
-#: gitk:533
 msgid "Error parsing revisions:"
 msgstr "Грешка при анализ на версиите:"
 
-#: gitk:588
 msgid "Error executing --argscmd command:"
 msgstr "Грешка при изпълнение на командата с „--argscmd“."
 
-#: gitk:601
 msgid "No files selected: --merge specified but no files are unmerged."
 msgstr ""
 "Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове."
 
-#: gitk:604
 msgid ""
 "No files selected: --merge specified but no unmerged files are within file "
 "limit."
@@ -51,330 +44,246 @@ msgstr ""
 "Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове "
 "в ограниченията."
 
-#: gitk:628 gitk:781
 msgid "Error executing git log:"
 msgstr "Грешка при изпълнение на „git log“:"
 
-#: gitk:646 gitk:797
 msgid "Reading"
 msgstr "Прочитане"
 
-#: gitk:706 gitk:4702
 msgid "Reading commits..."
 msgstr "Прочитане на подаванията…"
 
-#: gitk:709 gitk:1857 gitk:4705
 msgid "No commits selected"
 msgstr "Не са избрани подавания"
 
-#: gitk:1665 gitk:4222 gitk:12787
 msgid "Command line"
 msgstr "Команден ред"
 
-#: gitk:1731
 msgid "Can't parse git log output:"
 msgstr "Изходът от „git log“ не може да се анализира:"
 
-#: gitk:1960
 msgid "No commit information available"
 msgstr "Липсва информация за подавания"
 
-#: gitk:2126 gitk:2155 gitk:4492 gitk:9967 gitk:11820
 msgid "OK"
 msgstr "Добре"
 
-#: gitk:2157 gitk:4494 gitk:9403 gitk:9480 gitk:9612 gitk:9698 gitk:9969
-#: gitk:11821
 msgid "Cancel"
 msgstr "Отказ"
 
-#: gitk:2336
 msgid "&Update"
 msgstr "&Обновяване"
 
-#: gitk:2337
 msgid "&Reload"
 msgstr "&Презареждане"
 
-#: gitk:2338
 msgid "Reread re&ferences"
 msgstr "Прочитане &наново"
 
-#: gitk:2339
 msgid "&List references"
 msgstr "&Изброяване на указателите"
 
-#: gitk:2341
 msgid "Start git &gui"
 msgstr "&Стартиране на „git gui“"
 
-#: gitk:2343
 msgid "&Quit"
 msgstr "&Спиране на програмата"
 
-#: gitk:2335
 msgid "&File"
 msgstr "&Файл"
 
-#: gitk:2347
 msgid "&Preferences"
 msgstr "&Настройки"
 
-#: gitk:2346
 msgid "&Edit"
 msgstr "&Редактиране"
 
-#: gitk:2351
 msgid "&New view..."
 msgstr "&Нов изглед…"
 
-#: gitk:2352
 msgid "&Edit view..."
 msgstr "&Редактиране на изгледа…"
 
-#: gitk:2353
 msgid "&Delete view"
 msgstr "&Изтриване на изгледа"
 
-#: gitk:2355
 msgid "&All files"
 msgstr "&Всички файлове"
 
-#: gitk:2350
 msgid "&View"
 msgstr "&Изглед"
 
-#: gitk:2360 gitk:2370
 msgid "&About gitk"
 msgstr "&Относно gitk"
 
-#: gitk:2361 gitk:2375
 msgid "&Key bindings"
 msgstr "&Клавишни комбинации"
 
-#: gitk:2359 gitk:2374
 msgid "&Help"
 msgstr "Помо&щ"
 
-#: gitk:2442 gitk:8859
 msgid "Commit ID:"
 msgstr "Подаване:"
 
-#: gitk:2478
 msgid "Row"
 msgstr "Ред"
 
-#: gitk:2504
 msgid "Find"
 msgstr "Търсене"
 
-#: gitk:2532
 msgid "commit"
 msgstr "подаване"
 
-#: gitk:2536 gitk:2538 gitk:4864 gitk:4887 gitk:4911 gitk:6925 gitk:6997
-#: gitk:7082
 msgid "containing:"
 msgstr "съдържащо:"
 
-#: gitk:2539 gitk:3704 gitk:3709 gitk:4940
 msgid "touching paths:"
 msgstr "в пътищата:"
 
-#: gitk:2540 gitk:4954
 msgid "adding/removing string:"
 msgstr "добавящо/премахващо низ"
 
-#: gitk:2541 gitk:4956
 msgid "changing lines matching:"
 msgstr "променящо редове напасващи:"
 
-#: gitk:2550 gitk:2552 gitk:4943
 msgid "Exact"
 msgstr "Точно"
 
-#: gitk:2552 gitk:5031 gitk:6893
 msgid "IgnCase"
 msgstr "Без регистър"
 
-#: gitk:2552 gitk:4913 gitk:5029 gitk:6889
 msgid "Regexp"
 msgstr "Рег. израз"
 
-#: gitk:2554 gitk:2555 gitk:5051 gitk:5081 gitk:5088 gitk:7018 gitk:7086
 msgid "All fields"
 msgstr "Всички полета"
 
-#: gitk:2555 gitk:5048 gitk:5081 gitk:6956
 msgid "Headline"
 msgstr "Първи ред"
 
-#: gitk:2556 gitk:5048 gitk:6956 gitk:7086 gitk:7600
 msgid "Comments"
 msgstr "Коментари"
 
-#: gitk:2556 gitk:5048 gitk:5053 gitk:5088 gitk:6956 gitk:7535 gitk:9038
-#: gitk:9053
 msgid "Author"
 msgstr "Автор"
 
-#: gitk:2556 gitk:5048 gitk:6956 gitk:7537
 msgid "Committer"
 msgstr "Подаващ"
 
-#: gitk:2586
 msgid "Search"
 msgstr "Търсене"
 
-#: gitk:2594
 msgid "Diff"
 msgstr "Разлики"
 
-#: gitk:2596
 msgid "Old version"
 msgstr "Стара версия"
 
-#: gitk:2598
 msgid "New version"
 msgstr "Нова версия"
 
-#: gitk:2601
 msgid "Lines of context"
 msgstr "Контекст в редове"
 
-#: gitk:2611
 msgid "Ignore space change"
 msgstr "Празните знаци без значение"
 
-#: gitk:2615 gitk:2616 gitk:8159 gitk:8412
 msgid "Line diff"
 msgstr "Поредови разлики"
 
-#: gitk:2683
 msgid "Patch"
 msgstr "Кръпка"
 
-#: gitk:2685
 msgid "Tree"
 msgstr "Дърво"
 
-#: gitk:2760
 msgid "Unknown windowing system, cannot bind mouse"
 msgstr "Непозната графична система, не може да се установи връзка с мишка"
 
-#: gitk:2842 gitk:2863
 msgid "Diff this -> selected"
 msgstr "Разлики между това и избраното"
 
-#: gitk:2843 gitk:2864
 msgid "Diff selected -> this"
 msgstr "Разлики между избраното и това"
 
-#: gitk:2844 gitk:2865
 msgid "Make patch"
 msgstr "Създаване на кръпка"
 
-#: gitk:2845 gitk:9459
 msgid "Create tag"
 msgstr "Създаване на етикет"
 
-#: gitk:2846
 msgid "Copy commit reference"
 msgstr "Копиране на указателя на подаване"
 
-#: gitk:2847 gitk:9592
 msgid "Write commit to file"
 msgstr "Запазване на подаването във файл"
 
-#: gitk:2848
 msgid "Create new branch"
 msgstr "Създаване на нов клон"
 
-#: gitk:2849
 msgid "Cherry-pick this commit"
 msgstr "Отбиране на това подаване"
 
-#: gitk:2850
 msgid "Reset HEAD branch to here"
 msgstr "Привеждане на върха на клона към текущото подаване"
 
-#: gitk:2851
 msgid "Mark this commit"
 msgstr "Отбелязване на това подаване"
 
-#: gitk:2852
 msgid "Return to mark"
 msgstr "Връщане към отбелязаното подаване"
 
-#: gitk:2853
 msgid "Find descendant of this and mark"
 msgstr "Откриване и отбелязване на наследниците"
 
-#: gitk:2854
 msgid "Compare with marked commit"
 msgstr "Сравнение с отбелязаното подаване"
 
-#: gitk:2855 gitk:2866
 msgid "Diff this -> marked commit"
 msgstr "Разлики между това и отбелязаното"
 
-#: gitk:2856 gitk:2867
 msgid "Diff marked commit -> this"
 msgstr "Разлики между отбелязаното и това"
 
-#: gitk:2857
 msgid "Revert this commit"
 msgstr "Отмяна на това подаване"
 
-#: gitk:2873
 msgid "Check out this branch"
 msgstr "Изтегляне на този клон"
 
-#: gitk:2874
 msgid "Rename this branch"
 msgstr "Преименуване на този клон"
 
-#: gitk:2875
 msgid "Remove this branch"
 msgstr "Изтриване на този клон"
 
-#: gitk:2876
 msgid "Copy branch name"
 msgstr "Копиране на името на клона"
 
-#: gitk:2883
 msgid "Highlight this too"
 msgstr "Отбелязване и на това"
 
-#: gitk:2884
 msgid "Highlight this only"
 msgstr "Отбелязване само на това"
 
-#: gitk:2885
 msgid "External diff"
 msgstr "Външна програма за разлики"
 
-#: gitk:2886
 msgid "Blame parent commit"
 msgstr "Анотиране на родителското подаване"
 
-#: gitk:2887
 msgid "Copy path"
 msgstr "Копиране на пътя"
 
-#: gitk:2894
 msgid "Show origin of this line"
 msgstr "Показване на произхода на този ред"
 
-#: gitk:2895
 msgid "Run git gui blame on this line"
 msgstr "Изпълнение на „git gui blame“ върху този ред"
 
-#: gitk:3188
 msgid "About gitk"
 msgstr "Относно gitk"
 
-#: gitk:3190
 msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
@@ -390,324 +299,250 @@ msgstr ""
 "\n"
 "Използвайте и разпространявайте при условията на ОПЛ на ГНУ"
 
-#: gitk:3198 gitk:3265 gitk:10184
 msgid "Close"
 msgstr "Затваряне"
 
-#: gitk:3219
 msgid "Gitk key bindings"
 msgstr "Клавишни комбинации"
 
-#: gitk:3222
 msgid "Gitk key bindings:"
 msgstr "Клавишни комбинации:"
 
-#: gitk:3224
 #, tcl-format
 msgid "<%s-Q>\t\tQuit"
 msgstr "<%s-Q>\t\tСпиране на програмата"
 
-#: gitk:3225
 #, tcl-format
 msgid "<%s-W>\t\tClose window"
 msgstr "<%s-W>\t\tЗатваряне на прозореца"
 
-#: gitk:3226
 msgid "<Home>\t\tMove to first commit"
 msgstr "<Home>\t\tКъм първото подаване"
 
-#: gitk:3227
 msgid "<End>\t\tMove to last commit"
 msgstr "<End>\t\tКъм последното подаване"
 
-#: gitk:3228
 msgid "<Up>, p, k\tMove up one commit"
 msgstr "<Up>, p, k\tЕдно подаване нагоре"
 
-#: gitk:3229
 msgid "<Down>, n, j\tMove down one commit"
 msgstr "<Down>, n, j\tЕдно подаване надолу"
 
-#: gitk:3230
 msgid "<Left>, z, h\tGo back in history list"
 msgstr "<Left>, z, h\tНазад в историята"
 
-#: gitk:3231
 msgid "<Right>, x, l\tGo forward in history list"
 msgstr "<Right>, x, l\tНапред в историята"
 
-#: gitk:3232
 #, tcl-format
 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
 msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята"
 
-#: gitk:3233
 msgid "<PageUp>\tMove up one page in commit list"
 msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията"
 
-#: gitk:3234
 msgid "<PageDown>\tMove down one page in commit list"
 msgstr "<PageDown>\tСтраница надолу в списъка с подаванията"
 
-#: gitk:3235
 #, tcl-format
 msgid "<%s-Home>\tScroll to top of commit list"
 msgstr "<%s-Home>\tКъм началото на списъка с подаванията"
 
-#: gitk:3236
 #, tcl-format
 msgid "<%s-End>\tScroll to bottom of commit list"
 msgstr "<%s-End>\tКъм края на списъка с подаванията"
 
-#: gitk:3237
 #, tcl-format
 msgid "<%s-Up>\tScroll commit list up one line"
 msgstr "<%s-Up>\tРед нагоре в списъка с подавания"
 
-#: gitk:3238
 #, tcl-format
 msgid "<%s-Down>\tScroll commit list down one line"
 msgstr "<%s-Down>\tРед надолу в списъка с подавания"
 
-#: gitk:3239
 #, tcl-format
 msgid "<%s-PageUp>\tScroll commit list up one page"
 msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания"
 
-#: gitk:3240
 #, tcl-format
 msgid "<%s-PageDown>\tScroll commit list down one page"
 msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания"
 
-#: gitk:3241
 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
 msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)"
 
-#: gitk:3242
 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
 msgstr ""
 "<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)"
 
-#: gitk:3243
 msgid "<Delete>, b\tScroll diff view up one page"
 msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики"
 
-#: gitk:3244
 msgid "<Backspace>\tScroll diff view up one page"
 msgstr "<Backspace>\tСтраница надолу в изгледа за разлики"
 
-#: gitk:3245
 msgid "<Space>\t\tScroll diff view down one page"
 msgstr "<Space>\t\tСтраница надолу в изгледа за разлики"
 
-#: gitk:3246
 msgid "u\t\tScroll diff view up 18 lines"
 msgstr "u\t\t18 реда нагоре в изгледа за разлики"
 
-#: gitk:3247
 msgid "d\t\tScroll diff view down 18 lines"
 msgstr "d\t\t18 реда надолу в изгледа за разлики"
 
-#: gitk:3248
 #, tcl-format
 msgid "<%s-F>\t\tFind"
 msgstr "<%s-F>\t\tТърсене"
 
-#: gitk:3249
 #, tcl-format
 msgid "<%s-G>\t\tMove to next find hit"
 msgstr "<%s-G>\t\tКъм следващата поява"
 
-#: gitk:3250
 msgid "<Return>\tMove to next find hit"
 msgstr "<Return>\tКъм следващата поява"
 
-#: gitk:3251
 msgid "g\t\tGo to commit"
 msgstr "g\t\tКъм последното подаване"
 
-#: gitk:3252
 msgid "/\t\tFocus the search box"
 msgstr "/\t\tФокус върху полето за търсене"
 
-#: gitk:3253
 msgid "?\t\tMove to previous find hit"
 msgstr "?\t\tКъм предишната поява"
 
-#: gitk:3254
 msgid "f\t\tScroll diff view to next file"
 msgstr "f\t\tСледващ файл в изгледа за разлики"
 
-#: gitk:3255
 #, tcl-format
 msgid "<%s-S>\t\tSearch for next hit in diff view"
 msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики"
 
-#: gitk:3256
 #, tcl-format
 msgid "<%s-R>\t\tSearch for previous hit in diff view"
 msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики"
 
-#: gitk:3257
 #, tcl-format
 msgid "<%s-KP+>\tIncrease font size"
 msgstr "<%s-KP+>\tПо-голям размер на шрифта"
 
-#: gitk:3258
 #, tcl-format
 msgid "<%s-plus>\tIncrease font size"
 msgstr "<%s-plus>\tПо-голям размер на шрифта"
 
-#: gitk:3259
 #, tcl-format
 msgid "<%s-KP->\tDecrease font size"
 msgstr "<%s-KP->\tПо-малък размер на шрифта"
 
-#: gitk:3260
 #, tcl-format
 msgid "<%s-minus>\tDecrease font size"
 msgstr "<%s-minus>\tПо-малък размер на шрифта"
 
-#: gitk:3261
 msgid "<F5>\t\tUpdate"
 msgstr "<F5>\t\tОбновяване"
 
-#: gitk:3728 gitk:3737
 #, tcl-format
 msgid "Error creating temporary directory %s:"
 msgstr "Грешка при създаването на временната директория „%s“:"
 
-#: gitk:3750
 #, tcl-format
 msgid "Error getting \"%s\" from %s:"
 msgstr "Грешка при получаването на „%s“ от %s:"
 
-#: gitk:3813
 msgid "command failed:"
 msgstr "неуспешно изпълнение на команда:"
 
-#: gitk:3962
 msgid "No such commit"
 msgstr "Такова подаване няма"
 
-#: gitk:3976
 msgid "git gui blame: command failed:"
 msgstr "„git gui blame“: неуспешно изпълнение на команда:"
 
-#: gitk:4007
 #, tcl-format
 msgid "Couldn't read merge head: %s"
 msgstr "Върхът за сливане не може да се прочете: %s"
 
-#: gitk:4015
 #, tcl-format
 msgid "Error reading index: %s"
 msgstr "Грешка при прочитане на индекса: %s"
 
-#: gitk:4038
 #, tcl-format
 msgid "Couldn't start git blame: %s"
 msgstr "Командата „git blame“ не може да се стартира: %s"
 
-#: gitk:4041 gitk:6924
 msgid "Searching"
 msgstr "Търсене"
 
-#: gitk:4074
 #, tcl-format
 msgid "Error running git blame: %s"
 msgstr "Грешка при изпълнението на „git blame“: %s"
 
-#: gitk:4102
 #, tcl-format
 msgid "That line comes from commit %s,  which is not in this view"
 msgstr "Този ред идва от подаването %s, което не е в изгледа"
 
-#: gitk:4116
 msgid "External diff viewer failed:"
 msgstr "Неуспешно изпълнение на външната програма за разлики:"
 
-#: gitk:4220
 msgid "All files"
 msgstr "Всички файлове"
 
-#: gitk:4244
 msgid "View"
 msgstr "Изглед"
 
-#: gitk:4247
 msgid "Gitk view definition"
 msgstr "Дефиниция на изглед в Gitk"
 
-#: gitk:4251
 msgid "Remember this view"
 msgstr "Запазване на този изглед"
 
-#: gitk:4252
 msgid "References (space separated list):"
 msgstr "Указатели (списък с разделител интервал):"
 
-#: gitk:4253
 msgid "Branches & tags:"
 msgstr "Клони и етикети:"
 
-#: gitk:4254
 msgid "All refs"
 msgstr "Всички указатели"
 
-#: gitk:4255
 msgid "All (local) branches"
 msgstr "Всички (локални) клони"
 
-#: gitk:4256
 msgid "All tags"
 msgstr "Всички етикети"
 
-#: gitk:4257
 msgid "All remote-tracking branches"
 msgstr "Всички следящи клони"
 
-#: gitk:4258
 msgid "Commit Info (regular expressions):"
 msgstr "Информация за подаване (рег. изр.):"
 
-#: gitk:4259
 msgid "Author:"
 msgstr "Автор:"
 
-#: gitk:4260
 msgid "Committer:"
 msgstr "Подал:"
 
-#: gitk:4261
 msgid "Commit Message:"
 msgstr "Съобщение при подаване:"
 
-#: gitk:4262
 msgid "Matches all Commit Info criteria"
 msgstr "Съвпадение по всички характеристики на подаването"
 
-#: gitk:4263
 msgid "Matches no Commit Info criteria"
 msgstr "Не съвпада по никоя от характеристиките на подаването"
 
-#: gitk:4264
 msgid "Changes to Files:"
 msgstr "Промени по файловете:"
 
-#: gitk:4265
 msgid "Fixed String"
 msgstr "Дословен низ"
 
-#: gitk:4266
 msgid "Regular Expression"
 msgstr "Регулярен израз"
 
-#: gitk:4267
 msgid "Search string:"
 msgstr "Низ за търсене:"
 
-#: gitk:4268
 msgid ""
 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
 "15:27:38\"):"
@@ -715,208 +550,159 @@ msgstr ""
 "Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, "
 "„March 17, 2009 15:27:38“):"
 
-#: gitk:4269
 msgid "Since:"
 msgstr "От:"
 
-#: gitk:4270
 msgid "Until:"
 msgstr "До:"
 
-#: gitk:4271
 msgid "Limit and/or skip a number of revisions (positive integer):"
 msgstr ""
 "Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло "
 "число):"
 
-#: gitk:4272
 msgid "Number to show:"
 msgstr "Брой показани:"
 
-#: gitk:4273
 msgid "Number to skip:"
 msgstr "Брой прескочени:"
 
-#: gitk:4274
 msgid "Miscellaneous options:"
 msgstr "Разни:"
 
-#: gitk:4275
 msgid "Strictly sort by date"
 msgstr "Подреждане по дата"
 
-#: gitk:4276
 msgid "Mark branch sides"
 msgstr "Отбелязване на страните по клона"
 
-#: gitk:4277
 msgid "Limit to first parent"
 msgstr "Само първия родител"
 
-#: gitk:4278
 msgid "Simple history"
 msgstr "Опростена история"
 
-#: gitk:4279
 msgid "Additional arguments to git log:"
 msgstr "Допълнителни аргументи към „git log“:"
 
-#: gitk:4280
 msgid "Enter files and directories to include, one per line:"
 msgstr "Въведете файловете и директориите за включване, по елемент на ред"
 
-#: gitk:4281
 msgid "Command to generate more commits to include:"
 msgstr ""
 "Команда за генерирането на допълнителни подавания, които да се включат:"
 
-#: gitk:4405
 msgid "Gitk: edit view"
 msgstr "Gitk: редактиране на изглед"
 
-#: gitk:4413
 msgid "-- criteria for selecting revisions"
 msgstr "— критерии за избор на версии"
 
-#: gitk:4418
 msgid "View Name"
 msgstr "Име на изглед"
 
-#: gitk:4493
 msgid "Apply (F5)"
 msgstr "Прилагане (F5)"
 
-#: gitk:4531
 msgid "Error in commit selection arguments:"
 msgstr "Грешка в аргументите за избор на подавания:"
 
-#: gitk:4586 gitk:4639 gitk:5101 gitk:5115 gitk:6384 gitk:12724 gitk:12725
 msgid "None"
 msgstr "Няма"
 
-#: gitk:5198 gitk:5203
 msgid "Descendant"
 msgstr "Наследник"
 
-#: gitk:5199
 msgid "Not descendant"
 msgstr "Не е наследник"
 
-#: gitk:5206 gitk:5211
 msgid "Ancestor"
 msgstr "Предшественик"
 
-#: gitk:5207
 msgid "Not ancestor"
 msgstr "Не е предшественик"
 
-#: gitk:5500
 msgid "Local changes checked in to index but not committed"
 msgstr "Локални промени добавени към индекса, но неподадени"
 
-#: gitk:5536
 msgid "Local uncommitted changes, not checked in to index"
 msgstr "Локални промени извън индекса"
 
-#: gitk:7280
 msgid "Error starting web browser:"
 msgstr "Грешка при стартирането на уеб браузър:"
 
-#: gitk:7341
 msgid "and many more"
 msgstr "и още много"
 
-#: gitk:7344
 msgid "many"
 msgstr "много"
 
-#: gitk:7539
 msgid "Tags:"
 msgstr "Етикети:"
 
-#: gitk:7556 gitk:7562 gitk:9033
 msgid "Parent"
 msgstr "Родител"
 
-#: gitk:7567
 msgid "Child"
 msgstr "Дете"
 
-#: gitk:7576
 msgid "Branch"
 msgstr "Клон"
 
-#: gitk:7579
 msgid "Follows"
 msgstr "Следва"
 
-#: gitk:7582
 msgid "Precedes"
 msgstr "Предшества"
 
-#: gitk:8166
 #, tcl-format
 msgid "Error getting diffs: %s"
 msgstr "Грешка при получаването на разликите: %s"
 
-#: gitk:8857
 msgid "Goto:"
 msgstr "Към ред:"
 
-#: gitk:8879
 #, tcl-format
 msgid "Short commit ID %s is ambiguous"
 msgstr "Съкратената контролна сума %s не е еднозначна"
 
-#: gitk:8886
 #, tcl-format
 msgid "Revision %s is not known"
 msgstr "Непозната версия %s"
 
-#: gitk:8896
 #, tcl-format
 msgid "Commit ID %s is not known"
 msgstr "Непозната контролна сума %s"
 
-#: gitk:8898
 #, tcl-format
 msgid "Revision %s is not in the current view"
 msgstr "Версия %s не е в текущия изглед"
 
-#: gitk:9040 gitk:9055
 msgid "Date"
 msgstr "Дата"
 
-#: gitk:9043
 msgid "Children"
 msgstr "Деца"
 
-#: gitk:9106
 #, tcl-format
 msgid "Reset %s branch to here"
 msgstr "Зануляване на клона „%s“ към текущото подаване"
 
-#: gitk:9108
 msgid "Detached head: can't reset"
 msgstr "Несвързан връх: невъзможно зануляване"
 
-#: gitk:9211 gitk:9217
 msgid "Skipping merge commit "
 msgstr "Пропускане на подаването на сливането"
 
-#: gitk:9226 gitk:9231
 msgid "Error getting patch ID for "
 msgstr "Грешка при получаването на идентификатора на "
 
-#: gitk:9227 gitk:9232
 msgid " - stopping\n"
 msgstr " — спиране\n"
 
-#: gitk:9237 gitk:9240 gitk:9248 gitk:9262 gitk:9271
 msgid "Commit "
 msgstr "Подаване"
 
-#: gitk:9241
 msgid ""
 " is the same patch as\n"
 "       "
@@ -924,7 +710,6 @@ msgstr ""
 " е същата кръпка като\n"
 "       "
 
-#: gitk:9249
 msgid ""
 " differs from\n"
 "       "
@@ -932,7 +717,6 @@ msgstr ""
 " се различава от\n"
 "       "
 
-#: gitk:9251
 msgid ""
 "Diff of commits:\n"
 "\n"
@@ -940,147 +724,113 @@ msgstr ""
 "Разлика между подаванията:\n"
 "\n"
 
-#: gitk:9263 gitk:9272
 #, tcl-format
 msgid " has %s children - stopping\n"
 msgstr " има %s деца — спиране\n"
 
-#: gitk:9291
 #, tcl-format
 msgid "Error writing commit to file: %s"
 msgstr "Грешка при запазването на подаването във файл: %s"
 
-#: gitk:9297
 #, tcl-format
 msgid "Error diffing commits: %s"
 msgstr "Грешка при изчисляването на разликите между подаванията: %s"
 
-#: gitk:9343
 msgid "Top"
 msgstr "Най-горе"
 
-#: gitk:9344
 msgid "From"
 msgstr "От"
 
-#: gitk:9349
 msgid "To"
 msgstr "До"
 
-#: gitk:9374
 msgid "Generate patch"
 msgstr "Генериране на кръпка"
 
-#: gitk:9376
 msgid "From:"
 msgstr "От:"
 
-#: gitk:9385
 msgid "To:"
 msgstr "До:"
 
-#: gitk:9394
 msgid "Reverse"
 msgstr "Обръщане"
 
-#: gitk:9396 gitk:9606
 msgid "Output file:"
 msgstr "Запазване във файла:"
 
-#: gitk:9402
 msgid "Generate"
 msgstr "Генериране"
 
-#: gitk:9437
 msgid "Error creating patch:"
 msgstr "Грешка при създаването на кръпка:"
 
-#: gitk:9461 gitk:9594 gitk:9682
 msgid "ID:"
 msgstr "Идентификатор:"
 
-#: gitk:9470
 msgid "Tag name:"
 msgstr "Име на етикет:"
 
-#: gitk:9473
 msgid "Tag message is optional"
 msgstr "Съобщението за етикет е незадължително"
 
-#: gitk:9475
 msgid "Tag message:"
 msgstr "Съобщение за етикет:"
 
-#: gitk:9479 gitk:9652
 msgid "Create"
 msgstr "Създаване"
 
-#: gitk:9497
 msgid "No tag name specified"
 msgstr "Липсва име на етикет"
 
-#: gitk:9501
 #, tcl-format
 msgid "Tag \"%s\" already exists"
 msgstr "Етикетът „%s“ вече съществува"
 
-#: gitk:9511
 msgid "Error creating tag:"
 msgstr "Грешка при създаването на етикет:"
 
-#: gitk:9603
 msgid "Command:"
 msgstr "Команда:"
 
-#: gitk:9611
 msgid "Write"
 msgstr "Запазване"
 
-#: gitk:9629
 msgid "Error writing commit:"
 msgstr "Грешка при запазването на подаването:"
 
-#: gitk:9651
 msgid "Create branch"
 msgstr "Създаване на клон"
 
-#: gitk:9666
 #, tcl-format
 msgid "Rename branch %s"
 msgstr "Преименуване на клона „%s“"
 
-#: gitk:9667
 msgid "Rename"
 msgstr "Преименуване"
 
-#: gitk:9692
 msgid "Name:"
 msgstr "Име:"
 
-#: gitk:9716
 msgid "Please specify a name for the new branch"
 msgstr "Укажете име за новия клон"
 
-#: gitk:9721
 #, tcl-format
 msgid "Branch '%s' already exists. Overwrite?"
 msgstr "Клонът „%s“ вече съществува. Да се презапише ли?"
 
-#: gitk:9765
 msgid "Please specify a new name for the branch"
 msgstr "Укажете ново име за клона"
 
-#: gitk:9828
 #, tcl-format
 msgid "Commit %s is already included in branch %s -- really re-apply it?"
 msgstr ""
 "Подаването „%s“ вече е включено в клона „%s“ — да се приложи ли отново?"
 
-#: gitk:9833
 msgid "Cherry-picking"
 msgstr "Отбиране"
 
-#: gitk:9842
 #, tcl-format
 msgid ""
 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1089,7 +839,6 @@ msgstr ""
 "Неуспешно отбиране, защото във файла „%s“ има локални промени.\n"
 "Подайте, занулете или ги скатайте и пробвайте отново."
 
-#: gitk:9848
 msgid ""
 "Cherry-pick failed because of merge conflict.\n"
 "Do you wish to run git citool to resolve it?"
@@ -1097,20 +846,16 @@ msgstr ""
 "Неуспешно отбиране поради конфликти при сливане.\n"
 "Искате ли да ги коригирате чрез „git citool“?"
 
-#: gitk:9864 gitk:9922
 msgid "No changes committed"
 msgstr "Не са подадени промени"
 
-#: gitk:9891
 #, tcl-format
 msgid "Commit %s is not included in branch %s -- really revert it?"
 msgstr "Подаването „%s“ не е включено в клона „%s“. Да се отменени ли?"
 
-#: gitk:9896
 msgid "Reverting"
 msgstr "Отмяна"
 
-#: gitk:9904
 #, tcl-format
 msgid ""
 "Revert failed because of local changes to the following files:%s Please "
@@ -1119,7 +864,6 @@ msgstr ""
 "Неуспешна отмяна, защото във файла „%s“ има локални промени.\n"
 "Подайте, занулете или ги скатайте и пробвайте отново."
 
-#: gitk:9908
 msgid ""
 "Revert failed because of merge conflict.\n"
 " Do you wish to run git citool to resolve it?"
@@ -1127,28 +871,22 @@ msgstr ""
 "Неуспешно отмяна поради конфликти при сливане.\n"
 "Искате ли да ги коригирате чрез „git citool“?"
 
-#: gitk:9951
 msgid "Confirm reset"
 msgstr "Потвърждаване на зануляването"
 
-#: gitk:9953
 #, tcl-format
 msgid "Reset branch %s to %s?"
 msgstr "Да се занули ли клонът „%s“ към „%s“?"
 
-#: gitk:9955
 msgid "Reset type:"
 msgstr "Вид зануляване:"
 
-#: gitk:9958
 msgid "Soft: Leave working tree and index untouched"
 msgstr "Слабо: работното дърво и индекса остават същите"
 
-#: gitk:9961
 msgid "Mixed: Leave working tree untouched, reset index"
 msgstr "Смесено: работното дърво остава същото, индексът се занулява"
 
-#: gitk:9964
 msgid ""
 "Hard: Reset working tree and index\n"
 "(discard ALL local changes)"
@@ -1156,24 +894,19 @@ msgstr ""
 "Силно: зануляване и на работното дърво, и на индекса\n"
 "(ВСИЧКИ локални промени ще се загубят безвъзвратно)"
 
-#: gitk:9981
 msgid "Resetting"
 msgstr "Зануляване"
 
-#: gitk:10054
 #, tcl-format
 msgid "A local branch named %s exists already"
 msgstr "Вече съществува локален клон „%s“."
 
-#: gitk:10061
 msgid "Checking out"
 msgstr "Изтегляне"
 
-#: gitk:10120
 msgid "Cannot delete the currently checked-out branch"
 msgstr "Текущо изтегленият клон не може да се изтрие"
 
-#: gitk:10126
 #, tcl-format
 msgid ""
 "The commits on branch %s aren't on any other branch.\n"
@@ -1182,20 +915,16 @@ msgstr ""
 "Подаванията на клона „%s“ не са на никой друг клон.\n"
 "Наистина ли искате да изтриете клона „%s“?"
 
-#: gitk:10157
 #, tcl-format
 msgid "Tags and heads: %s"
 msgstr "Етикети и върхове: %s"
 
-#: gitk:10174
 msgid "Filter"
 msgstr "Филтриране"
 
-#: gitk:10181
 msgid "Sort refs by type"
 msgstr "Подредба на указателите по вид"
 
-#: gitk:10513
 msgid ""
 "Error reading commit topology information; branch and preceding/following "
 "tag information will be incomplete."
@@ -1203,221 +932,167 @@ msgstr ""
 "Грешка при прочитането на топологията на подаванията. Информацията за клона "
 "и предшестващите/следващите етикети ще е непълна."
 
-#: gitk:11490
 msgid "Tag"
 msgstr "Етикет"
 
-#: gitk:11494
 msgid "Id"
 msgstr "Идентификатор"
 
-#: gitk:11635
 msgid "Commit list display options"
 msgstr "Настройки на списъка с подавания"
 
-#: gitk:11638
 msgid "Maximum graph width (lines)"
 msgstr "Максимална широчина на графа (в редове)"
 
-#: gitk:11642
 #, no-tcl-format
 msgid "Maximum graph width (% of pane)"
 msgstr "Максимална широчина на графа (% от панела)"
 
-#: gitk:11645
 msgid "Show local changes"
 msgstr "Показване на локалните промени"
 
-#: gitk:11648
 msgid "Hide remote refs"
 msgstr "Скриване на отдалечените указатели"
 
-#: gitk:11652
 msgid "Copy commit ID to clipboard"
 msgstr "Копиране на контролната сума към буфера за обмен"
 
-#: gitk:11656
 msgid "Copy commit ID to X11 selection"
 msgstr "Копиране на контролната сума в селекцията на X11"
 
-#: gitk:11662
 msgid "Length of commit ID to copy"
 msgstr "Дължина на контролната сума, която се копира"
 
-#: gitk:11664
 msgid "Wheel scrolling multiplier"
 msgstr "Множител за колелцето на мишката"
 
-#: gitk:11668
 msgid "Diff display options"
 msgstr "Настройки на показването на разликите"
 
-#: gitk:11670
 msgid "Tab spacing"
 msgstr "Широчина на табулатора"
 
-#: gitk:11674
 msgid "Wrap comment text"
 msgstr "Пренасяне на думите в коментарите"
 
-#: gitk:11678
 msgid "Wrap other text"
 msgstr "Пренасяне на другия текст"
 
-#: gitk:11682
 msgid "Display nearby tags/heads"
 msgstr "Извеждане на близките етикети и върхове"
 
-#: gitk:11685
 msgid "Maximum # tags/heads to show"
 msgstr "Максимален брой етикети/върхове за показване"
 
-#: gitk:11688
 msgid "Limit diffs to listed paths"
 msgstr "Разлика само в избраните пътища"
 
-#: gitk:11691
 msgid "Support per-file encodings"
 msgstr "Поддръжка на различни кодирания за всеки файл"
 
-#: gitk:11697 gitk:11835
 msgid "External diff tool"
 msgstr "Външен инструмент за разлики"
 
-#: gitk:11698
 msgid "Choose..."
 msgstr "Избор…"
 
-#: gitk:11705
 msgid "Web browser"
 msgstr "Уеб браузър"
 
-#: gitk:11719
 msgid "Colors: press to choose"
 msgstr "Цветове: избира се с натискане"
 
-#: gitk:11722
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: gitk:11723
 msgid "interface"
 msgstr "интерфейс"
 
-#: gitk:11726
 msgid "Background"
 msgstr "Фон"
 
-#: gitk:11727 gitk:11769
 msgid "background"
 msgstr "фон"
 
-#: gitk:11730
 msgid "Foreground"
 msgstr "Знаци"
 
-#: gitk:11731
 msgid "foreground"
 msgstr "знаци"
 
-#: gitk:11734
 msgid "Diff: old lines"
 msgstr "Разлика: стари редове"
 
-#: gitk:11735
 msgid "diff old lines"
 msgstr "разлика, стари редове"
 
-#: gitk:11739
 msgid "Diff: old lines bg"
 msgstr "Разлика: фон на стари редове"
 
-#: gitk:11741
 msgid "diff old lines bg"
 msgstr "разлика, фон на стари редове"
 
-#: gitk:11745
 msgid "Diff: new lines"
 msgstr "Разлика: нови редове"
 
-#: gitk:11746
 msgid "diff new lines"
 msgstr "разлика, нови редове"
 
-#: gitk:11750
 msgid "Diff: new lines bg"
 msgstr "Разлика: фон на нови редове"
 
-#: gitk:11752
 msgid "diff new lines bg"
 msgstr "разлика, фон на нови редове"
 
-#: gitk:11756
 msgid "Diff: hunk header"
 msgstr "Разлика: начало на парче"
 
-#: gitk:11758
 msgid "diff hunk header"
 msgstr "разлика, начало на парче"
 
-#: gitk:11762
 msgid "Marked line bg"
 msgstr "Фон на отбелязан ред"
 
-#: gitk:11764
 msgid "marked line background"
 msgstr "фон на отбелязан ред"
 
-#: gitk:11768
 msgid "Select bg"
 msgstr "Избор на фон"
 
-#: gitk:11776
 msgid "Fonts: press to choose"
 msgstr "Шрифтове: избира се с натискане"
 
-#: gitk:11778
 msgid "Main font"
 msgstr "Основен шрифт"
 
-#: gitk:11779
 msgid "Diff display font"
 msgstr "Шрифт за разликите"
 
-#: gitk:11780
 msgid "User interface font"
 msgstr "Шрифт на интерфейса"
 
-#: gitk:11798
 msgid "Gitk preferences"
 msgstr "Настройки на Gitk"
 
-#: gitk:11803
 msgid "General"
 msgstr "Общи"
 
-#: gitk:11804
 msgid "Colors"
 msgstr "Цветове"
 
-#: gitk:11805
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: gitk:11845
 #, tcl-format
 msgid "Gitk: choose color for %s"
 msgstr "Gitk: избор на цвят на „%s“"
 
-#: gitk:12633
 msgid "Cannot find a git repository here."
 msgstr "Тук липсва хранилище на Git."
 
-#: gitk:12680
 #, tcl-format
 msgid "Ambiguous argument '%s': both revision and filename"
 msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл"
 
-#: gitk:12692
 msgid "Bad arguments to gitk:"
 msgstr "Неправилни аргументи на gitk:"

From b28119551bc06986bdc9048ee30393b6b9b20c5f Mon Sep 17 00:00:00 2001
From: Johannes Sixt <j6t@kdbg.org>
Date: Tue, 29 Jul 2025 14:52:54 +0200
Subject: [PATCH 12/14] gitk: avoid duplicated upstream refs

It is possible that multiple local branches track the same upstream.
In this case, the refs dialog lists the tracked upstream branch
multiple times. This is undesirable. Make them unique.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 gitk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitk b/gitk
index 38c2c81a79..b31d0b0a63 100755
--- a/gitk
+++ b/gitk
@@ -10340,7 +10340,7 @@ proc refill_reflist {} {
             }
         }
     }
-    set trackedremoterefs [lsort -index 0 $trackedremoterefs]
+    set trackedremoterefs [lsort -index 0 -unique $trackedremoterefs]
     set localrefs [lsort -index 0 $localrefs]
 
     foreach n [array names headids] {

From 9965cc771b6b43a8852a4950a196180f2c616891 Mon Sep 17 00:00:00 2001
From: Michael Rappazzo <michael.rappazzo@infor.com>
Date: Thu, 31 Jul 2025 07:53:21 -0400
Subject: [PATCH 13/14] gitk: filter invisible upstream refs from reference
 list

In refill_reflist, upstream refs are now only included if their
commits are visible in the current view. This prevents display
issues like multiple highlighted branches when clicking entries.

Signed-off-by: Michael Rappazzo <michael.rappazzo@infor.com>
---
 gitk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitk b/gitk
index b31d0b0a63..080192820e 100755
--- a/gitk
+++ b/gitk
@@ -10332,7 +10332,7 @@ proc refill_reflist {} {
         if {![string match "remotes/*" $n] && [string match $reflistfilter $n]} {
             if {[commitinview $headids($n) $curview]} {
                 lappend localrefs [list $n H]
-                if {[info exists upstreamofref($n)]} {
+                if {[info exists upstreamofref($n)] && [commitinview $headids($upstreamofref($n)) $curview]} {
                     lappend trackedremoterefs [list $upstreamofref($n) R]
                 }
             } else {

From 98a5b8564485ab300cfd743bdc5a4de7ba2f773b Mon Sep 17 00:00:00 2001
From: Ilya Grigoriev <ilyagr@users.noreply.github.com>
Date: Sat, 2 Aug 2025 21:59:24 -0700
Subject: [PATCH 14/14] gitk: Mention globs in description of preference to
 hide custom refs

This clarifies that one has to enter e.g. `jj/keep/*` and not just
`jj/keep`.

Follows up on 2441e19.

Signed-off-by: Ilya Grigoriev <ilyagr@users.noreply.github.com>
---
 gitk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitk b/gitk
index bba6561ed8..3b6acfc592 100755
--- a/gitk
+++ b/gitk
@@ -11683,7 +11683,7 @@ proc prefspage_general {notebook} {
 
     ttk::entry $page.refstohide -textvariable refstohide
     ttk::frame $page.refstohidef
-    ttk::label $page.refstohidef.l -text [mc "Refs to hide (space-separated)" ]
+    ttk::label $page.refstohidef.l -text [mc "Refs to hide (space-separated globs)" ]
     pack $page.refstohidef.l -side left
     pack configure $page.refstohidef.l -padx 10
     grid x $page.refstohidef $page.refstohide -sticky ew