am 7c40d5ee: (-s ours) am afd569b4: Import revised translations.  DO NOT MERGE

Merge commit '7c40d5ee855c4468d74b7ce030415763a9649ff7'

* commit '7c40d5ee855c4468d74b7ce030415763a9649ff7':
  Import revised translations.  DO NOT MERGE