am c2f6ce03: (-s ours) am 6a51d9b1: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Wed, 23 Feb 2011 05:36:09 +0000 (21:36 -0800)]
* commit 'c2f6ce032a2757dd09ed50d618fe79a9ffc42fd1':
  Import revised translations.  DO NOT MERGE


Trivial merge