am 3a0a60b6: (-s ours) am 5a849071: (-s ours) Import translations. DO NOT MERGE

* commit '3a0a60b6b73380aa083a28f1be0f4552ce9749cf':
  Import translations. DO NOT MERGE