am 6d5c42ef: (-s ours) Merge change Id0704505 into eclair

Merge commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-mr2

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