summaryrefslogtreecommitdiff
path: root/gitk-git/gitk
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-11 08:51:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-11 08:51:30 (GMT)
commit887ad79865d862a0a3aef4b59957d7dd95d0507d (patch)
tree0b9906aa1d1b3e8d1b07bf16226d00665254c395 /gitk-git/gitk
parent8c3c7b2adbac9d4fce1fcec0ca03cfb6535d5af3 (diff)
parent7d8856d091d3fd098643acb6157dfed376eddaea (diff)
downloadgit-887ad79865d862a0a3aef4b59957d7dd95d0507d.zip
git-887ad79865d862a0a3aef4b59957d7dd95d0507d.tar.gz
git-887ad79865d862a0a3aef4b59957d7dd95d0507d.tar.bz2
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 801a5a9..b3cb8e8 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"] ||