am 54791a59: (-s ours) am 505845fa: (-s ours) am 84f3e50c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '54791a59e2dc18ffe9a68ab525f547c2e6aeb8ff'

* commit '54791a59e2dc18ffe9a68ab525f547c2e6aeb8ff':
  Import revised translations.  DO NOT MERGE