Merge branch 'jx/i18n-fix' of github.com:jiangxin/gitk

* 'jx/i18n-fix' of github.com:jiangxin/gitk:
  gitk: l10n: make PO headers identify the Gitk project
  gitk: ignore generated POT file
  gitk: i18n: use "Gitk" as package name in POT file

Signed-off-by: Johannes Sixt <j6t@kdbg.org>

diff --cc Makefile
index dda9c2a456ccafd81ad84378828933d7b6fd617b,a9675a21456940f3fc67f87a2915d603aba4d907..41116d8a146f266ed1e34e859ef38051b8805210
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -68,12 -68,9 +68,12 @@@ gitk-wish: gitk GIT-TCLTK-VAR
        $(SHELL_PATH) ./generate-tcl.sh "$(TCLTK_PATH_SQ)" "$<" "$@"
  
  $(PO_TEMPLATE): gitk
-       $(XGETTEXT) -kmc -LTcl -o $@ gitk
+       $(XGETTEXT) -kmc -LTcl --package-name=Gitk -o $@ gitk
  update-po:: $(PO_TEMPLATE)
 -      $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
 +      $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U --add-location $p $(PO_TEMPLATE) ; )
 +      @echo "Before committing changes, ensure that a clean-filter is installed:"; \
 +      echo; \
 +      echo "  git config filter.gettext-no-location.clean \"msgcat --no-location -\""
  $(ALL_MSGFILES): %.msg : %.po
        @echo Generating catalog $@
        $(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $<

diff --cc po/ca.po
Simple merge

diff --cc po/de.po
Simple merge

diff --cc po/es.po
Simple merge

diff --cc po/fr.po
Simple merge

diff --cc po/hu.po
Simple merge

diff --cc po/it.po
Simple merge

diff --cc po/ja.po
Simple merge

diff --cc po/pt_br.po
Simple merge

diff --cc po/pt_pt.po
Simple merge

diff --cc po/ru.po
Simple merge

diff --cc po/sv.po
Simple merge

diff --cc po/ta.po
Simple merge

diff --cc po/vi.po
Simple merge

diff --cc po/zh_cn.po
index a2a794a97cd6bf210983c2ff02891a0dcfd854df,c89ce95e3d3d8c9b62b6688299eca052c1350c69..71a9878318e82c3b33be7c79cd2dfa1a43650140
--- 1/po/zh_cn.po
--- 2/po/zh_cn.po
+++ b/po/zh_cn.po
@@@ -2,9 -2,10 +2,9 @@@
  #
  # Translators:
  # YanKe <imyanke@163.com>, 2017
 -
  msgid ""
  msgstr ""
- "Project-Id-Version: Git Chinese Localization Project\n"
+ "Project-Id-Version: Gitk Chinese Localization Project\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2017-02-28 23:11+0800\n"
  "PO-Revision-Date: 2017-03-11 02:27+0800\n"