am adbfa3ee: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:40:50 +0000 (11:40 -0700)]
* commit 'adbfa3eea3eb9ee0689282a3fe21d4421b2162dc':
  Import revised translations.  DO NOT MERGE


Trivial merge