Amusing little factoid:
The German translation of "freedom fighter" is Freiheitskämpfer, and unlike the English version Freiheitskämpfer is almost exclusively used on people who do/did not fight violently.
It's more often used to describe the civil rights movement people than to describe guerrillas.