am 3c040f0c: (-s ours) am b567306a: (-s ours) Import revised translations.  DO NOT MERGE

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