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