NXP-14645: fix incorrect labels
NXP-14613: make sure quotes are doubled in messages with parameters, and not doubled in messages without parameters