am 5204b662: am 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '5204b662a0c155f695cf4e7b6341872a803a7e80' into eclair-mr2-plus-aosp

* commit '5204b662a0c155f695cf4e7b6341872a803a7e80':