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


Trivial merge