am 2b641738: (-s ours) Import translations. DO NOT MERGE

* commit '2b64173828f860898f0f35a03f70e06c6dcc9060':
  Import translations. DO NOT MERGE