am 33558fc1: (-s ours) Import translations. DO NOT MERGE

* commit '33558fc1335417c504337c64ef3119c119e8f5c6':
  Import translations. DO NOT MERGE