i18 in geocode controls and examples
Fix conflicts
Fix conflicts