merge default to default-i18n (nontrivial) This merge was nontrivial because it merges the normalization of i18n files from the default branch, but on default-i18n we don't want most of the normalization. And on top of the normalized i18n commits, there were actual translation changes (in normalized form) which do not apply cleanly on non-normalized i18n files. Hence some manual conflict management was necessary. The end result for each po file was compared with the (normalized) version on the default branch and found equivalent. This comparison was done using 'scripts/i18n-update normalized_diff'.