Merge branch 'km/gettext-n'