am 2cf42dfb: (-s ours) am c5d5334e: Import revised translations.  DO NOT MERGE

* commit '2cf42dfb2aa8b91495f4e3c61a5a5da08af9cadd':
  Import revised translations.  DO NOT MERGE