am 5555edfc: (-s ours) am 0a68553a: am bf67508d: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '5555edfca803eeeb912bdae3c9a0bc476237af01'

* commit '5555edfca803eeeb912bdae3c9a0bc476237af01':
  Import revised translations.  DO NOT MERGE