#25 : Fix spanish locale
Merged entity-based filter/restriction #24. This fixes a regression due
to the fork from the original code.

Update localization strings for french, and english. German translation
needed.