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

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