i18n: Sync upseam, no longer have to drop plural forms that chocked python