Bug 1074166 - Fix device type l10n missing issue

ok, I have to admit I'm not sure if I understand why it works that way on 2.1, but if it fixes the bug and doesn't introduce regressions, let's land it.