am 18c56f28: (-s ours) am 892a1307: (-s ours) Import translations. DO NOT MERGE

* commit '18c56f281b94b660e6d90c2e3f3888b609865f0d':
  Import translations. DO NOT MERGE