Merge pull request #271 from ThePyrotechnic/Dev

Translations
change to holstering + syncing, small type-o