From b5f1fd18f4a40a76cf3fd243cd055f1db78eabc3 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Tue, 18 Feb 2020 16:30:53 +0400
Subject: [PATCH 1/3] PHRAS-2779 #comment fix delete application on account
 #time 4h

---
 .../web/developers/application_form.html.twig | 22 +++++++++++--------
 .../web/developers/applications.html.twig     | 21 ++++++++++++++++++
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/templates/web/developers/application_form.html.twig b/templates/web/developers/application_form.html.twig
index 7d8e2eea76..c1ec6cb8bf 100644
--- a/templates/web/developers/application_form.html.twig
+++ b/templates/web/developers/application_form.html.twig
@@ -45,7 +45,7 @@
 {% endmacro %}
 
 {% block content_account %}
-<form id="form_create" action="{{ path("submit_developers_application") }}" method="POST" class="form-horizontal">
+<form id="form_create" action="{{ path("submit_developers_application") }}" method="POST" class="form-horizontal" style="padding: 20px; background: #757575;">
     {% if form is none %}
       {% set name, description, website, callback = "", "", "", "" %}
       {% set app_type = "web" %}
@@ -74,7 +74,7 @@
     <div class="control-group">
         <label for="website" class="control-label"><b>{{ "Site web" | trans }}</b></label>
         <div class="controls">
-            <select name="scheme-website"  class="input-mini">
+            <select name="scheme-website"  class="input-mini" style="min-height: 40px;">
                 <option value="http://">http://</option>
                 <option value="https://">https://</option>
             </select>
@@ -101,7 +101,7 @@
         <div class="control-group callback-control-group">
             <label for="callback" class="control-label"><b>{{ "URL de callback" | trans }}</b></label>
             <div class="controls">
-                <select name="scheme-callback" class="input-mini">
+                <select name="scheme-callback" class="input-mini" style="min-height: 40px;">
                     <option value="http://">http://</option>
                     <option value="https://">https://</option>
                 </select>
@@ -110,14 +110,18 @@
         </div>
     {% endif %}
 
-    <div class="form-actions">
-        <button class="btn btn-info" type="submit">
-            {{ "boutton::valider" | trans }}
-        </button>
-
-        <a class="btn" href="{{ path("developers_applications") }}">
+    <div class="control-group">
+        <div class="col-md-6 controls" style="margin-right: 25px; float: left">
+        <a class="btn btn-warning" href="{{ path("developers_applications") }}">
             {{ "boutton::retour" | trans }}
         </a>
+        </div>
+        <div class="col-md-6" style="width: 50%; float: left">
+        <button class="btn btn-info no-margin" type="submit" style="margin: 0;width: auto;min-width: 200px">
+            {{ "boutton::valider" | trans }}
+        </button>
+        </div>
+
     </div>
   </form>
 {% endblock %}
diff --git a/templates/web/developers/applications.html.twig b/templates/web/developers/applications.html.twig
index 63da01ba29..9e6f523598 100644
--- a/templates/web/developers/applications.html.twig
+++ b/templates/web/developers/applications.html.twig
@@ -66,4 +66,25 @@
             </div>
         </div>
     </div>
+    <script>
+     $('a.delete-app').bind('click', function (e) {
+            e.preventDefault();
+            var $this = $(this);
+            var li = $this.closest('li');
+
+            $.ajax({
+                type: 'DELETE',
+                url: $this.attr('href'),
+                dataType: 'json',
+                data: {},
+                success: function success(data) {
+                    if (data.success) {
+                        li.find('.modal').modal('hide');
+                        li.remove();
+                    }
+                }
+            });
+        });
+    </script>
+
 {% endblock %}

From 88836b60718b69ed67a7ee8f8a5f873dcb2d4465 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Tue, 18 Feb 2020 19:26:56 +0400
Subject: [PATCH 2/3] PHRAS-2825 Add translation

---
 resources/locales/messages.de.xlf   | 98 +++++++++++++++--------------
 resources/locales/messages.en.xlf   | 98 +++++++++++++++--------------
 resources/locales/messages.fr.xlf   | 98 +++++++++++++++--------------
 resources/locales/messages.nl.xlf   | 98 +++++++++++++++--------------
 resources/locales/validators.de.xlf |  2 +-
 resources/locales/validators.en.xlf |  2 +-
 resources/locales/validators.fr.xlf |  2 +-
 resources/locales/validators.nl.xlf |  2 +-
 8 files changed, 212 insertions(+), 188 deletions(-)

diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
index 6966ddfb08..3eabcb3949 100644
--- a/resources/locales/messages.de.xlf
+++ b/resources/locales/messages.de.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-<file date="2020-02-14T15:00:02Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2020-02-18T16:21:54Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -627,7 +627,7 @@
       <trans-unit id="43c8f4baa612c748fb9c0b6672d77827013ff2be" resname="Action Forbidden : You are not the publisher" approved="yes">
         <source>Action Forbidden : You are not the publisher</source>
         <target state="translated">Aktion verboten: Sie sind nicht der Veröffentlicher</target>
-        <jms:reference-file line="184">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="189">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="c3cd636a585b20c40ac2df5ffb403e83cb2eef51" resname="Actions" approved="yes">
         <source>Actions</source>
@@ -642,7 +642,7 @@
       <trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight" approved="yes">
         <source>Activate highlight</source>
         <target state="translated">Highlight aktivieren</target>
-        <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="74">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="682">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a733b809d2f1233496ab516eed0f3ef75cf3791a" resname="Active" approved="yes">
@@ -808,6 +808,11 @@
         <target state="translated">Nach Metadaten</target>
         <jms:reference-file line="735">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="8309825c7302ca269da1af87d2a9a5ea9e295426" resname="Aggregated">
+        <source>Aggregated</source>
+        <target state="new">Aggregated</target>
+        <jms:reference-file line="10">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="b9ba037c0e4c06d192c83e08070b15787f07daaa" resname="Aggregation" approved="yes">
         <source>Aggregation</source>
         <target state="translated">Aggregation</target>
@@ -870,11 +875,6 @@
         <target state="translated">Alle Bedingungen</target>
         <jms:reference-file line="417">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="4f5920cee28837f31429fd82f7bc5a335272a436" resname="All values" approved="yes">
-        <source>All values</source>
-        <target state="translated">Alle Werte</target>
-        <jms:reference-file line="247">admin/fields/templates.html.twig</jms:reference-file>
-      </trans-unit>
       <trans-unit id="bc5595b574bc9e623a22a54ae40ae0cef6c28e80" resname="Aller a" approved="yes">
         <source>Aller a</source>
         <target state="translated">Gehen Sie zu</target>
@@ -1032,7 +1032,7 @@
         <target state="translated">Ein Fehler ist aufgetreten</target>
         <jms:reference-file line="77">Order/Controller/ProdOrderController.php</jms:reference-file>
         <jms:reference-file line="521">Controller/Admin/DataboxController.php</jms:reference-file>
-        <jms:reference-file line="108">Controller/Admin/SearchEngineController.php</jms:reference-file>
+        <jms:reference-file line="135">Controller/Admin/SearchEngineController.php</jms:reference-file>
         <jms:reference-file line="126">Controller/Admin/CollectionController.php</jms:reference-file>
         <jms:reference-file line="145">Controller/Prod/BasketController.php</jms:reference-file>
         <jms:reference-file line="59">Controller/Api/V3Controller.php</jms:reference-file>
@@ -1068,7 +1068,7 @@
       <trans-unit id="aae1263383b96270870516a4097020921912df74" resname="Aperture" approved="yes">
         <source>Aperture</source>
         <target state="translated">Blende</target>
-        <jms:reference-file line="295">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="334">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="104">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="013cf62916a339608ae3c498d34b9e55afa46dc1" resname="Apparait aussi dans ces paniers" approved="yes">
@@ -1281,7 +1281,7 @@
       <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate" approved="yes">
         <source>Audio Samplerate</source>
         <target state="translated">Audio Samplerate</target>
-        <jms:reference-file line="339">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="378">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="31afcc88a7f552bfd4d330c2c70d8fafd7b8e0f9" resname="Audio channel" approved="yes">
         <source>Audio channel</source>
@@ -1291,7 +1291,7 @@
       <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec" approved="yes">
         <source>Audio codec</source>
         <target state="translated">Audio-Codec</target>
-        <jms:reference-file line="353">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="392">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="27be4ad944410219f1a8dd01cc5e216a09c16646" resname="AudioSamplerate" approved="yes">
         <source>AudioSamplerate</source>
@@ -1564,7 +1564,7 @@
       <trans-unit id="07d75a5073e3247c7ac54d3a797d3f777b421863" resname="Camera Model" approved="yes">
         <source>Camera Model</source>
         <target state="translated">Kameramodell</target>
-        <jms:reference-file line="281">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="320">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="56">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="77dfd2135f4db726c47299bb55be26f7f4525a46" resname="Cancel" approved="yes">
@@ -1854,7 +1854,7 @@
       <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace" approved="yes">
         <source>Colorspace</source>
         <target state="translated">Colorspace</target>
-        <jms:reference-file line="367">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="406">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
         <source>Commande</source>
@@ -2042,7 +2042,7 @@
       <trans-unit id="26a9831600fb0e895035038bcac30cc389b393e0" resname="Create index" approved="yes">
         <source>Create index</source>
         <target state="translated">Index erstellen</target>
-        <jms:reference-file line="43">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="56">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="c175379b0389b2d6057b0b7db996720f1fb92fc7" resname="Creation date" approved="yes">
         <source>Creation date</source>
@@ -2131,7 +2131,7 @@
         <source>Current configuration contains some
             errors</source>
         <target state="translated">Die aktuelle Konfiguration enthält einige Fehler</target>
-        <jms:reference-file line="309">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="310">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="31b3c410ee3a3630f3efc08bae2fd9d06ec16ff4" resname="Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again" approved="yes">
         <source>Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again</source>
@@ -2639,7 +2639,7 @@
       <trans-unit id="4e4528018d1a0aa11f7dc17b5425174a7436d334" resname="Drop index" approved="yes">
         <source>Drop index</source>
         <target state="translated">Drop index</target>
-        <jms:reference-file line="36">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="3a9c043f68c147a7c8d8c2fa14ddfaba6e05da62" resname="Duree" approved="yes">
         <source>Duree</source>
@@ -2747,19 +2747,19 @@
       <trans-unit id="201b9ab150a2ab3e5641814c373f8db1949199d0" resname="ElasticSearch index name" approved="yes">
         <source>ElasticSearch index name</source>
         <target state="translated">ElasticSearch Index Name</target>
-        <jms:reference-file line="31">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="44">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="666">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="b89586db0b00163ce75ae7426f06aa2e2a57b223" resname="ElasticSearch server host" approved="yes">
         <source>ElasticSearch server host</source>
         <target state="translated">ElasticSearch Server Host</target>
-        <jms:reference-file line="24">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="37">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="654">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="18fd7d0c79d71cd9317190ae98dccdb1f7cf8b76" resname="ElasticSearch service port" approved="yes">
         <source>ElasticSearch service port</source>
         <target state="translated">ElasticSearch Service Schnittstelle</target>
-        <jms:reference-file line="27">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="40">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="658">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="84add5b2952787581cb9a8851eef63d1ec75d22b" resname="Email" approved="yes">
@@ -3342,7 +3342,7 @@
       <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired" approved="yes">
         <source>FlashFired</source>
         <target state="translated">FlashFired</target>
-        <jms:reference-file line="318">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="357">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers" approved="yes">
         <source>Flatten layers</source>
@@ -3401,7 +3401,7 @@
       <trans-unit id="629fe48e7fcf628a108551add706c29832b214df" resname="FrameRate" approved="yes">
         <source>FrameRate</source>
         <target state="translated">Framerate</target>
-        <jms:reference-file line="332">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="371">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="d4947df23a237794a9ff63353bd60ebe679c830c" resname="Frequence d'echantillonage" approved="yes">
         <source>Frequence d'echantillonage</source>
@@ -3487,7 +3487,7 @@
       <trans-unit id="05a07cd950e4b273afdde28fa0b591cc75524121" resname="Get setting form index">
         <source>Get setting form index</source>
         <target state="needs-translation">Index Daten erhalten</target>
-        <jms:reference-file line="97">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="81">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="ee485ef50d127d2c51fe0091051d8c390d03ed59" resname="Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side." approved="yes">
         <source>Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side.</source>
@@ -3646,7 +3646,7 @@
       <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO" approved="yes">
         <source>ISO</source>
         <target state="translated">ISO</target>
-        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="327">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
         <source>ISO sensibility</source>
@@ -4324,7 +4324,7 @@
       <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType" approved="yes">
         <source>MimeType</source>
         <target state="translated">MimeType</target>
-        <jms:reference-file line="374">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="413">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="cb4f425374af2741715669ed8b541a666078b729" resname="Minimum number of letters before truncation" approved="yes">
         <source>Minimum number of letters before truncation</source>
@@ -4688,7 +4688,8 @@
       <trans-unit id="a6633333760410e40ad92a50baade0b83afe8f7f" resname="Not aggregated" approved="yes">
         <source>Not aggregated</source>
         <target state="translated">Nicht aggregiert</target>
-        <jms:reference-file line="242">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="17">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+        <jms:reference-file line="241">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="cc451929f50e088ffcff10e90dfe157d2319e753" resname="Notification par email" approved="yes">
         <source>Notification par email</source>
@@ -4754,13 +4755,13 @@
       <trans-unit id="997c69f6571530618bb38ac03f4cf2d236dcc15e" resname="Number of replicas" approved="yes">
         <source>Number of replicas</source>
         <target state="translated">Anzahl von Nachbauten</target>
-        <jms:reference-file line="53">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="66">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="674">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="5c2a8aa4e676273c8d8f177856923ed9950e54bb" resname="Number of shards" approved="yes">
         <source>Number of shards</source>
         <target state="translated">Anzahl von Scherben</target>
-        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="62">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="670">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a44db49e9b745fe2a96ae2a2ef3595913e274b33" resname="Number of threads to use for FFMpeg" approved="yes">
@@ -4861,7 +4862,7 @@
       <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation" approved="yes">
         <source>Orientation</source>
         <target state="translated">Ausrichtung</target>
-        <jms:reference-file line="360">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="399">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
         <source>Original name</source>
@@ -4901,7 +4902,7 @@
         <jms:reference-file line="53">mobile/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="140">mobile/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="257">web/account/account.html.twig</jms:reference-file>
-        <jms:reference-file line="91">web/lightbox/index.html.twig</jms:reference-file>
+        <jms:reference-file line="96">web/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="127">lightbox/IE6/validate.html.twig</jms:reference-file>
         <jms:reference-file line="140">web/lightbox/validate.html.twig</jms:reference-file>
       </trans-unit>
@@ -5898,7 +5899,7 @@
         <target state="translated">Speichern</target>
         <jms:reference-file line="108">actions/Feedback/list.html.twig</jms:reference-file>
         <jms:reference-file line="45">web/account/change-password.html.twig</jms:reference-file>
-        <jms:reference-file line="26">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+        <jms:reference-file line="3">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
         <jms:reference-file line="3">admin/search-engine/elastic-search.html.twig</jms:reference-file>
         <jms:reference-file line="75">task-manager/task-editor/task.html.twig</jms:reference-file>
         <jms:reference-file line="53">web/developers/application.html.twig</jms:reference-file>
@@ -6166,7 +6167,7 @@
       <trans-unit id="32e50dd99f3b67dc93272aa6c904b83d37f4f48d" resname="Shutter speed" approved="yes">
         <source>Shutter speed</source>
         <target state="translated">Verschlusszeit</target>
-        <jms:reference-file line="305">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="344">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="98">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e4538baf30d4eb324ec64e4b48c1ca424dd3b773" resname="Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur." approved="yes">
@@ -6749,13 +6750,13 @@
       <trans-unit id="3fc5195b4a6ff8dc205dbbad17104fa93db88281" resname="Thesaurus Min score" approved="yes">
         <source>Thesaurus Min score</source>
         <target state="translated">Thesaurus Hits (minimal)</target>
-        <jms:reference-file line="57">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="70">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="678">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="163fc70a23cf29331bab9896c9a8a0cb0b113bd6" resname="Thesaurus branch" approved="yes">
         <source>Thesaurus branch</source>
         <target state="translated">Thesaurus Sprung</target>
-        <jms:reference-file line="263">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="261">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="c80f8a4f795945c822db75e5414796446ada185c" resname="Thesaurus ou CTerms invalide" approved="yes">
         <source>Thesaurus ou CTerms invalide</source>
@@ -7380,7 +7381,7 @@
       <trans-unit id="534048d6c768f47f83f67c0498e6d4ecf5cff4bb" resname="Video codec" approved="yes">
         <source>Video codec</source>
         <target state="translated">Video-Codec</target>
-        <jms:reference-file line="346">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="385">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="56b71e89fb1079caaadefd0889e9a22e8b0560e3" resname="Videos" approved="yes">
         <source>Videos</source>
@@ -7401,7 +7402,7 @@
       <trans-unit id="a1e3e6d2f9b416cfab10df81ce100f4fc43eb90a" resname="Vocabulary type" approved="yes">
         <source>Vocabulary type</source>
         <target state="translated">Wortschatz Typ</target>
-        <jms:reference-file line="252">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="250">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="044d95dece43b99febe25cb6bc5fab28bf212ee0" resname="Voici vos paniers" approved="yes">
         <source>Voici vos paniers</source>
@@ -9941,10 +9942,15 @@
         <target state="translated">Änderungen wurden hergestellt</target>
         <jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="0bf89031fb0b79dd308305fa96c6e804bd701c06" resname="help::help-search: OR">
+        <source>help::help-search: OR</source>
+        <target state="new">help::help-search: OR</target>
+        <jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="afca2d3b5d8e63be2c3ad162f99cba5f67299d07" resname="help::help-search: relaunch search without filter">
         <source>help::help-search: relaunch search without filter</source>
         <target state="new">help::help-search: relaunch search without filter</target>
-        <jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
+        <jms:reference-file line="37">prod/results/help.html.twig</jms:reference-file>
         <jms:reference-file line="330">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling" approved="yes">
@@ -11439,17 +11445,17 @@
       <trans-unit id="cb08c63b1c016e31a255a38795c8e4cb66b0e66e" resname="prod::facet:base_label" approved="yes">
         <source>prod::facet:base_label</source>
         <target state="translated">Datenbanken</target>
-        <jms:reference-file line="260">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="299">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="36fa870bac03b1a7c83f2b7030bf93ed4718e0a7" resname="prod::facet:collection_label" approved="yes">
         <source>prod::facet:collection_label</source>
         <target state="translated">Kollektionen</target>
-        <jms:reference-file line="267">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="306">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="12988153991e94fd6fc58934903504b0bf03c30a" resname="prod::facet:doctype_label" approved="yes">
         <source>prod::facet:doctype_label</source>
         <target state="translated">Dokumenttyp</target>
-        <jms:reference-file line="274">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="313">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="a146a90e6a97ac82ffa4ab5d4dc7cf4955a1e305" resname="prod::feedback:feedback_set_title">
         <source>prod::feedback:feedback_set_title</source>
@@ -11697,8 +11703,8 @@
       <trans-unit id="02387557776e7e3b2a78b21c54e9fb019a9a6fc3" resname="publication::Voici votre fil RSS personnel. Il vous permettra d'etre tenu au courrant des publications." approved="yes">
         <source>publication::Voici votre fil RSS personnel. Il vous permettra d'etre tenu au courrant des publications.</source>
         <target state="translated">Hier finden Sie Ihr eigenes RSS Feed. Dank des RSS werden Sie über neue Veröffentlichungen automatisch informiert</target>
-        <jms:reference-file line="238">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="263">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="243">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="268">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="bc8cb61c550777cb4f094762ef7744693875ce09" resname="publications:: s'abonner aux publications" approved="yes">
         <source>publications:: s'abonner aux publications</source>
@@ -11709,14 +11715,14 @@
       <trans-unit id="d16bcb6609333ab86ad12c169212d30658b18ed4" resname="publications::Ne le partagez pas, il est strictement confidentiel" approved="yes">
         <source>publications::Ne le partagez pas, il est strictement confidentiel</source>
         <target state="translated">Dieses RSS nicht weiterleiten - es ist vertraulich</target>
-        <jms:reference-file line="240">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="265">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="245">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="270">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="317aac7149d4bb63238dbe1f9461b3d817f1ff65" resname="publications::votre rss personnel" approved="yes">
         <source>publications::votre rss personnel</source>
         <target state="translated">Ihr eigenes RSS</target>
-        <jms:reference-file line="243">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="267">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="248">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="272">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="70e2a7238a2b25916f8dda4ca72e2b8617edde67" resname="push::mail:: Rapport de validation de %user% pour %title%" approved="yes">
         <source>push::mail:: Rapport de validation de %user% pour %title%</source>
diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
index 2d3a413495..bce7b53ce0 100644
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-<file date="2020-02-14T15:00:18Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2020-02-18T16:22:02Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -627,7 +627,7 @@
       <trans-unit id="43c8f4baa612c748fb9c0b6672d77827013ff2be" resname="Action Forbidden : You are not the publisher" approved="yes">
         <source>Action Forbidden : You are not the publisher</source>
         <target state="translated">Forbidden: You are not the publisher</target>
-        <jms:reference-file line="184">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="189">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="c3cd636a585b20c40ac2df5ffb403e83cb2eef51" resname="Actions" approved="yes">
         <source>Actions</source>
@@ -642,7 +642,7 @@
       <trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight" approved="yes">
         <source>Activate highlight</source>
         <target state="translated">Activate highlight on full text (experimental). Impact the time performance of search.</target>
-        <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="74">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="682">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a733b809d2f1233496ab516eed0f3ef75cf3791a" resname="Active" approved="yes">
@@ -809,6 +809,11 @@
         <target state="translated">After captions</target>
         <jms:reference-file line="735">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="8309825c7302ca269da1af87d2a9a5ea9e295426" resname="Aggregated">
+        <source>Aggregated</source>
+        <target state="new">Aggregated</target>
+        <jms:reference-file line="10">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="b9ba037c0e4c06d192c83e08070b15787f07daaa" resname="Aggregation" approved="yes">
         <source>Aggregation</source>
         <target state="translated">Aggregation</target>
@@ -871,11 +876,6 @@
         <target state="translated">All these conditions</target>
         <jms:reference-file line="417">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="4f5920cee28837f31429fd82f7bc5a335272a436" resname="All values" approved="yes">
-        <source>All values</source>
-        <target state="translated">All values</target>
-        <jms:reference-file line="247">admin/fields/templates.html.twig</jms:reference-file>
-      </trans-unit>
       <trans-unit id="bc5595b574bc9e623a22a54ae40ae0cef6c28e80" resname="Aller a" approved="yes">
         <source>Aller a</source>
         <target state="translated">Go to</target>
@@ -1033,7 +1033,7 @@
         <target state="translated">An error occurred</target>
         <jms:reference-file line="77">Order/Controller/ProdOrderController.php</jms:reference-file>
         <jms:reference-file line="521">Controller/Admin/DataboxController.php</jms:reference-file>
-        <jms:reference-file line="108">Controller/Admin/SearchEngineController.php</jms:reference-file>
+        <jms:reference-file line="135">Controller/Admin/SearchEngineController.php</jms:reference-file>
         <jms:reference-file line="126">Controller/Admin/CollectionController.php</jms:reference-file>
         <jms:reference-file line="145">Controller/Prod/BasketController.php</jms:reference-file>
         <jms:reference-file line="59">Controller/Api/V3Controller.php</jms:reference-file>
@@ -1069,7 +1069,7 @@
       <trans-unit id="aae1263383b96270870516a4097020921912df74" resname="Aperture" approved="yes">
         <source>Aperture</source>
         <target state="translated">Aperture</target>
-        <jms:reference-file line="295">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="334">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="104">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="013cf62916a339608ae3c498d34b9e55afa46dc1" resname="Apparait aussi dans ces paniers" approved="yes">
@@ -1282,7 +1282,7 @@
       <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate" approved="yes">
         <source>Audio Samplerate</source>
         <target state="translated">Audio Samplerate</target>
-        <jms:reference-file line="339">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="378">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="31afcc88a7f552bfd4d330c2c70d8fafd7b8e0f9" resname="Audio channel" approved="yes">
         <source>Audio channel</source>
@@ -1292,7 +1292,7 @@
       <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec" approved="yes">
         <source>Audio codec</source>
         <target state="translated">Audio codec</target>
-        <jms:reference-file line="353">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="392">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="27be4ad944410219f1a8dd01cc5e216a09c16646" resname="AudioSamplerate" approved="yes">
         <source>AudioSamplerate</source>
@@ -1565,7 +1565,7 @@
       <trans-unit id="07d75a5073e3247c7ac54d3a797d3f777b421863" resname="Camera Model" approved="yes">
         <source>Camera Model</source>
         <target state="translated">Camera model</target>
-        <jms:reference-file line="281">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="320">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="56">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="77dfd2135f4db726c47299bb55be26f7f4525a46" resname="Cancel" approved="yes">
@@ -1856,7 +1856,7 @@
       <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace" approved="yes">
         <source>Colorspace</source>
         <target state="translated">Colorspace</target>
-        <jms:reference-file line="367">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="406">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
         <source>Commande</source>
@@ -2044,7 +2044,7 @@
       <trans-unit id="26a9831600fb0e895035038bcac30cc389b393e0" resname="Create index" approved="yes">
         <source>Create index</source>
         <target state="translated">Create index</target>
-        <jms:reference-file line="43">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="56">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="c175379b0389b2d6057b0b7db996720f1fb92fc7" resname="Creation date" approved="yes">
         <source>Creation date</source>
@@ -2134,7 +2134,7 @@
             errors</source>
         <target state="translated">Current configuration contains some
             errors</target>
-        <jms:reference-file line="309">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="310">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="31b3c410ee3a3630f3efc08bae2fd9d06ec16ff4" resname="Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again" approved="yes">
         <source>Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again</source>
@@ -2642,7 +2642,7 @@
       <trans-unit id="4e4528018d1a0aa11f7dc17b5425174a7436d334" resname="Drop index" approved="yes">
         <source>Drop index</source>
         <target state="translated">Drop index</target>
-        <jms:reference-file line="36">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="3a9c043f68c147a7c8d8c2fa14ddfaba6e05da62" resname="Duree" approved="yes">
         <source>Duree</source>
@@ -2750,19 +2750,19 @@
       <trans-unit id="201b9ab150a2ab3e5641814c373f8db1949199d0" resname="ElasticSearch index name" approved="yes">
         <source>ElasticSearch index name</source>
         <target state="translated">ElasticSearch index name</target>
-        <jms:reference-file line="31">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="44">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="666">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="b89586db0b00163ce75ae7426f06aa2e2a57b223" resname="ElasticSearch server host" approved="yes">
         <source>ElasticSearch server host</source>
         <target state="translated">ElasticSearch server host</target>
-        <jms:reference-file line="24">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="37">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="654">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="18fd7d0c79d71cd9317190ae98dccdb1f7cf8b76" resname="ElasticSearch service port" approved="yes">
         <source>ElasticSearch service port</source>
         <target state="translated">ElasticSearch service port</target>
-        <jms:reference-file line="27">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="40">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="658">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="84add5b2952787581cb9a8851eef63d1ec75d22b" resname="Email" approved="yes">
@@ -3345,7 +3345,7 @@
       <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired" approved="yes">
         <source>FlashFired</source>
         <target state="translated">FlashFired</target>
-        <jms:reference-file line="318">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="357">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers" approved="yes">
         <source>Flatten layers</source>
@@ -3404,7 +3404,7 @@
       <trans-unit id="629fe48e7fcf628a108551add706c29832b214df" resname="FrameRate" approved="yes">
         <source>FrameRate</source>
         <target state="translated">FrameRate</target>
-        <jms:reference-file line="332">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="371">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="d4947df23a237794a9ff63353bd60ebe679c830c" resname="Frequence d'echantillonage" approved="yes">
         <source>Frequence d'echantillonage</source>
@@ -3490,7 +3490,7 @@
       <trans-unit id="05a07cd950e4b273afdde28fa0b591cc75524121" resname="Get setting form index" approved="yes">
         <source>Get setting form index</source>
         <target state="translated">Get setting form index</target>
-        <jms:reference-file line="97">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="81">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="ee485ef50d127d2c51fe0091051d8c390d03ed59" resname="Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side." approved="yes">
         <source>Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side.</source>
@@ -3649,7 +3649,7 @@
       <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO" approved="yes">
         <source>ISO</source>
         <target state="translated">ISO</target>
-        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="327">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
         <source>ISO sensibility</source>
@@ -4327,7 +4327,7 @@
       <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType" approved="yes">
         <source>MimeType</source>
         <target state="translated">MimeType</target>
-        <jms:reference-file line="374">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="413">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="cb4f425374af2741715669ed8b541a666078b729" resname="Minimum number of letters before truncation" approved="yes">
         <source>Minimum number of letters before truncation</source>
@@ -4691,7 +4691,8 @@
       <trans-unit id="a6633333760410e40ad92a50baade0b83afe8f7f" resname="Not aggregated" approved="yes">
         <source>Not aggregated</source>
         <target state="translated">Not aggregated</target>
-        <jms:reference-file line="242">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="17">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+        <jms:reference-file line="241">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="cc451929f50e088ffcff10e90dfe157d2319e753" resname="Notification par email" approved="yes">
         <source>Notification par email</source>
@@ -4757,13 +4758,13 @@
       <trans-unit id="997c69f6571530618bb38ac03f4cf2d236dcc15e" resname="Number of replicas" approved="yes">
         <source>Number of replicas</source>
         <target state="translated">Number of replicas</target>
-        <jms:reference-file line="53">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="66">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="674">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="5c2a8aa4e676273c8d8f177856923ed9950e54bb" resname="Number of shards" approved="yes">
         <source>Number of shards</source>
         <target state="translated">Number of shards</target>
-        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="62">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="670">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a44db49e9b745fe2a96ae2a2ef3595913e274b33" resname="Number of threads to use for FFMpeg" approved="yes">
@@ -4864,7 +4865,7 @@
       <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation" approved="yes">
         <source>Orientation</source>
         <target state="translated">Orientation</target>
-        <jms:reference-file line="360">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="399">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
         <source>Original name</source>
@@ -4904,7 +4905,7 @@
         <jms:reference-file line="53">mobile/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="140">mobile/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="257">web/account/account.html.twig</jms:reference-file>
-        <jms:reference-file line="91">web/lightbox/index.html.twig</jms:reference-file>
+        <jms:reference-file line="96">web/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="127">lightbox/IE6/validate.html.twig</jms:reference-file>
         <jms:reference-file line="140">web/lightbox/validate.html.twig</jms:reference-file>
       </trans-unit>
@@ -5901,7 +5902,7 @@
         <target state="translated">Save</target>
         <jms:reference-file line="108">actions/Feedback/list.html.twig</jms:reference-file>
         <jms:reference-file line="45">web/account/change-password.html.twig</jms:reference-file>
-        <jms:reference-file line="26">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+        <jms:reference-file line="3">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
         <jms:reference-file line="3">admin/search-engine/elastic-search.html.twig</jms:reference-file>
         <jms:reference-file line="75">task-manager/task-editor/task.html.twig</jms:reference-file>
         <jms:reference-file line="53">web/developers/application.html.twig</jms:reference-file>
@@ -6169,7 +6170,7 @@
       <trans-unit id="32e50dd99f3b67dc93272aa6c904b83d37f4f48d" resname="Shutter speed" approved="yes">
         <source>Shutter speed</source>
         <target state="translated">Shutter speed</target>
-        <jms:reference-file line="305">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="344">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="98">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e4538baf30d4eb324ec64e4b48c1ca424dd3b773" resname="Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur." approved="yes">
@@ -6752,13 +6753,13 @@
       <trans-unit id="3fc5195b4a6ff8dc205dbbad17104fa93db88281" resname="Thesaurus Min score" approved="yes">
         <source>Thesaurus Min score</source>
         <target state="translated">Thesaurus Min score</target>
-        <jms:reference-file line="57">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="70">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="678">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="163fc70a23cf29331bab9896c9a8a0cb0b113bd6" resname="Thesaurus branch" approved="yes">
         <source>Thesaurus branch</source>
         <target state="translated">Thesaurus branch</target>
-        <jms:reference-file line="263">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="261">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="c80f8a4f795945c822db75e5414796446ada185c" resname="Thesaurus ou CTerms invalide" approved="yes">
         <source>Thesaurus ou CTerms invalide</source>
@@ -7383,7 +7384,7 @@
       <trans-unit id="534048d6c768f47f83f67c0498e6d4ecf5cff4bb" resname="Video codec" approved="yes">
         <source>Video codec</source>
         <target state="translated">Video codec</target>
-        <jms:reference-file line="346">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="385">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="56b71e89fb1079caaadefd0889e9a22e8b0560e3" resname="Videos" approved="yes">
         <source>Videos</source>
@@ -7404,7 +7405,7 @@
       <trans-unit id="a1e3e6d2f9b416cfab10df81ce100f4fc43eb90a" resname="Vocabulary type" approved="yes">
         <source>Vocabulary type</source>
         <target state="translated">Vocabulary type</target>
-        <jms:reference-file line="252">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="250">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="044d95dece43b99febe25cb6bc5fab28bf212ee0" resname="Voici vos paniers" approved="yes">
         <source>Voici vos paniers</source>
@@ -9944,10 +9945,15 @@
         <target state="translated">Modifications done</target>
         <jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="0bf89031fb0b79dd308305fa96c6e804bd701c06" resname="help::help-search: OR">
+        <source>help::help-search: OR</source>
+        <target state="new">help::help-search: OR</target>
+        <jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="afca2d3b5d8e63be2c3ad162f99cba5f67299d07" resname="help::help-search: relaunch search without filter">
         <source>help::help-search: relaunch search without filter</source>
         <target state="new">help::help-search: relaunch search without filter</target>
-        <jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
+        <jms:reference-file line="37">prod/results/help.html.twig</jms:reference-file>
         <jms:reference-file line="330">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling" approved="yes">
@@ -11442,17 +11448,17 @@
       <trans-unit id="cb08c63b1c016e31a255a38795c8e4cb66b0e66e" resname="prod::facet:base_label" approved="yes">
         <source>prod::facet:base_label</source>
         <target state="translated">Base</target>
-        <jms:reference-file line="260">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="299">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="36fa870bac03b1a7c83f2b7030bf93ed4718e0a7" resname="prod::facet:collection_label" approved="yes">
         <source>prod::facet:collection_label</source>
         <target state="translated">Collection</target>
-        <jms:reference-file line="267">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="306">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="12988153991e94fd6fc58934903504b0bf03c30a" resname="prod::facet:doctype_label" approved="yes">
         <source>prod::facet:doctype_label</source>
         <target state="translated">Document type</target>
-        <jms:reference-file line="274">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="313">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="a146a90e6a97ac82ffa4ab5d4dc7cf4955a1e305" resname="prod::feedback:feedback_set_title">
         <source>prod::feedback:feedback_set_title</source>
@@ -11703,8 +11709,8 @@ It is possible to place several search areas</target>
       <trans-unit id="02387557776e7e3b2a78b21c54e9fb019a9a6fc3" resname="publication::Voici votre fil RSS personnel. Il vous permettra d'etre tenu au courrant des publications." approved="yes">
         <source>publication::Voici votre fil RSS personnel. Il vous permettra d'etre tenu au courrant des publications.</source>
         <target state="translated">This is your personnal rss flow, it will inform you about publications</target>
-        <jms:reference-file line="238">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="263">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="243">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="268">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="bc8cb61c550777cb4f094762ef7744693875ce09" resname="publications:: s'abonner aux publications" approved="yes">
         <source>publications:: s'abonner aux publications</source>
@@ -11715,14 +11721,14 @@ It is possible to place several search areas</target>
       <trans-unit id="d16bcb6609333ab86ad12c169212d30658b18ed4" resname="publications::Ne le partagez pas, il est strictement confidentiel" approved="yes">
         <source>publications::Ne le partagez pas, il est strictement confidentiel</source>
         <target state="translated">Don't share it, it's yours only</target>
-        <jms:reference-file line="240">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="265">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="245">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="270">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="317aac7149d4bb63238dbe1f9461b3d817f1ff65" resname="publications::votre rss personnel" approved="yes">
         <source>publications::votre rss personnel</source>
         <target state="translated">Your own rss</target>
-        <jms:reference-file line="243">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="267">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="248">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="272">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="70e2a7238a2b25916f8dda4ca72e2b8617edde67" resname="push::mail:: Rapport de validation de %user% pour %title%" approved="yes">
         <source>push::mail:: Rapport de validation de %user% pour %title%</source>
diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
index 1ead0e61e8..74ae1c07a8 100644
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-14T15:00:34Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2020-02-18T16:22:14Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -627,7 +627,7 @@
       <trans-unit id="43c8f4baa612c748fb9c0b6672d77827013ff2be" resname="Action Forbidden : You are not the publisher" approved="yes">
         <source>Action Forbidden : You are not the publisher</source>
         <target state="translated">Action non autorisée: Vous n'êtes pas la personne qui a publié</target>
-        <jms:reference-file line="184">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="189">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="c3cd636a585b20c40ac2df5ffb403e83cb2eef51" resname="Actions" approved="yes">
         <source>Actions</source>
@@ -642,7 +642,7 @@
       <trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight" approved="yes">
         <source>Activate highlight</source>
         <target state="translated">Activer le surlignage (beta). Impacte les performances de recherche</target>
-        <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="74">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="682">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a733b809d2f1233496ab516eed0f3ef75cf3791a" resname="Active" approved="yes">
@@ -808,6 +808,11 @@
         <target state="translated">Dans l'infobulle de description, après les métadonnées</target>
         <jms:reference-file line="735">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="8309825c7302ca269da1af87d2a9a5ea9e295426" resname="Aggregated">
+        <source>Aggregated</source>
+        <target state="new">Aggregated</target>
+        <jms:reference-file line="10">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="b9ba037c0e4c06d192c83e08070b15787f07daaa" resname="Aggregation" approved="yes">
         <source>Aggregation</source>
         <target state="translated">Agrégation</target>
@@ -870,11 +875,6 @@
         <target state="translated">Toutes les conditions</target>
         <jms:reference-file line="417">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="4f5920cee28837f31429fd82f7bc5a335272a436" resname="All values" approved="yes">
-        <source>All values</source>
-        <target state="translated">Toutes les valeurs</target>
-        <jms:reference-file line="247">admin/fields/templates.html.twig</jms:reference-file>
-      </trans-unit>
       <trans-unit id="bc5595b574bc9e623a22a54ae40ae0cef6c28e80" resname="Aller a" approved="yes">
         <source>Aller a</source>
         <target state="translated">Aller à</target>
@@ -1032,7 +1032,7 @@
         <target state="translated">Une erreur est survenue</target>
         <jms:reference-file line="77">Order/Controller/ProdOrderController.php</jms:reference-file>
         <jms:reference-file line="521">Controller/Admin/DataboxController.php</jms:reference-file>
-        <jms:reference-file line="108">Controller/Admin/SearchEngineController.php</jms:reference-file>
+        <jms:reference-file line="135">Controller/Admin/SearchEngineController.php</jms:reference-file>
         <jms:reference-file line="126">Controller/Admin/CollectionController.php</jms:reference-file>
         <jms:reference-file line="145">Controller/Prod/BasketController.php</jms:reference-file>
         <jms:reference-file line="59">Controller/Api/V3Controller.php</jms:reference-file>
@@ -1068,7 +1068,7 @@
       <trans-unit id="aae1263383b96270870516a4097020921912df74" resname="Aperture" approved="yes">
         <source>Aperture</source>
         <target state="translated">Ouverture</target>
-        <jms:reference-file line="295">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="334">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="104">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="013cf62916a339608ae3c498d34b9e55afa46dc1" resname="Apparait aussi dans ces paniers" approved="yes">
@@ -1281,7 +1281,7 @@
       <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate" approved="yes">
         <source>Audio Samplerate</source>
         <target state="translated">Fréquence d'échantillonnage</target>
-        <jms:reference-file line="339">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="378">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="31afcc88a7f552bfd4d330c2c70d8fafd7b8e0f9" resname="Audio channel" approved="yes">
         <source>Audio channel</source>
@@ -1291,7 +1291,7 @@
       <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec" approved="yes">
         <source>Audio codec</source>
         <target state="translated">Encodeur Audio</target>
-        <jms:reference-file line="353">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="392">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="27be4ad944410219f1a8dd01cc5e216a09c16646" resname="AudioSamplerate" approved="yes">
         <source>AudioSamplerate</source>
@@ -1564,7 +1564,7 @@
       <trans-unit id="07d75a5073e3247c7ac54d3a797d3f777b421863" resname="Camera Model" approved="yes">
         <source>Camera Model</source>
         <target state="translated">Type d'appareil numérique</target>
-        <jms:reference-file line="281">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="320">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="56">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="77dfd2135f4db726c47299bb55be26f7f4525a46" resname="Cancel" approved="yes">
@@ -1854,7 +1854,7 @@
       <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace" approved="yes">
         <source>Colorspace</source>
         <target state="translated">Espace colorimétrique</target>
-        <jms:reference-file line="367">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="406">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
         <source>Commande</source>
@@ -2042,7 +2042,7 @@
       <trans-unit id="26a9831600fb0e895035038bcac30cc389b393e0" resname="Create index" approved="yes">
         <source>Create index</source>
         <target state="translated">Créer les index</target>
-        <jms:reference-file line="43">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="56">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="c175379b0389b2d6057b0b7db996720f1fb92fc7" resname="Creation date" approved="yes">
         <source>Creation date</source>
@@ -2131,7 +2131,7 @@
         <source>Current configuration contains some
             errors</source>
         <target state="translated">La configuration contient des erreurs</target>
-        <jms:reference-file line="309">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="310">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="31b3c410ee3a3630f3efc08bae2fd9d06ec16ff4" resname="Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again" approved="yes">
         <source>Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again</source>
@@ -2639,7 +2639,7 @@
       <trans-unit id="4e4528018d1a0aa11f7dc17b5425174a7436d334" resname="Drop index" approved="yes">
         <source>Drop index</source>
         <target state="translated">Supprimer les index</target>
-        <jms:reference-file line="36">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="3a9c043f68c147a7c8d8c2fa14ddfaba6e05da62" resname="Duree" approved="yes">
         <source>Duree</source>
@@ -2747,19 +2747,19 @@
       <trans-unit id="201b9ab150a2ab3e5641814c373f8db1949199d0" resname="ElasticSearch index name" approved="yes">
         <source>ElasticSearch index name</source>
         <target state="translated">Nom de l'index Elasticsearch</target>
-        <jms:reference-file line="31">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="44">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="666">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="b89586db0b00163ce75ae7426f06aa2e2a57b223" resname="ElasticSearch server host" approved="yes">
         <source>ElasticSearch server host</source>
         <target state="translated">Hôte du serveur Elasticsearch</target>
-        <jms:reference-file line="24">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="37">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="654">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="18fd7d0c79d71cd9317190ae98dccdb1f7cf8b76" resname="ElasticSearch service port" approved="yes">
         <source>ElasticSearch service port</source>
         <target state="translated">Port de service Elasticsearch</target>
-        <jms:reference-file line="27">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="40">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="658">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="84add5b2952787581cb9a8851eef63d1ec75d22b" resname="Email" approved="yes">
@@ -3342,7 +3342,7 @@
       <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired" approved="yes">
         <source>FlashFired</source>
         <target state="translated">Avec Flash</target>
-        <jms:reference-file line="318">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="357">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers" approved="yes">
         <source>Flatten layers</source>
@@ -3401,7 +3401,7 @@
       <trans-unit id="629fe48e7fcf628a108551add706c29832b214df" resname="FrameRate" approved="yes">
         <source>FrameRate</source>
         <target state="translated">Cadence</target>
-        <jms:reference-file line="332">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="371">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="d4947df23a237794a9ff63353bd60ebe679c830c" resname="Frequence d'echantillonage" approved="yes">
         <source>Frequence d'echantillonage</source>
@@ -3487,7 +3487,7 @@
       <trans-unit id="05a07cd950e4b273afdde28fa0b591cc75524121" resname="Get setting form index" approved="yes">
         <source>Get setting form index</source>
         <target state="translated">Obtenir les réglages de l'index</target>
-        <jms:reference-file line="97">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="81">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="ee485ef50d127d2c51fe0091051d8c390d03ed59" resname="Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side." approved="yes">
         <source>Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side.</source>
@@ -3646,7 +3646,7 @@
       <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO" approved="yes">
         <source>ISO</source>
         <target state="translated">ISO</target>
-        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="327">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
         <source>ISO sensibility</source>
@@ -4324,7 +4324,7 @@
       <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType" approved="yes">
         <source>MimeType</source>
         <target state="translated">MimeType</target>
-        <jms:reference-file line="374">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="413">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="cb4f425374af2741715669ed8b541a666078b729" resname="Minimum number of letters before truncation" approved="yes">
         <source>Minimum number of letters before truncation</source>
@@ -4688,7 +4688,8 @@
       <trans-unit id="a6633333760410e40ad92a50baade0b83afe8f7f" resname="Not aggregated" approved="yes">
         <source>Not aggregated</source>
         <target state="translated">Non agrégé</target>
-        <jms:reference-file line="242">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="17">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+        <jms:reference-file line="241">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="cc451929f50e088ffcff10e90dfe157d2319e753" resname="Notification par email" approved="yes">
         <source>Notification par email</source>
@@ -4754,13 +4755,13 @@
       <trans-unit id="997c69f6571530618bb38ac03f4cf2d236dcc15e" resname="Number of replicas" approved="yes">
         <source>Number of replicas</source>
         <target state="translated">Nombre de répliques (Replica Shards)</target>
-        <jms:reference-file line="53">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="66">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="674">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="5c2a8aa4e676273c8d8f177856923ed9950e54bb" resname="Number of shards" approved="yes">
         <source>Number of shards</source>
         <target state="translated">Nombre de Shards Elastic</target>
-        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="62">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="670">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a44db49e9b745fe2a96ae2a2ef3595913e274b33" resname="Number of threads to use for FFMpeg" approved="yes">
@@ -4861,7 +4862,7 @@
       <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation" approved="yes">
         <source>Orientation</source>
         <target state="translated">Orientation</target>
-        <jms:reference-file line="360">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="399">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
         <source>Original name</source>
@@ -4901,7 +4902,7 @@
         <jms:reference-file line="53">mobile/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="140">mobile/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="257">web/account/account.html.twig</jms:reference-file>
-        <jms:reference-file line="91">web/lightbox/index.html.twig</jms:reference-file>
+        <jms:reference-file line="96">web/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="127">lightbox/IE6/validate.html.twig</jms:reference-file>
         <jms:reference-file line="140">web/lightbox/validate.html.twig</jms:reference-file>
       </trans-unit>
@@ -5900,7 +5901,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
         <target state="translated">Sauvegarder</target>
         <jms:reference-file line="108">actions/Feedback/list.html.twig</jms:reference-file>
         <jms:reference-file line="45">web/account/change-password.html.twig</jms:reference-file>
-        <jms:reference-file line="26">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+        <jms:reference-file line="3">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
         <jms:reference-file line="3">admin/search-engine/elastic-search.html.twig</jms:reference-file>
         <jms:reference-file line="75">task-manager/task-editor/task.html.twig</jms:reference-file>
         <jms:reference-file line="53">web/developers/application.html.twig</jms:reference-file>
@@ -6168,7 +6169,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
       <trans-unit id="32e50dd99f3b67dc93272aa6c904b83d37f4f48d" resname="Shutter speed" approved="yes">
         <source>Shutter speed</source>
         <target state="translated">Vitesse d'obturateur</target>
-        <jms:reference-file line="305">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="344">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="98">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e4538baf30d4eb324ec64e4b48c1ca424dd3b773" resname="Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur." approved="yes">
@@ -6751,13 +6752,13 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
       <trans-unit id="3fc5195b4a6ff8dc205dbbad17104fa93db88281" resname="Thesaurus Min score" approved="yes">
         <source>Thesaurus Min score</source>
         <target state="translated">Hits minimum du Thésaurus</target>
-        <jms:reference-file line="57">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="70">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="678">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="163fc70a23cf29331bab9896c9a8a0cb0b113bd6" resname="Thesaurus branch" approved="yes">
         <source>Thesaurus branch</source>
         <target state="translated">Branche de thésaurus</target>
-        <jms:reference-file line="263">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="261">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="c80f8a4f795945c822db75e5414796446ada185c" resname="Thesaurus ou CTerms invalide" approved="yes">
         <source>Thesaurus ou CTerms invalide</source>
@@ -7382,7 +7383,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
       <trans-unit id="534048d6c768f47f83f67c0498e6d4ecf5cff4bb" resname="Video codec" approved="yes">
         <source>Video codec</source>
         <target state="translated">Codec vidéo</target>
-        <jms:reference-file line="346">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="385">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="56b71e89fb1079caaadefd0889e9a22e8b0560e3" resname="Videos" approved="yes">
         <source>Videos</source>
@@ -7403,7 +7404,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
       <trans-unit id="a1e3e6d2f9b416cfab10df81ce100f4fc43eb90a" resname="Vocabulary type" approved="yes">
         <source>Vocabulary type</source>
         <target state="translated">Liste de vocabulaire</target>
-        <jms:reference-file line="252">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="250">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="044d95dece43b99febe25cb6bc5fab28bf212ee0" resname="Voici vos paniers" approved="yes">
         <source>Voici vos paniers</source>
@@ -9944,10 +9945,15 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
         <target state="translated">Modifications effectuées</target>
         <jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="0bf89031fb0b79dd308305fa96c6e804bd701c06" resname="help::help-search: OR">
+        <source>help::help-search: OR</source>
+        <target state="new">help::help-search: OR</target>
+        <jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="afca2d3b5d8e63be2c3ad162f99cba5f67299d07" resname="help::help-search: relaunch search without filter">
         <source>help::help-search: relaunch search without filter</source>
         <target state="new">help::help-search: relaunch search without filter</target>
-        <jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
+        <jms:reference-file line="37">prod/results/help.html.twig</jms:reference-file>
         <jms:reference-file line="330">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling" approved="yes">
@@ -11442,17 +11448,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       <trans-unit id="cb08c63b1c016e31a255a38795c8e4cb66b0e66e" resname="prod::facet:base_label" approved="yes">
         <source>prod::facet:base_label</source>
         <target state="translated">Bases</target>
-        <jms:reference-file line="260">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="299">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="36fa870bac03b1a7c83f2b7030bf93ed4718e0a7" resname="prod::facet:collection_label" approved="yes">
         <source>prod::facet:collection_label</source>
         <target state="translated">Collections</target>
-        <jms:reference-file line="267">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="306">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="12988153991e94fd6fc58934903504b0bf03c30a" resname="prod::facet:doctype_label" approved="yes">
         <source>prod::facet:doctype_label</source>
         <target state="translated">Types de documents</target>
-        <jms:reference-file line="274">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="313">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="a146a90e6a97ac82ffa4ab5d4dc7cf4955a1e305" resname="prod::feedback:feedback_set_title" approved="yes">
         <source>prod::feedback:feedback_set_title</source>
@@ -11706,8 +11712,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       <trans-unit id="02387557776e7e3b2a78b21c54e9fb019a9a6fc3" resname="publication::Voici votre fil RSS personnel. Il vous permettra d'etre tenu au courrant des publications." approved="yes">
         <source>publication::Voici votre fil RSS personnel. Il vous permettra d'etre tenu au courrant des publications.</source>
         <target state="translated">Voici votre fil RSS personnel. Il vous permettra d'être tenu informé des publications.</target>
-        <jms:reference-file line="238">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="263">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="243">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="268">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="bc8cb61c550777cb4f094762ef7744693875ce09" resname="publications:: s'abonner aux publications" approved="yes">
         <source>publications:: s'abonner aux publications</source>
@@ -11718,14 +11724,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       <trans-unit id="d16bcb6609333ab86ad12c169212d30658b18ed4" resname="publications::Ne le partagez pas, il est strictement confidentiel" approved="yes">
         <source>publications::Ne le partagez pas, il est strictement confidentiel</source>
         <target state="translated">Ne le partagez pas, il est strictement confidentiel</target>
-        <jms:reference-file line="240">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="265">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="245">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="270">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="317aac7149d4bb63238dbe1f9461b3d817f1ff65" resname="publications::votre rss personnel" approved="yes">
         <source>publications::votre rss personnel</source>
         <target state="translated">Votre rss personnel</target>
-        <jms:reference-file line="243">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="267">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="248">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="272">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="70e2a7238a2b25916f8dda4ca72e2b8617edde67" resname="push::mail:: Rapport de validation de %user% pour %title%" approved="yes">
         <source>push::mail:: Rapport de validation de %user% pour %title%</source>
diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf
index b09a1cc389..30b26066a0 100644
--- a/resources/locales/messages.nl.xlf
+++ b/resources/locales/messages.nl.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-<file date="2020-02-14T15:00:57Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2020-02-18T16:22:28Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -631,7 +631,7 @@
       <trans-unit id="43c8f4baa612c748fb9c0b6672d77827013ff2be" resname="Action Forbidden : You are not the publisher" approved="yes">
         <source>Action Forbidden : You are not the publisher</source>
         <target state="translated">Verboden actie : U bent niet de publisher</target>
-        <jms:reference-file line="184">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="189">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="c3cd636a585b20c40ac2df5ffb403e83cb2eef51" resname="Actions" approved="yes">
         <source>Actions</source>
@@ -646,7 +646,7 @@
       <trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight">
         <source>Activate highlight</source>
         <target state="new">Activate highlight</target>
-        <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="74">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="682">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a733b809d2f1233496ab516eed0f3ef75cf3791a" resname="Active" approved="yes">
@@ -813,6 +813,11 @@
         <target state="new">After metadata</target>
         <jms:reference-file line="735">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="8309825c7302ca269da1af87d2a9a5ea9e295426" resname="Aggregated">
+        <source>Aggregated</source>
+        <target state="new">Aggregated</target>
+        <jms:reference-file line="10">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="b9ba037c0e4c06d192c83e08070b15787f07daaa" resname="Aggregation">
         <source>Aggregation</source>
         <target state="new">Aggregation</target>
@@ -875,11 +880,6 @@
         <target state="new">All these conditions</target>
         <jms:reference-file line="417">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="4f5920cee28837f31429fd82f7bc5a335272a436" resname="All values">
-        <source>All values</source>
-        <target state="new">All values</target>
-        <jms:reference-file line="247">admin/fields/templates.html.twig</jms:reference-file>
-      </trans-unit>
       <trans-unit id="bc5595b574bc9e623a22a54ae40ae0cef6c28e80" resname="Aller a" approved="yes">
         <source>Aller a</source>
         <target state="translated">Ga naar</target>
@@ -1037,7 +1037,7 @@
         <target state="translated">Er is een fout opgetreden</target>
         <jms:reference-file line="77">Order/Controller/ProdOrderController.php</jms:reference-file>
         <jms:reference-file line="521">Controller/Admin/DataboxController.php</jms:reference-file>
-        <jms:reference-file line="108">Controller/Admin/SearchEngineController.php</jms:reference-file>
+        <jms:reference-file line="135">Controller/Admin/SearchEngineController.php</jms:reference-file>
         <jms:reference-file line="126">Controller/Admin/CollectionController.php</jms:reference-file>
         <jms:reference-file line="145">Controller/Prod/BasketController.php</jms:reference-file>
         <jms:reference-file line="59">Controller/Api/V3Controller.php</jms:reference-file>
@@ -1073,7 +1073,7 @@
       <trans-unit id="aae1263383b96270870516a4097020921912df74" resname="Aperture" approved="yes">
         <source>Aperture</source>
         <target state="translated">Diafragma</target>
-        <jms:reference-file line="295">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="334">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="104">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="013cf62916a339608ae3c498d34b9e55afa46dc1" resname="Apparait aussi dans ces paniers" approved="yes">
@@ -1286,7 +1286,7 @@
       <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate">
         <source>Audio Samplerate</source>
         <target state="new">Audio Samplerate</target>
-        <jms:reference-file line="339">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="378">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="31afcc88a7f552bfd4d330c2c70d8fafd7b8e0f9" resname="Audio channel">
         <source>Audio channel</source>
@@ -1296,7 +1296,7 @@
       <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec">
         <source>Audio codec</source>
         <target state="new">Audio codec</target>
-        <jms:reference-file line="353">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="392">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="27be4ad944410219f1a8dd01cc5e216a09c16646" resname="AudioSamplerate">
         <source>AudioSamplerate</source>
@@ -1569,7 +1569,7 @@
       <trans-unit id="07d75a5073e3247c7ac54d3a797d3f777b421863" resname="Camera Model" approved="yes">
         <source>Camera Model</source>
         <target state="translated">Cameramodel</target>
-        <jms:reference-file line="281">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="320">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="56">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="77dfd2135f4db726c47299bb55be26f7f4525a46" resname="Cancel" approved="yes">
@@ -1860,7 +1860,7 @@
       <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace">
         <source>Colorspace</source>
         <target state="new">Colorspace</target>
-        <jms:reference-file line="367">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="406">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
         <source>Commande</source>
@@ -2048,7 +2048,7 @@
       <trans-unit id="26a9831600fb0e895035038bcac30cc389b393e0" resname="Create index">
         <source>Create index</source>
         <target state="new">Create index</target>
-        <jms:reference-file line="43">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="56">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="c175379b0389b2d6057b0b7db996720f1fb92fc7" resname="Creation date" approved="yes">
         <source>Creation date</source>
@@ -2138,7 +2138,7 @@
             errors</source>
         <target state="new">Current configuration contains some
             errors</target>
-        <jms:reference-file line="309">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="310">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="31b3c410ee3a3630f3efc08bae2fd9d06ec16ff4" resname="Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again" approved="yes">
         <source>Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again</source>
@@ -2646,7 +2646,7 @@
       <trans-unit id="4e4528018d1a0aa11f7dc17b5425174a7436d334" resname="Drop index">
         <source>Drop index</source>
         <target state="new">Drop index</target>
-        <jms:reference-file line="36">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="3a9c043f68c147a7c8d8c2fa14ddfaba6e05da62" resname="Duree" approved="yes">
         <source>Duree</source>
@@ -2754,19 +2754,19 @@
       <trans-unit id="201b9ab150a2ab3e5641814c373f8db1949199d0" resname="ElasticSearch index name">
         <source>ElasticSearch index name</source>
         <target state="new">ElasticSearch index name</target>
-        <jms:reference-file line="31">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="44">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="666">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="b89586db0b00163ce75ae7426f06aa2e2a57b223" resname="ElasticSearch server host">
         <source>ElasticSearch server host</source>
         <target state="new">ElasticSearch server host</target>
-        <jms:reference-file line="24">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="37">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="654">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="18fd7d0c79d71cd9317190ae98dccdb1f7cf8b76" resname="ElasticSearch service port">
         <source>ElasticSearch service port</source>
         <target state="new">ElasticSearch service port</target>
-        <jms:reference-file line="27">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="40">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="658">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="84add5b2952787581cb9a8851eef63d1ec75d22b" resname="Email">
@@ -3352,7 +3352,7 @@
       <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired">
         <source>FlashFired</source>
         <target state="new">FlashFired</target>
-        <jms:reference-file line="318">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="357">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers">
         <source>Flatten layers</source>
@@ -3411,7 +3411,7 @@
       <trans-unit id="629fe48e7fcf628a108551add706c29832b214df" resname="FrameRate">
         <source>FrameRate</source>
         <target state="new">FrameRate</target>
-        <jms:reference-file line="332">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="371">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="d4947df23a237794a9ff63353bd60ebe679c830c" resname="Frequence d'echantillonage" approved="yes">
         <source>Frequence d'echantillonage</source>
@@ -3497,7 +3497,7 @@
       <trans-unit id="05a07cd950e4b273afdde28fa0b591cc75524121" resname="Get setting form index">
         <source>Get setting form index</source>
         <target state="new">Get setting form index</target>
-        <jms:reference-file line="97">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="81">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="ee485ef50d127d2c51fe0091051d8c390d03ed59" resname="Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side.">
         <source>Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side.</source>
@@ -3656,7 +3656,7 @@
       <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO">
         <source>ISO</source>
         <target state="new">ISO</target>
-        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="327">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
         <source>ISO sensibility</source>
@@ -4334,7 +4334,7 @@
       <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType">
         <source>MimeType</source>
         <target state="new">MimeType</target>
-        <jms:reference-file line="374">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="413">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="cb4f425374af2741715669ed8b541a666078b729" resname="Minimum number of letters before truncation" approved="yes">
         <source>Minimum number of letters before truncation</source>
@@ -4698,7 +4698,8 @@
       <trans-unit id="a6633333760410e40ad92a50baade0b83afe8f7f" resname="Not aggregated">
         <source>Not aggregated</source>
         <target state="new">Not aggregated</target>
-        <jms:reference-file line="242">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="17">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+        <jms:reference-file line="241">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="cc451929f50e088ffcff10e90dfe157d2319e753" resname="Notification par email" approved="yes">
         <source>Notification par email</source>
@@ -4764,13 +4765,13 @@
       <trans-unit id="997c69f6571530618bb38ac03f4cf2d236dcc15e" resname="Number of replicas">
         <source>Number of replicas</source>
         <target state="new">Number of replicas</target>
-        <jms:reference-file line="53">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="66">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="674">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="5c2a8aa4e676273c8d8f177856923ed9950e54bb" resname="Number of shards">
         <source>Number of shards</source>
         <target state="new">Number of shards</target>
-        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="62">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="670">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a44db49e9b745fe2a96ae2a2ef3595913e274b33" resname="Number of threads to use for FFMpeg" approved="yes">
@@ -4871,7 +4872,7 @@
       <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation">
         <source>Orientation</source>
         <target state="new">Orientation</target>
-        <jms:reference-file line="360">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="399">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
         <source>Original name</source>
@@ -4911,7 +4912,7 @@
         <jms:reference-file line="53">mobile/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="140">mobile/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="257">web/account/account.html.twig</jms:reference-file>
-        <jms:reference-file line="91">web/lightbox/index.html.twig</jms:reference-file>
+        <jms:reference-file line="96">web/lightbox/index.html.twig</jms:reference-file>
         <jms:reference-file line="127">lightbox/IE6/validate.html.twig</jms:reference-file>
         <jms:reference-file line="140">web/lightbox/validate.html.twig</jms:reference-file>
       </trans-unit>
@@ -5908,7 +5909,7 @@
         <target state="translated">Opslaan</target>
         <jms:reference-file line="108">actions/Feedback/list.html.twig</jms:reference-file>
         <jms:reference-file line="45">web/account/change-password.html.twig</jms:reference-file>
-        <jms:reference-file line="26">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
+        <jms:reference-file line="3">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
         <jms:reference-file line="3">admin/search-engine/elastic-search.html.twig</jms:reference-file>
         <jms:reference-file line="75">task-manager/task-editor/task.html.twig</jms:reference-file>
         <jms:reference-file line="53">web/developers/application.html.twig</jms:reference-file>
@@ -6176,7 +6177,7 @@
       <trans-unit id="32e50dd99f3b67dc93272aa6c904b83d37f4f48d" resname="Shutter speed" approved="yes">
         <source>Shutter speed</source>
         <target state="translated">Sluitersnelheid</target>
-        <jms:reference-file line="305">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="344">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
         <jms:reference-file line="98">web/common/technical_datas.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e4538baf30d4eb324ec64e4b48c1ca424dd3b773" resname="Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur." approved="yes">
@@ -6759,13 +6760,13 @@
       <trans-unit id="3fc5195b4a6ff8dc205dbbad17104fa93db88281" resname="Thesaurus Min score">
         <source>Thesaurus Min score</source>
         <target state="new">Thesaurus Min score</target>
-        <jms:reference-file line="57">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="70">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
         <jms:reference-file line="678">web/setup/step2.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="163fc70a23cf29331bab9896c9a8a0cb0b113bd6" resname="Thesaurus branch" approved="yes">
         <source>Thesaurus branch</source>
         <target state="translated">Thesaurus tak</target>
-        <jms:reference-file line="263">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="261">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="c80f8a4f795945c822db75e5414796446ada185c" resname="Thesaurus ou CTerms invalide">
         <source>Thesaurus ou CTerms invalide</source>
@@ -7390,7 +7391,7 @@
       <trans-unit id="534048d6c768f47f83f67c0498e6d4ecf5cff4bb" resname="Video codec">
         <source>Video codec</source>
         <target state="new">Video codec</target>
-        <jms:reference-file line="346">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="385">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="56b71e89fb1079caaadefd0889e9a22e8b0560e3" resname="Videos" approved="yes">
         <source>Videos</source>
@@ -7411,7 +7412,7 @@
       <trans-unit id="a1e3e6d2f9b416cfab10df81ce100f4fc43eb90a" resname="Vocabulary type" approved="yes">
         <source>Vocabulary type</source>
         <target state="translated">Type van de vocabulair</target>
-        <jms:reference-file line="252">admin/fields/templates.html.twig</jms:reference-file>
+        <jms:reference-file line="250">admin/fields/templates.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="044d95dece43b99febe25cb6bc5fab28bf212ee0" resname="Voici vos paniers" approved="yes">
         <source>Voici vos paniers</source>
@@ -9951,10 +9952,15 @@
         <target state="translated">Bewerking correct uitgevoerd</target>
         <jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="0bf89031fb0b79dd308305fa96c6e804bd701c06" resname="help::help-search: OR">
+        <source>help::help-search: OR</source>
+        <target state="new">help::help-search: OR</target>
+        <jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="afca2d3b5d8e63be2c3ad162f99cba5f67299d07" resname="help::help-search: relaunch search without filter">
         <source>help::help-search: relaunch search without filter</source>
         <target state="new">help::help-search: relaunch search without filter</target>
-        <jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
+        <jms:reference-file line="37">prod/results/help.html.twig</jms:reference-file>
         <jms:reference-file line="330">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="45b162f3c09db4eb9ecea5e048393a7ccaab4f7d" resname="help::help-section-bullet: check-spelling">
@@ -11449,17 +11455,17 @@
       <trans-unit id="cb08c63b1c016e31a255a38795c8e4cb66b0e66e" resname="prod::facet:base_label">
         <source>prod::facet:base_label</source>
         <target state="new">prod::facet:base_label</target>
-        <jms:reference-file line="260">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="299">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="36fa870bac03b1a7c83f2b7030bf93ed4718e0a7" resname="prod::facet:collection_label">
         <source>prod::facet:collection_label</source>
         <target state="new">prod::facet:collection_label</target>
-        <jms:reference-file line="267">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="306">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="12988153991e94fd6fc58934903504b0bf03c30a" resname="prod::facet:doctype_label">
         <source>prod::facet:doctype_label</source>
         <target state="new">prod::facet:doctype_label</target>
-        <jms:reference-file line="274">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+        <jms:reference-file line="313">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="a146a90e6a97ac82ffa4ab5d4dc7cf4955a1e305" resname="prod::feedback:feedback_set_title">
         <source>prod::feedback:feedback_set_title</source>
@@ -11707,8 +11713,8 @@
       <trans-unit id="02387557776e7e3b2a78b21c54e9fb019a9a6fc3" resname="publication::Voici votre fil RSS personnel. Il vous permettra d'etre tenu au courrant des publications." approved="yes">
         <source>publication::Voici votre fil RSS personnel. Il vous permettra d'etre tenu au courrant des publications.</source>
         <target state="translated">Hier uw persoonlijke RSS feed. Deze laat u toe om op de hoogte te blijven van de publicaties.</target>
-        <jms:reference-file line="238">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="263">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="243">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="268">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="bc8cb61c550777cb4f094762ef7744693875ce09" resname="publications:: s'abonner aux publications" approved="yes">
         <source>publications:: s'abonner aux publications</source>
@@ -11719,14 +11725,14 @@
       <trans-unit id="d16bcb6609333ab86ad12c169212d30658b18ed4" resname="publications::Ne le partagez pas, il est strictement confidentiel" approved="yes">
         <source>publications::Ne le partagez pas, il est strictement confidentiel</source>
         <target state="translated">Deel deze niet, hij is strikt confidentieel</target>
-        <jms:reference-file line="240">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="265">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="245">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="270">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="317aac7149d4bb63238dbe1f9461b3d817f1ff65" resname="publications::votre rss personnel" approved="yes">
         <source>publications::votre rss personnel</source>
         <target state="translated">Uw persoonlijke rss feed</target>
-        <jms:reference-file line="243">Controller/Prod/FeedController.php</jms:reference-file>
-        <jms:reference-file line="267">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="248">Controller/Prod/FeedController.php</jms:reference-file>
+        <jms:reference-file line="272">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="70e2a7238a2b25916f8dda4ca72e2b8617edde67" resname="push::mail:: Rapport de validation de %user% pour %title%">
         <source>push::mail:: Rapport de validation de %user% pour %title%</source>
diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf
index 23329084f4..a203327709 100644
--- a/resources/locales/validators.de.xlf
+++ b/resources/locales/validators.de.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-14T15:00:03Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2020-02-18T16:21:54Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf
index 0f92e1060b..57469632c8 100644
--- a/resources/locales/validators.en.xlf
+++ b/resources/locales/validators.en.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-14T15:00:18Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2020-02-18T16:22:02Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf
index dc7661d732..39763beba8 100644
--- a/resources/locales/validators.fr.xlf
+++ b/resources/locales/validators.fr.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-14T15:00:34Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2020-02-18T16:22:14Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf
index 576bd153c2..78b38af1d2 100644
--- a/resources/locales/validators.nl.xlf
+++ b/resources/locales/validators.nl.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-14T15:00:57Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2020-02-18T16:22:28Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

From 50b50116e79c326877c32e7a876499c1f26a71c7 Mon Sep 17 00:00:00 2001
From: Jean-Yves Gaulier <gaulier@alchemy.fr>
Date: Tue, 18 Feb 2020 17:26:45 +0100
Subject: [PATCH 3/3] PHRAS-2934_Bad-dctrine-mapping-webhookeventdelivery_4.1 -
 added missing relation

---
 lib/Alchemy/Phrasea/Model/Entities/WebhookEventPayload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Alchemy/Phrasea/Model/Entities/WebhookEventPayload.php b/lib/Alchemy/Phrasea/Model/Entities/WebhookEventPayload.php
index 1befac1843..141d415e22 100644
--- a/lib/Alchemy/Phrasea/Model/Entities/WebhookEventPayload.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/WebhookEventPayload.php
@@ -30,7 +30,7 @@ class WebhookEventPayload
     private $id;
 
     /**
-     * @ORM\OneToOne(targetEntity="WebhookEventDelivery")
+     * @ORM\OneToOne(targetEntity="WebhookEventDelivery", inversedBy="payload")
      * @ORM\JoinColumn(name="delivery_id", referencedColumnName="id")
      */
     private $delivery;