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