am c15629dd: (-s ours) am b2d17e76: (-s ours) Import translations. DO NOT MERGE

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