Merge "Merge "Fix translateable -> translatable in .xml files" into pi-dev am: 9f38c5b8 am: 58e80553"