diff --git a/web_advanced_filter/i18n/de.po b/web_advanced_filter/i18n/de.po
index 0d753437d..e546b94a4 100644
--- a/web_advanced_filter/i18n/de.po
+++ b/web_advanced_filter/i18n/de.po
@@ -11,193 +11,278 @@ msgstr ""
 "PO-Revision-Date: 2015-01-04 14:05+0100\n"
 "Last-Translator: Rudolf Schnapka <schnapkar@golive-saar.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
-"Language: de\n"
 "X-Generator: Lokalize 1.5\n"
 
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Save filter"
-msgstr "Filter sichern"
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__action
+msgid "Action"
+msgstr "Aktion"
 
-#. module: web_advanced_filters
-#: selection:ir.filters.combine.with.existing,action:0
-msgid "Union"
-msgstr "Verbund"
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__union_filter_ids
+msgid "Add result of filters"
+msgstr "Ergebnis von Filtern hinzufügen"
 
-#. module: web_advanced_filters
-#: view:ir.filters:0
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
 msgid "Add the result of following filters"
 msgstr "Die Ergebnisse der folgenden Filter hinzufügen"
 
-#. module: web_advanced_filters
-#: view:ir.filters:0
-#: view:ir.filters.combine.with.existing:0
-msgid "Save"
-msgstr "Speichern"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Freeze filter"
-msgstr "Filter einfrieren"
-
-#. module: web_advanced_filters
+#. module: web_advanced_filter
 #. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:94
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:114
-#, python-format
-msgid "Remove from existing selection"
-msgstr "Aus aktueller Auswahl entfernen"
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:64
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:87
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:8
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:14
+#, fuzzy, python-format
+msgid "Add to existing filter"
+msgstr "Mit bestehendem Filter kombinieren"
 
-#. module: web_advanced_filters
-#: code:addons/web_advanced_filters/model/ir_filters.py:131
-#, python-format
-msgid "Testing %s"
-msgstr "Teste %s"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-#: view:ir.filters.combine.with.existing:0
-msgid "or"
-msgstr "oder"
-
-#. module: web_advanced_filters
-#: field:ir.filters,complement_filter_ids:0
-msgid "Remove result of filters"
-msgstr "Ergebnis der Filter entfernen"
-
-#. module: web_advanced_filters
+#. module: web_advanced_filter
 #. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:86
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:106
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:45
 #, python-format
-msgid "To existing selection"
-msgstr "Zu bestehender Auswahl"
+msgid "Advanced filters"
+msgstr "Fortgeschrittene Filter"
 
-#. module: web_advanced_filters
-#: view:ir.filters.combine.with.existing:0
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Are you sure? You can't undo this operation!"
+msgstr ""
+"Sind Sie sicher? Sie können diesen Vorgang nicht mehr rückgängig machen!"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: web_advanced_filter
+#: model:ir.model,name:web_advanced_filter.model_ir_filters_combine_with_existing
+msgid "Combine a selection with an existing filter"
+msgstr "Eine Auswahl mit bestehendem Filter kombinieren"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
 msgid "Combine with existing filter"
 msgstr "Mit bestehendem Filter kombinieren"
 
-#. module: web_advanced_filters
-#: view:ir.filters:0
+#. module: web_advanced_filter
+#: selection:ir.filters.combine.with.existing,action:0
+msgid "Complement"
+msgstr "Ergänzung"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__context
+msgid "Context"
+msgstr "Kontext"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__domain
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__domain
+msgid "Domain"
+msgstr "Domäne"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__domain_this
+msgid "Domain without helpers"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__evaluate_before_join
+msgid "Evaluate this filter before joining"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__evaluate_before_negate
+msgid "Evaluate this filter before negating"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__filter_id
+msgid "Filter"
+msgstr "Filter"
+
+#. module: web_advanced_filter
+#: model:ir.model,name:web_advanced_filter.model_ir_filters
+msgid "Filters"
+msgstr "Filter"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Freeze filter"
+msgstr "Filter einfrieren"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__is_frozen
+msgid "Frozen"
+msgstr "Eingefroren"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+#, fuzzy
 msgid ""
-"Have this filter contain extly the records it currently contains, with no "
+"Have this filter contain exactly the records it currently contains, with no "
 "changes in the future. Be careful, you can't undo this operation!"
 msgstr ""
 "Diesem Filter genau die aktuellen Datensätze, künftig unveränderlich, "
 "zuordnen. Vorsicht, dieser Vorgang kann nicht rückgängig gemacht werden!"
 
-#. module: web_advanced_filters
-#. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:32
-#, python-format
-msgid "Advanced filters"
-msgstr "Fortgeschrittene Filter"
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__id
+msgid "ID"
+msgstr ""
 
-#. module: web_advanced_filters
-#: field:ir.filters,active:0
-msgid "Active"
-msgstr "Aktiv"
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing____last_update
+msgid "Last Modified on"
+msgstr ""
 
-#. module: web_advanced_filters
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: web_advanced_filter
 #. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:74
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:78
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:11
 #, python-format
 msgid "Marked records"
 msgstr "Markierte Datensätze"
 
-#. module: web_advanced_filters
-#: field:ir.filters,is_frozen:0
-msgid "Frozen"
-msgstr "Eingefroren"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,filter_id:0
-msgid "Filter"
-msgstr "Filter"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Test filter"
-msgstr "Filtertest"
-
-#. module: web_advanced_filters
-#. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:78
-#, python-format
-msgid "To new selection"
-msgstr "Zu neuer Auswahl"
-
-#. module: web_advanced_filters
-#: field:ir.filters,domain_this:0
-msgid "This filter's own domain"
-msgstr "Dieses Filters eigene Domäne (Abgrenzung)"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Remove the result of following filters"
-msgstr "Das Ergebnis des folgenden Filters entfernen"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,context:0
-msgid "Context"
-msgstr "Kontext"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,action:0
-msgid "Action"
-msgstr "Aktion"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,model:0
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__model
 msgid "Model"
 msgstr "Modell"
 
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,domain:0
-msgid "Domain"
-msgstr "Domäne"
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__complement_filter_ids
+msgid "Remove result of filters"
+msgstr "Ergebnis der Filter entfernen"
 
-#. module: web_advanced_filters
-#: field:ir.filters,union_filter_ids:0
-msgid "Add result of filters"
-msgstr "Ergebnis von Filtern hinzufügen"
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Remove the result of following filters"
+msgstr "Das Ergebnis des folgenden Filters entfernen"
 
-#. module: web_advanced_filters
-#: model:ir.model,name:web_advanced_filters.model_ir_filters_combine_with_existing
-msgid "Combine a selection with an existing filter"
-msgstr "Eine Auswahl mit bestehendem Filter kombinieren"
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "Save"
+msgstr "Speichern"
 
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Are you sure? You can't undo this operation!"
-msgstr "Sind Sie sicher? Sie können diesen Vorgang nicht mehr rückgängig machen!"
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "Save filter"
+msgstr "Filter sichern"
 
-#. module: web_advanced_filters
-#: model:ir.model,name:web_advanced_filters.model_ir_filters
-msgid "Filters"
-msgstr "Filter"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-#: view:ir.filters.combine.with.existing:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: web_advanced_filters
+#. module: web_advanced_filter
 #. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:102
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:55
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:5
 #, python-format
-msgid "Whole selection"
-msgstr "Gesamte Auswahl"
+msgid "Search query"
+msgstr ""
 
-#. module: web_advanced_filters
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__save_as_public
+msgid "Share with all users"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:71
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:94
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:9
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:15
+#, fuzzy, python-format
+msgid "Subtract from existing filter"
+msgstr "Mit bestehendem Filter kombinieren"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Test filter"
+msgstr "Filtertest"
+
+#. module: web_advanced_filter
+#: code:addons/web_advanced_filter/models/ir_filters.py:293
+#, python-format
+msgid "Testing %s"
+msgstr "Teste %s"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,help:web_advanced_filter.field_ir_filters__evaluate_before_negate
+msgid ""
+"This is necessary if this filter contains positive operatorson x2many fields"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,help:web_advanced_filter.field_ir_filters__evaluate_before_join
+msgid ""
+"This is necessary if this filter contains x2many fields with_auto_join "
+"activated"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:59
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:82
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:7
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:13
+#, fuzzy, python-format
+msgid "To new filter"
+msgstr "Filtertest"
+
+#. module: web_advanced_filter
 #: selection:ir.filters.combine.with.existing,action:0
-msgid "Complement"
-msgstr "Ergänzung"
+msgid "Union"
+msgstr "Verbund"
 
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "or"
+msgstr "oder"
 
+#~ msgid "Remove from existing selection"
+#~ msgstr "Aus aktueller Auswahl entfernen"
+
+#~ msgid "To existing selection"
+#~ msgstr "Zu bestehender Auswahl"
+
+#~ msgid "Active"
+#~ msgstr "Aktiv"
+
+#~ msgid "To new selection"
+#~ msgstr "Zu neuer Auswahl"
+
+#~ msgid "This filter's own domain"
+#~ msgstr "Dieses Filters eigene Domäne (Abgrenzung)"
+
+#~ msgid "Whole selection"
+#~ msgstr "Gesamte Auswahl"
diff --git a/web_advanced_filter/i18n/nl.po b/web_advanced_filter/i18n/nl.po
index 9445741da..a11e5fef7 100644
--- a/web_advanced_filter/i18n/nl.po
+++ b/web_advanced_filter/i18n/nl.po
@@ -9,191 +9,266 @@ msgstr ""
 "PO-Revision-Date: 2014-07-29 09:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Save filter"
-msgstr "Opslaan filter"
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__action
+msgid "Action"
+msgstr "Actie"
 
-#. module: web_advanced_filters
-#: selection:ir.filters.combine.with.existing,action:0
-msgid "Union"
-msgstr "Union"
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__union_filter_ids
+msgid "Add result of filters"
+msgstr "Voeg resultaat toe aan filters"
 
-#. module: web_advanced_filters
-#: view:ir.filters:0
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
 msgid "Add the result of following filters"
 msgstr "Voeg resultaat van onderstaande filteringen toe aan filter"
 
-#. module: web_advanced_filters
-#: view:ir.filters:0
-#: view:ir.filters.combine.with.existing:0
-msgid "Save"
-msgstr "Opslaan"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Freeze filter"
-msgstr "Bevries filter"
-
-#. module: web_advanced_filters
+#. module: web_advanced_filter
 #. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:94
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:114
-#, python-format
-msgid "Remove from existing filter"
-msgstr "Verwijder uit bestaand filter"
-
-#. module: web_advanced_filters
-#: code:addons/web_advanced_filters/model/ir_filters.py:131
-#, python-format
-msgid "Testing %s"
-msgstr "Testen %s"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-#: view:ir.filters.combine.with.existing:0
-msgid "or"
-msgstr "or"
-
-#. module: web_advanced_filters
-#: field:ir.filters,save_as_public:0
-msgid "Share with all users"
-msgstr "Deel met alle gebruikers"
-
-#. module: web_advanced_filters
-#: field:ir.filters,complement_filter_ids:0
-msgid "Remove result of filters"
-msgstr "Verwijder resultaat van filters"
-
-#. module: web_advanced_filters
-#. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:86
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:106
-#, python-format
-msgid "To existing filter"
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:64
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:87
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:8
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:14
+#, fuzzy, python-format
+msgid "Add to existing filter"
 msgstr "Voeg toe aan bestaand  filter"
 
-#. module: web_advanced_filters
-#: view:ir.filters.combine.with.existing:0
-msgid "Combine with existing filter"
-msgstr "Combineer met bestaande filter"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Have this filter contain exactly the records it currently contains, with no changes in the future. Be careful, you can't undo this operation!"
-msgstr "Laat deze filter precies deze records bevatten, zonder veranderingen in de toekomst. Wees voorzichtig, je kan dit niet meer veranderen!"
-
-#. module: web_advanced_filters
+#. module: web_advanced_filter
 #. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:32
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:45
 #, python-format
 msgid "Advanced filters"
 msgstr "Geavanceerde filters"
 
-#. module: web_advanced_filters
-#: field:ir.filters,active:0
-msgid "Active"
-msgstr "Actief"
-
-#. module: web_advanced_filters
-#. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:74
-#, python-format
-msgid "Marked records"
-msgstr "Aangevinkte records (verzameling)"
-
-#. module: web_advanced_filters
-#: field:ir.filters,is_frozen:0
-msgid "Frozen"
-msgstr "Bevroren"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,filter_id:0
-msgid "Filter"
-msgstr "Filter"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Test filter"
-msgstr "Test filter"
-
-#. module: web_advanced_filters
-#. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:78
-#, python-format
-msgid "To new filter"
-msgstr "Opslaan als nieuw filter"
-
-#. module: web_advanced_filters
-#: field:ir.filters,domain_this:0
-msgid "This filter's own domain"
-msgstr "Deze filters eigen domein"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-msgid "Remove the result of following filters"
-msgstr "Verwijder resultaat van onderstaande filteringen uit filter"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,context:0
-msgid "Context"
-msgstr "Context"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,action:0
-msgid "Action"
-msgstr "Actie"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,model:0
-msgid "Model"
-msgstr "Model"
-
-#. module: web_advanced_filters
-#. openerp-web
-#: code:addons/web_advanced_filters/static/src/js/web_advanced_filters.js:102
-#, python-format
-msgid "Whole selection (criteria)"
-msgstr "Alle records (als criteria)"
-
-#. module: web_advanced_filters
-#: field:ir.filters.combine.with.existing,domain:0
-msgid "Domain"
-msgstr "Domein"
-
-#. module: web_advanced_filters
-#: field:ir.filters,union_filter_ids:0
-msgid "Add result of filters"
-msgstr "Voeg resultaat toe aan filters"
-
-#. module: web_advanced_filters
-#: model:ir.model,name:web_advanced_filters.model_ir_filters_combine_with_existing
-msgid "Combine a selection with an existing filter"
-msgstr "Combineer een selectie met een bestaande filter"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
 msgid "Are you sure? You can't undo this operation!"
 msgstr "Weet u het zeker? U kan deze operatie niet meer ongedaan maken"
 
-#. module: web_advanced_filters
-#: model:ir.model,name:web_advanced_filters.model_ir_filters
-msgid "Filters"
-msgstr "Filters"
-
-#. module: web_advanced_filters
-#: view:ir.filters:0
-#: view:ir.filters.combine.with.existing:0
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: web_advanced_filters
+#. module: web_advanced_filter
+#: model:ir.model,name:web_advanced_filter.model_ir_filters_combine_with_existing
+msgid "Combine a selection with an existing filter"
+msgstr "Combineer een selectie met een bestaande filter"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
+msgid "Combine with existing filter"
+msgstr "Combineer met bestaande filter"
+
+#. module: web_advanced_filter
 #: selection:ir.filters.combine.with.existing,action:0
 msgid "Complement"
 msgstr "Aanvullen"
 
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__context
+msgid "Context"
+msgstr "Context"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__domain
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__domain
+msgid "Domain"
+msgstr "Domein"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__domain_this
+msgid "Domain without helpers"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__evaluate_before_join
+msgid "Evaluate this filter before joining"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__evaluate_before_negate
+msgid "Evaluate this filter before negating"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__filter_id
+msgid "Filter"
+msgstr "Filter"
+
+#. module: web_advanced_filter
+#: model:ir.model,name:web_advanced_filter.model_ir_filters
+msgid "Filters"
+msgstr "Filters"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Freeze filter"
+msgstr "Bevries filter"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__is_frozen
+msgid "Frozen"
+msgstr "Bevroren"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid ""
+"Have this filter contain exactly the records it currently contains, with no "
+"changes in the future. Be careful, you can't undo this operation!"
+msgstr ""
+"Laat deze filter precies deze records bevatten, zonder veranderingen in de "
+"toekomst. Wees voorzichtig, je kan dit niet meer veranderen!"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__id
+msgid "ID"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:78
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:11
+#, python-format
+msgid "Marked records"
+msgstr "Aangevinkte records (verzameling)"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__model
+msgid "Model"
+msgstr "Model"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__complement_filter_ids
+msgid "Remove result of filters"
+msgstr "Verwijder resultaat van filters"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Remove the result of following filters"
+msgstr "Verwijder resultaat van onderstaande filteringen uit filter"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "Save"
+msgstr "Opslaan"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "Save filter"
+msgstr "Opslaan filter"
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:55
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:5
+#, python-format
+msgid "Search query"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__save_as_public
+msgid "Share with all users"
+msgstr "Deel met alle gebruikers"
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:71
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:94
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:9
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:15
+#, fuzzy, python-format
+msgid "Subtract from existing filter"
+msgstr "Verwijder uit bestaand filter"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Test filter"
+msgstr "Test filter"
+
+#. module: web_advanced_filter
+#: code:addons/web_advanced_filter/models/ir_filters.py:293
+#, python-format
+msgid "Testing %s"
+msgstr "Testen %s"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,help:web_advanced_filter.field_ir_filters__evaluate_before_negate
+msgid ""
+"This is necessary if this filter contains positive operatorson x2many fields"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,help:web_advanced_filter.field_ir_filters__evaluate_before_join
+msgid ""
+"This is necessary if this filter contains x2many fields with_auto_join "
+"activated"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:59
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:82
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:7
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:13
+#, python-format
+msgid "To new filter"
+msgstr "Opslaan als nieuw filter"
+
+#. module: web_advanced_filter
+#: selection:ir.filters.combine.with.existing,action:0
+msgid "Union"
+msgstr "Union"
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "or"
+msgstr "or"
+
+#~ msgid "Active"
+#~ msgstr "Actief"
+
+#~ msgid "This filter's own domain"
+#~ msgstr "Deze filters eigen domein"
+
+#~ msgid "Whole selection (criteria)"
+#~ msgstr "Alle records (als criteria)"
diff --git a/web_advanced_filter/i18n/web_advanced_filter.pot b/web_advanced_filter/i18n/web_advanced_filter.pot
new file mode 100644
index 000000000..d3c36e983
--- /dev/null
+++ b/web_advanced_filter/i18n/web_advanced_filter.pot
@@ -0,0 +1,257 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* web_advanced_filter
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__action
+msgid "Action"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__union_filter_ids
+msgid "Add result of filters"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Add the result of following filters"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:64
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:87
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:8
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:14
+#, python-format
+msgid "Add to existing filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:45
+#, python-format
+msgid "Advanced filters"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Are you sure? You can't undo this operation!"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "Cancel"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model,name:web_advanced_filter.model_ir_filters_combine_with_existing
+msgid "Combine a selection with an existing filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
+msgid "Combine with existing filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#: selection:ir.filters.combine.with.existing,action:0
+msgid "Complement"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__context
+msgid "Context"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__domain
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__domain
+msgid "Domain"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__domain_this
+msgid "Domain without helpers"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__evaluate_before_join
+msgid "Evaluate this filter before joining"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__evaluate_before_negate
+msgid "Evaluate this filter before negating"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__filter_id
+msgid "Filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model,name:web_advanced_filter.model_ir_filters
+msgid "Filters"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Freeze filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__is_frozen
+msgid "Frozen"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Have this filter contain exactly the records it currently contains, with no changes in the future. Be careful, you can't undo this operation!"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__id
+msgid "ID"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:78
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:11
+#, python-format
+msgid "Marked records"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters_combine_with_existing__model
+msgid "Model"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__complement_filter_ids
+msgid "Remove result of filters"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Remove the result of following filters"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_combine_with_existing
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "Save"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "Save filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:55
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:5
+#, python-format
+msgid "Search query"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,field_description:web_advanced_filter.field_ir_filters__save_as_public
+msgid "Share with all users"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:71
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:94
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:9
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:15
+#, python-format
+msgid "Subtract from existing filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.ir_filters_view_form
+msgid "Test filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#: code:addons/web_advanced_filter/models/ir_filters.py:293
+#, python-format
+msgid "Testing %s"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,help:web_advanced_filter.field_ir_filters__evaluate_before_negate
+msgid "This is necessary if this filter contains positive operatorson x2many fields"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model:ir.model.fields,help:web_advanced_filter.field_ir_filters__evaluate_before_join
+msgid "This is necessary if this filter contains x2many fields with_auto_join activated"
+msgstr ""
+
+#. module: web_advanced_filter
+#. openerp-web
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:59
+#: code:addons/web_advanced_filter/static/src/js/web_advanced_filter.js:82
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:7
+#: code:addons/web_advanced_filter/static/src/xml/web_advanced_filter.xml:13
+#, python-format
+msgid "To new filter"
+msgstr ""
+
+#. module: web_advanced_filter
+#: selection:ir.filters.combine.with.existing,action:0
+msgid "Union"
+msgstr ""
+
+#. module: web_advanced_filter
+#: model_terms:ir.ui.view,arch_db:web_advanced_filter.form_ir_filters_save_new
+msgid "or"
+msgstr ""
+