string language fix (oh god!)
Merge branch 'master' into xperia_p