am 6565cd3b: (-s ours) am 30355654: (-s ours) Import translations. DO NOT MERGE

* commit '6565cd3b9c899902c106e3cb1de57093ad9f9fc2':
  Import translations. DO NOT MERGE