am b48d3ce0: (-s ours) am 54064f66: (-s ours) Import translations. DO NOT MERGE

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