Small PL translation fixes.
Next bunch of PL translation fixes...
Some PL translation fixes and improvements
Fixed conflicts