{"thread":{"id":"65322","subject":"[GIT PULL] gitk: *.po no-location and package name, link and ref colors","startedAt":"2026-03-21T11:51:16Z","lastAt":"2026-03-21T16:27:21Z","messageCount":2,"participants":["Johannes Sixt","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"539595","messageId":"5a6b375f-734d-4935-825a-afa41abc3ea0@kdbg.org","threadId":"65322","inReplyTo":null,"subject":"[GIT PULL] gitk: *.po no-location and package name, link and ref colors","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2026-03-21T11:51:06Z","receivedAt":"2026-03-21T11:51:16Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"The following changes since commit ddae547e3775638c238c11f30120f1e7e763fba8:\n\n  Merge branch 'pks-meson-fix-missing-msgfmt' of https://github.com/pks-gitlab/gitk (2026-02-05 13:45:51 +0100)\n\nare available in the Git repository at:\n\n  https://github.com/j6t/gitk.git master\n\nfor you to fetch changes up to c8c5df79df34b40119c4bf8e3079520762f258d1:\n\n  Merge branch 'jx/i18n-fix' of github.com:jiangxin/gitk (2026-03-20 09:23:32 +0100)\n\n----------------------------------------------------------------\nJiang Xin (3):\n      gitk: i18n: use \"Gitk\" as package name in POT file\n      gitk: ignore generated POT file\n      gitk: l10n: make PO headers identify the Gitk project\n\nJohannes Sixt (4):\n      gitk: commit translation files without file information\n      Merge branch 'sb/heed-ref-decoration-settings'\n      Merge branch 'js/i18n-no-location'\n      Merge branch 'jx/i18n-fix' of github.com:jiangxin/gitk\n\nShannon Barber (1):\n      gitk: use config settings for head/tag colors\n\nWang Zichong (1):\n      gitk: support link color in the Preferences dialog\n\n .gitignore        |   1 +\n Makefile          |   7 +-\n gitk              |  21 ++-\n po/.gitattributes |   1 +\n po/bg.po          |   2 +-\n po/ca.po          | 312 +-----------------------------------------\n po/de.po          | 318 +------------------------------------------\n po/es.po          | 312 +-----------------------------------------\n po/fr.po          | 341 +++-------------------------------------------\n po/hu.po          | 312 +-----------------------------------------\n po/it.po          | 312 +-----------------------------------------\n po/ja.po          | 327 ++------------------------------------------\n po/pt_br.po       | 312 +-----------------------------------------\n po/pt_pt.po       | 316 +------------------------------------------\n po/ru.po          | 397 ++++++++----------------------------------------------\n po/sv.po          | 328 +-------------------------------------------\n po/ta.po          | 391 ++++-------------------------------------------------\n po/vi.po          | 312 +-----------------------------------------\n po/zh_cn.po       | 374 ++++++--------------------------------------------\n 19 files changed, 187 insertions(+), 4509 deletions(-)\n create mode 100644 po/.gitattributes\n"},{"id":"539603","messageId":"xmqqbjghb120.fsf@gitster.g","threadId":"65322","inReplyTo":"5a6b375f-734d-4935-825a-afa41abc3ea0@kdbg.org","subject":"Re: [GIT PULL] gitk: *.po no-location and package name, link and ref colors","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-03-21T16:27:19Z","receivedAt":"2026-03-21T16:27:21Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt <j6t@kdbg.org> writes:\n\n> The following changes since commit ddae547e3775638c238c11f30120f1e7e763fba8:\n>\n>   Merge branch 'pks-meson-fix-missing-msgfmt' of https://github.com/pks-gitlab/gitk (2026-02-05 13:45:51 +0100)\n>\n> are available in the Git repository at:\n>\n>   https://github.com/j6t/gitk.git master\n>\n> for you to fetch changes up to c8c5df79df34b40119c4bf8e3079520762f258d1:\n>\n>   Merge branch 'jx/i18n-fix' of github.com:jiangxin/gitk (2026-03-20 09:23:32 +0100)\n>\n> ----------------------------------------------------------------\n> Jiang Xin (3):\n>       gitk: i18n: use \"Gitk\" as package name in POT file\n>       gitk: ignore generated POT file\n>       gitk: l10n: make PO headers identify the Gitk project\n>\n> Johannes Sixt (4):\n>       gitk: commit translation files without file information\n>       Merge branch 'sb/heed-ref-decoration-settings'\n>       Merge branch 'js/i18n-no-location'\n>       Merge branch 'jx/i18n-fix' of github.com:jiangxin/gitk\n>\n> Shannon Barber (1):\n>       gitk: use config settings for head/tag colors\n>\n> Wang Zichong (1):\n>       gitk: support link color in the Preferences dialog\n>\n>  .gitignore        |   1 +\n>  Makefile          |   7 +-\n>  gitk              |  21 ++-\n>  po/.gitattributes |   1 +\n>  po/bg.po          |   2 +-\n>  po/ca.po          | 312 +-----------------------------------------\n>  po/de.po          | 318 +------------------------------------------\n>  po/es.po          | 312 +-----------------------------------------\n>  po/fr.po          | 341 +++-------------------------------------------\n>  po/hu.po          | 312 +-----------------------------------------\n>  po/it.po          | 312 +-----------------------------------------\n>  po/ja.po          | 327 ++------------------------------------------\n>  po/pt_br.po       | 312 +-----------------------------------------\n>  po/pt_pt.po       | 316 +------------------------------------------\n>  po/ru.po          | 397 ++++++++----------------------------------------------\n>  po/sv.po          | 328 +-------------------------------------------\n>  po/ta.po          | 391 ++++-------------------------------------------------\n>  po/vi.po          | 312 +-----------------------------------------\n>  po/zh_cn.po       | 374 ++++++--------------------------------------------\n>  19 files changed, 187 insertions(+), 4509 deletions(-)\n>  create mode 100644 po/.gitattributes\n\nThanks, pulled and the merge summary I saw matches the above.\n\n"}]}