am a0baea68: (-s ours) am 7a3da8d2: Trim unwanted whitespace from translations.  DO NOT MERGE

Merge commit 'a0baea68afac09c091e78d63709c0fe0dda177fb'

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