typo
added a bunch of translation stuff.  still more to do
fixed a merge conflict in language.feature