Add more message pluralization

Even though we can't do much about the case with multiple plurals in
one sentence, we can fix the other cases.