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

Merge commit 'abce77cac9b510a2937fffcd3dc7d855fb171d16'

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