bug 815852: now works with and without multilocale
Merge pull request #7407 from fabi1cazenave/inline-l10n-followup2

bug 815852: now works with and without multilocale, r=21