am e021954e: (-s ours) am 76126492: am d5351de1: Import revised translations. DO...
Eric Fischer [Thu, 16 Jun 2011 16:31:38 +0000 (09:31 -0700)]
* commit 'e021954e3d72dff35ecc091b618600b0047ec648':
  Import revised translations.  DO NOT MERGE


Trivial merge