am e4d48b19: (-s ours) am 5cb25280: am 376bb3be: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'e4d48b198dd23fbc311eb48861408059cda948a8'

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