am 67496e59: Merge "Import revised translations.  DO NOT MERGE" into gingerbread