am 0de11871: (-s ours) am b2ffcd64: (-s ours) Import translations. DO NOT MERGE

* commit '0de11871c5569921296a72a56a33bddab1167ed0':
  Import translations. DO NOT MERGE