am 4e012037: (-s ours) Import revised translations

Merge commit '4e01203746710646227470390d4a9f7fb52c6238' into gingerbread

* commit '4e01203746710646227470390d4a9f7fb52c6238':
  Import revised translations