am 20ff2d03: (-s ours) am 9cb4e104: Import translations. DO NOT MERGE

* commit '20ff2d03f94b944996e1b5c5ce07c163d81aee47':
  Import translations. DO NOT MERGE