am 0ddcb31c: (-s ours) am 030b2d76: Import translations. DO NOT MERGE

* commit '0ddcb31cff0c7932472103bb9efd440c1c39af48':
  Import translations. DO NOT MERGE