Corrected some missing translatable strings.
Avoid non-fatal assertion warning on Mac platforms.
Merge branch 'master' into refactoring

Conflicts:
	src/routeprop.cpp