am 82b027e9: am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyo