merge _locale and _locales
merge _locale and _locales
add the po files