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

Merge commit '0f6dd4506fea5ebb04fb145ec5120ab6b6d36e4b'

* commit '0f6dd4506fea5ebb04fb145ec5120ab6b6d36e4b':
  Import revised translations.  DO NOT MERGE