am 36f80863: (-s ours) Import translations. DO NOT MERGE

* commit '36f80863325e759cad038c0d9940aa1dd36281d0':
  Import translations. DO NOT MERGE