am 39f8dba1: (-s ours) am e1e257f4: Import revised translations.  DO NOT MERGE

* commit '39f8dba1146fd68160c862f81ccc219735d40fbf':
  Import revised translations.  DO NOT MERGE