am b1cdeef0: (-s ours) am 9dafca38: (-s ours) Import translations. DO NOT MERGE

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