* [GIT PULL] gitk: *.po no-location and package name, link and ref colors
@ 2026-03-21 11:51 Johannes Sixt
2026-03-21 16:27 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Sixt @ 2026-03-21 11:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [GIT PULL] gitk: *.po no-location and package name, link and ref colors
2026-03-21 11:51 [GIT PULL] gitk: *.po no-location and package name, link and ref colors Johannes Sixt
@ 2026-03-21 16:27 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2026-03-21 16:27 UTC (permalink / raw)
To: Johannes Sixt; +Cc: Git Mailing List
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-03-21 16:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-21 11:51 [GIT PULL] gitk: *.po no-location and package name, link and ref colors Johannes Sixt
2026-03-21 16:27 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox