am 2f3c23e4: (-s ours) am 612161f6: (-s ours) am 3315c12c: (-s ours) Import translations. DO NOT MERGE

* commit '2f3c23e48b07ef534948df6999088b8c3d6a11aa':
  Import translations. DO NOT MERGE