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

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