am 59b2307e: am ea631334: (-s ours) am 92a90a31: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '59b2307edb692344d8a05002172858d15638e8c3' into eclair-mr2-plus-aosp

* commit '59b2307edb692344d8a05002172858d15638e8c3':