Merge https://github.com/git-l10n/git-po