Merged language files
Moved to vanilla 1.6 localization system