am 2611fc23: (-s ours) am 4b281a71: (-s ours) am cc4c1a82: Import revised translations.  DO NOT MERGE

* commit '2611fc23f829eb863d1c8e90edc0e6c7f6c97446':
  Import revised translations.  DO NOT MERGE