am f8699b80: (-s ours) am cafabd80: (-s ours) Import revised translations.  DO NOT MERGE

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