am 3e1dae5f: (-s ours) am dd36f149: (-s ours) Import translations. DO NOT MERGE

* commit '3e1dae5fa4ee3d0719f8fbdd1c0d7bf6004b7814':
  Import translations. DO NOT MERGE