am a318a7fc: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:32:39 +0000 (13:32 -0800)]
* commit 'a318a7fc77521dae0ea4afdc087dd30973e89f50':
  Import revised translations.  DO NOT MERGE


Trivial merge