Added {lang} substitution to parseMessageForRowHolder.  As per note
added in last commit, we may be able to do away with this method all
together, and use the main helper func.  But it would need some careful
testing.
Fixing oops in last commit for view/edit labels