am 5d84df0c: am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo