am 1c4a0204: (-s ours) am 6b73f40a: (-s ours) Import translations. DO NOT MERGE

* commit '1c4a020485c40e778182d8dd26b3221afa6a9d8c':
  Import translations. DO NOT MERGE