From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Jan 2008 06:41:15 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.4-rc3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f85fd3f0d1213a2b714fddc7a834817aceeca932;p=thirdparty%2Fgit.git

Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: use user-configured background in view definition dialog
  [PATCH] gitk: Update German translation
  [PATCH] gitk: Update and fix Makefile
  gitk: Restore some widget options whose defaults changed in Tk 8.5
  gitk: Recode de.po to UTF-8
  [PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
  [PATCH] gitk i18n: More markup -- various options menus
  [PATCH] gitk i18n: Initial German translation
  [PATCH] gitk i18n: Markup several strings for translation
  [PATCH] gitk i18n: Import msgcat for message string translation; load translation catalogs
  [PATCH] gitk i18n: Add Makefile with rules for po file creation and installation
---

f85fd3f0d1213a2b714fddc7a834817aceeca932
diff --cc gitk-git/Makefile
index 9bc1e24082,0000000000..61585045b7
mode 100644,000000..100644
--- a/gitk-git/Makefile
+++ b/gitk-git/Makefile
@@@ -1,29 -1,0 +1,58 @@@
 +# The default target of this Makefile is...
 +all::
 +
 +prefix ?= $(HOME)
 +bindir ?= $(prefix)/bin
++sharedir ?= $(prefix)/share
++gitk_libdir   ?= $(sharedir)/gitk/lib
++msgsdir    ?= $(gitk_libdir)/msgs
++msgsdir_SQ  = $(subst ','\'',$(msgsdir))
++
 +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))
++
 +ifndef V
 +	QUIET          = @
 +	QUIET_GEN      = $(QUIET)echo '   ' GEN $@ &&
 +endif
 +
- all:: gitk-wish
++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
++	$(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
++update-po:: $(PO_TEMPLATE)
++	$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
++$(ALL_MSGFILES): %.msg : %.po
++	@echo Generating catalog $@
++	$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
++
diff --cc gitk-git/gitk
index 1da0b0af1d,801a5a9d86..801a5a9d86
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
diff --cc gitk-git/po/de.po
index 0000000000,d7881dd121..d7881dd121
mode 000000,100644..100644
--- a/gitk-git/po/de.po
+++ b/gitk-git/po/de.po