Merge in l10n changes.