Make instance DISPLAY_CHOICES translatable

Also fix a typo.

Change-Id: Ic69e19daba1cca31637b02799e51a023300062f4
Closes-bug: #1242541
Merge "Make instance DISPLAY_CHOICES translatable"