am 963bc99b: am a174247a: (-s ours) Import revised translations.  DO NOT MERGE

* commit '963bc99b2f22912cdf85256e808e1ec595627fa6':
  Import revised translations.  DO NOT MERGE