am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE

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