Merge "i18n: use int: for consistency"