Merge ../gitk

* ../gitk: gitk: Update German translation. gitk: Fix typo in user message. gitk: Fix the Makefile to cope with systems lacking msgfmt
git-mirror · Jan 11, 2008 · 887ad79 · 887ad79
2 parents 8c3c7b2 + 7d8856d
commit 887ad79
Show file tree

Hide file tree

Showing 5 changed files with 363 additions and 202 deletions.
diff --git a/gitk-git/Makefile b/gitk-git/Makefile
@@ -18,7 +18,12 @@ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 
 ## po-file creation rules
 XGETTEXT   ?= xgettext
-MSGFMT     ?= msgfmt
+ifdef NO_MSGFMT
+	MSGFMT ?= $(TCL_PATH) po/po2msg.sh
+else
+	MSGFMT ?= msgfmt
+endif
+
 PO_TEMPLATE = po/gitk.pot
 ALL_POFILES = $(wildcard po/*.po)
 ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))

diff --git 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"] ||

diff --git a/gitk-git/po/.gitignore b/gitk-git/po/.gitignore
@@ -0,0 +1 @@
+*.msg