Fix latest merge
Rename xliff files to xlf
Fix translations to be imported by Pootle