am 3f894261: (-s ours) am 188eb406: Import revised translations.  DO NOT MERGE

Merge commit '3f89426152a67d6178c9d3533b0bb43dd20f3006'

* commit '3f89426152a67d6178c9d3533b0bb43dd20f3006':
  Import revised translations.  DO NOT MERGE