am 9cb3c000: (-s ours) am 547b9ba1: (-s ours) Import translations. DO NOT MERGE

* commit '9cb3c0004da91da527657c829c957bf536f45d29':
  Import translations. DO NOT MERGE