am 6bc0865d: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Oct 2010 18:02:04 +0000 (11:02 -0700)]

Trivial merge