am 0677b4e6: (-s ours) am 307f0c17: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit '0677b4e647c70c5a9540a76d3b463d41d9d251f6'

* commit '0677b4e647c70c5a9540a76d3b463d41d9d251f6':
  Trim unwanted whitespace from translations.  DO NOT MERGE