am d13f5f4f: (-s ours) am 67496e59: Merge "Import revised translations.  DO NOT MERGE" into gingerbread