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

* commit 'bb6115874c6377c358019acf85d5f78a498e762b':
  Import translations. DO NOT MERGE