am 0b655575: (-s ours) am 901f4fbe: Merge "Import revised translations.  DO NOT MERGE" into gingerbread