* merged i18n fixes from apt--mvo