Merge commit '6fe9b86e' into eclair-mr2 * commit '6fe9b86e': Import revised translations. DO NOT MERGE