Commit adddd1bd authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development

parents 729e06f9 f6f10dd0
...@@ -96,7 +96,7 @@ class OvertureAds extends Searchengine ...@@ -96,7 +96,7 @@ class OvertureAds extends Searchengine
} }
# Erstellen des neuen Suchmaschinenobjekts und anpassen des GetStrings: # Erstellen des neuen Suchmaschinenobjekts und anpassen des GetStrings:
$next = new Overture($this->name, $this->engine, $metager); $next = new OvertureAds($this->name, $this->engine, $metager);
$next->getString = preg_replace("/&Keywords=.*?&/si", "&", $next->getString) . "&" . $nextArgs; $next->getString = preg_replace("/&Keywords=.*?&/si", "&", $next->getString) . "&" . $nextArgs;
$next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name); $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next; $this->next = $next;
......
...@@ -15,7 +15,7 @@ Deutschland/Germany', ...@@ -15,7 +15,7 @@ Deutschland/Germany',
Tel.: ++49-(0)511-34000070 Tel.: ++49-(0)511-34000070
EMail: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a><a href="/kontakt/"> - Public-PGP-Key</a> EMail: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a><a href="/kontakt/"> - Public-PGP-Key</a>
<a href="/kontakt/">Verschlüsselndes Kontaktformular</a>', <a href="/kontakt/">Verschlüsselndes Kontaktformular</a>',
'info.4' => 'Vorstand: Dominik Hebeler, Carsten Riel, <a href="https://www2.ostfalia.de/cms/de/pws/jensenn/index.html">Prof.Dr. Nils Jensen</a>', 'info.4' => 'Vorstand: Dominik Hebeler, Carsten Riel, <a href="https://www.ostfalia.de/cms/de/pws/jensen/index.html">Prof.Dr. Nils Jensen</a>',
'info.6' => 'Jugendschutzbeauftragter: Georg Becker 'info.6' => 'Jugendschutzbeauftragter: Georg Becker
<a href="mailto:jugendschutz@metager.de">jugendschutz@metager.de</a>', <a href="mailto:jugendschutz@metager.de">jugendschutz@metager.de</a>',
'info.8' => '"SUMA-EV - Verein für freien Wissenszugang" ist ein gemeinnütziger 'info.8' => '"SUMA-EV - Verein für freien Wissenszugang" ist ein gemeinnütziger
......
...@@ -3,12 +3,19 @@ return [ ...@@ -3,12 +3,19 @@ return [
"achtung" => "Warning! Structure and functionality of our website are subject to constant development and changes. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.", "achtung" => "Warning! Structure and functionality of our website are subject to constant development and changes. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
"title" => "MetaGer Help", "title" => "MetaGer Help",
"title.2" => 'Use of the search engine',
"searchfield.title" => 'The search field', "searchfield.title" => 'The search field',
"searchfield.info" => 'The search field contains:', "searchfield.info" => 'The search field contains:',
"searchfield.memberkey" => 'The key symbol (only SUMA-EV members): Members can enter a private key to use the "free-of-advertising" metager search. If you want this too, just become a member: <a href = "https://metager.org/beitritt">Membership form</a>', "searchfield.memberkey" => 'The key symbol (only SUMA-EV members): Members can enter a private key to use the "free-of-advertising" metager search. If you want this too, just become a member: <a href = "https://metager.org/beitritt">Membership form</a>',
"searchfield.slot" => 'The search field: Enter your words here.', "searchfield.slot" => 'The search field: Enter your words here.',
"searchfield.search" => 'The magnifier: Start your search.', "searchfield.search" => 'The magnifier: Start your search.',
"result.top" => 'On the results page: Click / Touch the filter symbol to activate all filter options.',
"resultpage.title" => 'The result page',
"resultpage.foci" => 'There are six different search focuses below the search field (Web, Pictures...). We assigned specific search engines to these focuses.',
"resultpage.choice" => 'Below these you have two links:',
"resultpage.filter" => 'Filter: Toggle filters on / off and apply settings here. Each focus has its own assortment.',
"resultpage.settings" => 'Settings: Apply here your permanent settings for the current focus. You can select / unselect search engines here, too. Your settings are stored as non-personally identifiable cookies. Click "Overview" to see your settings. If settings have been stored you find a deletion button at the end of the page.',
"stopworte.title" => "Exclude single words", "stopworte.title" => "Exclude single words",
"stopworte.1" => "If you want to exclude words within the search result, you have to put a \"-\" in front of that word", "stopworte.1" => "If you want to exclude words within the search result, you have to put a \"-\" in front of that word",
......
...@@ -14,7 +14,7 @@ Deutschland/Germany', ...@@ -14,7 +14,7 @@ Deutschland/Germany',
Tel.: ++49-(0)511-34000070 Tel.: ++49-(0)511-34000070
EMail: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a><a href="/kontakt/"> - Public-PGP-Key</a> EMail: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a><a href="/kontakt/"> - Public-PGP-Key</a>
<a href="/kontakt/">encrypted contact form</a>', <a href="/kontakt/">encrypted contact form</a>',
'info.4' => 'Board: Dominik Hebeler, Carsten Riel, <a href="https://www2.ostfalia.de/cms/de/pws/jensenn/index.html">Prof.Dr. Nils Jensen</a>', 'info.4' => 'Board: Dominik Hebeler, Carsten Riel, <a href="https://www.ostfalia.de/cms/de/pws/jensen/index.html">Prof.Dr. Nils Jensen</a>',
'info.6' => 'Youth Protection Commissioner: Georg Becker 'info.6' => 'Youth Protection Commissioner: Georg Becker
<a href="mailto:jugendschutz@metager.de">jugendschutz@metager.de</a>', <a href="mailto:jugendschutz@metager.de">jugendschutz@metager.de</a>',
'info.8' => '"SUMA-EV - Verein für freien Wissenszugang" is a charitable association, registered in the register of associations at the Amtsgericht Hannover 'info.8' => '"SUMA-EV - Verein für freien Wissenszugang" is a charitable association, registered in the register of associations at the Amtsgericht Hannover
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment