From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 21 Mar 2026 16:27:19 GMT
Subject: Re: [GIT PULL] gitk: *.po no-location and package name, link and ref colors
Message-ID: <xmqqbjghb120.fsf@gitster.g>
In-Reply-To: <5a6b375f-734d-4935-825a-afa41abc3ea0@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

> The following changes since commit ddae547e3775638c238c11f30120f1e7e763fba8:
>
>   Merge branch 'pks-meson-fix-missing-msgfmt' of https://github.com/pks-gitlab/gitk (2026-02-05 13:45:51 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/j6t/gitk.git master
>
> for you to fetch changes up to c8c5df79df34b40119c4bf8e3079520762f258d1:
>
>   Merge branch 'jx/i18n-fix' of github.com:jiangxin/gitk (2026-03-20 09:23:32 +0100)
>
> ----------------------------------------------------------------
> Jiang Xin (3):
>       gitk: i18n: use "Gitk" as package name in POT file
>       gitk: ignore generated POT file
>       gitk: l10n: make PO headers identify the Gitk project
>
> Johannes Sixt (4):
>       gitk: commit translation files without file information
>       Merge branch 'sb/heed-ref-decoration-settings'
>       Merge branch 'js/i18n-no-location'
>       Merge branch 'jx/i18n-fix' of github.com:jiangxin/gitk
>
> Shannon Barber (1):
>       gitk: use config settings for head/tag colors
>
> Wang Zichong (1):
>       gitk: support link color in the Preferences dialog
>
>  .gitignore        |   1 +
>  Makefile          |   7 +-
>  gitk              |  21 ++-
>  po/.gitattributes |   1 +
>  po/bg.po          |   2 +-
>  po/ca.po          | 312 +-----------------------------------------
>  po/de.po          | 318 +------------------------------------------
>  po/es.po          | 312 +-----------------------------------------
>  po/fr.po          | 341 +++-------------------------------------------
>  po/hu.po          | 312 +-----------------------------------------
>  po/it.po          | 312 +-----------------------------------------
>  po/ja.po          | 327 ++------------------------------------------
>  po/pt_br.po       | 312 +-----------------------------------------
>  po/pt_pt.po       | 316 +------------------------------------------
>  po/ru.po          | 397 ++++++++----------------------------------------------
>  po/sv.po          | 328 +-------------------------------------------
>  po/ta.po          | 391 ++++-------------------------------------------------
>  po/vi.po          | 312 +-----------------------------------------
>  po/zh_cn.po       | 374 ++++++--------------------------------------------
>  19 files changed, 187 insertions(+), 4509 deletions(-)
>  create mode 100644 po/.gitattributes

Thanks, pulled and the merge summary I saw matches the above.