am b847f5c6: (-s ours) Merge change I3a308bca into eclair

Merge commit 'b847f5c644cfa4923b13a8a25252ccfe91c378c5' into eclair-mr2

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