am 515effa4: (-s ours) am 4a224759: am 0a8c90ec: (-s ours) am e697e22c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '515effa42a0bb873d1bfb5e3bb24e42c0880fac1'

* commit '515effa42a0bb873d1bfb5e3bb24e42c0880fac1':
  Import revised translations.  DO NOT MERGE