am 16c38696: (-s ours) am 12afdb2b: (-s ours) Import revised translations.  DO NOT MERGE

* commit '16c38696a29662c190ab2f2c3c506a4e20f44a94':
  Import revised translations.  DO NOT MERGE