am bce66392: (-s ours) am f3e11426: am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair

Merge commit 'bce66392fe728780bc203657f21e65ad53c097bb'

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