Merged l10n branch to trunk