Support merge of non located data
Add french postal code merge
Update translations
Add merge_postal_code_FR to france_local_db