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

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