Clean up l10n wrapping for Bug 960689