am 8504423f: (-s ours) am c657fcce: am 20ccaf6c: Import revised translations.  DO NOT MERGE

* commit '8504423f00237e13e87499f74e41ecf73c3e8e1b':
  Import revised translations.  DO NOT MERGE