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

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