Merge branch 'master' of https://github.com/j6t/gitk

* 'master' of https://github.com/j6t/gitk:
  gitk: fix msgfmt being required
  gitk: fix highlighted remote prefix of branches with directories

diff --cc gitk-git/gitk
Simple merge

diff --cc gitk-git/meson.build
index ca3c0cec5832478594d9e0cc07f5f044e3a920f3,0000000000000000000000000000000000000000..aecc068d30ccc04c8b91aa7b820be116fc219eda
mode 100644,000000..100644
--- 1/gitk-git/meson.build
--- /dev/null
+++ b/gitk-git/meson.build
@@@ -1,30 -1,0 +1,30 @@@
- if find_program('msgfmt').found()
 +project('gitk')
 +
 +shell = find_program('sh')
 +wish = find_program('wish')
 +
 +# Verify that dependencies of "generate-tcl.sh" are satisfied.
 +foreach dependency : [ 'chmod', 'mv', 'sed' ]
 +  find_program(dependency)
 +endforeach
 +
 +custom_target(
 +  command: [
 +    shell,
 +    meson.current_source_dir() / 'generate-tcl.sh',
 +    wish.full_path(),
 +    '@INPUT@',
 +    '@OUTPUT@',
 +  ],
 +  input: 'gitk',
 +  output: 'gitk',
 +  depend_files: [
 +    'generate-tcl.sh',
 +  ],
 +  install: true,
 +  install_dir: get_option('bindir'),
 +)
 +
++if find_program('msgfmt', required: false).found()
 +  subdir('po')
 +endif