am 161f0024: (-s ours) am e336ebc9: (-s ours) Import translations. DO NOT MERGE

* commit '161f00243498e171bbbf12c37aadfb18ce1c612f':
  Import translations. DO NOT MERGE