Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-po