am ea110274: (-s ours) am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms

Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-mr2

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