Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread