am 8a0dc9cc: (-s ours) am 4fadf9d6: Import translations. DO NOT MERGE

* commit '8a0dc9cca3107308aef1d75b6d122f874b024725':
  Import translations. DO NOT MERGE