am 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 22:34:52 +0000 (14:34 -0800)]
* commit '0fe3c81d681ce35ef7506aa9d60d390305cad8be':
  Import revised translations. DO NOT MERGE


Trivial merge