am fe110beb: Import translations. DO NOT MERGE
Eric Fischer [Mon, 5 Mar 2012 21:39:40 +0000 (13:39 -0800)]
* commit 'fe110beb2cd7f8f2a166f71bb54ca9c174f6d6e5':
  Import translations. DO NOT MERGE


Trivial merge