Merge pull request #12344 from overholt/master

Bug 878700 - Untranslated text in 'Enter PIN' screen r=fcampo(cherry picked from commit c357e33b00d1c54774a4b0083b49457fad47afd6)