Wrap strings for l10n (Bug 869937)
Also updated the headline text for non-Firefox users for Bug 864483
Merge pull request #929 from sgarrity/bug-869937-update-l10n

Wrap strings for l10n (Bug 869937)