am edf3cbdd: (-s ours) am d57d9abd: (-s ours) am a47d23f9: Import revised translations.  DO NOT MERGE

* commit 'edf3cbdddd756e34fe0a4cf8321248aa684fd2f2':
  Import revised translations.  DO NOT MERGE