WIP: Fix for strings containing xliff