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


Trivial merge