am 5a68dd6e: am c7329814: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:20:01 +0000 (14:20 -0700)]
* commit '5a68dd6e679cd2272ed1ec676ba29db6d4106cd5':
  Import revised translations.  DO NOT MERGE


Trivial merge