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

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