am 312df73a: (-s ours) Merge change I122ce5c5 into eclair

Merge commit '312df73a1fb84a221a1d1e7fe675f93dbd5230ba' into eclair-mr2

* commit '312df73a1fb84a221a1d1e7fe675f93dbd5230ba':
  Import revised translations.   DO NOT MERGE