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