From: Johannes Sixt <j6t@kdbg.org>
Date: Fri, 20 Mar 2026 08:23:32 +0000 (+0100)
Subject: Merge branch 'jx/i18n-fix' of github.com:jiangxin/gitk
X-Git-Tag: v2.54.0-rc0~54^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8c5df79df34b40119c4bf8e3079520762f258d1;p=thirdparty%2Fgit.git

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>
---

c8c5df79df34b40119c4bf8e3079520762f258d1
diff --cc Makefile
index dda9c2a456,a9675a2145..41116d8a14
--- a/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/zh_cn.po
index a2a794a97c,c89ce95e3d..71a9878318
--- a/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"