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

* commit '5bf5569996d152a28c227cc3e620b16cbcf350c9':
  Import revised translations. DO NOT MERGE