how to say in hindi "when will you come again?"

How to say 'When will you come again?'

English	Hindi
when	kab
will come to come	aaoge anaa
you	tum, aap
again	fir
When will you come again?	Aap (or, tum) fir kab aaoge?

How to say 'I will come next week.'

English	Hindi
I	mai
will come to come	aaungaa anaa
next	agalaa agalay
week	saptah
I will come next week.	Mai agalay saptah aaungaa.