Folded string tables into Marvin

I marked every change and query I have with a //KG: comment. I reverted
the comments that have been translated back to English.