Remove "Do not translate" and restore translations

Some "Do not translate" comments were inadvertently left when removing
unused strings which made the translation tools skip the next string
entry. This removes those comments and restores the translations for the
missing strings.

Bug: 2579112
Change-Id: I731217d4cf6581885c122fefd180133c243fa1f7
21 files changed