Merge from l10n repository rev 92f8b10c9178dcc452341855e156d70fe33cd311. As discussed over irc with pkerr.