Update to r54660:

Correctly tag root username.

While here, add some missing bits that weren't translated
yet.