Merge branch 'master' into dev

3 files changed, 68 insertions, 55 deletions

diff --git a/Makefile b/Makefile
index 38154b6e08..61585045b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,52 @@
-# Set the installation directories; this section is needed only in
-# gitk.git but probably not in git.git.
-ifndef gitexecdir
-	gitexecdir := $(shell git --exec-path)
-endif
-ifndef sharedir
-	sharedir := $(dir $(gitexecdir))share
-endif
+# The default target of this Makefile is...
+all::
 
-# From here on, these are needed in git.git/gitk/Makefile.
+prefix ?= $(HOME)
+bindir ?= $(prefix)/bin
+sharedir ?= $(prefix)/share
 gitk_libdir   ?= $(sharedir)/gitk/lib
 msgsdir    ?= $(gitk_libdir)/msgs
 msgsdir_SQ  = $(subst ','\'',$(msgsdir))
 
-## Beginning of po-file creation rules
+TCLTK_PATH ?= wish
+INSTALL ?= install
+RM ?= rm -f
+
+DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+bindir_SQ = $(subst ','\'',$(bindir))
+TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
+
+## po-file creation rules
 XGETTEXT   ?= xgettext
 MSGFMT     ?= msgfmt
 PO_TEMPLATE = po/gitk.pot
 ALL_POFILES = $(wildcard po/*.po)
 ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
 
-all:: $(ALL_MSGFILES)
+ifndef V
+	QUIET          = @
+	QUIET_GEN      = $(QUIET)echo '   ' GEN $@ &&
+endif
+
+all:: gitk-wish $(ALL_MSGFILES)
+
+install:: all
+	$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
+	$(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'
+	$(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
+
+uninstall::
+	$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
+	$(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
+
+clean::
+	$(RM) gitk-wish po/*.msg
+
+gitk-wish: gitk
+	$(QUIET_GEN)$(RM) $@ $@+ && \
+	sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
+	chmod +x $@+ && \
+	mv -f $@+ $@
 
 $(PO_TEMPLATE): gitk
 	$(XGETTEXT) -kmc -LTcl -o $@ gitk
@@ -29,17 +56,3 @@ $(ALL_MSGFILES): %.msg : %.po
 	@echo Generating catalog $@
 	$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
 
-clean::
-	rm -f $(ALL_PROGRAMS) po/*.msg
-## End of po-file creation rules
-
-# Install rules for po-files
-install: all
-	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
-	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
-
-uninstall:
-	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
-	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1)
-	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
-	$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)
diff --git a/gitk b/gitk
index dc1872c7d0..0dacfdadf1 100755
--- a/gitk
+++ b/gitk
@@ -2606,7 +2606,7 @@ proc editview {} {
 }
 
 proc vieweditor {top n title} {
-    global newviewname newviewperm viewfiles
+    global newviewname newviewperm viewfiles bgcolor
 
     toplevel $top
     wm title $top $title
@@ -2620,12 +2620,12 @@ proc vieweditor {top n title} {
 	-text [mc "Commits to include (arguments to git rev-list):"]
     grid $top.al - -sticky w -pady 5
     entry $top.args -width 50 -textvariable newviewargs($n) \
-	-background white
+	-background $bgcolor
     grid $top.args - -sticky ew -padx 5
     message $top.l -aspect 1000 \
 	-text [mc "Enter files and directories to include, one per line:"]
     grid $top.l - -sticky w
-    text $top.t -width 40 -height 10 -background white -font uifont
+    text $top.t -width 40 -height 10 -background $bgcolor -font uifont
     if {[info exists viewfiles($n)]} {
 	foreach f $viewfiles($n) {
 	    $top.t insert end $f
diff --git a/po/de.po b/po/de.po
index 19d048b683..d7881dd121 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of gitk to German.
-# Copyright (C) 2007 Paul Mackerras and Christian Stimming.
-# This file is distributed under the same license as the git package.
+# Copyright (C) 2007 Paul Mackerras.
+# This file is distributed under the same license as the gitk package.
 # Christian Stimming <stimming@tuhh.de>, 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-07 12:27+0100\n"
-"PO-Revision-Date: 2007-11-07 12:36+0100\n"
+"POT-Creation-Date: 2007-12-21 12:04+0100\n"
+"PO-Revision-Date: 2008-01-08 21:48+0100\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -321,11 +321,11 @@ msgstr ""
 
 #: gitk:2883
 msgid "Local changes checked in to index but not committed"
-msgstr ""
+msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
 
 #: gitk:2913
 msgid "Local uncommitted changes, not checked in to index"
-msgstr ""
+msgstr "Lokale Änderungen, nicht bereitgestellt"
 
 #: gitk:4264
 msgid "Searching"
@@ -496,7 +496,7 @@ msgstr "Zurücksetzen bestätigen"
 #: gitk:6357
 #, tcl-format
 msgid "Reset branch %s to %s?"
-msgstr ""
+msgstr "Zweig »%s« auf »%s« zurücksetzen?"
 
 #: gitk:6361
 msgid "Reset type:"
@@ -504,7 +504,7 @@ msgstr "Art des Zurücksetzens:"
 
 #: gitk:6365
 msgid "Soft: Leave working tree and index untouched"
-msgstr "Weich: Arbeitskopie und Bereitstellung unverändert"
+msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
 
 #: gitk:6368
 msgid "Mixed: Leave working tree untouched, reset index"
@@ -526,11 +526,11 @@ msgstr "Zurücksetzen"
 
 #: gitk:6444
 msgid "Checking out"
-msgstr ""
+msgstr "Umstellen"
 
 #: gitk:6474
 msgid "Cannot delete the currently checked-out branch"
-msgstr ""
+msgstr "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht gelöscht werden."
 
 #: gitk:6480
 #, tcl-format
@@ -580,28 +580,28 @@ msgstr "Gitk Einstellungen"
 
 #: gitk:7960
 msgid "Commit list display options"
-msgstr ""
+msgstr "Anzeige Versionsliste"
 
 #: gitk:7964
 msgid "Maximum graph width (lines)"
-msgstr ""
+msgstr "Maximale Graphenbreite (Zeilen)"
 
 #: gitk:7968
 #, tcl-format
 msgid "Maximum graph width (% of pane)"
-msgstr ""
+msgstr "Maximale Graphenbreite (% des Fensters)"
 
 #: gitk:7973
 msgid "Show local changes"
-msgstr ""
+msgstr "Lokale Änderungen anzeigen"
 
 #: gitk:7978
 msgid "Diff display options"
-msgstr ""
+msgstr "Anzeige Vergleich"
 
 #: gitk:7981
 msgid "Tab spacing"
-msgstr ""
+msgstr "Tabulatorbreite"
 
 #: gitk:7985
 msgid "Display nearby tags"
@@ -609,11 +609,11 @@ msgstr ""
 
 #: gitk:7990
 msgid "Limit diffs to listed paths"
-msgstr ""
+msgstr "Vergleich nur für angezeigte Pfade"
 
 #: gitk:7995
 msgid "Colors: press to choose"
-msgstr ""
+msgstr "Farben: Klicken zum Wählen"
 
 #: gitk:7999
 msgid "Background"
@@ -625,15 +625,15 @@ msgstr "Hintergrund"
 
 #: gitk:8007
 msgid "Diff: old lines"
-msgstr ""
+msgstr "Vergleich: Alte Zeilen"
 
 #: gitk:8012
 msgid "Diff: new lines"
-msgstr ""
+msgstr "Vergleich: Neue Zeilen"
 
 #: gitk:8017
 msgid "Diff: hunk header"
-msgstr ""
+msgstr "Vergleich: Änderungstitel"
 
 #: gitk:8023
 msgid "Select bg"
@@ -641,24 +641,24 @@ msgstr "Hintergrundfarbe Auswählen"
 
 #: gitk:8027
 msgid "Fonts: press to choose"
-msgstr ""
+msgstr "Schriftart: Klicken zum Wählen"
 
 #: gitk:8030
 msgid "Main font"
-msgstr ""
+msgstr "Programmschriftart"
 
 #: gitk:8031
 msgid "Diff display font"
-msgstr ""
+msgstr "Vergleich"
 
 #: gitk:8032
 msgid "User interface font"
-msgstr ""
+msgstr "Beschriftungen"
 
 #: gitk:8050
 #, tcl-format
 msgid "Gitk: choose color for %s"
-msgstr ""
+msgstr "Gitk: Farbe wählen für %s"
 
 #: gitk:8431
 msgid ""
@@ -668,7 +668,7 @@ msgstr ""
 
 #: gitk:8516
 msgid "Cannot find a git repository here."
-msgstr ""
+msgstr "Kein Git-Projektarchiv gefunden."
 
 #: gitk:8520
 #, tcl-format