brandname-812762: Backout due to unchanged key

Localizers need changed key names so they know to re-translate. We
changed some values without changing the keys names, so the patch got
backed out.

Signed-off-by: Joe Walker <jwalker@mozilla.com>
Merge branch 'brandname-812762'
Merge branch 'master' into asynctypes-685526