diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-21 09:25:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-21 09:25:10 -0700 |
| commit | b70a02dcc9add838175b4c4a07171f8ab6b9f7c0 (patch) | |
| tree | cc5a7a5c00882e59176abbfcb2e26b907a4b4396 /gitk-git/Makefile | |
| parent | 7ff1e8dc1e1680510c96e69965b3fa81372c5037 (diff) | |
| parent | c8c5df79df34b40119c4bf8e3079520762f258d1 (diff) | |
| download | git-b70a02dcc9add838175b4c4a07171f8ab6b9f7c0.tar.xz | |
Merge branch 'master' of https://github.com/j6t/gitk
* 'master' of https://github.com/j6t/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
gitk: commit translation files without file information
gitk: support link color in the Preferences dialog
gitk: use config settings for head/tag colors
Diffstat (limited to 'gitk-git/Makefile')
| -rw-r--r-- | gitk-git/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gitk-git/Makefile b/gitk-git/Makefile index cc32dcab4b..41116d8a14 100644 --- a/gitk-git/Makefile +++ b/gitk-git/Makefile @@ -68,9 +68,12 @@ gitk-wish: gitk GIT-TCLTK-VARS $(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 $@) $< |