bug 815852: now works with and without multilocale
Bug 826558 - STK app does not display help info. Add the main Help menu. r=vingtetun
Merge pull request #7408 from vingtetun/826558

Bug 826558 - STK app does not display help info. Add the main Help menu....
Merge pull request #7407 from fabi1cazenave/inline-l10n-followup2

bug 815852: now works with and without multilocale, r=21
Auto-merge from branch 'master'