fix translation links
fix merge