Merge l10n rev 92f8b10c9178dcc452341855e156d70fe33cd311