Merge branch 'translation' of https://github.com/ChrisADR/git-po