am 22bf0a87: (-s ours) am 5a68dd6e: am c7329814: (-s ours) Import revised translation...
Eric Fischer [Tue, 29 Mar 2011 23:59:44 +0000 (16:59 -0700)]
* commit '22bf0a872be69b6c036edef5437b206faafa997d':
  Import revised translations.  DO NOT MERGE


Trivial merge