Both.
It definitely means "man; warrior, army". It's the feminine form of Charles.
Anyway, I like Charlotte a lot, but it has lost some of its spark thanks to recent popularity. When my cousin was named Charlotte ten years ago, she was the only one I knew, but know I know countless Charlottes.