am 6a4b7bc4: (-s ours) am cb85aa7d: (-s ours) Import translations. DO NOT MERGE

* commit '6a4b7bc4c1e1cd146384135f8aaca0a2d9281c3f':
  Import translations. DO NOT MERGE