am 2cb6b7fb: (-s ours) Merge change Ic4bf942c into eclair

Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-mr2

* commit '2cb6b7fb868899a3c718280605b0e462d0f8491f':
  Import revised translations.  DO NOT MERGE