am e1a84b31: (-s ours) am d50b3d13: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit 'e1a84b31d5945c4690b25d3c86ee82bfa9278bb8'

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