am 05437aad: (-s ours) am 122106cb: Merge "Import revised translations.  DO NOT MERGE.  Bug 3394542" into honeycomb

* commit '05437aad8e250f508e73d4ddcce9ef99393d9414':
  Import revised translations.  DO NOT MERGE.  Bug 3394542