It's 2 total terms. There's no "resetting the clock" in that rule. Any attempt to remain in power for a third term would be blatantly unconstitutional.
That said, there's a real concern that he's likely to try anyway, and a non-zero chance that he'd succeed if he manages to fill enough of the government and military with people more loyal to him than to the constitution.
I'm gonna greatly increase my while squad's death by stepping on mines rate!