am 7a6a867f: (-s ours) am c711e06c: am 926492d9: (-s ours) Merge change Ie8493cf1 into eclair

Merge commit '7a6a867f9eaacd9206ab0476f0444b417f556674'

* commit '7a6a867f9eaacd9206ab0476f0444b417f556674':
  Import revised translations.  DO NOT MERGE