am 993d2efb: Merge "Import revised translations" into froyo