Fixed an issue with building incorrect PO/POT files. Also fixed an issue with some entities that are espaced by publican.