am f34b1a3f: (-s ours) am a345868b: (-s ours) am 3c8d7fd9: (-s ours) Import translations. DO NOT MERGE

* commit 'f34b1a3f159c4e0d7990ddaf52c9997a500ced62':