Polis, civitas, Stadtstaat and city-state