am 4dd5a5d9: (-s ours) am a6ce58d5: am 70021c39: Import translations. DO NOT MERGE

* commit '4dd5a5d90c2819cec8b7028ea129cbbeff848c80':
  Import translations. DO NOT MERGE