bug 824621, localize email address placeholder in ftu
Merge pull request #7293 from Pike/bug-824621-l12y-email-address

bug 824621, localize email address placeholder in ftu
Auto-merge from branch 'master'