- locals: resort

Conflicts:
	src/system/locals_intern.h