FIX #20392 TIME 0:10 resolve merge conflicts from 20.10_TMA1 to fix/20392/20.10_TMA1

dist/index.html

dist/main-es2015.9498f9bceae89bf30af2.js

dist/main-es5.21403661682cc9204de4.js

dist/main-es5.9498f9bceae89bf30af2.js

src/app/search/controllers/SearchController.php

src/frontend/app/header/header-right.component.ts

...urce/linkResourceModal/link-resource-modal.component.html

...nd/app/search/result-list/search-result-list.component.ts

src/frontend/app/search/search.component.ts

src/lang/lang-en.json

src/lang/lang-fr.json