Fix language item in en.xml
Merge branch '2.0'