summaryrefslogtreecommitdiff
path: root/gitk-git/gitk
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-01-11 00:51:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-01-11 00:51:30 -0800
commit887ad79865d862a0a3aef4b59957d7dd95d0507d (patch)
tree0b9906aa1d1b3e8d1b07bf16226d00665254c395 /gitk-git/gitk
parentpack-objects: remove redundant and wrong call to deflateEnd() (diff)
parentgitk: Update German translation. (diff)
downloadtgif-887ad79865d862a0a3aef4b59957d7dd95d0507d.tar.xz
Merge ../gitk
* ../gitk: gitk: Update German translation. gitk: Fix typo in user message. gitk: Fix the Makefile to cope with systems lacking msgfmt
Diffstat (limited to 'gitk-git/gitk')
-rw-r--r--gitk-git/gitk6
1 files changed, 3 insertions, 3 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 801a5a9d86..b3cb8e8b7e 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2629,12 +2629,12 @@ proc askrelhighlight {row id} {
if {![info exists selectedline]} return
set isbold 0
- if {$highlight_related eq [mc "Descendent"] ||
- $highlight_related eq [mc "Not descendent"]} {
+ if {$highlight_related eq [mc "Descendant"] ||
+ $highlight_related eq [mc "Not descendant"]} {
if {![info exists descendent($id)]} {
is_descendent $id
}
- if {$descendent($id) == ($highlight_related eq [mc "Descendent"])} {
+ if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
set isbold 1
}
} elseif {$highlight_related eq [mc "Ancestor"] ||