GPS receiver used for making traces: GlobalSat DG-100 set to a few meters details level.

I use gpsbabel under Linux to get data from my DG-100.

I made a script to help me clean and comment my tracks before uploading them.
My files are often "doctored" (no time, no speed, only positions and elevations) to enforce my privacy.
Viking is a nice tool to help doing the cleaning.

As a navigation tool, I use Navit.

Most of my OSM edits are made with Potlatch, but I'm beginning to use JOSM as it is can help solving big problems/errors, thanks to the validator plug-in. I am also discovering the Cadastre JOSM plug-in, which is very useful for France areas.