porting PHRAS-1578/PHRAS-1579/PHRAS-1621/PHRAS-1675/PHRAS-1404/PHRAS-1336 to 4.1

2025-10-16 22:43:19 +00:00 · 2018-01-03 15:26:43 +04:00
parent 0d7c2bd52d
commit 071ce25b31
21 changed files with 842 additions and 189 deletions
--- a/lib/Alchemy/Phrasea/Controller/Admin/SearchEngineController.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/SearchEngineController.php
@@ -36,12 +36,14 @@ class SearchEngineController extends Controller
            return $this->app->redirectPath('admin_searchengine_form');
        }

-        return $this->render('admin/search-engine/elastic-search.html.twig', [
+        return $this->render('admin/search-engine/search-engine-settings.html.twig', [
            'form' => $form->createView(),
            'indexer' => $this->app['elasticsearch.indexer']
        ]);
    }

+
+
    public function dropIndexAction(Request $request)
    {
        $indexer = $this->app['elasticsearch.indexer'];
@@ -87,4 +89,28 @@ class SearchEngineController extends Controller
            'action' => $this->app->url('admin_searchengine_form'),
        ]);
    }
+
+    /**
+     * @param Request $request
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     */
+    public function getSettingFromIndexAction(Request $request)
+    {
+        if (!$request->isXmlHttpRequest()) {
+            $this->app->abort(400);
+        }
+        $indexer = $this->app['elasticsearch.indexer'];
+        $index = $request->get('index');
+        if (!$indexer->indexExists() || is_null($index))
+        {
+            return $this->app->json([
+                'success' => false,
+                'message' => $this->app->trans('An error occurred'),
+            ]);
+        }
+        return $this->app->json([
+            'success' => true,
+            'response' => $indexer->getSettings(['index' => $index])
+        ]);
+    }
 }
--- a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php
@@ -15,6 +15,7 @@ use Alchemy\Phrasea\Cache\Exception;
 use Alchemy\Phrasea\Collection\Reference\CollectionReference;
 use Alchemy\Phrasea\Controller\Controller;
 use Alchemy\Phrasea\Core\Configuration\DisplaySettingService;
+use Alchemy\Phrasea\SearchEngine\Elastic\ElasticsearchOptions;
 use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContextFactory;
 use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Structure;
 use Alchemy\Phrasea\SearchEngine\Elastic\ElasticSearchEngine;
@@ -280,11 +281,12 @@ class QueryController extends Controller
            $json['parsed_query'] = $result->getEngineQuery();
            /** End debug */

-            $fieldLabels = [
-                'Base_Name' => $this->app->trans('prod::facet:base_label'),
-                'Collection_Name' => $this->app->trans('prod::facet:collection_label'),
-                'Type_Name' => $this->app->trans('prod::facet:doctype_label'),
-            ];
+            $fieldLabels = [];
+            // add technical fields
+            foreach(ElasticsearchOptions::getAggregableTechnicalFields() as $k => $f) {
+                $fieldLabels[$k] = $this->app->trans($f['label']);
+            }
+            // add databox fields
            foreach ($this->app->getDataboxes() as $databox) {
                foreach ($databox->get_meta_structure() as $field) {
                    if (!isset($fieldLabels[$field->get_name()])) {
--- a/lib/Alchemy/Phrasea/ControllerProvider/Admin/SearchEngine.php
+++ b/lib/Alchemy/Phrasea/ControllerProvider/Admin/SearchEngine.php
@@ -43,6 +43,9 @@ class SearchEngine implements ControllerProviderInterface, ServiceProviderInterf
        $controllers->post('/create_index', 'controller.admin.search-engine:createIndexAction')
            ->bind("admin_searchengine_create_index");

+        $controllers->get('/setting_from_index', 'controller.admin.search-engine:getSettingFromIndexAction')
+            ->bind('admin_searchengine_setting_from_index');
+
        $controllers->match('/', 'controller.admin.search-engine:formConfigurationPanelAction')
            ->method('GET|POST')
            ->bind('admin_searchengine_form');
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
@@ -19,6 +19,7 @@ use Alchemy\Phrasea\SearchEngine\Elastic\Search\FacetsResponse;
 use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryCompiler;
 use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContext;
 use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContextFactory;
+use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Field AS ESField;
 use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Flag;
 use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Structure;
 use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
@@ -29,6 +30,7 @@ use Closure;
 use Doctrine\Common\Collections\ArrayCollection;
 use Alchemy\Phrasea\Model\Entities\FeedEntry;
 use Alchemy\Phrasea\Application;
+use databox_field;
 use Elasticsearch\Client;

 class ElasticSearchEngine implements SearchEngineInterface
@@ -487,33 +489,36 @@ class ElasticSearchEngine implements SearchEngineInterface
    private function getAggregationQueryParams(SearchEngineOptions $options)
    {
        $aggs = [];
-
-        // We always want a collection facet right now
-        $collection_facet_agg = array();
-        $collection_facet_agg['terms']['field'] = 'collection_name';
-        $aggs['Collection_Name'] = $collection_facet_agg;
-
-        // We always want a base facet right now
-        $base_facet_agg = array();
-        $base_facet_agg['terms']['field'] = 'databox_name';
-        $aggs['Base_Name'] = $base_facet_agg;
-
-        // We always want a type facet right now
-        $base_facet_agg = array();
-        $base_facet_agg['terms']['field'] = 'type';
-        $aggs['Type_Name'] = $base_facet_agg;
-
+        // technical aggregates (enable + optional limit)
+        foreach (ElasticsearchOptions::getAggregableTechnicalFields() as $k => $f) {
+            $size = $this->options->getAggregableFieldLimit($k);
+            if ($size !== databox_field::FACET_DISABLED) {
+                if ($size === databox_field::FACET_NO_LIMIT) {
+                    $size = ESField::FACET_NO_LIMIT;
+                }
+                $agg = [
+                    'terms' => [
+                        'field' => $f['field'],
+                        'size'  => $size
+                    ]
+                ];
+                $aggs[$k] = $agg;
+            }
+        }
+        // fields aggregates
        $structure = $this->context_factory->getLimitedStructure($options);
        foreach ($structure->getFacetFields() as $name => $field) {
            // 2015-05-26 (mdarse) Removed databox filtering.
            // It was already done by the ACL filter in the query scope, so no
            // document that shouldn't be displayed can go this far.
-            $agg = [];
-            $agg['terms']['field'] = $field->getIndexField(true);
-            $agg['terms']['size'] = $field->getFacetValuesLimit();
+            $agg = [
+                'terms' => [
+                    'field' => $field->getIndexField(true),
+                    'size'  => $field->getFacetValuesLimit()
+                ]
+            ];
            $aggs[$name] = AggregationHelper::wrapPrivateFieldAggregation($field, $agg);
        }
-
        return $aggs;
    }

--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php
@@ -26,6 +26,10 @@ class ElasticsearchOptions
    /** @var  bool */
    private $highlight;

+    /** @var  int[] */
+    private $_customValues;
+    private $activeTab;
+
    /**
     * Factory method to hydrate an instance from serialized options
     *
@@ -34,15 +38,22 @@ class ElasticsearchOptions
     */
    public static function fromArray(array $options)
    {
-        $options = array_replace([
+        $defaultOptions = [
            'host' => '127.0.0.1',
            'port' => 9200,
            'index' => '',
            'shards' => 3,
            'replicas' => 0,
            'minScore' => 4,
-            'highlight' => true
-        ], $options);
+            'highlight' => true,
+            'activeTab' => null,
+        ];
+
+        foreach(self::getAggregableTechnicalFields() as $k => $f) {
+            $defaultOptions[$k.'_limit'] = 0;
+        }
+        $options = array_replace($defaultOptions, $options);
+

        $self = new self();
        $self->setHost($options['host']);
@@ -52,6 +63,11 @@ class ElasticsearchOptions
        $self->setReplicas($options['replicas']);
        $self->setMinScore($options['minScore']);
        $self->setHighlight($options['highlight']);
+        $self->setActiveTab($options['activeTab']);
+        foreach(self::getAggregableTechnicalFields() as $k => $f) {
+            $self->setAggregableFieldLimit($k, $options[$k.'_limit']);
+        }
+

        return $self;
    }
@@ -61,7 +77,7 @@ class ElasticsearchOptions
     */
    public function toArray()
    {
-        return [
+        $ret = [
            'host' => $this->host,
            'port' => $this->port,
            'index' => $this->indexName,
@@ -69,7 +85,13 @@ class ElasticsearchOptions
            'replicas' => $this->replicas,
            'minScore' => $this->minScore,
            'highlight' => $this->highlight,
+            'activeTab' => $this->activeTab
        ];
+        foreach(self::getAggregableTechnicalFields() as $k => $f) {
+            $ret[$k.'_limit'] = $this->getAggregableFieldLimit($k);
+        }
+
+        return $ret;
    }

    /**
@@ -183,4 +205,121 @@ class ElasticsearchOptions
    {
        $this->highlight = $highlight;
    }
+
+    public function setAggregableFieldLimit($key, $value)
+    {
+        $this->_customValues[$key.'_limit'] = $value;
+    }
+
+    public function getAggregableFieldLimit($key)
+    {
+        return $this->_customValues[$key.'_limit'];
+    }
+
+    public function getActiveTab()
+    {
+        return $this->activeTab;
+    }
+    public function setActiveTab($activeTab)
+    {
+        $this->activeTab = $activeTab;
+    }
+
+    public function __get($key)
+    {
+        if(!array_key_exists($key, $this->_customValues)) {
+            $this->_customValues[$key] = 0;
+        }
+        return $this->_customValues[$key];
+    }
+
+    public function __set($key, $value)
+    {
+        $this->_customValues[$key] = $value;
+    }
+
+    public static function getAggregableTechnicalFields()
+    {
+        return [
+            'base_aggregate' => [
+                'label' => 'prod::facet:base_label',
+                'field' => 'databox_name',
+                'query' => 'database:%s',
+            ],
+            'collection_aggregate' => [
+                'label' => 'prod::facet:collection_label',
+                'field' => 'collection_name',
+                'query' => 'collection:%s',
+            ],
+            'doctype_aggregate' => [
+                'label' => 'prod::facet:doctype_label',
+                'field' => 'type',
+                'query' => 'type:%s',
+            ],
+            'camera_model_aggregate' => [
+                'label' => 'Camera Model',
+                'field' => 'metadata_tags.CameraModel.raw',
+                'query' => 'meta.CameraModel:%s',
+            ],
+            'iso_aggregate' => [
+                'label' => 'ISO',
+                'field' => 'metadata_tags.ISO',
+                'query' => 'meta.ISO=%s',
+            ],
+            'aperture_aggregate' => [
+                'label' => 'Aperture',
+                'field' => 'metadata_tags.Aperture',
+                'query' => 'meta.Aperture=%s',
+            ],
+            'shutterspeed_aggregate' => [
+                'label' => 'Shutter speed',
+                'field' => 'metadata_tags.ShutterSpeed',
+                'query' => 'meta.ShutterSpeed=%s',
+            ],
+            'flashfired_aggregate' => [
+                'label' => 'FlashFired',
+                'field' => 'metadata_tags.FlashFired',
+                'query' => 'meta.FlashFired=%s',
+                'choices' => [
+                    "aggregated (2 values: fired = 0 or 1)" => -1,
+                ],
+            ],
+            'framerate_aggregate' => [
+                'label' => 'FrameRate',
+                'field' => 'metadata_tags.FrameRate',
+                'query' => 'meta.FrameRate=%s',
+            ],
+            'audiosamplerate_aggregate' => [
+                'label' => 'Audio Samplerate',
+                'field' => 'metadata_tags.AudioSamplerate',
+                'query' => 'meta.AudioSamplerate=%s',
+            ],
+            'videocodec_aggregate' => [
+                'label' => 'Video codec',
+                'field' => 'metadata_tags.VideoCodec',
+                'query' => 'meta.VideoCodec:%s',
+            ],
+            'audiocodec_aggregate' => [
+                'label' => 'Audio codec',
+                'field' => 'metadata_tags.AudioCodec',
+                'query' => 'meta.AudioCodec:%s',
+            ],
+            'orientation_aggregate' => [
+                'label' => 'Orientation',
+                'field' => 'metadata_tags.Orientation',
+                'query' => 'meta.Orientation=%s',
+            ],
+            'colorspace_aggregate' => [
+                'label' => 'Colorspace',
+                'field' => 'metadata_tags.ColorSpace',
+                'query' => 'meta.ColorSpace:%s',
+            ],
+            'mimetype_aggregate' => [
+                'label' => 'MimeType',
+                'field' => 'metadata_tags.MimeType',
+                'query' => 'meta.MimeType:%s',
+            ],
+        ];
+    }
+
 }
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchSettingsFormType.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchSettingsFormType.php
@@ -10,6 +10,7 @@
 namespace Alchemy\Phrasea\SearchEngine\Elastic;

 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Range;
@@ -29,14 +30,20 @@ class ElasticsearchSettingsFormType extends AbstractType
            ->add('indexName', 'text', [
                'label' => 'ElasticSearch index name',
                'constraints' => new NotBlank(),
+                'attr' =>['data-class'=>'inline']
            ])
            ->add('esSettingsDropIndexButton', 'button', [
                'label' => "Drop index",
-                'attr' => ['data-id' => "esSettingsDropIndexButton"]
+                'attr' => [
+                    'data-id' => 'esSettingsDropIndexButton',
+                    'class' => 'btn btn-danger'
+                ]
            ])
            ->add('esSettingsCreateIndexButton', 'button', [
                'label' => "Create index",
-                'attr' => ['data-id' => "esSettingsCreateIndexButton"]
+                'attr' => ['data-id' => "esSettingsCreateIndexButton",
+                           'class' => 'btn btn-success'
+                ]
            ])
            ->add('shards', 'integer', [
                'label' => 'Number of shards',
@@ -49,12 +56,58 @@ class ElasticsearchSettingsFormType extends AbstractType
            ->add('minScore', 'integer', [
                'label' => 'Thesaurus Min score',
                'constraints' => new Range(['min' => 0]),
-            ])
+            ]);
+
+            foreach(ElasticsearchOptions::getAggregableTechnicalFields() as $k => $f) {
+                if(array_key_exists('choices', $f)) {
+                    // choices[] : choice_key => choice_value
+                    $choices = $f['choices'];
+                }
+                else {
+                    $choices = [
+                        "10 values" => 10,
+                        "20 values" => 20,
+                        "50 values" => 50,
+                        "100 values" => 100,
+                        "all values" => -1
+                    ];
+                }
+                // array_unshift($choices, "not aggregated");  //  always as first choice
+                $choices = array_merge(["not aggregated" => 0], $choices);
+                $builder
+                    ->add($k.'_limit', ChoiceType::class, [
+                        // 'label' => $f['label'],// . ' ' . 'aggregate limit',
+                        'choices_as_values' => true,
+                        'choices'           => $choices,
+                        'attr'              => [
+                            'class' => 'aggregate'
+                        ]
+                    ]);
+            }
+
+            $builder
                ->add('highlight', 'checkbox', [
                    'label' => 'Activate highlight',
                    'required' => false
                ])
-            ->add('save', 'submit')
+//                ->add('save', 'submit', [
+//                    'attr' => ['class' => 'btn btn-primary']
+//                ])
+                ->add('esSettingFromIndex', 'button', [
+                    'label' => 'Get setting form index',
+                    'attr' => [
+                        'onClick' => 'esSettingFromIndex()',
+                        'class' => 'btn'
+                    ]
+                ])
+                ->add('dumpField', 'textarea', [
+                    'label' => false,
+                    'required' => false,
+                    'mapped' => false,
+                    'attr' => ['class' => 'dumpfield hide']
+                ])
+                ->add('activeTab', 'hidden');
+
            ;
    }

--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer.php
@@ -238,4 +238,14 @@ class Indexer
        // Flush just in case, it's a noop when already done
        $bulk->flush();
    }
+
+    public function getSettings(array $params)
+    {
+        try {
+            //Get setting from index
+            return $this->client->indices()->getSettings($params);
+        } catch (\Exception $e) {
+            return $e->getMessage();
+        }
+    }
 }
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php
@@ -3,6 +3,7 @@
 namespace Alchemy\Phrasea\SearchEngine\Elastic\Search;

 use Alchemy\Phrasea\Exception\RuntimeException;
+use Alchemy\Phrasea\SearchEngine\Elastic\ElasticsearchOptions;
 use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Structure;
 use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -70,18 +71,14 @@ class FacetsResponse

    private function buildQuery($name, $value)
    {
-        switch($name) {
-            case 'Collection_Name':
-                return sprintf('collection:%s', $this->escaper->escapeWord($value));
-            case 'Base_Name':
-                return sprintf('database:%s', $this->escaper->escapeWord($value));
-            case 'Type_Name':
-                return sprintf('type:%s', $this->escaper->escapeWord($value));
-            default:
-                return sprintf('field.%s = %s',
-                    $this->escaper->escapeWord($name),
-                    $this->escaper->escapeWord($value));
+        if(array_key_exists($name, ElasticsearchOptions::getAggregableTechnicalFields())) {
+            $q = ElasticsearchOptions::getAggregableTechnicalFields()[$name]['query'];
+            $ret = sprintf($q, $this->escaper->escapeWord($value));
        }
+        else {
+            $ret = sprintf('field.%s:%s', $this->escaper->escapeWord($name), $this->escaper->escapeWord($value));
+        }
+        return $ret;
    }

    private function throwAggregationResponseError()
--- 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="2017-11-21T11:34:06Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2018-01-03T11:11:49Z" 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>
@@ -130,7 +130,7 @@
      <trans-unit id="de0804eb70c10b14d71df74292e45c6daa13d672" resname="%number% documents&lt;br/&gt;selectionnes" approved="yes">
        <source><![CDATA[%number% documents<br/>selectionnes]]></source>
        <target state="translated"><![CDATA[%number% documents<br/> ausgewählt]]></target>
-        <jms:reference-file line="246">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="247">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="ac5c6fe2979cfa2496c95dcb218f135fd916040d" resname="%quantity% Stories attached to the WorkZone" approved="yes">
        <source>%quantity% Stories attached to the WorkZone</source>
@@ -211,7 +211,7 @@
      <trans-unit id="f9b19aa0c7cf7aab245692450b473acff6a077e4" resname="%total% reponses" approved="yes">
        <source>%total% reponses</source>
        <target state="translated">%total% Ergebnisse</target>
-        <jms:reference-file line="248">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="249">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="3d850bddc9385d23589a2204c4583dcc0d62ffe5" resname="%total_count% results" approved="yes">
        <source>%total_count% results</source>
@@ -567,7 +567,7 @@
      <trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight" approved="yes">
        <source>Activate highlight</source>
        <target state="translated">Highlight aktivieren</target>
-        <jms:reference-file line="54">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a733b809d2f1233496ab516eed0f3ef75cf3791a" resname="Active" approved="yes">
        <source>Active</source>
@@ -911,6 +911,7 @@
        <target state="translated">Ein Fehler ist aufgetreten</target>
        <jms:reference-file line="125">Controller/Admin/CollectionController.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="1971">Controller/Api/V1Controller.php</jms:reference-file>
        <jms:reference-file line="2417">Controller/Api/V1Controller.php</jms:reference-file>
        <jms:reference-file line="145">Controller/Prod/BasketController.php</jms:reference-file>
@@ -945,6 +946,7 @@
      <trans-unit id="aae1263383b96270870516a4097020921912df74" resname="Aperture" approved="yes">
        <source>Aperture</source>
        <target state="translated">Blende</target>
+        <jms:reference-file line="270">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">
@@ -1154,6 +1156,16 @@
        <jms:reference-file line="34">Media/Subdef/Audio.php</jms:reference-file>
        <jms:reference-file line="36">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate">
+        <source>Audio Samplerate</source>
+        <target state="new">Audio Samplerate</target>
+        <jms:reference-file line="293">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec">
+        <source>Audio codec</source>
+        <target state="new">Audio codec</target>
+        <jms:reference-file line="303">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="27be4ad944410219f1a8dd01cc5e216a09c16646" resname="AudioSamplerate" approved="yes">
        <source>AudioSamplerate</source>
        <target state="translated">Audio Samplerate</target>
@@ -1413,6 +1425,7 @@
      <trans-unit id="07d75a5073e3247c7ac54d3a797d3f777b421863" resname="Camera Model" approved="yes">
        <source>Camera Model</source>
        <target state="translated">Kameramodell</target>
+        <jms:reference-file line="260">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">
@@ -1703,6 +1716,11 @@
        <target state="translated">Farbraum</target>
        <jms:reference-file line="62">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace">
+        <source>Colorspace</source>
+        <target state="new">Colorspace</target>
+        <jms:reference-file line="313">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
        <source>Commande</source>
        <target state="translated">Bestellung</target>
@@ -1879,7 +1897,7 @@
      <trans-unit id="26a9831600fb0e895035038bcac30cc389b393e0" resname="Create index" approved="yes">
        <source>Create index</source>
        <target state="translated">Index erstellen</target>
-        <jms:reference-file line="38">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="43">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="384422e656d8a4d803155efc371754913755a4b0" resname="Create new subdef" approved="yes">
        <source>Create new subdef</source>
@@ -2423,7 +2441,7 @@
      <trans-unit id="4e4528018d1a0aa11f7dc17b5425174a7436d334" resname="Drop index" approved="yes">
        <source>Drop index</source>
        <target state="translated">Drop index</target>
-        <jms:reference-file line="34">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="36">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="3a9c043f68c147a7c8d8c2fa14ddfaba6e05da62" resname="Duree" approved="yes">
        <source>Duree</source>
@@ -2513,22 +2531,22 @@
      <trans-unit id="be61ecc340f590e9b41e78d8f0dd9a07a0eadeda" resname="ElasticSearch configuration" approved="yes">
        <source>ElasticSearch configuration</source>
        <target state="translated">ElasticSearch Einstellung</target>
-        <jms:reference-file line="1">admin/search-engine/elastic-search.html.twig</jms:reference-file>
+        <jms:reference-file line="4">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
      </trans-unit>
      <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="30">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="31">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="23">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="24">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="26">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="27">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="84add5b2952787581cb9a8851eef63d1ec75d22b" resname="Email" approved="yes">
        <source>Email</source>
@@ -3089,6 +3107,11 @@
        <jms:reference-file line="87">web/common/technical_datas.html.twig</jms:reference-file>
        <jms:reference-file line="282">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired">
+        <source>FlashFired</source>
+        <target state="new">FlashFired</target>
+        <jms:reference-file line="280">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers" approved="yes">
        <source>Flatten layers</source>
        <target state="translated">Flatten Layers</target>
@@ -3143,6 +3166,11 @@
        <target state="translated">Bildfrequenz</target>
        <jms:reference-file line="33">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="629fe48e7fcf628a108551add706c29832b214df" resname="FrameRate">
+        <source>FrameRate</source>
+        <target state="new">FrameRate</target>
+        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="d4947df23a237794a9ff63353bd60ebe679c830c" resname="Frequence d'echantillonage" approved="yes">
        <source>Frequence d'echantillonage</source>
        <target state="translated">Abtastfrequenz</target>
@@ -3224,6 +3252,11 @@
        <target state="translated">Eine Nachricht erhalten wenn ein Email Export fehlschlägt</target>
        <jms:reference-file line="72">eventsmanager/notify/downloadmailfail.php</jms:reference-file>
      </trans-unit>
+      <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>
+      </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>
        <target state="translated">Gibt Ihrer Applikation die Möglichkeit, mit Phraseanet zu kommunizieren. Diese Webhook kann benutzt werden, um einige Aktionen auf Ihrer Applikationsseite auszulösen.</target>
@@ -3375,6 +3408,11 @@
        <target state="translated">IP</target>
        <jms:reference-file line="28">web/account/sessions.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO">
+        <source>ISO</source>
+        <target state="new">ISO</target>
+        <jms:reference-file line="265">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
        <source>ISO sensibility</source>
        <target state="translated">ISO Empfindlichkeit</target>
@@ -4050,6 +4088,11 @@
        <target state="translated">Mime Typ</target>
        <jms:reference-file line="14">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType">
+        <source>MimeType</source>
+        <target state="new">MimeType</target>
+        <jms:reference-file line="318">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>
        <target state="translated">Mindestzeichenzahl vor der Kürzung</target>
@@ -4460,12 +4503,12 @@
      <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="46">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="53">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="42">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a44db49e9b745fe2a96ae2a2ef3595913e274b33" resname="Number of threads to use for FFMpeg" approved="yes">
        <source>Number of threads to use for FFMpeg</source>
@@ -4550,6 +4593,11 @@
        <target state="translated">Einfach</target>
        <jms:reference-file line="151">Controller/Root/LoginController.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation">
+        <source>Orientation</source>
+        <target state="new">Orientation</target>
+        <jms:reference-file line="308">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
        <source>Original name</source>
        <target state="translated">ursprünglicher Name</target>
@@ -5608,6 +5656,8 @@
        <source>Save</source>
        <target state="translated">Speichern</target>
        <jms:reference-file line="45">web/account/change-password.html.twig</jms:reference-file>
+        <jms:reference-file line="3">admin/search-engine/elastic-search.html.twig</jms:reference-file>
+        <jms:reference-file line="26">admin/search-engine/general-aggregation.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>
        <jms:reference-file line="91">web/developers/application.html.twig</jms:reference-file>
@@ -5843,6 +5893,7 @@
      <trans-unit id="32e50dd99f3b67dc93272aa6c904b83d37f4f48d" resname="Shutter speed" approved="yes">
        <source>Shutter speed</source>
        <target state="translated">Verschlusszeit</target>
+        <jms:reference-file line="275">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">
@@ -6451,7 +6502,7 @@
      <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="50">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="57">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="163fc70a23cf29331bab9896c9a8a0cb0b113bd6" resname="Thesaurus branch" approved="yes">
        <source>Thesaurus branch</source>
@@ -7080,6 +7131,11 @@
        <target state="translated">Video Codec</target>
        <jms:reference-file line="34">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="534048d6c768f47f83f67c0498e6d4ecf5cff4bb" resname="Video codec">
+        <source>Video codec</source>
+        <target state="new">Video codec</target>
+        <jms:reference-file line="298">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="56b71e89fb1079caaadefd0889e9a22e8b0560e3" resname="Videos" approved="yes">
        <source>Videos</source>
        <target state="translated">Videos</target>
@@ -8647,6 +8703,11 @@
        <target state="translated">Ein Benutzer hat sich angemeldet</target>
        <jms:reference-file line="29">Notification/Mail/MailInfoSomebodyAutoregistered.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="d515b5152446301602332e06b1d84bf3974ca24d" resname="admin::search-engine: general-aggregation">
+        <source>admin::search-engine: general-aggregation</source>
+        <target state="new">admin::search-engine: general-aggregation</target>
+        <jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
+      </trans-unit>
      <trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
        <source>admin::status: case A</source>
        <target state="translated">Off</target>
@@ -8790,7 +8851,7 @@
      <trans-unit id="bc977e6f2634272519d99c369e27b6c0f4f2b542" resname="ascendant" approved="yes">
        <source>ascendant</source>
        <target state="translated">aufsteigend</target>
-        <jms:reference-file line="174">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="176">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a06a492959ce12b3f0292406ec84177d07ae19b1" resname="audio" approved="yes">
        <source>audio</source>
@@ -9343,7 +9404,7 @@
      <trans-unit id="aab7fdd9c18941cbc8d78fa0c690361ffd8c50bf" resname="date dajout" approved="yes">
        <source>date dajout</source>
        <target state="translated">hinzugefügtes Datum</target>
-        <jms:reference-file line="139">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="141">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="41c882ad92672dcb86f0ede3f789f7542bcc82fc" resname="decembre" approved="yes">
        <source>decembre</source>
@@ -9358,7 +9419,7 @@
      <trans-unit id="1051f820052d19c0fff9afec561c3d02607fc90d" resname="descendant" approved="yes">
        <source>descendant</source>
        <target state="translated">absteigend</target>
-        <jms:reference-file line="173">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="175">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="55a2ad6e3d1c02d871104d64fb811f08c54bd1b9" resname="do you want to validate" approved="yes">
        <source>do you want to validate</source>
@@ -10220,7 +10281,7 @@
      <trans-unit id="f16110620b1971f58336063cbdb64df7e0e0c7ac" resname="pertinence" approved="yes">
        <source>pertinence</source>
        <target state="translated">Relevanz</target>
-        <jms:reference-file line="138">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="140">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="da819bd8e531681e8cc8b0c5f30da694b7ffe03c" resname="php.ini path" approved="yes">
        <source>php.ini path</source>
@@ -10832,17 +10893,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="284">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="245">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="285">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="250">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="286">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="255">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="2a4d65f9a1aaeec92617d3d5dc3ef0167a019e82" resname="prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee." approved="yes">
        <source>prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee.</source>
@@ -11077,12 +11138,12 @@
      <trans-unit id="20de9f9f6ca10877415fac4611f5edd2e898c4f0" resname="reponses:: %available% Resultats rappatries sur un total de %total% trouves" approved="yes">
        <source>reponses:: %available% Resultats rappatries sur un total de %total% trouves</source>
        <target state="translated">%available% Ergebnisse abgerufen, für insgesamt %total% gefunden</target>
-        <jms:reference-file line="236">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="237">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="796a49ee2759063c6ffcb69cb54bc55b92020af5" resname="reponses:: %total% Resultats" approved="yes">
        <source>reponses:: %total% Resultats</source>
        <target state="translated">%total% Ergebnisse</target>
-        <jms:reference-file line="238">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="239">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="8791c3f27e222c796605d749c60766ef98da955c" resname="reponses:: Ces enregistrements vont etre definitivement supprimes et ne pourront etre recuperes. Etes vous sur ?" approved="yes">
        <source>reponses:: Ces enregistrements vont etre definitivement supprimes et ne pourront etre recuperes. Etes vous sur ?</source>
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?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="2017-11-21T11:34:47Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2018-01-03T11:12:30Z" 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>
    </header>
    <body>
      <trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
-        <source/>
-        <target state="new"/>
+        <source></source>
+        <target state="new"></target>
        <jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
        <jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
      </trans-unit>
@@ -130,7 +130,7 @@
      <trans-unit id="de0804eb70c10b14d71df74292e45c6daa13d672" resname="%number% documents&lt;br/&gt;selectionnes" approved="yes">
        <source><![CDATA[%number% documents<br/>selectionnes]]></source>
        <target state="translated"><![CDATA[%number% documents<br/>selected]]></target>
-        <jms:reference-file line="246">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="247">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="ac5c6fe2979cfa2496c95dcb218f135fd916040d" resname="%quantity% Stories attached to the WorkZone" approved="yes">
        <source>%quantity% Stories attached to the WorkZone</source>
@@ -211,7 +211,7 @@
      <trans-unit id="f9b19aa0c7cf7aab245692450b473acff6a077e4" resname="%total% reponses" approved="yes">
        <source>%total% reponses</source>
        <target state="translated">%total% responses</target>
-        <jms:reference-file line="248">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="249">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="3d850bddc9385d23589a2204c4583dcc0d62ffe5" resname="%total_count% results" approved="yes">
        <source>%total_count% results</source>
@@ -567,7 +567,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="54">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a733b809d2f1233496ab516eed0f3ef75cf3791a" resname="Active" approved="yes">
        <source>Active</source>
@@ -911,6 +911,7 @@
        <target state="translated">An error occurred</target>
        <jms:reference-file line="125">Controller/Admin/CollectionController.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="1971">Controller/Api/V1Controller.php</jms:reference-file>
        <jms:reference-file line="2417">Controller/Api/V1Controller.php</jms:reference-file>
        <jms:reference-file line="145">Controller/Prod/BasketController.php</jms:reference-file>
@@ -945,6 +946,7 @@
      <trans-unit id="aae1263383b96270870516a4097020921912df74" resname="Aperture" approved="yes">
        <source>Aperture</source>
        <target state="translated">Aperture</target>
+        <jms:reference-file line="270">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">
@@ -1154,6 +1156,16 @@
        <jms:reference-file line="34">Media/Subdef/Audio.php</jms:reference-file>
        <jms:reference-file line="36">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate">
+        <source>Audio Samplerate</source>
+        <target state="new">Audio Samplerate</target>
+        <jms:reference-file line="293">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec">
+        <source>Audio codec</source>
+        <target state="new">Audio codec</target>
+        <jms:reference-file line="303">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="27be4ad944410219f1a8dd01cc5e216a09c16646" resname="AudioSamplerate" approved="yes">
        <source>AudioSamplerate</source>
        <target state="translated">Audio sample rate</target>
@@ -1413,6 +1425,7 @@
      <trans-unit id="07d75a5073e3247c7ac54d3a797d3f777b421863" resname="Camera Model" approved="yes">
        <source>Camera Model</source>
        <target state="translated">Camera model</target>
+        <jms:reference-file line="260">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">
@@ -1703,6 +1716,11 @@
        <target state="translated">Color space</target>
        <jms:reference-file line="62">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace">
+        <source>Colorspace</source>
+        <target state="new">Colorspace</target>
+        <jms:reference-file line="313">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
        <source>Commande</source>
        <target state="translated">Order</target>
@@ -1879,7 +1897,7 @@
      <trans-unit id="26a9831600fb0e895035038bcac30cc389b393e0" resname="Create index" approved="yes">
        <source>Create index</source>
        <target state="translated">Create index</target>
-        <jms:reference-file line="38">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="43">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="384422e656d8a4d803155efc371754913755a4b0" resname="Create new subdef" approved="yes">
        <source>Create new subdef</source>
@@ -2232,7 +2250,7 @@
        <jms:reference-file line="45">prod/results/entry.html.twig</jms:reference-file>
        <jms:reference-file line="39">prod/results/feeds_entry.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="dcce9368ad626fe4addfa719b7a16807d464aa9b" resname="Derniers envois" approved="no">
+      <trans-unit id="dcce9368ad626fe4addfa719b7a16807d464aa9b" resname="Derniers envois">
        <source>Derniers envois</source>
        <target state="needs-translation">Last sent</target>
        <jms:reference-file line="126">web/developers/application.html.twig</jms:reference-file>
@@ -2423,7 +2441,7 @@
      <trans-unit id="4e4528018d1a0aa11f7dc17b5425174a7436d334" resname="Drop index" approved="yes">
        <source>Drop index</source>
        <target state="translated">Drop index</target>
-        <jms:reference-file line="34">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="36">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="3a9c043f68c147a7c8d8c2fa14ddfaba6e05da62" resname="Duree" approved="yes">
        <source>Duree</source>
@@ -2513,22 +2531,22 @@
      <trans-unit id="be61ecc340f590e9b41e78d8f0dd9a07a0eadeda" resname="ElasticSearch configuration" approved="yes">
        <source>ElasticSearch configuration</source>
        <target state="translated">Elasticsearch configuration</target>
-        <jms:reference-file line="1">admin/search-engine/elastic-search.html.twig</jms:reference-file>
+        <jms:reference-file line="4">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
      </trans-unit>
      <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="30">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="31">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="23">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="24">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="26">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="27">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="84add5b2952787581cb9a8851eef63d1ec75d22b" resname="Email" approved="yes">
        <source>Email</source>
@@ -3089,6 +3107,11 @@
        <jms:reference-file line="87">web/common/technical_datas.html.twig</jms:reference-file>
        <jms:reference-file line="282">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired">
+        <source>FlashFired</source>
+        <target state="new">FlashFired</target>
+        <jms:reference-file line="280">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers" approved="yes">
        <source>Flatten layers</source>
        <target state="translated">Flatten layers</target>
@@ -3143,6 +3166,11 @@
        <target state="translated">Frame rate</target>
        <jms:reference-file line="33">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="629fe48e7fcf628a108551add706c29832b214df" resname="FrameRate">
+        <source>FrameRate</source>
+        <target state="new">FrameRate</target>
+        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="d4947df23a237794a9ff63353bd60ebe679c830c" resname="Frequence d'echantillonage" approved="yes">
        <source>Frequence d'echantillonage</source>
        <target state="translated">Sampling frequency</target>
@@ -3224,6 +3252,11 @@
        <target state="translated">Get notification when e-mail export fails</target>
        <jms:reference-file line="72">eventsmanager/notify/downloadmailfail.php</jms:reference-file>
      </trans-unit>
+      <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>
+      </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>
        <target state="translated">Gives the option to your application to communicate with Phraseanet. This Webhook can be used to trigger some actions on a third-party application.</target>
@@ -3375,6 +3408,11 @@
        <target state="translated">IP address</target>
        <jms:reference-file line="28">web/account/sessions.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO">
+        <source>ISO</source>
+        <target state="new">ISO</target>
+        <jms:reference-file line="265">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
        <source>ISO sensibility</source>
        <target state="translated">ISO sensibility</target>
@@ -4050,6 +4088,11 @@
        <target state="translated">Mime type</target>
        <jms:reference-file line="14">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType">
+        <source>MimeType</source>
+        <target state="new">MimeType</target>
+        <jms:reference-file line="318">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>
        <target state="translated">Minimum number of characters before truncation</target>
@@ -4460,12 +4503,12 @@
      <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="46">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="53">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="42">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a44db49e9b745fe2a96ae2a2ef3595913e274b33" resname="Number of threads to use for FFMpeg" approved="yes">
        <source>Number of threads to use for FFMpeg</source>
@@ -4550,6 +4593,11 @@
        <target state="translated">Ordinary</target>
        <jms:reference-file line="151">Controller/Root/LoginController.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation">
+        <source>Orientation</source>
+        <target state="new">Orientation</target>
+        <jms:reference-file line="308">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
        <source>Original name</source>
        <target state="translated">Original name</target>
@@ -4625,7 +4673,7 @@
        <target state="translated">Past year</target>
        <jms:reference-file line="60">WorkZone/Browser/Browser.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="781961bc81c25697841ecce5d4d9dad9f6b261c6" resname="Pause" approved="no">
+      <trans-unit id="781961bc81c25697841ecce5d4d9dad9f6b261c6" resname="Pause">
        <source>Pause</source>
        <target state="needs-translation">Pause</target>
        <jms:reference-file line="122">Controller/Prod/LanguageController.php</jms:reference-file>
@@ -5608,6 +5656,8 @@
        <source>Save</source>
        <target state="translated">Save</target>
        <jms:reference-file line="45">web/account/change-password.html.twig</jms:reference-file>
+        <jms:reference-file line="3">admin/search-engine/elastic-search.html.twig</jms:reference-file>
+        <jms:reference-file line="26">admin/search-engine/general-aggregation.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>
        <jms:reference-file line="91">web/developers/application.html.twig</jms:reference-file>
@@ -5843,6 +5893,7 @@
      <trans-unit id="32e50dd99f3b67dc93272aa6c904b83d37f4f48d" resname="Shutter speed" approved="yes">
        <source>Shutter speed</source>
        <target state="translated">Shutter speed</target>
+        <jms:reference-file line="275">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">
@@ -6451,7 +6502,7 @@
      <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="50">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="57">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="163fc70a23cf29331bab9896c9a8a0cb0b113bd6" resname="Thesaurus branch" approved="yes">
        <source>Thesaurus branch</source>
@@ -6995,7 +7046,7 @@
        <target state="translated">Users suggestion</target>
        <jms:reference-file line="134">prod/actions/Push.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:" approved="no">
+      <trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:">
        <source>Utilisation prevue:</source>
        <target state="needs-translation">Intended use:</target>
        <jms:reference-file line="238">prod/orders/order_item.html.twig</jms:reference-file>
@@ -7080,6 +7131,11 @@
        <target state="translated">Video codec</target>
        <jms:reference-file line="34">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="534048d6c768f47f83f67c0498e6d4ecf5cff4bb" resname="Video codec">
+        <source>Video codec</source>
+        <target state="new">Video codec</target>
+        <jms:reference-file line="298">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="56b71e89fb1079caaadefd0889e9a22e8b0560e3" resname="Videos" approved="yes">
        <source>Videos</source>
        <target state="translated">Videos</target>
@@ -8648,6 +8704,11 @@
        <target state="translated">A new user has registered</target>
        <jms:reference-file line="29">Notification/Mail/MailInfoSomebodyAutoregistered.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="d515b5152446301602332e06b1d84bf3974ca24d" resname="admin::search-engine: general-aggregation">
+        <source>admin::search-engine: general-aggregation</source>
+        <target state="new">admin::search-engine: general-aggregation</target>
+        <jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
+      </trans-unit>
      <trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
        <source>admin::status: case A</source>
        <target state="translated">Off</target>
@@ -8791,7 +8852,7 @@
      <trans-unit id="bc977e6f2634272519d99c369e27b6c0f4f2b542" resname="ascendant" approved="yes">
        <source>ascendant</source>
        <target state="translated">ascending</target>
-        <jms:reference-file line="174">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="176">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a06a492959ce12b3f0292406ec84177d07ae19b1" resname="audio" approved="yes">
        <source>audio</source>
@@ -9344,7 +9405,7 @@
      <trans-unit id="aab7fdd9c18941cbc8d78fa0c690361ffd8c50bf" resname="date dajout" approved="yes">
        <source>date dajout</source>
        <target state="translated">Add date</target>
-        <jms:reference-file line="139">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="141">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="41c882ad92672dcb86f0ede3f789f7542bcc82fc" resname="decembre" approved="yes">
        <source>decembre</source>
@@ -9359,7 +9420,7 @@
      <trans-unit id="1051f820052d19c0fff9afec561c3d02607fc90d" resname="descendant" approved="yes">
        <source>descendant</source>
        <target state="translated">descending</target>
-        <jms:reference-file line="173">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="175">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="55a2ad6e3d1c02d871104d64fb811f08c54bd1b9" resname="do you want to validate" approved="yes">
        <source>do you want to validate</source>
@@ -10221,7 +10282,7 @@
      <trans-unit id="f16110620b1971f58336063cbdb64df7e0e0c7ac" resname="pertinence" approved="yes">
        <source>pertinence</source>
        <target state="translated">Relevance</target>
-        <jms:reference-file line="138">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="140">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="da819bd8e531681e8cc8b0c5f30da694b7ffe03c" resname="php.ini path" approved="yes">
        <source>php.ini path</source>
@@ -10833,17 +10894,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="284">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="245">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="285">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="250">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="286">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="255">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="2a4d65f9a1aaeec92617d3d5dc3ef0167a019e82" resname="prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee." approved="yes">
        <source>prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee.</source>
@@ -11078,12 +11139,12 @@
      <trans-unit id="20de9f9f6ca10877415fac4611f5edd2e898c4f0" resname="reponses:: %available% Resultats rappatries sur un total de %total% trouves" approved="yes">
        <source>reponses:: %available% Resultats rappatries sur un total de %total% trouves</source>
        <target state="translated">%available% returnees results from a total of %total% found</target>
-        <jms:reference-file line="236">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="237">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="796a49ee2759063c6ffcb69cb54bc55b92020af5" resname="reponses:: %total% Resultats" approved="yes">
        <source>reponses:: %total% Resultats</source>
        <target state="translated">%total% results</target>
-        <jms:reference-file line="238">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="239">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="8791c3f27e222c796605d749c60766ef98da955c" resname="reponses:: Ces enregistrements vont etre definitivement supprimes et ne pourront etre recuperes. Etes vous sur ?" approved="yes">
        <source>reponses:: Ces enregistrements vont etre definitivement supprimes et ne pourront etre recuperes. Etes vous sur ?</source>
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?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="2017-11-21T11:35:35Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2018-01-03T11:13:27Z" 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>
    </header>
    <body>
      <trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
-        <source/>
-        <target state="new"/>
+        <source></source>
+        <target state="new"></target>
        <jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
        <jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
      </trans-unit>
@@ -130,7 +130,7 @@
      <trans-unit id="de0804eb70c10b14d71df74292e45c6daa13d672" resname="%number% documents&lt;br/&gt;selectionnes" approved="yes">
        <source><![CDATA[%number% documents<br/>selectionnes]]></source>
        <target state="translated"><![CDATA[%number% documents<br/>sélectionnés]]></target>
-        <jms:reference-file line="246">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="247">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="ac5c6fe2979cfa2496c95dcb218f135fd916040d" resname="%quantity% Stories attached to the WorkZone" approved="yes">
        <source>%quantity% Stories attached to the WorkZone</source>
@@ -211,7 +211,7 @@
      <trans-unit id="f9b19aa0c7cf7aab245692450b473acff6a077e4" resname="%total% reponses" approved="yes">
        <source>%total% reponses</source>
        <target state="translated">%total% réponses</target>
-        <jms:reference-file line="248">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="249">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="3d850bddc9385d23589a2204c4583dcc0d62ffe5" resname="%total_count% results" approved="yes">
        <source>%total_count% results</source>
@@ -567,7 +567,7 @@
      <trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight" approved="yes">
        <source>Activate highlight</source>
        <target state="translated">Activer le surlignage</target>
-        <jms:reference-file line="54">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a733b809d2f1233496ab516eed0f3ef75cf3791a" resname="Active" approved="yes">
        <source>Active</source>
@@ -911,6 +911,7 @@
        <target state="translated">Une erreur est survenue</target>
        <jms:reference-file line="125">Controller/Admin/CollectionController.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="1971">Controller/Api/V1Controller.php</jms:reference-file>
        <jms:reference-file line="2417">Controller/Api/V1Controller.php</jms:reference-file>
        <jms:reference-file line="145">Controller/Prod/BasketController.php</jms:reference-file>
@@ -945,6 +946,7 @@
      <trans-unit id="aae1263383b96270870516a4097020921912df74" resname="Aperture" approved="yes">
        <source>Aperture</source>
        <target state="translated">Ouverture</target>
+        <jms:reference-file line="270">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">
@@ -1154,6 +1156,16 @@
        <jms:reference-file line="34">Media/Subdef/Audio.php</jms:reference-file>
        <jms:reference-file line="36">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate">
+        <source>Audio Samplerate</source>
+        <target state="new">Audio Samplerate</target>
+        <jms:reference-file line="293">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec">
+        <source>Audio codec</source>
+        <target state="new">Audio codec</target>
+        <jms:reference-file line="303">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="27be4ad944410219f1a8dd01cc5e216a09c16646" resname="AudioSamplerate" approved="yes">
        <source>AudioSamplerate</source>
        <target state="translated">Taux d’échantillonnage audio</target>
@@ -1413,6 +1425,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="260">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">
@@ -1703,6 +1716,11 @@
        <target state="translated">Espace colorimétrique</target>
        <jms:reference-file line="62">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace">
+        <source>Colorspace</source>
+        <target state="new">Colorspace</target>
+        <jms:reference-file line="313">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
        <source>Commande</source>
        <target state="translated">Commande</target>
@@ -1879,7 +1897,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="38">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="43">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="384422e656d8a4d803155efc371754913755a4b0" resname="Create new subdef" approved="yes">
        <source>Create new subdef</source>
@@ -2423,7 +2441,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="34">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="36">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="3a9c043f68c147a7c8d8c2fa14ddfaba6e05da62" resname="Duree" approved="yes">
        <source>Duree</source>
@@ -2513,22 +2531,22 @@
      <trans-unit id="be61ecc340f590e9b41e78d8f0dd9a07a0eadeda" resname="ElasticSearch configuration" approved="yes">
        <source>ElasticSearch configuration</source>
        <target state="translated">Configuration Elasticsearch</target>
-        <jms:reference-file line="1">admin/search-engine/elastic-search.html.twig</jms:reference-file>
+        <jms:reference-file line="4">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
      </trans-unit>
      <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="30">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="31">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="23">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="24">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="26">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="27">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="84add5b2952787581cb9a8851eef63d1ec75d22b" resname="Email" approved="yes">
        <source>Email</source>
@@ -3089,6 +3107,11 @@
        <jms:reference-file line="87">web/common/technical_datas.html.twig</jms:reference-file>
        <jms:reference-file line="282">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired">
+        <source>FlashFired</source>
+        <target state="new">FlashFired</target>
+        <jms:reference-file line="280">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers" approved="yes">
        <source>Flatten layers</source>
        <target state="translated">Aplatir les calques</target>
@@ -3143,6 +3166,11 @@
        <target state="translated">Nombre d'images par seconde</target>
        <jms:reference-file line="33">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="629fe48e7fcf628a108551add706c29832b214df" resname="FrameRate">
+        <source>FrameRate</source>
+        <target state="new">FrameRate</target>
+        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="d4947df23a237794a9ff63353bd60ebe679c830c" resname="Frequence d'echantillonage" approved="yes">
        <source>Frequence d'echantillonage</source>
        <target state="translated">Fréquence d'échantillonnage</target>
@@ -3224,6 +3252,11 @@
        <target state="translated">Obtenir une notification quand un export par e-mail échoue</target>
        <jms:reference-file line="72">eventsmanager/notify/downloadmailfail.php</jms:reference-file>
      </trans-unit>
+      <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>
+      </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>
        <target state="translated">Donne la possibilité à votre application de communiquer avec Phraseanet. Ce Webhook peut être utilisé pour déclencher des actions sur l'application distante.</target>
@@ -3375,6 +3408,11 @@
        <target state="translated">Adresse IP</target>
        <jms:reference-file line="28">web/account/sessions.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO">
+        <source>ISO</source>
+        <target state="new">ISO</target>
+        <jms:reference-file line="265">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
        <source>ISO sensibility</source>
        <target state="translated">Sensibilité ISO</target>
@@ -4050,6 +4088,11 @@
        <target state="translated">Type Mime</target>
        <jms:reference-file line="14">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType">
+        <source>MimeType</source>
+        <target state="new">MimeType</target>
+        <jms:reference-file line="318">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>
        <target state="translated">Nombre minimal de caractères avant la troncature</target>
@@ -4460,12 +4503,12 @@
      <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="46">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="53">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="42">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a44db49e9b745fe2a96ae2a2ef3595913e274b33" resname="Number of threads to use for FFMpeg" approved="yes">
        <source>Number of threads to use for FFMpeg</source>
@@ -4550,6 +4593,11 @@
        <target state="translated">Normale</target>
        <jms:reference-file line="151">Controller/Root/LoginController.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation">
+        <source>Orientation</source>
+        <target state="new">Orientation</target>
+        <jms:reference-file line="308">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
        <source>Original name</source>
        <target state="translated">Le nom de fichier original</target>
@@ -5610,6 +5658,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <source>Save</source>
        <target state="translated">Sauvegarder</target>
        <jms:reference-file line="45">web/account/change-password.html.twig</jms:reference-file>
+        <jms:reference-file line="3">admin/search-engine/elastic-search.html.twig</jms:reference-file>
+        <jms:reference-file line="26">admin/search-engine/general-aggregation.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>
        <jms:reference-file line="91">web/developers/application.html.twig</jms:reference-file>
@@ -5845,6 +5895,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="275">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">
@@ -6296,7 +6347,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <jms:reference-file line="6">web/login/cgus.html.twig</jms:reference-file>
        <jms:reference-file line="74">login/layout/base-layout.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="903b3a1a72b51b7b51f85ec8c81def53ed9c9b0c" resname="The Phraseanet Web API allows other web application to rely on this instance" approved="no">
+      <trans-unit id="903b3a1a72b51b7b51f85ec8c81def53ed9c9b0c" resname="The Phraseanet Web API allows other web application to rely on this instance">
        <source>The Phraseanet Web API allows other web application to rely on this instance</source>
        <target state="needs-translation">L'API Web Phraseanet permet à d'autres applications web de se reposer sur cette instance</target>
        <jms:reference-file line="23">Form/Configuration/APIClientsFormType.php</jms:reference-file>
@@ -6453,7 +6504,7 @@ 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="50">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="57">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="163fc70a23cf29331bab9896c9a8a0cb0b113bd6" resname="Thesaurus branch" approved="yes">
        <source>Thesaurus branch</source>
@@ -6997,7 +7048,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Suggestion d'utilisateurs</target>
        <jms:reference-file line="134">prod/actions/Push.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:" approved="no">
+      <trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:">
        <source>Utilisation prevue:</source>
        <target state="needs-translation">Utilisation prévue:</target>
        <jms:reference-file line="238">prod/orders/order_item.html.twig</jms:reference-file>
@@ -7082,6 +7133,11 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
        <target state="translated">Codec Vidéos</target>
        <jms:reference-file line="34">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="534048d6c768f47f83f67c0498e6d4ecf5cff4bb" resname="Video codec">
+        <source>Video codec</source>
+        <target state="new">Video codec</target>
+        <jms:reference-file line="298">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="56b71e89fb1079caaadefd0889e9a22e8b0560e3" resname="Videos" approved="yes">
        <source>Videos</source>
        <target state="translated">Vidéos</target>
@@ -8651,6 +8707,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Un utilisateur s'est inscrit</target>
        <jms:reference-file line="29">Notification/Mail/MailInfoSomebodyAutoregistered.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="d515b5152446301602332e06b1d84bf3974ca24d" resname="admin::search-engine: general-aggregation">
+        <source>admin::search-engine: general-aggregation</source>
+        <target state="new">admin::search-engine: general-aggregation</target>
+        <jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
+      </trans-unit>
      <trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
        <source>admin::status: case A</source>
        <target state="translated">Off</target>
@@ -8794,7 +8855,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
      <trans-unit id="bc977e6f2634272519d99c369e27b6c0f4f2b542" resname="ascendant" approved="yes">
        <source>ascendant</source>
        <target state="translated">Ascendant</target>
-        <jms:reference-file line="174">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="176">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a06a492959ce12b3f0292406ec84177d07ae19b1" resname="audio" approved="yes">
        <source>audio</source>
@@ -9347,7 +9408,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
      <trans-unit id="aab7fdd9c18941cbc8d78fa0c690361ffd8c50bf" resname="date dajout" approved="yes">
        <source>date dajout</source>
        <target state="translated">Date d'ajout</target>
-        <jms:reference-file line="139">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="141">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="41c882ad92672dcb86f0ede3f789f7542bcc82fc" resname="decembre" approved="yes">
        <source>decembre</source>
@@ -9362,7 +9423,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
      <trans-unit id="1051f820052d19c0fff9afec561c3d02607fc90d" resname="descendant" approved="yes">
        <source>descendant</source>
        <target state="translated">Descendant</target>
-        <jms:reference-file line="173">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="175">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="55a2ad6e3d1c02d871104d64fb811f08c54bd1b9" resname="do you want to validate" approved="yes">
        <source>do you want to validate</source>
@@ -10224,7 +10285,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
      <trans-unit id="f16110620b1971f58336063cbdb64df7e0e0c7ac" resname="pertinence" approved="yes">
        <source>pertinence</source>
        <target state="translated">Pertinence</target>
-        <jms:reference-file line="138">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="140">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="da819bd8e531681e8cc8b0c5f30da694b7ffe03c" resname="php.ini path" approved="yes">
        <source>php.ini path</source>
@@ -10836,17 +10897,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="284">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="245">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="285">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="250">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="286">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="255">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="2a4d65f9a1aaeec92617d3d5dc3ef0167a019e82" resname="prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee." approved="yes">
        <source>prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee.</source>
@@ -11081,12 +11142,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
      <trans-unit id="20de9f9f6ca10877415fac4611f5edd2e898c4f0" resname="reponses:: %available% Resultats rappatries sur un total de %total% trouves" approved="yes">
        <source>reponses:: %available% Resultats rappatries sur un total de %total% trouves</source>
        <target state="translated">%available% résultats récupérés sur un total de %total% trouvés</target>
-        <jms:reference-file line="236">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="237">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="796a49ee2759063c6ffcb69cb54bc55b92020af5" resname="reponses:: %total% Resultats" approved="yes">
        <source>reponses:: %total% Resultats</source>
        <target state="translated">%total% résultats</target>
-        <jms:reference-file line="238">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="239">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="8791c3f27e222c796605d749c60766ef98da955c" resname="reponses:: Ces enregistrements vont etre definitivement supprimes et ne pourront etre recuperes. Etes vous sur ?" approved="yes">
        <source>reponses:: Ces enregistrements vont etre definitivement supprimes et ne pourront etre recuperes. Etes vous sur ?</source>
--- 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="2017-11-21T11:36:28Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2018-01-03T11:14:25Z" 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>
@@ -134,7 +134,7 @@
      <trans-unit id="de0804eb70c10b14d71df74292e45c6daa13d672" resname="%number% documents&lt;br/&gt;selectionnes">
        <source><![CDATA[%number% documents<br/>selectionnes]]></source>
        <target state="new"><![CDATA[%number% documents<br/>selectionnes]]></target>
-        <jms:reference-file line="246">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="247">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="ac5c6fe2979cfa2496c95dcb218f135fd916040d" resname="%quantity% Stories attached to the WorkZone">
        <source>%quantity% Stories attached to the WorkZone</source>
@@ -215,7 +215,7 @@
      <trans-unit id="f9b19aa0c7cf7aab245692450b473acff6a077e4" resname="%total% reponses">
        <source>%total% reponses</source>
        <target state="new">%total% reponses</target>
-        <jms:reference-file line="248">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="249">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="3d850bddc9385d23589a2204c4583dcc0d62ffe5" resname="%total_count% results" approved="yes">
        <source>%total_count% results</source>
@@ -571,7 +571,7 @@
      <trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight">
        <source>Activate highlight</source>
        <target state="new">Activate highlight</target>
-        <jms:reference-file line="54">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a733b809d2f1233496ab516eed0f3ef75cf3791a" resname="Active" approved="yes">
        <source>Active</source>
@@ -915,6 +915,7 @@
        <target state="translated">Er is een fout opgetreden</target>
        <jms:reference-file line="125">Controller/Admin/CollectionController.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="1971">Controller/Api/V1Controller.php</jms:reference-file>
        <jms:reference-file line="2417">Controller/Api/V1Controller.php</jms:reference-file>
        <jms:reference-file line="145">Controller/Prod/BasketController.php</jms:reference-file>
@@ -949,6 +950,7 @@
      <trans-unit id="aae1263383b96270870516a4097020921912df74" resname="Aperture" approved="yes">
        <source>Aperture</source>
        <target state="translated">Diafragma</target>
+        <jms:reference-file line="270">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">
@@ -1158,6 +1160,16 @@
        <jms:reference-file line="34">Media/Subdef/Audio.php</jms:reference-file>
        <jms:reference-file line="36">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="a80232c45008d73666e95544f7c9c8c0896536af" resname="Audio Samplerate">
+        <source>Audio Samplerate</source>
+        <target state="new">Audio Samplerate</target>
+        <jms:reference-file line="293">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="bdeea21f6257f434dcfcffb4f0470a042a1b5c17" resname="Audio codec">
+        <source>Audio codec</source>
+        <target state="new">Audio codec</target>
+        <jms:reference-file line="303">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="27be4ad944410219f1a8dd01cc5e216a09c16646" resname="AudioSamplerate">
        <source>AudioSamplerate</source>
        <target>AudioSamplerate</target>
@@ -1417,6 +1429,7 @@
      <trans-unit id="07d75a5073e3247c7ac54d3a797d3f777b421863" resname="Camera Model" approved="yes">
        <source>Camera Model</source>
        <target state="translated">Cameramodel</target>
+        <jms:reference-file line="260">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">
@@ -1707,6 +1720,11 @@
        <target state="translated">Kleurruimte</target>
        <jms:reference-file line="62">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="0b8cb446bc8277d5fd8242aa11ecb0054f9bbaa6" resname="Colorspace">
+        <source>Colorspace</source>
+        <target state="new">Colorspace</target>
+        <jms:reference-file line="313">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="478443411674f0df06db3b28230d37625383f8c2" resname="Commande" approved="yes">
        <source>Commande</source>
        <target state="translated">Bestelling</target>
@@ -1883,7 +1901,7 @@
      <trans-unit id="26a9831600fb0e895035038bcac30cc389b393e0" resname="Create index">
        <source>Create index</source>
        <target state="new">Create index</target>
-        <jms:reference-file line="38">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="43">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="384422e656d8a4d803155efc371754913755a4b0" resname="Create new subdef" approved="yes">
        <source>Create new subdef</source>
@@ -2427,7 +2445,7 @@
      <trans-unit id="4e4528018d1a0aa11f7dc17b5425174a7436d334" resname="Drop index">
        <source>Drop index</source>
        <target state="new">Drop index</target>
-        <jms:reference-file line="34">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="36">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="3a9c043f68c147a7c8d8c2fa14ddfaba6e05da62" resname="Duree" approved="yes">
        <source>Duree</source>
@@ -2517,22 +2535,22 @@
      <trans-unit id="be61ecc340f590e9b41e78d8f0dd9a07a0eadeda" resname="ElasticSearch configuration">
        <source>ElasticSearch configuration</source>
        <target state="new">ElasticSearch configuration</target>
-        <jms:reference-file line="1">admin/search-engine/elastic-search.html.twig</jms:reference-file>
+        <jms:reference-file line="4">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="201b9ab150a2ab3e5641814c373f8db1949199d0" resname="ElasticSearch index name">
        <source>ElasticSearch index name</source>
        <target state="new">ElasticSearch index name</target>
-        <jms:reference-file line="30">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="31">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="23">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="24">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="26">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="27">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="84add5b2952787581cb9a8851eef63d1ec75d22b" resname="Email">
        <source>Email</source>
@@ -3093,6 +3111,11 @@
        <jms:reference-file line="87">web/common/technical_datas.html.twig</jms:reference-file>
        <jms:reference-file line="282">web/prod/index.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="2869d115faa9aa305076269dfbaf57c28cbd9fb6" resname="FlashFired">
+        <source>FlashFired</source>
+        <target state="new">FlashFired</target>
+        <jms:reference-file line="280">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="02893456d53323f0fdbbe9447fe5b3401f2102f7" resname="Flatten layers">
        <source>Flatten layers</source>
        <target state="new">Flatten layers</target>
@@ -3147,6 +3170,11 @@
        <target state="translated">Beelden per Seconden</target>
        <jms:reference-file line="33">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="629fe48e7fcf628a108551add706c29832b214df" resname="FrameRate">
+        <source>FrameRate</source>
+        <target state="new">FrameRate</target>
+        <jms:reference-file line="288">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="d4947df23a237794a9ff63353bd60ebe679c830c" resname="Frequence d'echantillonage" approved="yes">
        <source>Frequence d'echantillonage</source>
        <target state="translated">Samplefrequentie</target>
@@ -3228,6 +3256,11 @@
        <target state="translated">Krijg een melding wanneer een email export niet lukt</target>
        <jms:reference-file line="72">eventsmanager/notify/downloadmailfail.php</jms:reference-file>
      </trans-unit>
+      <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>
+      </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>
        <target state="new">Gives the option to your application to communicate with Phraseanet. This webhook can be used to trigger some actions on your application side.</target>
@@ -3379,6 +3412,11 @@
        <target>IP</target>
        <jms:reference-file line="28">web/account/sessions.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="4f325d995b6d028ccc75771b1679537b623521c4" resname="ISO">
+        <source>ISO</source>
+        <target state="new">ISO</target>
+        <jms:reference-file line="265">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="16a5173a6d384d155354f429d72834cd0bd6bc54" resname="ISO sensibility" approved="yes">
        <source>ISO sensibility</source>
        <target state="translated">ISO waarde</target>
@@ -4054,6 +4092,11 @@
        <target state="new">Mime type</target>
        <jms:reference-file line="14">web/common/technical_datas.html.twig</jms:reference-file>
      </trans-unit>
+      <trans-unit id="1bd7ccbde8d3077fec1f549017e747393223a900" resname="MimeType">
+        <source>MimeType</source>
+        <target state="new">MimeType</target>
+        <jms:reference-file line="318">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>
        <target state="translated">Minimum aantal tekens alvorens te ledigen</target>
@@ -4464,12 +4507,12 @@
      <trans-unit id="997c69f6571530618bb38ac03f4cf2d236dcc15e" resname="Number of replicas">
        <source>Number of replicas</source>
        <target state="new">Number of replicas</target>
-        <jms:reference-file line="46">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="53">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</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="42">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="49">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a44db49e9b745fe2a96ae2a2ef3595913e274b33" resname="Number of threads to use for FFMpeg" approved="yes">
        <source>Number of threads to use for FFMpeg</source>
@@ -4554,6 +4597,11 @@
        <target state="translated">Gewoon</target>
        <jms:reference-file line="151">Controller/Root/LoginController.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="86e4e3875420cdee95d08d4472073493729a7aee" resname="Orientation">
+        <source>Orientation</source>
+        <target state="new">Orientation</target>
+        <jms:reference-file line="308">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="77561f3d48cb738cc40f376dec4616a77da54ee1" resname="Original name" approved="yes">
        <source>Original name</source>
        <target state="translated">Originele naam</target>
@@ -5612,6 +5660,8 @@
        <source>Save</source>
        <target state="translated">Opslaan</target>
        <jms:reference-file line="45">web/account/change-password.html.twig</jms:reference-file>
+        <jms:reference-file line="3">admin/search-engine/elastic-search.html.twig</jms:reference-file>
+        <jms:reference-file line="26">admin/search-engine/general-aggregation.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>
        <jms:reference-file line="91">web/developers/application.html.twig</jms:reference-file>
@@ -5847,6 +5897,7 @@
      <trans-unit id="32e50dd99f3b67dc93272aa6c904b83d37f4f48d" resname="Shutter speed" approved="yes">
        <source>Shutter speed</source>
        <target state="translated">Sluitersnelheid</target>
+        <jms:reference-file line="275">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">
@@ -6455,7 +6506,7 @@
      <trans-unit id="3fc5195b4a6ff8dc205dbbad17104fa93db88281" resname="Thesaurus Min score">
        <source>Thesaurus Min score</source>
        <target state="new">Thesaurus Min score</target>
-        <jms:reference-file line="50">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
+        <jms:reference-file line="57">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="163fc70a23cf29331bab9896c9a8a0cb0b113bd6" resname="Thesaurus branch" approved="yes">
        <source>Thesaurus branch</source>
@@ -7084,6 +7135,11 @@
        <target>Video Codec</target>
        <jms:reference-file line="34">Media/Subdef/Video.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="534048d6c768f47f83f67c0498e6d4ecf5cff4bb" resname="Video codec">
+        <source>Video codec</source>
+        <target state="new">Video codec</target>
+        <jms:reference-file line="298">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
+      </trans-unit>
      <trans-unit id="56b71e89fb1079caaadefd0889e9a22e8b0560e3" resname="Videos" approved="yes">
        <source>Videos</source>
        <target state="translated">Video's</target>
@@ -8651,6 +8707,11 @@
        <target state="translated">een gebruiker heeft zich ingeschreven</target>
        <jms:reference-file line="29">Notification/Mail/MailInfoSomebodyAutoregistered.php</jms:reference-file>
      </trans-unit>
+      <trans-unit id="d515b5152446301602332e06b1d84bf3974ca24d" resname="admin::search-engine: general-aggregation">
+        <source>admin::search-engine: general-aggregation</source>
+        <target state="new">admin::search-engine: general-aggregation</target>
+        <jms:reference-file line="5">admin/search-engine/search-engine-settings.html.twig</jms:reference-file>
+      </trans-unit>
      <trans-unit id="8fb48b51ad1962dc1b6a3643964f38fc48853161" resname="admin::status: case A" approved="yes">
        <source>admin::status: case A</source>
        <target state="translated">Case A</target>
@@ -8794,7 +8855,7 @@
      <trans-unit id="bc977e6f2634272519d99c369e27b6c0f4f2b542" resname="ascendant" approved="yes">
        <source>ascendant</source>
        <target state="translated">aflopend</target>
-        <jms:reference-file line="174">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="176">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="a06a492959ce12b3f0292406ec84177d07ae19b1" resname="audio" approved="yes">
        <source>audio</source>
@@ -9347,7 +9408,7 @@
      <trans-unit id="aab7fdd9c18941cbc8d78fa0c690361ffd8c50bf" resname="date dajout" approved="yes">
        <source>date dajout</source>
        <target state="translated">Datum toegevoegd</target>
-        <jms:reference-file line="139">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="141">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="41c882ad92672dcb86f0ede3f789f7542bcc82fc" resname="decembre" approved="yes">
        <source>decembre</source>
@@ -9362,7 +9423,7 @@
      <trans-unit id="1051f820052d19c0fff9afec561c3d02607fc90d" resname="descendant" approved="yes">
        <source>descendant</source>
        <target state="translated">oplopend</target>
-        <jms:reference-file line="173">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="175">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="55a2ad6e3d1c02d871104d64fb811f08c54bd1b9" resname="do you want to validate" approved="yes">
        <source>do you want to validate</source>
@@ -10224,7 +10285,7 @@
      <trans-unit id="f16110620b1971f58336063cbdb64df7e0e0c7ac" resname="pertinence" approved="yes">
        <source>pertinence</source>
        <target state="translated">relevantie</target>
-        <jms:reference-file line="138">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
+        <jms:reference-file line="140">SearchEngine/Elastic/ElasticSearchEngine.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="da819bd8e531681e8cc8b0c5f30da694b7ffe03c" resname="php.ini path" approved="yes">
        <source>php.ini path</source>
@@ -10836,17 +10897,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="284">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="245">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="285">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="250">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="286">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="255">SearchEngine/Elastic/ElasticsearchOptions.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="2a4d65f9a1aaeec92617d3d5dc3ef0167a019e82" resname="prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee." approved="yes">
        <source>prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee.</source>
@@ -11081,12 +11142,12 @@
      <trans-unit id="20de9f9f6ca10877415fac4611f5edd2e898c4f0" resname="reponses:: %available% Resultats rappatries sur un total de %total% trouves">
        <source>reponses:: %available% Resultats rappatries sur un total de %total% trouves</source>
        <target state="new">reponses:: %available% Resultats rappatries sur un total de %total% trouves</target>
-        <jms:reference-file line="236">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="237">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="796a49ee2759063c6ffcb69cb54bc55b92020af5" resname="reponses:: %total% Resultats">
        <source>reponses:: %total% Resultats</source>
        <target state="new">reponses:: %total% Resultats</target>
-        <jms:reference-file line="238">Controller/Prod/QueryController.php</jms:reference-file>
+        <jms:reference-file line="239">Controller/Prod/QueryController.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="8791c3f27e222c796605d749c60766ef98da955c" resname="reponses:: Ces enregistrements vont etre definitivement supprimes et ne pourront etre recuperes. Etes vous sur ?" approved="yes">
        <source>reponses:: Ces enregistrements vont etre definitivement supprimes et ne pourront etre recuperes. Etes vous sur ?</source>
--- 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="2017-11-21T11:34:06Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2018-01-03T11:11:50Z" 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>
--- 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="2017-11-21T11:34:47Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2018-01-03T11:12:30Z" 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>
--- 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="2017-11-21T11:35:35Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2018-01-03T11:13:27Z" 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>
--- 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="2017-11-21T11:36:29Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2018-01-03T11:14:25Z" 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>
--- a/resources/www/admin/styles/main.scss
+++ b/resources/www/admin/styles/main.scss
@@ -111,6 +111,13 @@ div.finder div.content div.title {
  white-space: nowrap;
  overflow: hidden;
 }
+
+//setting
+.dumpfield {
+  margin-top:10px;
+  width: 400px;
+}
+
 /******* MAIN MENU ************************************************************/


@@ -336,6 +343,104 @@ div.switch_right.unchecked {
  margin-top: 5px;
 }

+/******* SEARCH ENGINE SETTINGS ***************************************************/
+.search-engine-tabs {
+  background: 0;
+  border: 0;
+  .top-bar-shadow {
+    margin-top: 1px;
+    background: #aaa8a5; /* For browsers that do not support gradients */
+    background: -webkit-linear-gradient(bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* For Safari 5.1 to 6.0 */
+    background: -o-linear-gradient(bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* For Opera 11.1 to 12.0 */
+    background: -moz-linear-gradient(bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* For Firefox 3.6 to 15 */
+    background: linear-gradient(to bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* Standard syntax */
+    height: 4px;
+  }
+  .ui-tabs-active {
+    background: #9EA09D !important;
+    a {
+      color: #FFFFFF !important;
+    }
+  }
+  .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    border: 0;
+    background: #EFF0F0;
+    a {
+      color: #9EA09D;
+    }
+  }
+}
+
+#elasticsearch_settings_esSettingsDropIndexButton, #elasticsearch_settings_esSettingsCreateIndexButton {
+  margin-bottom: 20px;
+}
+
+#elasticsearch_settings_save {
+  padding: 15px;
+  margin-top: 20px;
+  &::before {
+    content: "\F0A0";
+    font-family: "FontAwesome";
+    margin-right: 5px;
+  }
+}
+
+#elasticsearch_settings_esSettingFromIndex {
+  margin-top: 20px;
+}
+
+#elastic-search, #general-aggregation {
+  background: #ffffff;
+}
+
+.general-aggregation-layout {
+  margin-top: 20px;
+  width: 450px;
+  button.btn-primary {
+    margin-left: 4px;
+    margin-top: 20px;
+    padding: 15px;
+    width: 180px;
+    i {
+      margin-right: 5px;
+    }
+  }
+}
+
+.aggregation-collection {
+  li {
+    border: 1px solid #ccc;
+    background: #FFF;
+    color: #000;
+    height: 30px;
+    margin: 4px;
+    padding: 20px;
+    table {
+      width: 100%;
+      display: inline-table;
+      vertical-align: middle;
+      height: 100%;
+      table-layout: fixed;
+    }
+  }
+  .label-aggregation {
+    font-weight: bold;
+    font-size: 16px;
+    color: #666;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: inline-block;
+    width: 100%;
+    vertical-align: middle;
+    margin-bottom: 0px;
+  }
+  select {
+    float: right;
+    width: 100%;
+  }
+}
+
@import './databases';
@import './fields';
@import './tables';
--- a/templates/web/admin/search-engine/elastic-search.html.twig
+++ b/templates/web/admin/search-engine/elastic-search.html.twig
@@ -1,29 +1,6 @@
-<h1>{{ 'ElasticSearch configuration' | trans }}</h1>
-
-{{ form_start(form) }}
-    {{ form_errors(form) }}
-
-    {{ form_row(form.host) }}
-    {{ form_row(form.port) }}
-
-    <div>
-    {{ form_label(form.indexName) }}
-    {{ form_errors(form.indexName) }}
-    {{ form_widget(form.indexName) }}
-
-    {{ form_label(form.esSettingsDropIndexButton) }}
-    {{ form_widget(form.esSettingsDropIndexButton) }}
-
-    {{ form_label(form.esSettingsCreateIndexButton) }}
-    {{ form_widget(form.esSettingsCreateIndexButton) }}
-    </div>
-
-    {{ form_row(form.shards) }}
-    {{ form_row(form.replicas) }}
-    {{ form_row(form.minScore) }}
-    {{ form_row(form.highlight) }}
-    {{ form_row(form.save) }}
-{{ form_end(form) }}
+{{ form(form) }}
+<button type="submit" id="elasticsearch_settings_save" name="elasticsearch_settings[save]"
+        class="btn btn-primary">{{ 'Save' | trans }}</button>

 <form id="ElasticSearchDropIndexForm" action="{{ path('admin_searchengine_drop_index') }}" method="POST">
 </form>
@@ -33,13 +10,16 @@
 <div id="dropIndexConfirmDialog">Really drop index ?</div>

 {% block javascript %}
-<script type="text/javascript" src="{{ path('minifier', { 'f' : '/scripts/apps/admin/search-engine/views/es_config.js' }) }}"></script>
-<script type="text/javascript">
+    <script type="text/javascript">
+        var pathGetIndexSettings = "{{ path('admin_searchengine_setting_from_index') }}";
+    </script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : '/scripts/apps/admin/search-engine/views/es_config.js' }) }}"></script>
+    <script type="text/javascript">
        {% if indexer.indexExists() %}
        var elasticSearchIndexExists = true;
        {% else %}
        var elasticSearchIndexExists = false;
        {% endif %}
        searchEngineConfigurationFormInit(elasticSearchIndexExists);
-</script>
+    </script>
 {% endblock %}
--- a/templates/web/admin/search-engine/general-aggregation.html.twig
+++ b/templates/web/admin/search-engine/general-aggregation.html.twig
@@ -0,0 +1,27 @@
+<div class="general-aggregation-layout">
+    <ul class="unstyled aggregation-collection">
+        {% for formdata in form %}
+            {% set attr = formdata.vars['attr']|join(',') %}
+            {% if attr == 'aggregate' %}
+                <li>
+                    <table>
+                        <tbody>
+                        <tr>
+                            <td>
+                                {{ form_label(formdata, null, {
+                                    'label_attr': {'class': 'label-aggregation'}
+                                }) }}
+                            </td>
+                            <td>
+                                {{ form_widget(formdata) }}
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </li>
+            {% endif %}
+        {% endfor %}
+    </ul>
+    <button type="submit" id="elasticsearch_settings_save" name="elasticsearch_settings[save]"
+            class="btn btn-primary">{{ 'Save' | trans }}</button>
+</div>
--- a/templates/web/admin/search-engine/search-engine-settings.html.twig
+++ b/templates/web/admin/search-engine/search-engine-settings.html.twig
@@ -0,0 +1,33 @@
+{{ form_start(form) }}
+<div class="search-engine-tabs" style="display: none;">
+    <ul>
+        <li><a href="#elastic-search">{{ 'ElasticSearch configuration' | trans }}</a></li>
+        <li><a href="#general-aggregation">{{ 'admin::search-engine: general-aggregation' | trans }}</a></li>
+    </ul>
+    <div class="top-bar-shadow"></div>
+
+    <div id="general-aggregation">
+        {% include 'admin/search-engine/general-aggregation.html.twig'%}
+    </div>
+    <div id="elastic-search">
+        {% include 'admin/search-engine/elastic-search.html.twig' %}
+    </div>
+</div>
+
+{% block javascript %}
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $('.search-engine-tabs').tabs({
+                activate: function (event, ui) {
+                    $('#elasticsearch_settings_activeTab').val(ui.newPanel.selector);
+                }
+            });
+            var activeTab = $('#elasticsearch_settings_activeTab').val();
+            if (activeTab) {
+                $('.search-engine-tabs a[href="' + activeTab + '"]').trigger('click');
+            }
+        });
+        $(".search-engine-tabs").show();
+    </script>
+{% endblock %}
+{{ form_end(form) }}
--- a/www/scripts/apps/admin/search-engine/views/es_config.js
+++ b/www/scripts/apps/admin/search-engine/views/es_config.js
@@ -37,3 +37,32 @@ function searchEngineConfigurationFormInit(indexExists) {
        });
    }
 }
+
+$("input[data-class='inline']").parent('div').css('display','inline-block');
+$("button[data-class='inline']").parent('div').css({'display':'inline-block'});
+$("button[data-class='inline']").css({'margin-left':'10px', 'margin-bottom': '10px'});
+//Get setting from index
+function esSettingFromIndex() {
+    $('#elasticsearch_settings_dumpField').removeClass('hide');
+    var data = {};
+    data.index = $('#elasticsearch_settings_indexName').val();
+    var url = pathGetIndexSettings;
+    $.ajax({
+        type: "GET",
+        url: url,
+        dataType: 'json',
+        data : data,
+        success: function (data) {
+            if (data.success) {
+                $('#elasticsearch_settings_dumpField').text(JSON.stringify(data.response));
+            } else {
+                $('#elasticsearch_settings_dumpField').text(data.message);
+            }
+        }
+        , error: function (jqXHR, textStatus, errorThrown) {
+            alert("Error XML:\n\n" + jqXHR.responseText);
+        }
+    });
+
+    return false;
+}