am 3db5c3fe: (-s ours) am 17793c1f: am 0e2a846d: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '3db5c3fec31c163443aca42e8c7ebc372b0cd2f5'

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