am acdf36bf: (-s ours) am 4ef31143: (-s ours) am 8c6c90ca: (-s ours) am 342a66c8: (-s ours) Import translations. DO NOT MERGE

* commit 'acdf36bfd73b0d13f6c22e7d3d8eeb13c19b2ce8':
  Import translations. DO NOT MERGE