GIS Marker cleanup, i18n fixes & Vi translations