Fix some translator names

Change-Id: I29272faaa9d8f62da986423477ba8c6d8bd06e5a
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0