i18n: Sort message keys (again)

Change-Id: I258466be47cda414f10150d49d592da61a323a5a
Merge "i18n: Sort message keys (again)"