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

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