am 0cc9de30: (-s ours) am a0632c38: Merge "Import revised translations.  DO NOT MERGE.  Bug 3394542" into honeycomb

* commit '0cc9de30a3f487800e8d6bea5343fceae517f443':
  Import revised translations.  DO NOT MERGE.  Bug 3394542