am 04d181dd: (-s ours) am b879135b: (-s ours) am 9d8285fa: Import revised translations.  DO NOT MERGE

* commit '04d181ddd0a29acfffc19094711afce5fac3a18d':
  Import revised translations.  DO NOT MERGE