Merge branch 'master' into PHRAS-3151-upgrade_mapbox

docker/phraseanet/entrypoint.sh

@@ -12,8 +12,7 @@ chown -R app:app \
     datas \
     tmp \
     logs \
-    www/thumbnails \
+    www
-    www/custom
 
 FILE=config/configuration.yml
 
@@ -48,6 +47,7 @@ if [ ${XDEBUG_ENABLED} == "1" ]; then
 fi
 
 ./docker/phraseanet/plugins/console init
+rm -Rf cache/
 
 chown -R app:app \
     cache \
@@ -55,7 +55,10 @@ chown -R app:app \
     datas \
     tmp \
     logs \
-    www \
+    www 
-    plugins/
+
+if [ -d "plugins/" ];then
+chown -R app:app plugin;
+fi
 
 bash -e docker-php-entrypoint $@

resources/locales/messages.de.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-06-29T07:49:55Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2020-06-30T14:45:25Z" 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>
@@ -9627,7 +9627,7 @@
         <jms:reference-file line="36">web/thesaurus/export-topics.html.twig</jms:reference-file>
         <jms:reference-file line="115">web/thesaurus/accept.html.twig</jms:reference-file>
         <jms:reference-file line="129">web/thesaurus/accept.html.twig</jms:reference-file>
-        <jms:reference-file line="114">web/thesaurus/properties.html.twig</jms:reference-file>
+        <jms:reference-file line="111">web/thesaurus/properties.html.twig</jms:reference-file>
         <jms:reference-file line="45">web/thesaurus/link-field-step3.html.twig</jms:reference-file>
         <jms:reference-file line="96">web/common/dialog_export.html.twig</jms:reference-file>
         <jms:reference-file line="23">web/lightbox/sc_note.html.twig</jms:reference-file>
@@ -13418,7 +13418,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
       <trans-unit id="8722fc011f51b468cf4205d8e3b8f8984f2de548" resname="thesaurus:: Confirmer la suppression du terme %s" approved="yes">
         <source>thesaurus:: Confirmer la suppression du terme %s</source>
         <target state="translated">Das Löschen des Begriffes "%s" bestätigen</target>
-        <jms:reference-file line="222">web/thesaurus/properties.html.twig</jms:reference-file>
+        <jms:reference-file line="219">web/thesaurus/properties.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="d02ad78a59c7dc07363f5017d0adb96648880f77" resname="thesaurus:: Editer le thesaurus" approved="yes">
         <source>thesaurus:: Editer le thesaurus</source>
@@ -13647,16 +13647,6 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
         <target state="translated">erzeugte Datei am %date%</target>
         <jms:reference-file line="357">Controller/Thesaurus/ThesaurusController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9eea030ece6cc7f8d7bf5b6eda81a71e4a658fd2" resname="thesaurus:: hits" approved="yes">
-        <source>thesaurus:: hits</source>
-        <target state="translated">Ergebnisse</target>
-        <jms:reference-file line="68">web/thesaurus/properties.html.twig</jms:reference-file>
-      </trans-unit>
-      <trans-unit id="7a28dd52290d73ad90e5291f2d23b2780ead3cfa" resname="thesaurus:: ids" approved="yes">
-        <source>thesaurus:: ids</source>
-        <target state="translated">Benutzernamen</target>
-        <jms:reference-file line="69">web/thesaurus/properties.html.twig</jms:reference-file>
-      </trans-unit>
       <trans-unit id="c0f2a335de197ca806136680f016f57191f504e9" resname="thesaurus:: langue par default" approved="yes">
         <source>thesaurus:: langue par default</source>
         <target state="translated">Standardmässige Sprache</target>
@@ -13717,6 +13707,11 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
         <target state="translated">Keine Wieder Indexierung</target>
         <jms:reference-file line="86">web/thesaurus/link-field-step2.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="8c922c9810f5a481a9bad960b4c2c838b09d4a22" resname="thesaurus:: populate button">
+        <source>thesaurus:: populate button</source>
+        <target state="new">thesaurus:: populate button</target>
+        <jms:reference-file line="226">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="a448f487b7feb813766fdba3b0713bd3c690c756" resname="thesaurus:: presentation" approved="yes">
         <source>thesaurus:: presentation</source>
         <target state="translated">Anzeigeoptionen</target>
@@ -13906,12 +13901,12 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
       <trans-unit id="2f3ee022a88321b6be0c4a75ba9d2fe332a5271a" resname="thesaurus::populate: Warning populate is in process to indexing databox">
         <source>thesaurus::populate: Warning populate is in process to indexing databox</source>
         <target state="new">thesaurus::populate: Warning populate is in process to indexing databox</target>
-        <jms:reference-file line="1564">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+        <jms:reference-file line="1566">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="86465964be7ece23a936c992fc5caff911f7a259" resname="thesaurus::populate: success message">
         <source>thesaurus::populate: success message</source>
         <target state="new">thesaurus::populate: success message</target>
-        <jms:reference-file line="1559">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+        <jms:reference-file line="1561">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="af1aa44c04fac8955dcec74f9a412e27baf564f1" resname="thesaurus:dialog:: export">
         <source>thesaurus:dialog:: export</source>
@@ -13923,6 +13918,11 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
         <target state="new">thesaurus:dialog:: properties</target>
         <jms:reference-file line="648">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="bf4b4b493b31b491dfc5f522f303ea1ac691f65c" resname="thesaurus:termePorperties:termeId">
+        <source>thesaurus:termePorperties:termeId</source>
+        <target state="new">thesaurus:termePorperties:termeId</target>
+        <jms:reference-file line="68">web/thesaurus/properties.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="1118f7e206d8ec4d92392f3e8c2804b156b3a082" resname="thumbnail validation" approved="yes">
         <source>thumbnail validation</source>
         <target state="translated">Miniaturansicht Bestätigung</target>

resources/locales/messages.en.xlf

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-06-29T07:50:20Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2020-06-30T14:45:51Z" 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>
@@ -9630,7 +9630,7 @@
         <jms:reference-file line="36">web/thesaurus/export-topics.html.twig</jms:reference-file>
         <jms:reference-file line="115">web/thesaurus/accept.html.twig</jms:reference-file>
         <jms:reference-file line="129">web/thesaurus/accept.html.twig</jms:reference-file>
-        <jms:reference-file line="114">web/thesaurus/properties.html.twig</jms:reference-file>
+        <jms:reference-file line="111">web/thesaurus/properties.html.twig</jms:reference-file>
         <jms:reference-file line="45">web/thesaurus/link-field-step3.html.twig</jms:reference-file>
         <jms:reference-file line="96">web/common/dialog_export.html.twig</jms:reference-file>
         <jms:reference-file line="23">web/lightbox/sc_note.html.twig</jms:reference-file>
@@ -12197,19 +12197,19 @@ It is possible to place several search areas</target>
         <target state="needs-translation">Type a subtitle</target>
         <jms:reference-file line="179">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="e382cd2339d70cb6f6500fb44c81737e72ee66b1" resname="prod:videoeditor:subtitletab:: End time">
+      <trans-unit id="e382cd2339d70cb6f6500fb44c81737e72ee66b1" resname="prod:videoeditor:subtitletab:: End time" approved="yes">
         <source>prod:videoeditor:subtitletab:: End time</source>
-        <target state="needs-translation">End</target>
+        <target state="translated">End</target>
         <jms:reference-file line="177">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="b12193c53fdd26a57e157dc15823df75ad0756e3" resname="prod:videoeditor:subtitletab:: No caption message">
+      <trans-unit id="b12193c53fdd26a57e157dc15823df75ad0756e3" resname="prod:videoeditor:subtitletab:: No caption message" approved="yes">
         <source>prod:videoeditor:subtitletab:: No caption message</source>
-        <target state="needs-translation">No Subtitle set for this language</target>
+        <target state="translated">No Subtitle set for this language</target>
         <jms:reference-file line="198">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="f79f9eb59816db76a3249710f753b7972c449654" resname="prod:videoeditor:subtitletab:: Show for">
+      <trans-unit id="f79f9eb59816db76a3249710f753b7972c449654" resname="prod:videoeditor:subtitletab:: Show for" approved="yes">
         <source>prod:videoeditor:subtitletab:: Show for</source>
-        <target state="needs-translation">Duration</target>
+        <target state="translated">Duration</target>
         <jms:reference-file line="178">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e79e454459e7dc39a4aad9eb7f65014fa6f0a001" resname="prod:videoeditor:subtitletab:: Start time" approved="yes">
@@ -13393,7 +13393,7 @@ It is possible to place several search areas</target>
         <target state="translated">Thesaurus has been updated</target>
         <jms:reference-file line="5">web/thesaurus/load-thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="04b142345b93cbda377e24dd051b6e3a051d6fc2" resname="thesaurus: Populate title" approved="no">
+      <trans-unit id="04b142345b93cbda377e24dd051b6e3a051d6fc2" resname="thesaurus: Populate title">
         <source>thesaurus: Populate title</source>
         <target state="needs-translation">Indexing</target>
         <jms:reference-file line="1528">web/thesaurus/thesaurus.html.twig</jms:reference-file>
@@ -13426,7 +13426,7 @@ It is possible to place several search areas</target>
       <trans-unit id="8722fc011f51b468cf4205d8e3b8f8984f2de548" resname="thesaurus:: Confirmer la suppression du terme %s" approved="yes">
         <source>thesaurus:: Confirmer la suppression du terme %s</source>
         <target state="translated">Confirm term "%s" delete</target>
-        <jms:reference-file line="222">web/thesaurus/properties.html.twig</jms:reference-file>
+        <jms:reference-file line="219">web/thesaurus/properties.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="d02ad78a59c7dc07363f5017d0adb96648880f77" resname="thesaurus:: Editer le thesaurus" approved="yes">
         <source>thesaurus:: Editer le thesaurus</source>
@@ -13528,7 +13528,7 @@ It is possible to place several search areas</target>
         <target state="translated">starts with</target>
         <jms:reference-file line="282">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="830f705269778d157154cbd4b82a56c913601835" resname="thesaurus:: confirm populate" approved="no">
+      <trans-unit id="830f705269778d157154cbd4b82a56c913601835" resname="thesaurus:: confirm populate">
         <source>thesaurus:: confirm populate</source>
         <target state="needs-translation">Launch databases indexing</target>
         <jms:reference-file line="230">web/thesaurus/thesaurus.html.twig</jms:reference-file>
@@ -13655,16 +13655,6 @@ It is possible to place several search areas</target>
         <target state="translated">Generated file on %date%</target>
         <jms:reference-file line="357">Controller/Thesaurus/ThesaurusController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9eea030ece6cc7f8d7bf5b6eda81a71e4a658fd2" resname="thesaurus:: hits" approved="yes">
-        <source>thesaurus:: hits</source>
-        <target state="translated">hits</target>
-        <jms:reference-file line="68">web/thesaurus/properties.html.twig</jms:reference-file>
-      </trans-unit>
-      <trans-unit id="7a28dd52290d73ad90e5291f2d23b2780ead3cfa" resname="thesaurus:: ids" approved="yes">
-        <source>thesaurus:: ids</source>
-        <target state="translated">ids</target>
-        <jms:reference-file line="69">web/thesaurus/properties.html.twig</jms:reference-file>
-      </trans-unit>
       <trans-unit id="c0f2a335de197ca806136680f016f57191f504e9" resname="thesaurus:: langue par default" approved="yes">
         <source>thesaurus:: langue par default</source>
         <target state="translated">Default language</target>
@@ -13725,6 +13715,11 @@ It is possible to place several search areas</target>
         <target state="translated">No re-index</target>
         <jms:reference-file line="86">web/thesaurus/link-field-step2.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="8c922c9810f5a481a9bad960b4c2c838b09d4a22" resname="thesaurus:: populate button" approved="no">
+        <source>thesaurus:: populate button</source>
+        <target state="needs-translation">Indexing</target>
+        <jms:reference-file line="226">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="a448f487b7feb813766fdba3b0713bd3c690c756" resname="thesaurus:: presentation" approved="yes">
         <source>thesaurus:: presentation</source>
         <target state="translated">Display options</target>
@@ -13849,7 +13844,7 @@ It is possible to place several search areas</target>
       </trans-unit>
       <trans-unit id="1c9e7274902f1bddc9bd0abb8b9c1113685a9c2e" resname="thesaurus::menu:  Mettre dans le stock" approved="no">
         <source>thesaurus::menu:  Mettre dans le stock</source>
-        <target state="needs-translation">Place in the stock</target>
+        <target state="needs-translation">Move to the stock</target>
         <jms:reference-file line="196">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="758b089c0ed0efc0a6b86e1b45b1526dca96bb34" resname="thesaurus::menu: Nouveau synonyme" approved="yes">
@@ -13911,27 +13906,31 @@ It is possible to place several search areas</target>
         <jms:reference-file line="33">web/thesaurus/properties.html.twig</jms:reference-file>
         <jms:reference-file line="182">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="2f3ee022a88321b6be0c4a75ba9d2fe332a5271a" resname="thesaurus::populate: Warning populate is in process to indexing databox" approved="no">
+      <trans-unit id="2f3ee022a88321b6be0c4a75ba9d2fe332a5271a" resname="thesaurus::populate: Warning populate is in process to indexing databox">
         <source>thesaurus::populate: Warning populate is in process to indexing databox</source>
-        <target state="needs-translation">Warning populate is in process to indexing databox,
+        <target state="needs-translation">Warning populate is in process to indexing databox. Wait the end of this indexing, before launch a new one.</target>
-Wait the end of this indexing, before launch a new one.</target>
+        <jms:reference-file line="1566">web/thesaurus/thesaurus.html.twig</jms:reference-file>
-        <jms:reference-file line="1564">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="86465964be7ece23a936c992fc5caff911f7a259" resname="thesaurus::populate: success message">
         <source>thesaurus::populate: success message</source>
         <target state="new">thesaurus::populate: success message</target>
-        <jms:reference-file line="1559">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+        <jms:reference-file line="1561">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="af1aa44c04fac8955dcec74f9a412e27baf564f1" resname="thesaurus:dialog:: export" approved="no">
         <source>thesaurus:dialog:: export</source>
-        <target state="needs-translation">Candidats export</target>
+        <target state="needs-translation">Export Candidats</target>
         <jms:reference-file line="696">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="20d809c23bf735082691fef2239d95d86d37e461" resname="thesaurus:dialog:: properties" approved="no">
+      <trans-unit id="20d809c23bf735082691fef2239d95d86d37e461" resname="thesaurus:dialog:: properties">
         <source>thesaurus:dialog:: properties</source>
         <target state="needs-translation">Properties</target>
         <jms:reference-file line="648">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="bf4b4b493b31b491dfc5f522f303ea1ac691f65c" resname="thesaurus:termePorperties:termeId" approved="no">
+        <source>thesaurus:termePorperties:termeId</source>
+        <target state="needs-translation">Id</target>
+        <jms:reference-file line="68">web/thesaurus/properties.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="1118f7e206d8ec4d92392f3e8c2804b156b3a082" resname="thumbnail validation" approved="yes">
         <source>thumbnail validation</source>
         <target state="translated">Confirm thumbnail</target>

resources/locales/messages.fr.xlf

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-06-29T07:50:46Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2020-06-30T14:46:16Z" 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>
@@ -9630,7 +9630,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
         <jms:reference-file line="36">web/thesaurus/export-topics.html.twig</jms:reference-file>
         <jms:reference-file line="115">web/thesaurus/accept.html.twig</jms:reference-file>
         <jms:reference-file line="129">web/thesaurus/accept.html.twig</jms:reference-file>
-        <jms:reference-file line="114">web/thesaurus/properties.html.twig</jms:reference-file>
+        <jms:reference-file line="111">web/thesaurus/properties.html.twig</jms:reference-file>
         <jms:reference-file line="45">web/thesaurus/link-field-step3.html.twig</jms:reference-file>
         <jms:reference-file line="96">web/common/dialog_export.html.twig</jms:reference-file>
         <jms:reference-file line="23">web/lightbox/sc_note.html.twig</jms:reference-file>
@@ -13396,7 +13396,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles
         <target state="translated">Le thésaurus a été mis à jour</target>
         <jms:reference-file line="5">web/thesaurus/load-thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="04b142345b93cbda377e24dd051b6e3a051d6fc2" resname="thesaurus: Populate title" approved="no">
+      <trans-unit id="04b142345b93cbda377e24dd051b6e3a051d6fc2" resname="thesaurus: Populate title">
         <source>thesaurus: Populate title</source>
         <target state="needs-translation">Indéxation</target>
         <jms:reference-file line="1528">web/thesaurus/thesaurus.html.twig</jms:reference-file>
@@ -13429,7 +13429,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles
       <trans-unit id="8722fc011f51b468cf4205d8e3b8f8984f2de548" resname="thesaurus:: Confirmer la suppression du terme %s" approved="yes">
         <source>thesaurus:: Confirmer la suppression du terme %s</source>
         <target state="translated">Confirmer la suppression du terme "%s"</target>
-        <jms:reference-file line="222">web/thesaurus/properties.html.twig</jms:reference-file>
+        <jms:reference-file line="219">web/thesaurus/properties.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="d02ad78a59c7dc07363f5017d0adb96648880f77" resname="thesaurus:: Editer le thesaurus" approved="yes">
         <source>thesaurus:: Editer le thesaurus</source>
@@ -13531,7 +13531,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles
         <target state="translated">commence par</target>
         <jms:reference-file line="282">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="830f705269778d157154cbd4b82a56c913601835" resname="thesaurus:: confirm populate" approved="no">
+      <trans-unit id="830f705269778d157154cbd4b82a56c913601835" resname="thesaurus:: confirm populate">
         <source>thesaurus:: confirm populate</source>
         <target state="needs-translation">Lancer une indexation de l'intégralité de la base</target>
         <jms:reference-file line="230">web/thesaurus/thesaurus.html.twig</jms:reference-file>
@@ -13658,16 +13658,6 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles
         <target state="translated">Fichier généré le %date%</target>
         <jms:reference-file line="357">Controller/Thesaurus/ThesaurusController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9eea030ece6cc7f8d7bf5b6eda81a71e4a658fd2" resname="thesaurus:: hits" approved="yes">
-        <source>thesaurus:: hits</source>
-        <target state="translated">hits</target>
-        <jms:reference-file line="68">web/thesaurus/properties.html.twig</jms:reference-file>
-      </trans-unit>
-      <trans-unit id="7a28dd52290d73ad90e5291f2d23b2780ead3cfa" resname="thesaurus:: ids" approved="yes">
-        <source>thesaurus:: ids</source>
-        <target state="translated">Nom de l'utilisateur</target>
-        <jms:reference-file line="69">web/thesaurus/properties.html.twig</jms:reference-file>
-      </trans-unit>
       <trans-unit id="c0f2a335de197ca806136680f016f57191f504e9" resname="thesaurus:: langue par default" approved="yes">
         <source>thesaurus:: langue par default</source>
         <target state="translated">Langue par défaut</target>
@@ -13728,6 +13718,11 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles
         <target state="translated">Pas de ré-indexation</target>
         <jms:reference-file line="86">web/thesaurus/link-field-step2.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="8c922c9810f5a481a9bad960b4c2c838b09d4a22" resname="thesaurus:: populate button" approved="no">
+        <source>thesaurus:: populate button</source>
+        <target state="needs-translation">Indexation</target>
+        <jms:reference-file line="226">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="a448f487b7feb813766fdba3b0713bd3c690c756" resname="thesaurus:: presentation" approved="yes">
         <source>thesaurus:: presentation</source>
         <target state="translated">Options d'affichage</target>
@@ -13850,7 +13845,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles
         <target state="translated">Tout fermer (navigable)</target>
         <jms:reference-file line="137">web/thesaurus/export-topics-dialog.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="1c9e7274902f1bddc9bd0abb8b9c1113685a9c2e" resname="thesaurus::menu:  Mettre dans le stock" approved="no">
+      <trans-unit id="1c9e7274902f1bddc9bd0abb8b9c1113685a9c2e" resname="thesaurus::menu:  Mettre dans le stock">
         <source>thesaurus::menu:  Mettre dans le stock</source>
         <target state="needs-translation">Déplacer dans le stock</target>
         <jms:reference-file line="196">web/thesaurus/thesaurus.html.twig</jms:reference-file>
@@ -13914,27 +13909,31 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles
         <jms:reference-file line="33">web/thesaurus/properties.html.twig</jms:reference-file>
         <jms:reference-file line="182">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="2f3ee022a88321b6be0c4a75ba9d2fe332a5271a" resname="thesaurus::populate: Warning populate is in process to indexing databox" approved="no">
+      <trans-unit id="2f3ee022a88321b6be0c4a75ba9d2fe332a5271a" resname="thesaurus::populate: Warning populate is in process to indexing databox">
         <source>thesaurus::populate: Warning populate is in process to indexing databox</source>
-        <target state="needs-translation">Attention une indexation de la base est deja en cours.
+        <target state="needs-translation">Attention une indexation de la base est deja en cours. Il est nécéssaire d'attendre la fin de cette indexation pour en relancer une nouvelle.</target>
-Il est nécéssaire d'attendre la fin de cette indexation pour en relancer une nouvelle</target>
+        <jms:reference-file line="1566">web/thesaurus/thesaurus.html.twig</jms:reference-file>
-        <jms:reference-file line="1564">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="86465964be7ece23a936c992fc5caff911f7a259" resname="thesaurus::populate: success message">
         <source>thesaurus::populate: success message</source>
         <target state="new">thesaurus::populate: success message</target>
-        <jms:reference-file line="1559">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+        <jms:reference-file line="1561">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="af1aa44c04fac8955dcec74f9a412e27baf564f1" resname="thesaurus:dialog:: export" approved="no">
+      <trans-unit id="af1aa44c04fac8955dcec74f9a412e27baf564f1" resname="thesaurus:dialog:: export">
         <source>thesaurus:dialog:: export</source>
         <target state="needs-translation">Export des termes candidats</target>
         <jms:reference-file line="696">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="20d809c23bf735082691fef2239d95d86d37e461" resname="thesaurus:dialog:: properties" approved="no">
+      <trans-unit id="20d809c23bf735082691fef2239d95d86d37e461" resname="thesaurus:dialog:: properties">
         <source>thesaurus:dialog:: properties</source>
         <target state="needs-translation">Propriétés</target>
         <jms:reference-file line="648">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="bf4b4b493b31b491dfc5f522f303ea1ac691f65c" resname="thesaurus:termePorperties:termeId" approved="no">
+        <source>thesaurus:termePorperties:termeId</source>
+        <target state="needs-translation">ID</target>
+        <jms:reference-file line="68">web/thesaurus/properties.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="1118f7e206d8ec4d92392f3e8c2804b156b3a082" resname="thumbnail validation" approved="yes">
         <source>thumbnail validation</source>
         <target state="translated">Validation de la vignette</target>

resources/locales/messages.nl.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-06-29T07:51:14Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2020-06-30T14:46:45Z" 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>
@@ -9637,7 +9637,7 @@
         <jms:reference-file line="36">web/thesaurus/export-topics.html.twig</jms:reference-file>
         <jms:reference-file line="115">web/thesaurus/accept.html.twig</jms:reference-file>
         <jms:reference-file line="129">web/thesaurus/accept.html.twig</jms:reference-file>
-        <jms:reference-file line="114">web/thesaurus/properties.html.twig</jms:reference-file>
+        <jms:reference-file line="111">web/thesaurus/properties.html.twig</jms:reference-file>
         <jms:reference-file line="45">web/thesaurus/link-field-step3.html.twig</jms:reference-file>
         <jms:reference-file line="96">web/common/dialog_export.html.twig</jms:reference-file>
         <jms:reference-file line="23">web/lightbox/sc_note.html.twig</jms:reference-file>
@@ -13427,7 +13427,7 @@
       <trans-unit id="8722fc011f51b468cf4205d8e3b8f8984f2de548" resname="thesaurus:: Confirmer la suppression du terme %s" approved="yes">
         <source>thesaurus:: Confirmer la suppression du terme %s</source>
         <target state="translated">Bevestig verwijderinng van de term %s</target>
-        <jms:reference-file line="222">web/thesaurus/properties.html.twig</jms:reference-file>
+        <jms:reference-file line="219">web/thesaurus/properties.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="d02ad78a59c7dc07363f5017d0adb96648880f77" resname="thesaurus:: Editer le thesaurus" approved="yes">
         <source>thesaurus:: Editer le thesaurus</source>
@@ -13656,16 +13656,6 @@
         <target state="new">thesaurus:: fichier genere le %date%</target>
         <jms:reference-file line="357">Controller/Thesaurus/ThesaurusController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9eea030ece6cc7f8d7bf5b6eda81a71e4a658fd2" resname="thesaurus:: hits" approved="yes">
-        <source>thesaurus:: hits</source>
-        <target state="translated">Hits</target>
-        <jms:reference-file line="68">web/thesaurus/properties.html.twig</jms:reference-file>
-      </trans-unit>
-      <trans-unit id="7a28dd52290d73ad90e5291f2d23b2780ead3cfa" resname="thesaurus:: ids" approved="yes">
-        <source>thesaurus:: ids</source>
-        <target state="translated">Ids</target>
-        <jms:reference-file line="69">web/thesaurus/properties.html.twig</jms:reference-file>
-      </trans-unit>
       <trans-unit id="c0f2a335de197ca806136680f016f57191f504e9" resname="thesaurus:: langue par default" approved="yes">
         <source>thesaurus:: langue par default</source>
         <target state="translated">Default taal</target>
@@ -13726,6 +13716,11 @@
         <target state="translated">Geen herindexatie</target>
         <jms:reference-file line="86">web/thesaurus/link-field-step2.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="8c922c9810f5a481a9bad960b4c2c838b09d4a22" resname="thesaurus:: populate button">
+        <source>thesaurus:: populate button</source>
+        <target state="new">thesaurus:: populate button</target>
+        <jms:reference-file line="226">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="a448f487b7feb813766fdba3b0713bd3c690c756" resname="thesaurus:: presentation" approved="yes">
         <source>thesaurus:: presentation</source>
         <target state="translated">Presentatie</target>
@@ -13915,12 +13910,12 @@
       <trans-unit id="2f3ee022a88321b6be0c4a75ba9d2fe332a5271a" resname="thesaurus::populate: Warning populate is in process to indexing databox">
         <source>thesaurus::populate: Warning populate is in process to indexing databox</source>
         <target state="new">thesaurus::populate: Warning populate is in process to indexing databox</target>
-        <jms:reference-file line="1564">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+        <jms:reference-file line="1566">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="86465964be7ece23a936c992fc5caff911f7a259" resname="thesaurus::populate: success message">
         <source>thesaurus::populate: success message</source>
         <target state="new">thesaurus::populate: success message</target>
-        <jms:reference-file line="1559">web/thesaurus/thesaurus.html.twig</jms:reference-file>
+        <jms:reference-file line="1561">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="af1aa44c04fac8955dcec74f9a412e27baf564f1" resname="thesaurus:dialog:: export">
         <source>thesaurus:dialog:: export</source>
@@ -13932,6 +13927,11 @@
         <target state="new">thesaurus:dialog:: properties</target>
         <jms:reference-file line="648">web/thesaurus/thesaurus.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="bf4b4b493b31b491dfc5f522f303ea1ac691f65c" resname="thesaurus:termePorperties:termeId">
+        <source>thesaurus:termePorperties:termeId</source>
+        <target state="new">thesaurus:termePorperties:termeId</target>
+        <jms:reference-file line="68">web/thesaurus/properties.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="1118f7e206d8ec4d92392f3e8c2804b156b3a082" resname="thumbnail validation" approved="yes">
         <source>thumbnail validation</source>
         <target state="translated">thumbnail goedkeuring</target>

resources/locales/validators.de.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-06-29T07:49:55Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2020-06-30T14:45:25Z" 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>

resources/locales/validators.en.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-06-29T07:50:20Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2020-06-30T14:45:51Z" 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>

resources/locales/validators.fr.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-06-29T07:50:46Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2020-06-30T14:46:17Z" 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>

resources/locales/validators.nl.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-06-29T07:51:14Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2020-06-30T14:46:45Z" 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>

resources/www/thesaurus/images/caret-right-solid-grey.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="caret-right" class="svg-inline--fa fa-caret-right fa-w-6" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 512"><path fill="#6d6d6d" d="M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"></path></svg>

resources/www/thesaurus/images/caret-right-solid.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="caret-right" class="svg-inline--fa fa-caret-right fa-w-6" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 512"><path fill="#fff" d="M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"></path></svg>

resources/www/thesaurus/styles/main.scss

@@ -1,6 +1,6 @@
 $blue-tsr: #2196f3;
 $grey-tsr: #aaa;
-
+$iconsPath: '../../../assets/thesaurus/images/';
 @mixin blue-btn {
   color: #fff;
   background: $blue-tsr;
@@ -275,17 +275,13 @@ H3, H4 {
 .menu {
   FONT-FAMILY: Arial, helvetica, sans-serif;
   font-size: 12px;
-  border-left: 1px solid #ffffff;
-  border-top: 1px solid #ffffff;
-  border-right: 2px solid #000000;
-  border-bottom: 2px solid #000000;
   padding: 0px;
   margin: 0px;
   visibility: hidden;
   position: absolute;
-  top: 0px;
+  top: 0;
-  left: 0px;
+  left: 0;
-  background-color: #d4d0c8;
+  background-color: #535353;
 }
 
 .menu IMG {
@@ -299,19 +295,19 @@ H3, H4 {
   position: relative;
 }
 
-.menu A {
+.menu a {
   font-size: 12px;
   display: block;
   position: relative;
   text-decoration: none;
-  color: #000000;
+  color: #fff;
-  padding-top: 1px;
+  padding: 5px 6px 5px 16px;
-  padding-bottom: 1px;
+  background-image: url('#{$iconsPath}caret-right-solid.svg');
-  padding-left: 13px;
+  background-size: 5px;
-  padding-right: 3px;
+  background-position: 5px;
-  overflow: hidden;
+  background-color: #535353;
-  border: none 0px #FFFFFF;
+  background-repeat: no-repeat;
-  white-space: nowrap;
+
 }
 
 .menu A:hover {
@@ -320,7 +316,7 @@ H3, H4 {
   position: relative;
   text-decoration: none;
   color: #ffffff;
-  background-color: #000080;
+  background-color: #884c92;
 }
 
 .menu A.disabled {
@@ -328,12 +324,9 @@ H3, H4 {
   display: block;
   position: relative;
   text-decoration: none;
-  color: #A0A0A0;
+  color: lighten(#535353, 10%);
-  padding-top: 1px;
-  padding-bottom: 1px;
-  padding-left: 13px;
-  padding-right: 3px;
   overflow: hidden;
+  background-image: url('#{$iconsPath}caret-right-solid-grey.svg');
 }
 
 .menu A.disabled:hover {
@@ -341,8 +334,8 @@ H3, H4 {
   display: block;
   position: relative;
   text-decoration: none;
-  color: #A0A0A0;
+  color: lighten(#535353, 5%);
-  background-color: #d4d0c8;
+  background-color: #535353;
 }
 
 .menu .line {
@@ -398,15 +391,17 @@ H3, H4 {
     &:nth-child(1) {
       @include grey-btn
     }
-      &:nth-child(2) {
+    &:nth-child(2) {
       @include blue-btn
     }
   }
 }
+
 .text-center {
   text-align: center;
   padding-bottom: 10px;
 }
+
 .populate_btn {
   position: absolute;
   background: $blue-tsr;
@@ -417,10 +412,21 @@ H3, H4 {
   color: #fff;
   padding: 7px 10px;
   font-weight: bold;
-  border: 1px solid  #d0d0d0;
+  border: 1px solid #d0d0d0;
   cursor: pointer;
 
   &:hover {
     background: darken($blue-tsr, 20%);
   }
 }
+
+.thesaurus-page {
+  .ui-widget-header {
+    border: 1px solid darken(#884c92, 20%);
+    background: #884c92;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+}

templates/web/thesaurus/properties.html.twig

@@ -65,9 +65,7 @@
                             <th>&nbsp;</th>
                             <th>&nbsp;</th>
                             <th>{{ 'thesaurus:: synonymes' | trans }}</th>
-                            <th>{{ 'thesaurus:: hits' | trans }}</th>
+                            <th colspan="3">{{ 'thesaurus:termePorperties:termeId' | trans }}</th>
-                            <th>{{ 'thesaurus:: ids' | trans }}</th>
-                            <th></th>
                         </tr>
                     </thead>
                 </table>
@@ -98,7 +96,6 @@
                                     <td id='FLG_{{ data['id'] }}'></td>
                                 {% endif %}
                                 <td>{{ data['t'] }}</td>
-                                <td>{{ data['hits'] }}</td>
                                 <td>{{ data['id'] }}</td>
                                 <td><span class="delete_term"></span></td>
                             </tr>

templates/web/thesaurus/thesaurus.html.twig

@@ -223,7 +223,7 @@
             <br/>
             <div id="id_thbox_bck" class="thbox" style="position:absolute; top:28px; left:8px; right:8px; bottom:8px; background-color:#f4f4f4; xoverflow:hidden">
                 <div class="populate_btn_wrapper">
-                    <a class="populate_btn btn btn-primary" id="populate_btn">Populate</a>
+                    <a class="populate_btn btn btn-primary" id="populate_btn">{{ 'thesaurus:: populate button' | trans }}</a>
                 </div>
                 <div style="display: none">
                     <div id="confirm_populate">
@@ -1535,6 +1535,8 @@
                                                     $('.cancel_button').click(function () {
                                                         $('.close-dialog').trigger('click');
                                                     });
+                                                    $('#CTERMS').find('.OB').addClass('ob').removeClass('OB');
+                                                    $('#THP_C').html('+');
 
 
                                                 }