am 6097c0cb: (-s ours) am 0f308b47: (-s ours) Import translations. DO NOT MERGE

* commit '6097c0cb456cd8acc9f3945d5686a5faad9a57b6':
  Import translations. DO NOT MERGE