Merge branch 'l10n-2.33-rnd2' of github.com:ralfth/git