am 59ff28af: (-s ours) am 60b7b5db: (-s ours) Import translations. DO NOT MERGE

* commit '59ff28afd923047474a072bbdbb5d0ab6d26ceb1':
  Import translations. DO NOT MERGE