am d1c5ae48: (-s ours) am b4ee938f: (-s ours) Import translations. DO NOT MERGE

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