am 6b1118fc: am 2875a3cc: (-s ours) Merge change I0ae41e06 into eclair

Merge commit '6b1118fc8cfba19e3d4cb57c849212c21cde26d5' into eclair-mr2-plus-aosp

* commit '6b1118fc8cfba19e3d4cb57c849212c21cde26d5':
  Import revised translations.  DO NOT MERGE