am 10c260bb: (-s ours) am 04417280: (-s ours) Import translations. DO NOT MERGE

* commit '10c260bbf6f9f2ba9248e203eef382003b0bb505':
  Import translations. DO NOT MERGE