Merge "Fix translateable -> translatable in .xml files"