Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Mon, 7 Mar 2011 21:07:08 +0000 (13:07 -0800)]

Trivial merge