Trump vows military build-up, hammers nationalist themes