am 3e86f891: Import translations. DO NOT MERGE
Eric Fischer [Mon, 27 Feb 2012 21:51:53 +0000 (13:51 -0800)]
* commit '3e86f891c84f7b2b62e3b99e44fdb88499d02c1e':
  Import translations. DO NOT MERGE


Trivial merge