am f54d7a2c: am a3cf93a2: (-s ours) Merge change I3ff67703 into eclair

Merge commit 'f54d7a2c924b2d1060a89ac398f57a58e3e581d1' into eclair-mr2-plus-aosp

* commit 'f54d7a2c924b2d1060a89ac398f57a58e3e581d1':
  Import revised translations.  DO NOT MERGE