am 31b95e61: am 6d0860d6: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '31b95e612f51afa9d0a2a80fe1b5b26f06339c46' into eclair-mr2-plus-aosp

* commit '31b95e612f51afa9d0a2a80fe1b5b26f06339c46':
  Import revised translations.  DO NOT MERGE