fix gettext( -> _(
Fixes for android build
use get_nprocs_conf
Merge remote-tracking branch 'upstream/master' into next