am 9d6862fd: (-s ours) am 19276b6b: Import translations. DO NOT MERGE

* commit '9d6862fd9e333b90976df3df18523784f80fd99b':
  Import translations. DO NOT MERGE