am b0178921: (-s ours) am d2bca5c6: am 9c50b60c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'b0178921bd8b95f35ddec754b6022424b356cd7d'

* commit 'b0178921bd8b95f35ddec754b6022424b356cd7d':
  Import revised translations.  DO NOT MERGE