am 6b830efd: (-s ours) am cfb07d91: (-s ours) Import revised translations.  DO NOT MERGE

* commit '6b830efdc4f33dd2c7058ba5ec74b6c647c50b9f':
  Import revised translations.  DO NOT MERGE