Final fixes, json fixing and .pot generation.
Merge pull request #4228 from GlyphGryph/pot_generation

Final fixes, json fixing and .pot generation.