Fixing pot-file generation. Trying to reactivate old makefile behaviour.
Sort msgmerge by file, just like xgettext.
Updated po files. TODO: Fix Project-Id-Version.
Refreshed the *.po files. Especially en.po and de.po.
Merge pull request #1086 from cherokee/fix-1076

Fix 1076