Merge commit 'd30198b3' into eclair-mr2-plus-aosp * commit 'd30198b3': Import revised translations. DO NOT MERGE