am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE

* commit '258bd63f38d90ac96aac5eb4e3a5c696e8b089f8':
  Import translations. DO NOT MERGE