am 28d13bff: (-s ours) am bbea2cec: (-s ours) Import translations. DO NOT MERGE

* commit '28d13bff5306fa45e41d7ea675aafe9e8a1113f4':
  Import translations. DO NOT MERGE