am 3efb3153: (-s ours) am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread

* commit '3efb3153137d310851346807fcc04e71144c5413':
  Import revised translations. DO NOT MERGE