am fb95298f: (-s ours) am e30059fd: am fbb9146f: (-s ours) Merge change I452e3a4c into eclair

Merge commit 'fb95298f47388589752d0daa6bded568b7898864'

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