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

Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'

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