added more localizations
fixed some merge conflicts
a couple more translations