am 4f439baf: am 490be2c2: (-s ours) am 999477f9: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '4f439baf097ac40d2face176e1660d4d1b367ed5' into eclair-mr2-plus-aosp

* commit '4f439baf097ac40d2face176e1660d4d1b367ed5':