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

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