hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRDPL-86_xdebug

Browse Source
This commit is contained in:
Nicolas Maillat
2020-02-19 17:25:02 +01:00
committed by GitHub
parent 2c4c119663 0c582d3e76
commit c040124202
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/locales/messages.en.xlf
View File

@@ -9945,9 +9945,9 @@
<target state="translated">Modifications done</target>
<jms:reference-file line="14">admin/databox/databox.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="0bf89031fb0b79dd308305fa96c6e804bd701c06" resname="help::help-search: OR" approved="no">
<trans-unit id="0bf89031fb0b79dd308305fa96c6e804bd701c06" resname="help::help-search: OR" approved="yes">
<source>help::help-search: OR</source>
<target state="needs-translation">OR</target>
<target state="translated">Or</target>
<jms:reference-file line="34">prod/results/help.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="afca2d3b5d8e63be2c3ad162f99cba5f67299d07" resname="help::help-search: relaunch search without filter" approved="yes">
@@ -10090,7 +10090,7 @@
</trans-unit>
<trans-unit id="e11523c5ff23fc1600aca2d8ee5adb542c5ce4b3" resname="language" approved="yes">
<source>language</source>
<target state="translated">Language</target>
<target state="translated">Current language</target>
<jms:reference-file line="17">login/include/language-block.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="15daeb7ec47bb61b62c6b2af177ef7bcc1094ba9" resname="le service sera de nouveau disponible dans quelques minutes" approved="yes">
@@ -11325,9 +11325,9 @@
<target state="translated">Narrow the search results to dates</target>
<jms:reference-file line="466">web/prod/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fa55093d5fb1dfe235a46f8b4fecad5d36d3f250" resname="prod::advancesearch:tooltips:field_restriction_explanation">
<trans-unit id="fa55093d5fb1dfe235a46f8b4fecad5d36d3f250" resname="prod::advancesearch:tooltips:field_restriction_explanation" approved="yes">
<source>prod::advancesearch:tooltips:field_restriction_explanation</source>
<target state="new">prod::advancesearch:tooltips:field_restriction_explanation</target>
<target state="translated">Search content on a specific field</target>
<jms:reference-file line="411">web/prod/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8b8698f202f815bbde691f54c7d51b691bef0263" resname="prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s)" approved="yes">

8
resources/locales/messages.fr.xlf
View File

@@ -808,9 +808,9 @@
<target state="translated">Dans l'infobulle de description, après les métadonnées</target>
<jms:reference-file line="735">web/prod/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8309825c7302ca269da1af87d2a9a5ea9e295426" resname="Aggregated">
<trans-unit id="8309825c7302ca269da1af87d2a9a5ea9e295426" resname="Aggregated" approved="yes">
<source>Aggregated</source>
<target state="new">Aggregated</target>
<target state="translated">Agrégé</target>
<jms:reference-file line="10">admin/search-engine/general-aggregation.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="b9ba037c0e4c06d192c83e08070b15787f07daaa" resname="Aggregation" approved="yes">
@@ -9952,7 +9952,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
</trans-unit>
<trans-unit id="afca2d3b5d8e63be2c3ad162f99cba5f67299d07" resname="help::help-search: relaunch search without filter" approved="yes">
<source>help::help-search: relaunch search without filter</source>
<target state="translated">Supprimer tout les filtres et relancer la recherche</target>
<target state="translated">Supprimer tous les filtres et relancer la recherche</target>
<jms:reference-file line="37">prod/results/help.html.twig</jms:reference-file>
<jms:reference-file line="330">web/prod/index.html.twig</jms:reference-file>
</trans-unit>
@@ -10090,7 +10090,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
</trans-unit>
<trans-unit id="e11523c5ff23fc1600aca2d8ee5adb542c5ce4b3" resname="language" approved="yes">
<source>language</source>
<target state="translated">Langue</target>
<target state="translated">Langue actuelle</target>
<jms:reference-file line="17">login/include/language-block.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="15daeb7ec47bb61b62c6b2af177ef7bcc1094ba9" resname="le service sera de nouveau disponible dans quelques minutes" approved="yes">