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

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