Merge "Import revised translations" into froyo