Merge branch 'js/git-gui-msgfmt-on-windows' into maint