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

Merge commit '9ecb342649cd8931e50034550d5ec29b48b2c129'

* commit '9ecb342649cd8931e50034550d5ec29b48b2c129':
  Import revised translations.  DO NOT MERGE