Added fixes for Pheromone, Portal generators, Tazers, and all repair kits
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into 0_charge
Fixes more prices.
String extraction fixes
Translation template update
Merge pull request #7692 from Rivet-the-Zombie/more-prices

Fixes more prices.
Merge branch '0_charge' of https://github.com/Lucasargh/Cataclysm-DDA into fixes
Merge branch 'update-pot-file' of https://github.com/VlasovVitaly/Cataclysm-DDA into fixes