am 13b21c66: (-s ours) am f2f268a5: Import revised translations.  DO NOT MERGE

Merge commit '13b21c660a6bba3681910d2bf37d603a7b534f95'

* commit '13b21c660a6bba3681910d2bf37d603a7b534f95':
  Import revised translations.  DO NOT MERGE