am ed6db520: (-s ours) am 6d471d04: (-s ours) am a4f54454: (-s ours) Import translations. DO NOT MERGE

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