diff --git a/app/MetaGer.php b/app/MetaGer.php
index 28c4305b85e2891e4678253b583e42f46dcd27e3..c29d45c8181e8578c16b7eb2e2a75a4ae60d533d 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -499,6 +499,7 @@ class MetaGer
# Prüfe ob Parser vorhanden
if (!file_exists(app_path() . "/Models/parserSkripte/" . ucfirst($engine["package"]->__toString()) . ".php")) {
Log::error("Konnte " . $engine["name"] . " nicht abfragen, da kein Parser existiert");
+ $this->errors[] = trans('metaGer.engines.noParser', ['engine' => $engine["name"]]);
continue;
}
diff --git a/app/Models/parserSkripte/Radiobrowser.php b/app/Models/parserSkripte/Radiobrowser.php
new file mode 100644
index 0000000000000000000000000000000000000000..1fbc12ae26009dc4180fdc78d3ad19b3834fe556
--- /dev/null
+++ b/app/Models/parserSkripte/Radiobrowser.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace app\Models\parserSkripte;
+
+use App\Models\Searchengine;
+
+class Radiobrowser extends Searchengine
+{
+ public $results = [];
+
+ public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+ {
+ parent::__construct($engine, $metager);
+ }
+
+ public function loadResults($result)
+ {
+ $result = preg_replace("/\r\n/si", "", $result);
+ try {
+ $content = json_decode($result);
+ } catch (\Exception $e) {
+ abort(500, "$result is not a valid json string");
+ }
+
+ if (!$content) {
+ return;
+ }
+
+ foreach ($content as $result) {
+ $title = $result->name;
+ $link = $result->homepage;
+ $anzeigeLink = $link;
+ $descr = "";
+ if ($result->tags != "") {
+ $descr .= "Tags: " . $result->tags;
+ }
+ if ($result->tags != "") {
+ if ($descr != "") {
+ $descr .= " - ";
+ }
+ $descr .= "Country: " . $result->country;
+ }
+ if ($result->tags != "") {
+ if ($descr != "") {
+ $descr .= " - ";
+ }
+ $descr .= "Language: " . $result->language;
+ }
+ $this->counter++;
+ $this->results[] = new \App\Models\Result(
+ $this->engine,
+ $title,
+ $link,
+ $anzeigeLink,
+ $descr,
+ $this->gefVon,
+ $this->counter,
+ false
+ );
+ }
+ }
+}
diff --git a/public/css/style.css b/public/css/style.css
index a3345e22b86dbafd941f1630875c5b4a2bcfef73..ab51f618f7c033fa746804a1476c0563209394e4 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,189 +1,206 @@
-* {
- font-family: Liberation Sans, sans-serif;
+/*
+
+
+
+
+
+By ID
+
+
+
+
+
+*/
+
+#color-chooser {
+ padding: 0;
}
-label a {
- color: inherit;
+#moreInformation {
+ box-shadow: none;
+ margin-top: 5%;
+ text-align: center;
+ -moz-box-shadow: none;
}
-label a:hover {
- text-decoration: none;
- color: inherit;
+#mglogo {
+ width: 100%;
+ text-align: center;
}
-li#info {
- white-space: pre-line;
+#spruch {
+ margin-bottom: 20px;
+ padding: 5px;
+ line-height: 1.2;
+ color: #070;
+ border-left: 3px solid #070;
+ font-size: 16px;
+ font-family: Georgia, "Times New Roman", Palatino, Times, serif;
}
-.navbar-default {
- background-color: white;
- border-radius: 0;
+
+/*
+
+
+
+
+
+Mixed
+
+
+
+
+
+*/
+
+#color-chooser #standard {
+ background-color: rgb(255, 194, 107);
}
-.row {
- margin-left: 0;
- margin-right: 0;
+#color-chooser #standardHard {
+ background-color: rgb(255, 128, 0);
}
-.mg-panel {
- text-align: left;
- margin: 0 auto;
- margin-top: 20px;
- padding: 10px 20px;
- margin-bottom: 0;
- background-color: white;
- -webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
- -moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
- box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+#color-chooser #green {
+ background-color: rgb(177, 226, 163);
}
-.input-group-addon {
- padding: 0;
+#color-chooser #greenHard {
+ background-color: rgb(127, 175, 27);
}
-.form-group {
- font-family: sans-serif;
- font-size: 16px;
- color: black;
- background-color: transparent;
- text-align: center;
+#color-chooser #blue {
+ background-color: rgb(164, 192, 230);
}
-section {
- padding: 10px;
- box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
- -moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
- -moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
+#color-chooser #blueHard {
+ background-color: rgb(2, 93, 140);
}
-body > div {
- background-color: transparent;
- padding-top: 70px;
+#color-chooser #red {
+ background-color: rgb(255, 92, 92);
}
-footer ul.list-inline {
- width: 100%;
+#color-chooser #redHard {
+ background-color: rgb(255, 0, 0);
}
-footer li {
- width: 33%;
- text-align: center;
+#color-chooser #pink {
+ background-color: rgb(255, 196, 246);
}
-footer img {
- max-width: 100%;
+#color-chooser #pinkHard {
+ background-color: rgb(254, 67, 101);
}
-span.glyphicon {
- background-color: transparent;
+#color-chooser #black {
+ background-color: rgb(238, 238, 238);
}
-footer {
- margin-top: 8%;
- bottom: 0;
- width: 100%;
+#color-chooser #blackHard {
+ background-color: rgb(50, 50, 50);
}
-main ul li {
- margin: 0 10px;
+#mglogo > a {
+ display: block;
+ width: 200px;
+ text-decoration: none;
+ font-size: 1.1em;
+ font-family: Liberation Sans, sans-serif;
+ font-weight: bold;
+ font-style: italic;
+ font-size: 1.0em;
+ line-height: 1;
+ white-space: nowrap;
+ padding: 0.4em 0;
+ border-radius: .25em;
+ margin: 0 auto;
}
-body ul {
- list-style-type: none;
- text-align: center;
- margin-left: 0!important;
- margin-top: 10px;
+#sponsors a {
+ font-size: 0.8em;
}
-fieldset input[type=text] {
- width: 100%;
- padding-left: 10px;
- padding-right: 10px;
- border-width: 1px;
- overflow: visible;
+#sponsors h2 {
+ font-size: 1.5em;
}
-main fieldset {
- border: 0;
+#foki label > span {
+ margin-right: 5px;
}
-main fieldset#foki {
- margin: 5px 0;
- text-align: center;
+#foki label span {
+ background-color: transparent;
}
-a.content.hidden-xs {
- color: #333;
+#foki input {
+ visibility: hidden;
}
-header nav a {
- text-decoration: none;
- color: rgb(119, 119, 119);
+#foki input:checked + label {
+ font-weight: bold;
+ background-color: #e3e3e3;
}
-a.navbar-brand {
- line-height: 100%!important;
- padding: 0;
+#foki input + label {
+ border-radius: 4px;
+ padding: 7px 20px;
+ font-weight: normal;
}
-nav .navbar-brand > div.logo {
- height: 100%;
+#foki input + label:hover {
+ cursor: pointer;
+ background-color: #f6f6f6;
}
-nav h1 {
- margin: 0;
- height: 100%;
- padding-left: 20px;
- padding-top: 8px;
- font-family: sans-serif;
- font-style: italic;
- margin: 0;
- font-weight: bold;
- line-height: 1;
- white-space: nowrap;
+#color-chooser a {
+ display: block;
+ width: 50px;
+ height: 50px;
}
-body {
+#color-chooser li {
+ width: 50px;
margin: 0;
}
-header {
- position: fixed;
- background-color: white;
- z-index: 500;
- width: 100%;
- height: 50px;
+#moreInformation ul {
+ padding: 0;
}
-.dotlist {
- list-style-type: disc;
- text-align: left;
+#moreInformation ul li {
+ color: grey;
}
-.dotlist li {
- margin-bottom: 5px;
+#moreInformation > div {
+ font-size: 15px;
}
-.well-sm {
- margin: 10px 0px;
+#moreInformation h2 {
+ color: grey;
+ font-size: 25px;
}
-address {
- white-space: pre;
+#moreInformation a:hover {
+ text-decoration: underline;
}
-.subheading {
- font-size: 20px;
- margin: 20px 0px;
- white-space: pre-wrap;
+#searchForm button {
+ width: 50px;
+ line-height: 100%;
+ height: 28px;
+ border: 0;
+ background-color: transparent;
+ padding: 0;
}
-p {
- white-space: pre-wrap;
+li#info {
+ white-space: pre-line;
}
-form {
- margin: 10px 0px;
+main fieldset#foki {
+ margin: 5px 0;
+ text-align: center;
}
div#right {
@@ -200,69 +217,106 @@ div#right p {
padding-bottom: 15px;
}
-.bitcoins {
- text-align: center;
-}
-
div#left {
padding-right: 35px;
}
-.bold {
- font-weight: bold;
+textarea#message {
+ height: 200px;
}
-code {
- white-space: pre-wrap;
- word-break: break-word;
+#anpassen-label a.content {
+ color: inherit;
}
-form.contact {
- max-width: 500px;
+#plugin-modal ol > li {
+ margin-bottom: 5px;
}
-textarea#message {
- height: 200px;
+
+/*
+
+
+
+
+
+By Class
+
+
+
+
+
+*/
+
+.quicktip {
+ margin-bottom: 15px;
+ padding: 10px;
+ line-height: 1.2 !important;
+ font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+ color: #000;
+ border-left: 3px solid #FB0;
+ font-size: 14px;
}
-.checkbox {
- margin-top: 5px;
- margin-bottom: 5px;
+.wikiqtextract {
+ font-family: Georgia, "Times New Roman", Palatino, Times, serif;
}
-label.select-label {
- margin-bottom: 0;
- margin-top: 10px;
+.qtheader {
+ font-family: verdana, arial, helvetica, sans-serif;
}
-.settings-btn {
- margin-top: 25px;
+.author {
+ float: right !important;
}
-.settings-btn + .settings-btn {
- margin-left: 10px;
+.language-textarea {
+ resize: none;
+ overflow: hidden;
}
-.fokus-category {
- font-size: 20px;
+.language-name {
+ white-space: pre;
}
-.settings-form-control {
- width: 200px;
- margin-top: 10px;
+.navbar-default {
+ background-color: white;
+ border-radius: 0;
}
-a:hover {
- cursor: pointer;
+.row {
+ margin-left: 0;
+ margin-right: 0;
}
-.settings-checkbox .settings-glyphicon {
- margin-left: 5px;
- font-size: 12px;
+.mg-panel {
+ text-align: left;
+ margin: 0 auto;
+ margin-top: 20px;
+ padding: 10px 20px;
+ margin-bottom: 0;
+ background-color: white;
+ -webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+ box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+}
+
+.input-group-addon {
+ padding: 0;
}
+.form-group {
+ font-family: sans-serif;
+ font-size: 16px;
+ color: black;
+ background-color: transparent;
+ text-align: center;
+}
-/* Widgets */
+.kontakt-form-group {
+ text-align: left;
+ font-size: 14px;
+}
.metager-searchinput {
height: 30px;
@@ -307,23 +361,23 @@ a:hover {
margin-right: 3px;
}
-code {
- overflow-wrap: break-word;
- word-wrap: break-word;
+.mutelink {
+ color: grey;
}
-.non-bold {
- font-weight: normal;
+.dotlist {
+ list-style-type: disc;
+ text-align: left;
}
-@media print {
- .noprint {
- display: none!important;
- }
+.well-sm {
+ margin: 10px 0px;
}
-.donation-form-group label {
- font-weight: bold;
+.subheading {
+ font-size: 20px;
+ margin: 20px 0px;
+ white-space: pre-wrap;
}
.donation-form-group {
@@ -335,239 +389,266 @@ code {
text-align: left;
}
-#color-chooser #standard {
- background-color: rgb(255, 194, 107);
+.modal-content {
+ border-radius: 0;
+ -webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+ box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
}
-#color-chooser #standardHard {
- background-color: rgb(255, 128, 0);
+.bold {
+ font-weight: bold;
}
-#color-chooser #green {
- background-color: rgb(177, 226, 163);
+.settings-btn {
+ margin-top: 25px;
}
-#color-chooser #greenHard {
- background-color: rgb(127, 175, 27);
+.fokus-category {
+ font-size: 20px;
}
-#color-chooser #blue {
- background-color: rgb(164, 192, 230);
+.settings-form-control {
+ width: 200px;
+ margin-top: 10px;
}
-#color-chooser #blueHard {
- background-color: rgb(2, 93, 140);
+.bitcoins {
+ text-align: center;
}
-#color-chooser #red {
- background-color: rgb(255, 92, 92);
+.checkbox {
+ margin-top: 5px;
+ margin-bottom: 5px;
}
-#color-chooser #redHard {
- background-color: rgb(255, 0, 0);
+.non-bold {
+ font-weight: normal;
}
-#color-chooser #pink {
- background-color: rgb(255, 196, 246);
-}
-#color-chooser #pinkHard {
- background-color: rgb(254, 67, 101);
-}
+/*
-#color-chooser #black {
- background-color: rgb(238, 238, 238);
+
+
+
+
+Mixed
+
+
+
+
+
+*/
+
+.quicktip.aufruf {
+ border-left: 3px solid #FF4000;
+ color: #FF4000;
}
-#color-chooser #blackHard {
- background-color: rgb(50, 50, 50);
+.settings-checkbox .settings-glyphicon {
+ margin-left: 5px;
+ font-size: 12px;
}
-#color-chooser {
- padding: 0;
+.settings-btn + .settings-btn {
+ margin-left: 10px;
}
-#color-chooser a {
- display: block;
- width: 50px;
- height: 50px;
+.wikiqtextract p {
+ margin-bottom: 0;
}
-#color-chooser li {
- width: 50px;
- margin: 0;
+footer ul.list-inline {
+ width: 100%;
}
-#moreInformation {
- box-shadow: none;
- margin-top: 5%;
- text-align: center;
- -moz-box-shadow: none;
+span.glyphicon {
+ background-color: transparent;
}
-#moreInformation ul {
- /* text-align: left; */
- padding: 0;
+a.content.hidden-xs {
+ color: #333;
}
-#moreInformation ul li {
- color: grey;
+a.navbar-brand {
+ line-height: 100%!important;
+ padding: 0;
}
-#moreInformation > div {
- font-size: 15px;
+nav .navbar-brand > div.logo {
+ height: 100%;
}
-#moreInformation h2 {
- color: grey;
- font-size: 25px;
+.dotlist li {
+ margin-bottom: 5px;
}
-#moreInformation a:hover {
- text-decoration: underline;
+form.contact {
+ max-width: 500px;
}
-#searchForm button {
- width: 50px;
- line-height: 100%;
- height: 28px;
- border: 0;
- background-color: transparent;
- padding: 0;
+label.select-label {
+ margin-bottom: 0;
+ margin-top: 10px;
}
-#mglogo {
- width: 100%;
- text-align: center;
+@media print {
+ .noprint {
+ display: none!important;
+ }
}
-#mglogo > a {
- display: block;
- width: 200px;
- text-decoration: none;
- font-size: 1.1em;
- font-family: Liberation Sans, sans-serif;
+.donation-form-group label {
font-weight: bold;
- font-style: italic;
- font-size: 1.0em;
- line-height: 1;
- white-space: nowrap;
- padding: 0.4em 0;
- border-radius: .25em;
- margin: 0 auto;
}
-#sponsors a {
- font-size: 0.8em;
+.quicktip h1 {
+ font-size: 22px;
+ margin-top: 0px;
}
-#sponsors h2 {
- font-size: 1.5em!important;
-}
-#foki label > span {
- margin-right: 5px;
+/*
+
+
+
+
+
+By Element
+
+
+
+
+
+*/
+
+* {
+ font-family: Liberation Sans, sans-serif;
}
-#foki label span {
- background-color: transparent;
+section {
+ padding: 10px;
+ box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
+ -moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
+ -moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
}
-#foki input {
- visibility: hidden;
+footer {
+ margin-top: 8%;
+ bottom: 0;
+ width: 100%;
}
-#foki input:checked + label {
- font-weight: bold;
- background-color: #e3e3e3;
+body {
+ margin: 0;
}
-#foki input + label {
- border-radius: 4px;
- padding: 7px 20px;
- font-weight: normal;
+header {
+ position: fixed;
+ background-color: white;
+ z-index: 500;
+ width: 100%;
+ height: 50px;
}
-#foki input + label:hover {
- cursor: pointer;
- background-color: #f6f6f6;
+address {
+ white-space: pre;
}
-.modal-content {
- border-radius: 0;
- -webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
- -moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
- box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
+p {
+ white-space: pre-wrap;
}
-#anpassen-label a.content {
- color: inherit;
+form {
+ margin: 10px 0px;
}
-.mutelink {
- color: grey;
+code {
+ white-space: pre-wrap;
+ overflow-wrap: break-word;
+ word-break: break-word;
}
-#plugin-modal ol > li {
- margin-bottom: 5px;
+
+/*
+
+
+
+
+
+Mixed
+
+
+
+
+
+*/
+
+label a {
+ color: inherit;
}
-.quicktip {
- margin-bottom: 15px;
- padding: 10px;
- line-height: 1.2 !important;
- font-family: Georgia, "Times New Roman", Palatino, Times, serif;
- color: #000;
- border-left: 3px solid #FB0;
- font-size: 14px;
+label a:hover {
+ text-decoration: none;
+ color: inherit;
}
-.wikiqtextract {
- font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+footer li {
+ width: 33%;
+ text-align: center;
}
-.wikiqtextract p {
- margin-bottom: 0;
+footer img {
+ max-width: 100%;
}
-.qtheader {
- font-family: verdana, arial, helvetica, sans-serif;
+main ul li {
+ margin: 0 10px;
}
-#spruch {
- margin-bottom: 20px;
- padding: 5px;
- line-height: 1.2 !important;
- color: #070;
- border-left: 3px solid #070;
- font-size: 16px;
- font-family: Georgia, "Times New Roman", Palatino, Times, serif;
+body ul {
+ list-style-type: none;
+ text-align: center;
+ margin-left: 0!important;
+ margin-top: 10px;
}
-.author {
- float: right !important;
+fieldset input[type=text] {
+ width: 100%;
+ padding-left: 10px;
+ padding-right: 10px;
+ border-width: 1px;
+ overflow: visible;
}
-.quicktip h1 {
- font-size: 22px;
- margin-top: 0px;
+main fieldset {
+ border: 0;
}
-.quicktip.aufruf {
- border-left: 3px solid #FF4000;
- color: #FF4000;
+nav h1 {
+ margin: 0;
+ height: 100%;
+ padding-left: 20px;
+ padding-top: 8px;
+ font-family: sans-serif;
+ font-style: italic;
+ margin: 0;
+ font-weight: bold;
+ line-height: 1;
+ white-space: nowrap;
}
-.language-textarea {
- resize: none;
- overflow: hidden;
+header nav a {
+ text-decoration: none;
+ color: rgb(119, 119, 119);
}
-.language-name {
- white-space: pre;
+body > div {
+ background-color: transparent;
+ padding-top: 70px;
}
-.kontakt-form-group {
- text-align: left;
- font-size: 14px;
+a:hover {
+ cursor: pointer;
}
\ No newline at end of file
diff --git a/public/css/styleResultPage.css b/public/css/styleResultPage.css
index d25c3961fa787630ac9a52bba5b4968a9ec7d73e..60357a02c00c881ad080923c61861d751b9170f0 100644
--- a/public/css/styleResultPage.css
+++ b/public/css/styleResultPage.css
@@ -156,6 +156,7 @@ body {
a:link {
color: #0000FF;
+ font-size: 12px;
}
a#donation:hover {}
@@ -251,7 +252,7 @@ a:hover {
.result .title {
color: black;
text-decoration: none;
- font-size: 15px;
+ font-size: 14px;
font-weight: bold;
margin-bottom: 0;
white-space: nowrap;
diff --git a/public/js/kontakt.js b/public/js/kontakt.js
index 2f109b35fada6fcf3d5d0d585bb4aef075d3f284..063d8e596ed5d105216e5b2dfd608182f3fef62e 100644
--- a/public/js/kontakt.js
+++ b/public/js/kontakt.js
@@ -29,7 +29,11 @@ function encrypt() {
return true;
}
} else {
- window.alert("Fehler: Ihr Browser wird nicht unterstützt. Bitte installieren Sie einen aktuellen Broweser wie z.B. Mozilla Firefox.");
+ if (isEnglish()) {
+ window.alert("Error: Your browser is not supported. Please install an up to date browser like Mozilla Firefox.");
+ } else {
+ window.alert("Fehler: Ihr Browser wird nicht unterstützt. Bitte installieren Sie einen aktuellen Broweser wie z.B. Mozilla Firefox.");
+ }
return false;
}
}
diff --git a/public/js/scriptStartPage.js b/public/js/scriptStartPage.js
index d2fff42ea6fd226190dc2294e191d2c56efdd06c..00454a56d27f6c98a920d5b95de1aa548b4f70e9 100644
--- a/public/js/scriptStartPage.js
+++ b/public/js/scriptStartPage.js
@@ -1,223 +1,144 @@
-$(document).ready(function(){
- // checkPlugin();
- if(location.href.indexOf("#plugin-modal") > -1)
- $("#plugin-modal").modal("show");
- $("button").popover();
- if(localStorage){
- var theme = localStorage.getItem("theme");
- if(theme != null){
- if((theme.match(/,/g) || []).length != 3){
- localStorage.removeItem("theme");
- }else{
- theme = theme.split(",");
- $("#theme").attr("href", "/css/theme.css.php?r=" + theme[0] + "&g=" + theme[1] + "&b=" + theme[2] + "&a=" + theme[3]);
- }
- }
-
- if(localStorage.getItem("pers")){
- setSettings();
- }
- }
- $("button").on("shown.bs.popover", function(){
- $("#color-chooser a").click(function(){
- var theme = $(this).attr("data-rgba");
- if(localStorage){
- localStorage.setItem("theme", theme);
- location.href = "/";
- }
- });
- });
-
- $("#mobileFoki").change(function(){
- var fokus = $("#mobileFoki > option:selected").val();
- if(fokus == "angepasst")
- window.location = "./settings/";
- else
- window.location = "./?focus=" + fokus;//$("#mobileFoki > option:selected").val());
- });
- if($("fieldset#foki.mobile").length){
- $("fieldset#foki.mobile label#anpassen-label").click(function(){
- window.location = "./settings/";
- });
- }
- $("#anpassen-label").click(function(){
- window.location = "./settings/";
- });
+$(document).ready(function() {
+ // checkPlugin();
+ if (location.href.indexOf("#plugin-modal") > -1) $("#plugin-modal").modal("show");
+ $("button").popover();
+ if (localStorage) {
+ var theme = localStorage.getItem("theme");
+ if (theme != null) {
+ if ((theme.match(/,/g) || []).length != 3) {
+ localStorage.removeItem("theme");
+ } else {
+ theme = theme.split(",");
+ $("#theme").attr("href", "/css/theme.css.php?r=" + theme[0] + "&g=" + theme[1] + "&b=" + theme[2] + "&a=" + theme[3]);
+ }
+ }
+ if (localStorage.getItem("pers")) {
+ setSettings();
+ }
+ }
+ $("button").on("shown.bs.popover", function() {
+ $("#color-chooser a").click(function() {
+ var theme = $(this).attr("data-rgba");
+ if (localStorage) {
+ localStorage.setItem("theme", theme);
+ location.href = "/";
+ }
+ });
+ });
+ $("#mobileFoki").change(function() {
+ var fokus = $("#mobileFoki > option:selected").val();
+ if (fokus == "angepasst") window.location = "./settings/";
+ else window.location = "./?focus=" + fokus; //$("#mobileFoki > option:selected").val());
+ });
+ if ($("fieldset#foki.mobile").length) {
+ $("fieldset#foki.mobile label#anpassen-label").click(function() {
+ window.location = "./settings/";
+ });
+ }
+ $("#anpassen-label").click(function() {
+ window.location = "./settings/";
+ });
});
-/*
-function checkPlugin(){
- if(isFirefox){
- $("#plugin-modal .modal-header h4").html("MetaGer zum Firefox hinzufügen");
- var content = "" +
- "<ol>" +
- "<li>Klicken Sie <a href=\"javascript:window.external.AddSearchProvider($('link[rel=search]').attr('href'))\">hier</a> um MetaGer als Suchmaschine hinzuzufügen.</li>" +
- "<li>Setzen Sie einen Haken bei \"Diese als aktuelle Suchmaschine setzen\"</li>" +
- "<li>Klicken Sie auf \"Hinzufügen\"</li>" +
- "</ol>";
- $("#plugin-modal .modal-body").html(content);
- }else if(isChrome){
- $("#plugin-modal .modal-header h4").html("MetaGer zum Chrome hinzufügen");
- var content = "" +
- "<ol>" +
- "<li>Klicken Sie <a href=\"javascript:window.external.AddSearchProvider($('link[rel=search]').attr('href'))\" onclick=\"$('#more').removeClass('hidden');\">hier</a>, um MetaGer als Suchmaschine hinzuzufügen" +
- "<ul id=\"more\" class=\"hidden list-unstyled\">" +
- "<li>Klicken Sie im Popup auf OK</li>" +
- "<li><small>(Sollte der OK-Knopf deaktiviert sein, ist MetaGer bereits in Ihren Suchmaschinen. Klicken Sie dann auf Abbrechen und fahren mit Schritt 2 fort.)</small></li>" +
- "</ul></li>" +
- "<li>Klicken in Ihrem Browser oben rechts auf <span class=\"glyphicon glyphicon-menu-hamburger\"></span></li>" +
- "<li>Wählen Sie \"Einstellungen\"</li>" +
- "<li>Im Bereich Suchen, klicken Sie auf \"Suchmaschinen verwalten\"</li>" +
- "<li>In der nun angezeigten Liste, finden Sie MetaGer. Fahren Sie mit der Maus über den Eintrag und klicken auf \"Als Standard festlegen\"</li>" +
- "</ol>";
- $("#plugin-modal .modal-body").html(content);
- }else if(isOpera){
- $("#plugin-modal .modal-header h4").html("MetaGer zum Opera hinzufügen");
- var content = "" +
- "<ol>" +
- "<li>Klicken Sie <a href=\"/\" target=\"_blank\">hier</a> um MetaGer in einem neuen Tab zu öffnen.</li>" +
- "<li>Im neuen Tab klicken Sie mit der rechten Maustaste auf das Sucheingabefeld in der Mitte der Seite.</li>" +
- "<li>Wählen Sie im Kontextmenü \"Suchmaschine erstellen...\"</li>" +
- "<li>Klicken Sie im Popup auf \"erstellen\"</li>" +
- "<li><small>(Leider ist es Suchmaschinen nicht mehr möglich im Opera als Standard eingestellt zu werden, aber <a href=\"https://www.mozilla.org/de/firefox/new/\" target=\"_blank\">hier</a> können Sie mit Firefox einen Open-Source Browser installieren, der dies unterstützt.)</small>" +
- "</ol>";
- $("#plugin-modal .modal-body").html(content);
- }else if(isIE && !isEdge){
- $("#plugin-modal .modal-header h4").html("MetaGer zum Internet Explorer hinzufügen");
- var content = "" +
- "<ol>" +
- "<li>Klicken Sie <a href=\"javascript:window.external.addSearchProvider($('link[rel=search]').attr('href'));\">hier</a>, um MetaGer als Suchmaschine hinzuzufügen" +
- "<li>Klicken Sie in Ihrem Browser oben rechts auf Extras (<span class=\"glyphicon glyphicon-cog\"></span>)</li>" +
- "<li>Wählen Sie den Menüpunkt \"Add-Ons verwalten\"</li>" +
- "<li>Klicken Sie im Bereich Add-On-Typen auf \"Suchanbieter\" und danach im rechten Bereich auf \"MetaGer\"</li>" +
- "<li>Wählen Sie unten den Knopf \"Als Standard\"</li>" +
- "</ol>";
- $("#plugin-modal .modal-body").html(content);
- }else if(isEdge){
- $("#plugin-modal .modal-header h4").html("MetaGer zum Microsoft Edge hinzufügen");
- var content = "" +
- "<ol>" +
- "<li>Klicken Sie in Ihrem Browser oben rechts auf Extras (<span class=\"glyphicon glyphicon-option-horizontal\"></span>) und wählen sie \"Einstellungen\"</li>" +
- "<li>Scrollen Sie nach unten und klicken auf \"Erweiterte Einstellungen anzeigen\"</li>" +
- "<li>Scrollen Sie erneut nach unten bis zu Punk \"In Adressleiste suchen mit\" und klicken Sie auf \"Ändern\"</li>" +
- "<li>Wählen Sie \"MetaGer: Sicher suchen & finden...\" und klicken Sie auf \"Als Standard\"</li>" +
- "</ol>";
- $("#plugin-modal .modal-body").html(content);
- }else{
- $("#plug").addClass("hidden");
- $(".seperator").addClass("hidden");
- }
-}
-*/
-
-function setSettings(){
- for(var i = 0; i < localStorage.length; i++){
- var key = localStorage.key(i);
- var value = localStorage.getItem(key);
- if(key.startsWith("param_") && !key.endsWith("lang")){
- key = key.substring(key.indexOf("param_")+6);
- $("#searchForm").append("<input type=\"hidden\" name=\"" + key + "\" value=\"" + value + "\">");
- }
- $("#foki input[type=radio]#angepasst").attr("checked",true);
- }
- if($("fieldset#foki.mobile").length){
- $("fieldset.mobile input#bilder").val("angepasst");
- $("fieldset.mobile input#bilder").prop("checked", true);
- $("fieldset.mobile input#bilder").attr("id", "angepasst");
- $("fieldset.mobile label#bilder-label").attr("id", "anpassen-label");
- $("fieldset.mobile label#anpassen-label").attr("for", "angepasst");
- $("fieldset.mobile label#anpassen-label span.glyphicon").attr("class", "glyphicon glyphicon-cog");
- $("fieldset.mobile label#anpassen-label span.content").html("angepasst");
- console.log("test");
- }
+function setSettings() {
+ for (var i = 0; i < localStorage.length; i++) {
+ var key = localStorage.key(i);
+ var value = localStorage.getItem(key);
+ if (key.startsWith("param_") && !key.endsWith("lang")) {
+ key = key.substring(key.indexOf("param_") + 6);
+ $("#searchForm").append("<input type=\"hidden\" name=\"" + key + "\" value=\"" + value + "\">");
+ }
+ $("#foki input[type=radio]#angepasst").attr("checked", true);
+ }
+ if ($("fieldset#foki.mobile").length) {
+ $("fieldset.mobile input#bilder").val("angepasst");
+ $("fieldset.mobile input#bilder").prop("checked", true);
+ $("fieldset.mobile input#bilder").attr("id", "angepasst");
+ $("fieldset.mobile label#bilder-label").attr("id", "anpassen-label");
+ $("fieldset.mobile label#anpassen-label").attr("for", "angepasst");
+ $("fieldset.mobile label#anpassen-label span.glyphicon").attr("class", "glyphicon glyphicon-cog");
+ $("fieldset.mobile label#anpassen-label span.content").html("angepasst");
+ console.log("test");
+ }
}
//Polyfill for form attribute
(function($) {
- /**
- * polyfill for html5 form attr
- */
- // detect if browser supports this
- var sampleElement = $('[form]').get(0);
- var isIE11 = !(window.ActiveXObject) && "ActiveXObject" in window;
- if (sampleElement && window.HTMLFormElement && sampleElement.form instanceof HTMLFormElement && !isIE11) {
- // browser supports it, no need to fix
- return;
- }
- /**
- * Append a field to a form
- *
- */
- $.fn.appendField = function(data) {
- // for form only
- if (!this.is('form')) return;
-
- // wrap data
- if (!$.isArray(data) && data.name && data.value) {
- data = [data];
- }
-
- var $form = this;
-
- // attach new params
- $.each(data, function(i, item) {
- $('<input/>')
- .attr('type', 'hidden')
- .attr('name', item.name)
- .val(item.value).appendTo($form);
- });
-
- return $form;
- };
-
- /**
- * Find all input fields with form attribute point to jQuery object
- *
- */
- $('form[id]').submit(function(e) {
- var $form = $(this);
- // serialize data
- var data = $('[form='+ $form.attr('id') + ']').serializeArray();
- // append data to form
- $form.appendField(data);
- }).each(function() {
- var form = this,
- $form = $(form),
- $fields = $('[form=' + $form.attr('id') + ']');
-
- $fields.filter('button, input').filter('[type=reset],[type=submit]').click(function() {
- var type = this.type.toLowerCase();
- if (type === 'reset') {
- // reset form
- form.reset();
- // for elements outside form
- $fields.each(function() {
- this.value = this.defaultValue;
- this.checked = this.defaultChecked;
- }).filter('select').each(function() {
- $(this).find('option').each(function() {
- this.selected = this.defaultSelected;
- });
- });
- } else if (type.match(/^submit|image$/i)) {
- $(form).appendField({name: this.name, value: this.value}).submit();
- }
- });
- });
-
-
- })(jQuery);
-
+ /**
+ * polyfill for html5 form attr
+ */
+ // detect if browser supports this
+ var sampleElement = $('[form]').get(0);
+ var isIE11 = !(window.ActiveXObject) && "ActiveXObject" in window;
+ if (sampleElement && window.HTMLFormElement && sampleElement.form instanceof HTMLFormElement && !isIE11) {
+ // browser supports it, no need to fix
+ return;
+ }
+ /**
+ * Append a field to a form
+ *
+ */
+ $.fn.appendField = function(data) {
+ // for form only
+ if (!this.is('form')) return;
+ // wrap data
+ if (!$.isArray(data) && data.name && data.value) {
+ data = [data];
+ }
+ var $form = this;
+ // attach new params
+ $.each(data, function(i, item) {
+ $('<input/>').attr('type', 'hidden').attr('name', item.name).val(item.value).appendTo($form);
+ });
+ return $form;
+ };
+ /**
+ * Find all input fields with form attribute point to jQuery object
+ *
+ */
+ $('form[id]').submit(function(e) {
+ var $form = $(this);
+ // serialize data
+ var data = $('[form=' + $form.attr('id') + ']').serializeArray();
+ // append data to form
+ $form.appendField(data);
+ }).each(function() {
+ var form = this,
+ $form = $(form),
+ $fields = $('[form=' + $form.attr('id') + ']');
+ $fields.filter('button, input').filter('[type=reset],[type=submit]').click(function() {
+ var type = this.type.toLowerCase();
+ if (type === 'reset') {
+ // reset form
+ form.reset();
+ // for elements outside form
+ $fields.each(function() {
+ this.value = this.defaultValue;
+ this.checked = this.defaultChecked;
+ }).filter('select').each(function() {
+ $(this).find('option').each(function() {
+ this.selected = this.defaultSelected;
+ });
+ });
+ } else if (type.match(/^submit|image$/i)) {
+ $(form).appendField({
+ name: this.name,
+ value: this.value
+ }).submit();
+ }
+ });
+ });
+})(jQuery);
// Opera 8.0+
var isOpera = (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
- // Firefox 1.0+
+// Firefox 1.0+
var isFirefox = typeof InstallTrigger !== 'undefined';
- // At least Safari 3+: "[object HTMLElementConstructor]"
+// At least Safari 3+: "[object HTMLElementConstructor]"
var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
- // Internet Explorer 6-11
-var isIE = /*@cc_on!@*/false || !!document.documentMode;
- // Edge 20+
+// Internet Explorer 6-11
+var isIE = /*@cc_on!@*/ false || !!document.documentMode;
+// Edge 20+
var isEdge = !isIE && !!window.StyleMedia;
- // Chrome 1+
+// Chrome 1+
var isChrome = !!window.chrome && !!window.chrome.webstore;
- // Blink engine detection
+// Blink engine detection
var isBlink = (isChrome || isOpera) && !!window.CSS;
\ No newline at end of file
diff --git a/public/js/settings.js b/public/js/settings.js
index 48492da47d75d1119145ca8e3bb6d7f89c405afc..8af2c7c4631d7b4aa1691cbb04f0b9c0d84ed6d6 100644
--- a/public/js/settings.js
+++ b/public/js/settings.js
@@ -1,76 +1,90 @@
-$(document).ready(function(){
- // Wenn LocalStorage verfügbar ist, geben wir die Möglichkeit die Einstellungen dort zu speichern
- tickOptions();
- if(localStorage){
- $("#save").removeClass("hidden");
- if(localStorage.getItem("pers"))
- $("#reset").removeClass("hidden");
- $("#save").click(function(){
- resetOptions();
- localStorage.setItem("pers", true);
- $("input[type=checkbox]:checked, input[type=hidden]").each(function(el){
- localStorage.setItem($(this).attr("name"), $(this).val());
- });
- $("select").each(function(el){
- localStorage.setItem($(this).attr("name"), $(this).val());
- });
- document.location.href=$("#save").attr("data-href");
- });
- $("#reset").click(function(){
- resetOptions();
- document.location.href=$("#save").attr("data-href");
- });
- }
- $(".checker").click(function(){
- var selector = "." + $(this).attr("data-type");
- if($(selector+" input:checked").length){
- $(selector+" input").prop("checked", false);
- }else{
- $(selector+" input").prop("checked", true);
- }
- });
- $(".allUnchecker").click(function(){
- $(".focusCheckbox").prop("checked", false);
- });
- $("#unten").click(function(){
- alert("Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichnen einrichten.");
- });
- $("#plugin").click(function(){
- $("form").attr('action', $("#save").attr("data-href") + '#plugin-modal');
- alert("Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.");
- });
+$(document).ready(function() {
+ // Wenn LocalStorage verfügbar ist, geben wir die Möglichkeit die Einstellungen dort zu speichern
+ tickOptions();
+ if (localStorage) {
+ $("#save").removeClass("hidden");
+ if (localStorage.getItem("pers")) $("#reset").removeClass("hidden");
+ $("#save").click(function() {
+ resetOptions();
+ localStorage.setItem("pers", true);
+ $("input[type=checkbox]:checked, input[type=hidden]").each(function(el) {
+ localStorage.setItem($(this).attr("name"), $(this).val());
+ });
+ $("select").each(function(el) {
+ localStorage.setItem($(this).attr("name"), $(this).val());
+ });
+ document.location.href = $("#save").attr("data-href");
+ });
+ $("#reset").click(function() {
+ resetOptions();
+ document.location.href = $("#save").attr("data-href");
+ });
+ }
+ $(".checker").click(function() {
+ var selector = "." + $(this).attr("data-type");
+ if ($(selector + " input:checked").length) {
+ $(selector + " input").prop("checked", false);
+ } else {
+ $(selector + " input").prop("checked", true);
+ }
+ });
+ $(".allUnchecker").click(function() {
+ $(".focusCheckbox").prop("checked", false);
+ });
+ $("#unten").click(function() {
+ if (isEnglish()) {
+ alert("On the following startpage your settings are saved one-time. They will be lost after your first search. Though if you want to save them, you can create a bookmark for the generated startpage.");
+ } else {
+ alert("Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichnen für die generierte Startseite einrichten.");
+ }
+ });
+ $("#plugin").click(function() {
+ $("form").attr('action', $("#save").attr("data-href") + '#plugin-modal');
+ if (isEnglish()) {
+ alert("Your browser plugin with personal settings was generated. Please follow the instructions on the following page to install it. Notice that beforehand you might have to delete a former MetaGer plugin.");
+ } else {
+ alert("Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.");
+ }
+ });
});
-function tickOptions(){
- if(localStorage && localStorage.getItem("pers")){
- for(var i = 0; i < localStorage.length; i++){
- var key = localStorage.key(i);
- var value = localStorage.getItem(key);
- if(key.startsWith("param_")){
- if($("input[name=" + key + "]").length){
- $("input[name=" + key + "]").attr("checked", "");
- }else{
- $("select[name="+key+"] > option[value="+value+"]").attr("selected", true);
- }
-
- }
- }
- }else{
- $("div.web input").attr("checked", true);
- }
+function tickOptions() {
+ if (localStorage && localStorage.getItem("pers")) {
+ for (var i = 0; i < localStorage.length; i++) {
+ var key = localStorage.key(i);
+ var value = localStorage.getItem(key);
+ if (key.startsWith("param_")) {
+ if ($("input[name=" + key + "]").length) {
+ $("input[name=" + key + "]").attr("checked", "");
+ } else {
+ $("select[name=" + key + "] > option[value=" + value + "]").attr("selected", true);
+ }
+ }
+ }
+ } else {
+ $("div.web input").attr("checked", true);
+ }
}
-function resetOptions(){
- localStorage.removeItem("pers");
- var keys = [];
- for(var i = 0; i < localStorage.length; i++){
- var key = localStorage.key(i)
- keys.push(key);
- }
- for(var i = 0; i < keys.length; i++){
- var key = keys[i];
- if(key.startsWith("param_" || key.startsWith("focus"))){
- localStorage.removeItem(key);
- }
- }
+function resetOptions() {
+ localStorage.removeItem("pers");
+ var keys = [];
+ for (var i = 0; i < localStorage.length; i++) {
+ var key = localStorage.key(i)
+ keys.push(key);
+ }
+ for (var i = 0; i < keys.length; i++) {
+ var key = keys[i];
+ if (key.startsWith("param_" || key.startsWith("focus"))) {
+ localStorage.removeItem(key);
+ }
+ }
+}
+
+function isEnglish() {
+ if (window.location.href.indexOf('/en/') == -1) {
+ return false;
+ } else {
+ return true;
+ }
}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 329b21bdf82c38a2e222e0e0992c47ff4d99c239..1c822141e130bd03be2e85e718ed61a7ee28c7de 100644
--- a/readme.md
+++ b/readme.md
@@ -14,13 +14,6 @@
* redis-server
* Das Perl-Paket: Lingua::Identify (http://search.cpan.org/~ambs/Lingua-Identify-0.56/lib/Lingua/Identify.pm)
-## MetaGer zu langsam?
-Damit MetaGer so schnell wird, wie auf unserem Live-Server, erfordert es ein wenig Konfigurationsarbeit. Der Grund, warum die Version nach dem Checkout langsamer als normal ist, ist der, dass die eingestellten Suchmaschinen im Standard seriell abgefragt werden.
-Das heißt, dass bei einer Suche mit 20 Suchmaschinen eine Suchmaschine nach der anderen abgefragt wird.
-Die parallele Abarbeitung kann mit Hilfe von Laravels Queue-System ( https://laravel.com/docs/5.2/queues ) hergestellt werden.
-Im Standard, ist in der Datei ".env" QUEUE_DRIVER=sync gesetzt.
-Wir verwenden auf unseren Servern den QUEUE_DRIVER=redis und haben mit Hilfe von Supervisor ( https://laravel.com/docs/5.2/queues#supervisor-configuration ) eine Menge queue:worker Prozesse am laufen, die für eine parallele Bearbeitung sorgen.
-
## Offizielle Dokumentation
Die Dokumentation ist im Wiki des Gitlab-Projektes zu finden.
diff --git a/resources/lang/de/faq.php b/resources/lang/de/faq.php
index db07d89a63056c70f6588273bdf9f4efb98ba21e..dfb9cc8390eaa0bb7579a3fb5147b242943a9747 100644
--- a/resources/lang/de/faq.php
+++ b/resources/lang/de/faq.php
@@ -5,7 +5,6 @@ return [
'title' => 'MetaGer - FAQ',
- 'faq.title' => 'FAQ',
'faq.1.h' => 'Was ist MetaGer?',
'faq.1.b' => 'MetaGer ist eine Suchmaschine, die Suchdienste parallel nach den von Ihnen eingegebenen Suchworten absucht und alle Ergebnisse zusammenfasst. MetaGer arbeitet die Ergebnisse sinnvoll auf. Dabei werden etwa (möglichst) alle doppelten Treffer (Doubletten) zu einem zusammengefasst. Eine vollständige Erkennung von Doubletten ist allerdings unmöglich. So etwas nennt man eine Meta-Suchmaschine. Wenn man also sinnvoll suchen will, dann muss man etliche Suchmaschinen nacheinander "von Hand" absuchen und alle Ergebnisse vergleichen und zusammenführen. Diese Arbeit kann einem ein Automat - die Metasuchmaschine – abnehmen. Dazu kommt der höhere Abdeckungsgrad, denn nicht jede Suchmaschine kennt das ganze Internet. Näheres zu Metasuchmaschinen finden Sie bei <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">Wikipedia</a>. Vielleicht genügen Ihnen die Ergebnisse, die Ihnen MetaGer präsentiert, vielleicht möchten Sie mit einer einzelnen Suchmaschine nochmals suchen. In der Ergebnisliste sehen Sie an jedem Ergebnis, woher es kam und können auch direkt klicken. Viele weitere Suchmaschinen finden Sie zum Beispiel hier: <a href="http://www.klug-suchen.de/" target="_blank">klug-suchen.de</a>.',
'faq.2.h' => 'Welche Suchdienste sucht MetaGer ab?',
diff --git a/resources/lang/de/metaGer.php b/resources/lang/de/metaGer.php
index 22d28be63a404282773cce08be77034080215f32..3d9cd7825f37c3307761f94ca615bc2d2a84ad29 100644
--- a/resources/lang/de/metaGer.php
+++ b/resources/lang/de/metaGer.php
@@ -5,6 +5,8 @@ return [
'settings.noneSelected' => 'Achtung: Sie haben in ihren Einstellungen keine Suchmaschine ausgewählt.',
+ 'engines.noParser' => 'Beim Abfragen von :engine ist ein Fehler aufgetreten. Bitte benachrichtigen Sie uns unter: <a href="mailto:office@suma-ev.de?subject=Fehlender Parser: :engine">office@suma-ev.de</a>',
+
'formdata.cantLoad' => 'Suma-File konnte nicht gefunden werden',
'formdata.noSearch' => 'Achtung: Sie haben keinen Suchbegriff eingegeben. Sie können ihre Suchbegriffe oben eingeben und es erneut versuchen.',
'formdata.dartEurope' => 'Hinweis: Sie haben Dart-Europe aktiviert. Die Suche kann deshalb länger dauern und die maximale Suchzeit wurde auf 10 Sekunden hochgesetzt.',
diff --git a/resources/lang/de/plugin.php b/resources/lang/de/plugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..04def9978cf784378eaa4d6c0658ca7e56bc3280
--- /dev/null
+++ b/resources/lang/de/plugin.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+ 'description' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
+];
diff --git a/resources/lang/de/tips.php b/resources/lang/de/tips.php
index 33471f22a6d1e4debf2de3d06428084351ca05d5..30d9df55455a98d1645ac832e92f39b990f49fb1 100644
--- a/resources/lang/de/tips.php
+++ b/resources/lang/de/tips.php
@@ -1,5 +1,6 @@
<?php
return [
- 'title' => 'MetaGer Tipps, unsortiert - dies & das - wussten Sie schon?',
+ "title" => "MetaGer Tipps, unsortiert - dies & das - wussten Sie schon?",
+ "shorttitle" => "Wussten Sie schon?"
];
diff --git a/resources/lang/en/about.php b/resources/lang/en/about.php
index 9a87787edf500bc413274f474ac5a42fc6349f2f..0ba5af9c07d27ea6150aa7a41afcbef0faaf77c9 100644
--- a/resources/lang/en/about.php
+++ b/resources/lang/en/about.php
@@ -5,9 +5,9 @@ return [
'head.2' => 'What are the advantages of using MetaGer?',
'list.1' => 'Privacy is quite natural for us: Completely built in and automatically applied to every search. <a href="/en/datenschutz/">More about privacy...</a>',
- 'list.2' => 'We do not work profit-oriented, we are a <a href="/en/spende/">charitable association:</a> Our goal is not to enrich ourselves with your clicks or even your data.',
- 'list.3' => '<a href="https://de.wikipedia.org/wiki/MetaGer" target="_blank">MetaGer</a> is primarily a <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">meta search engine:</a> We query up to 50 search engines. Thus we can offer real variety in results.',
- 'list.4' => 'For our results, we do not prefer results <a href="https://de.wikipedia.org/wiki/Filterblase" target="_blank">that are clicked more often:</a> This also gives you variety, instead of mainstream.',
- 'list.5' => '<a href="http://blog.suma-ev.de/node/207" target="_blank">MetaGer is online since about 20 years:</a> Our experience is your advantage - we know what we do.',
- 'list.6' => 'But we are not perfect as well: If you encounter something weird: Please <a href="/en/kontakt/" target="_blank">contact us!</a> We take your hints real serious: YOU are most important for us.',
+ 'list.2' => 'We do not work profit-oriented, we are a <a href="/en/spende/">charitable association</a>: Our goal is not to enrich ourselves with your clicks or even your data.',
+ 'list.3' => '<a href="https://en.wikipedia.org/wiki/MetaGer" target="_blank">MetaGer</a> is primarily a <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank">meta search engine</a>: We query up to 50 search engines. Thus we can offer real variety in results.',
+ 'list.4' => 'For our results, we do not prefer results <a href="https://en.wikipedia.org/wiki/Filter_bubble" target="_blank">that are clicked more often</a>: This also gives you variety, instead of mainstream.',
+ 'list.5' => 'MetaGer is online since about 20 years: Our experience is your advantage - we know what we do.',
+ 'list.6' => 'But we are not perfect as well: If you encounter something weird: Please <a href="/en/kontakt/" target="_blank">contact us</a>! We take your hints seriously: <em>You</em> are most important for us.',
];
diff --git a/resources/lang/en/datenschutz.php b/resources/lang/en/datenschutz.php
index 6d640438010b6d917df25e5664dae13776b137c6..100da5f486a19eadd48c6c6cc514ef94507c524f 100644
--- a/resources/lang/en/datenschutz.php
+++ b/resources/lang/en/datenschutz.php
@@ -3,31 +3,30 @@
return [
'head' => 'Privacy',
- 'general.1' => 'For us, privacy is one of the most important goods on the internet. It needs to be preserved and is not to be used for profit. The following is a small summary of our approach. A more detailed description why we are the most secure search engine can be found <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">here (in German).</a>',
+ 'general.1' => 'For us, privacy is one of the most important goods on the internet. It needs to be preserved and is not to be used for profit. The following is a small summary of our approach.',
'general.3' => 'Only free software with open source code is under control of any user. In
-all other cases the users have to BELIEVE what the maintainers tell about
+all other cases the users have to <em>believe</em> what the maintainers tell about
what is going on inside. If maintainers claim that they have strictly
-implemented privacy and data protecion, you have to believe them.
+implemented privacy and data protecion, users have to believe them.
MetaGer is free software under GNU-AGPLv3 Licence. It is available to
-anyone at <a href="https://gitlab.metager3.de/open-source/MetaGer">https://gitlab.metager3.de/open-source/MetaGer</a>. You do not
-have to believe us, YOU might control it yourself!',
+anyone at <a href="https://gitlab.metager3.de/open-source/MetaGer">https://gitlab.metager3.de/open-source/MetaGer</a>.',
'policy.1' => 'Our Approach/Policy:',
'policy.2' => 'Neither do we save your IP, nor the
-<a href="http://www.heise.de/security/meldung/Fingerprinting-Viele-Browser-sind-ohne-Cookies-identifizierbar-1982976.html" target="_blank">"fingerprint" of your Browser</a> (which most likely could identify you as well).',
+<a href="https://en.wikipedia.org/wiki/Canvas_fingerprinting" target="_blank">"fingerprint" of your Browser</a> (which most likely could identify you as well).',
- 'policy.5' => 'We do not set cookies or use tracking-pixel or similar technology, to "track" our users (tracking = following a users digital movement on the internet).',
- 'policy.6' => 'The data transmission from MetaGer is only done encrypted via the https protocol.',
- 'policy.7' => 'We offer access via the anonymous TOR network, the <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43&sid=c994b628153235dfef098ba6fea3d60e" target="_blank">MetaGer hidden service.</a>',
+ 'policy.5' => 'We do not set cookies or use tracking-pixels or similar technology, to "track" our users (tracking = following a users digital movement on the internet).',
+ 'policy.6' => 'Data transmission is only done encrypted via the https protocol.',
+ 'policy.7' => 'We offer access via the anonymous TOR network, the <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43&sid=c994b628153235dfef098ba6fea3d60e" target="_blank">MetaGer hidden service</a>.',
- 'policy.9' => 'Since the access via the TOR-network seems complicated to many users and sometimes is also slow, we offer a different way, to visit the result pages anonymously: By clicking on the link "open anonymously". Doing this your personal information will be protected on this click and even on all following clicks.',
- 'policy.10' => 'We show as few advertisements as possible, clearly marking them, and financially rely on our users, their <a href="/en/spende/">Donations</a> and membership fees for <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a>.',
+ 'policy.9' => 'Since access via the TOR-network seems complicated to many users and often slow, we offer a proxy server, to visit the result pages anonymously: By clicking on the link "open anonymously" your personal information will be protected on this click and even on all following clicks.',
+ 'policy.10' => 'We show as few advertisements as possible, clearly marking them, and financially rely on our users, their <a href="/en/spende/">Donations</a> and membership fees for <a href="http://suma-ev.de/en/" target="_blank">SUMA-EV</a>.',
- 'policy.13' => 'Metager is operated and developed by the charitable german organisation <a href="http://suma-ev.de/" target="_blank">SUMA-EV</a> in cooperation with the <a href="http://www.uni-hannover.de/" target="_blank">Leibniz University Hanover</a>.',
+ 'policy.13' => 'Metager is operated and developed by the charitable german organisation <a href="http://suma-ev.de/en/" target="_blank">SUMA-EV</a> in cooperation with the <a href="http://www.uni-hannover.de/" target="_blank">Leibniz University Hanover</a>.',
- 'policy.17' => 'Our Servers are exclusively located in germany. Therefore they are governed by the german privacy law, which is among the strictest world wide.',
- 'policy.18' => 'Since the <a href="http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html" target="_blank">revealments of Edward Snowden in June 2013</a> numerous search engines claim that they protect theit users privacy, because the user\'s IP adress is not saved. No matter how honourable these descriptions are - fact is that many search engines at least partially host their servers in the USA. Because these search engines are, <a href="http://de.wikipedia.org/wiki/USA_PATRIOT_Act" target="_blank">as per the Patriot Act and US law</a> , fully unprotected against the access of local authorities. Thus they cannot provide protection of personal data (even if they really try to).',
+ 'policy.17' => 'Our Servers are located exclusively in germany. Therefore they are governed by the german privacy law, which is among the strictest world wide.',
+ 'policy.18' => 'Since the <a href="http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html" target="_blank">revealments of Edward Snowden in June 2013</a> numerous search engines claim that they protect their users\' privacy, because the users\' IP adresses are not saved. No matter how honorable these descriptions are - many search engines at least partially host their servers in the USA. Because these search engines are, <a href="http://de.wikipedia.org/wiki/USA_PATRIOT_Act" target="_blank">as per the Patriot Act and US law</a>, unprotected against the access of local authorities. Thus they cannot provide protection of personal data (even if they really try to).',
'twitter' => 'What others say about our privacy-concept on twitter:',
];
diff --git a/resources/lang/en/faq.php b/resources/lang/en/faq.php
index 1ba8cdbe47c37dc5b85173714b9e92ab50375db2..2c4fde5e99a5b3cc5cfba0e5f89935b1a50f91a5 100644
--- a/resources/lang/en/faq.php
+++ b/resources/lang/en/faq.php
@@ -1,26 +1,29 @@
<?php
return [
- "achtung" => "Warning! For our website is in constant development there are continuous changes to the structure and functionality of our website. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
- "title" => "MetaGer - FAQ",
- "faq.title" => "FAQ",
- "faq.1.h" => "MetaGer – what is it?",
- "faq.1.b" => "MetaGer is primarily a metasearch engine. The details are explained <a href=\"https://en.wikipedia.org/wiki/Metasearch_engine\" target=\"_blank\">here</a>. Besides that MetaGer maintains a number of specialized crawlers and indexers of its own.",
- "faq.2.h" => "Which search engines are meta-crawled by MetaGer?",
- "faq.2.b" => "You might find a list at our menu \"customize\" on the MetaGer homepage",
- "faq.3.h" => "Why does MetaGer has no button \"search over all search engines\"?",
- "faq.3.b" => "The reason is, that the requirements of a search are are often not suitable for this. For a search for scientific results for example it makes no sense to search with a product search engine.",
- "faq.4.h" => "Why don't you metacrawl search engine XY no longer?",
- "faq.4.b" => "If we do not query a search engine which we did query before, then this has technical or \"political\" reasons.",
- "faq.5.h" => "One search engine does not answer any more",
- "faq.5.b" => "If you observe this it is probably a technical fault. Please email us in that case: office@suma-ev.de",
- "faq.6.h" => "Unappropriate Content",
- "faq.6.b.1" => "I found results with illegal content",
- "faq.6.b.2" => "If you found content in the Internet, which you think is illegal, you might point your browser to http://www.jugendschutz.net/ and fill in the complaint form. Or you could email to us at <a href=\"mailto:jugendschutz@metager.de\" target=\"_blank\">jugendschutz@metager.de</a>",
- "faq.7.h" => "Is it possible to integrate MetaGer in my own homepage?",
- "faq.7.b" => "No problem! You might find detailed information if you click on our homepage on \"Tools\" and then \"Widget\"",
- "faq.8.h" => "How can I register my homepage on MetaGer?",
- "faq.8.b" => "You can't. MetaGer is a metasearch engine. It does not search itself, but lets search others. If you want to propagate your homepage, you have to visit all the other search engines for that purpose",
- "faq.9.h" => "How does the MetaGer Ranking work?",
- "faq.9.b" => "You would have to check our source code to find out."
+ "achtung" => "Warning! For our website is in constant development there are continuous changes to the structure and functionality of our website. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
+
+ "title" => "MetaGer - FAQ",
+
+ "faq.1.h" => "What is MetaGer?",
+ "faq.1.b" => "MetaGer is primarily a <a href=\"https://en.wikipedia.org/wiki/Metasearch_engine\" target=\"_blank\">meta search engine</a>. Besides that MetaGer maintains a number of specialized crawlers and indexers of its own.",
+ "faq.2.h" => "Which search engines are meta-crawled by MetaGer?",
+ "faq.2.b" => "You can find a list at our \"customize\" menu on the MetaGer homepage.",
+ "faq.3.h" => "Why does MetaGer has no button \"search using all search engines\"?",
+ "faq.3.b" => "The reason is, that the requirements of a search are are often not suitable for this. For a search for scientific results for example it makes no sense to search with a product search engine.",
+ "faq.4.h" => "Why don't you metacrawl search engine XY anymore?",
+ "faq.4.b" => "If we do not query a search engine which we did query before, then this has technical or \"political\" reasons.",
+ "faq.5.h" => "One search engine does not answer anymore",
+ "faq.5.b" => "If you observe this it is probably a technical fault. Please email us in that case: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a>",
+ "faq.6.h" => "Inappropriate Content",
+ "faq.6.b.1" => "> I found results with illegal content.",
+ "faq.6.b.2" => "If you found content through MetaGer, which you think is illegal, you can email us at <a href=\"mailto:jugendschutz@metager.de\" target=\"_blank\">jugendschutz@metager.de</a>.",
+ "faq.7.h" => "Is it possible to integrate MetaGer into my own website?",
+ "faq.7.b" => "No problem! We have a <a href=\"/en/widget\" target=_blank>widget</a> that you can use free of charge.",
+ "faq.8.h" => "How can I register my homepage on MetaGer?",
+ "faq.8.b" => "You can't. MetaGer is a metasearch engine. If you want to propagate your website, you have to register at all the other search engines for that purpose.",
+ "faq.9.h" => "How does the MetaGer ranking work?",
+ "faq.9.b" => "You can check <a href=\"https://gitlab.metager3.de/open-source/MetaGer\" target=_blank>our source code</a> to find out.",
+ "faq.10.h" => "I can't use MetaGer with my browser X and operating system Y. I need help!",
+ "faq.15.h" => "How was MetaGer started, what is the story behind MetaGer?",
];
diff --git a/resources/lang/en/hilfe.php b/resources/lang/en/hilfe.php
index 53a9f4f4ece91eca3fa54076ecad50539879283c..b4d87685b2ad7eb698ee95608bca54b129ff555e 100644
--- a/resources/lang/en/hilfe.php
+++ b/resources/lang/en/hilfe.php
@@ -1,5 +1,3 @@
-
-
<?php
return [
@@ -19,6 +17,7 @@ return [
"datenschutz.title" => "Privacy",
"datenschutz.1" => "cookies, session-IDs, IP addresses",
"datenschutz.2" => "We don't store or work with any personal information. We provide further privacy security services as follows:",
+ "datenschutz.3" => "For more details see \"Tools\" above.",
"tor.title" => "Tor Hidden Service",
"tor.1" => "MetaGer provides the highest reachable security level for your privacy (anonymised IP addresses, servers under german privacy protection law). For further security needs or fear of compromised servers you may use the MetaGer-Tor branch. Please download the specialized webbrowser from <a href=\"https://www.torproject.org/\" target=\"_blank\">https://www.torproject.org/</a>. You will find help there, too.",
"tor.2" => "MetaGer Tor address: http://b7cxf4dkdsko6ah2.onion/tor/",
@@ -40,5 +39,4 @@ return [
"grossklein.title" => "Upper case vs. lower case",
"grossklein.1" => "Upper case will not be distinguished from lower case",
"grossklein.2" => "Searching for <div class=\"well well-sm\">Shakespeare</div> or <div class=\"well well-sm\">SHAKESPEARE</div> will deliver the same results that <div class=\"well well-sm\">shakespeare</div>"
-];
-
+];
\ No newline at end of file
diff --git a/resources/lang/en/languages.php b/resources/lang/en/languages.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b8c57bd4e8141a05cfabb82c260316141ff2afb
--- /dev/null
+++ b/resources/lang/en/languages.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+ "header" => "MetaGer - translations"
+];
diff --git a/resources/lang/en/plugin.php b/resources/lang/en/plugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..79839a76f0c5e115f9efcb31c34e28e489e9cc6b
--- /dev/null
+++ b/resources/lang/en/plugin.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+ "description" => "MetaGer: secure search & find, protecting privacy"
+];
diff --git a/resources/lang/en/resultPage.php b/resources/lang/en/resultPage.php
index deb000b603cde51683634c2fcc2c61a9520c561d..b5f386929c33818b5c84e23a3ff7a584bdaed4d7 100644
--- a/resources/lang/en/resultPage.php
+++ b/resources/lang/en/resultPage.php
@@ -1,6 +1,7 @@
<?php
return [
- 'startseite' => 'MetaGer start page',
- 'impressum' => 'legal notice',
+ "opensearch" => "MetaGer: secure search & find, protecting privacy",
+ "startseite" => "MetaGer start page",
+ "impressum" => "legal notice"
];
diff --git a/resources/lang/en/staticPages.php b/resources/lang/en/staticPages.php
index 7a473cb6ddc589e2fd3e9f77e10e7f707ed99623..bff864d6255f2e186eaf0e95dc989885dfafc3ca 100644
--- a/resources/lang/en/staticPages.php
+++ b/resources/lang/en/staticPages.php
@@ -1,34 +1,34 @@
<?php
return [
- "opensearch" => "MetaGer: search & find safely while protecting your privacy",
- "nav1" => "Search",
- "nav2" => "Donate",
- "nav3" => "Privacy",
- "nav20" => "Help",
- "nav21" => "FAQ",
- "nav4" => "Board",
- "nav5" => "Contact",
- "nav6" => "Team",
- "nav7" => "About us",
- "nav8" => "Imprint",
- "nav9" => "Help",
- "nav10" => "Widget",
- "nav11" => "Associator",
- "nav12" => "Code-Search",
- "nav13" => "URL-Shortener",
- "nav14" => "TOR-Hidden-Service",
- "nav15" => "Tools",
- "nav16" => "Support Us",
- "nav17" => "Purchase at affiliate shops",
- "nav18" => "Contact",
- "nav19" => "Language",
- "nav22" => "Citation Search",
- "nav24" => "MetaGer source code",
- "navigationToggle" => "show navigation",
- "sumaev.1" => "MetaGer is developed and run by ",
- "sumaev.2" => "SUMA-EV - Association for Free Access to Knowledge.",
- "meta.Description" => "Search safely while having your privacy respected. The digital knowledge of the world must be freely accessible without paternalism and abide by states or corporations.",
- "meta.Keywords" => "Internet Search, privacy, searchengine, data protection, Anonproxy, anonymous proxy, search anonymous, image search, anonymous, MetaGer, metager, metager.de, metager.net",
- "meta.language" => "en"
-];
\ No newline at end of file
+ "opensearch" => "MetaGer: search & find safely while protecting your privacy",
+ "nav1" => "Search",
+ "nav2" => "Donate",
+ "nav3" => "Privacy",
+ "nav20" => "Help",
+ "nav21" => "FAQ",
+ "nav4" => "Board",
+ "nav5" => "Contact",
+ "nav6" => "Team",
+ "nav7" => "About us",
+ "nav8" => "Legal information",
+ "nav9" => "Help",
+ "nav10" => "Widget",
+ "nav11" => "Associator",
+ "nav12" => "Code-Search",
+ "nav13" => "URL-Shortener",
+ "nav14" => "TOR-Hidden-Service",
+ "nav15" => "Tools",
+ "nav16" => "Support Us",
+ "nav17" => "Purchase at affiliate shops",
+ "nav18" => "Contact",
+ "nav19" => "Language",
+ "nav22" => "Citation Search",
+ "nav24" => "MetaGer source code",
+ "navigationToggle" => "show navigation",
+ "sumaev.1" => "MetaGer is developed and run by ",
+ "sumaev.2" => "SUMA-EV - Association for Free Access to Knowledge.",
+ "meta.Description" => "Search safely while having your privacy respected. The digital knowledge of the world must be freely accessible without paternalism and abide by states or corporations.",
+ "meta.Keywords" => "Internet Search, privacy, searchengine, data protection, Anonproxy, anonymous proxy, search anonymous, image search, anonymous, MetaGer, metager, metager.de, metager.net",
+ "meta.language" => "en",
+];
diff --git a/resources/lang/en/tips.php b/resources/lang/en/tips.php
index 9a7db8a2506708e367826a3b4164a853577d1294..75888538d9a713fae394c6cb885c713177503b66 100644
--- a/resources/lang/en/tips.php
+++ b/resources/lang/en/tips.php
@@ -1,5 +1,6 @@
<?php
return [
- "title" => "MetaGer hints, unsorted - this and that - did you know it?"
-];
+ "title" => "MetaGer hints, unsorted - this and that - did you know it?",
+ "shorttitle" => "Did you already know?"
+];
\ No newline at end of file
diff --git a/resources/lang/en/titles.php b/resources/lang/en/titles.php
index dc2337b82fb0c5dd9bf32ebe303a7c002ad584b6..d4a6ca0b630fb23d216c45f0400c90db37ae0c85 100644
--- a/resources/lang/en/titles.php
+++ b/resources/lang/en/titles.php
@@ -1,18 +1,19 @@
<?php
return [
- 'index' => 'MetaGer: Search and Find Savely, Protect Privacy',
- 'impressum' => 'Site Notice - MetaGer',
- 'about' => 'About Us - MetaGer',
- 'team' => 'Team - MetaGer',
- 'kontakt' => 'Contact - MetaGer',
- 'spende' => 'Donation - MetaGer',
- 'datenschutz' => 'Privacy - MetaGer',
- 'hilfe' => 'Help - MetaGer',
- 'widget' => 'MetaGer Widget',
- 'settings' => 'Settings',
- 'websearch' => 'Websearch-Widget - MetaGer',
- 'sitesearch' => 'Sitesearch-Widget - MetaGer',
- 'faq' => 'FAQ - MetaGer',
- 'partnershops' => 'Partnershops - MetaGer',
-];
+ "index" => "MetaGer: Search and Find Savely, Protect Privacy",
+ "impressum" => "Site Notice - MetaGer",
+ "about" => "About Us - MetaGer",
+ "team" => "Team - MetaGer",
+ "kontakt" => "Contact - MetaGer",
+ "spende" => "Donation - MetaGer",
+ "datenschutz" => "Privacy - MetaGer",
+ "hilfe" => "Help - MetaGer",
+ "widget" => "MetaGer Widget",
+ "settings" => "Settings",
+ "websearch" => "Websearch-Widget - MetaGer",
+ "sitesearch" => "Sitesearch-Widget - MetaGer",
+ "faq" => "FAQ - MetaGer",
+ "partnershops" => "Partnershops - MetaGer",
+ "languages.edit" => "Edit language files - MetaGer"
+];
\ No newline at end of file
diff --git a/resources/lang/es/index.php b/resources/lang/es/index.php
index e8cbccd55ba77b7a26e1fa06c189b7fa242a6f6d..08ada640c97cdf68e44e808dfdaf74ea90c8d8d8 100644
--- a/resources/lang/es/index.php
+++ b/resources/lang/es/index.php
@@ -15,9 +15,9 @@ return [
"plugintitle" => "Añadir MetaGer a su navegador",
"sponsors.head.1" => "Más informaciones",
"sponsors.head.2" => "Esponsores",
- "sponsors.woxikon" => '<a href="http://www.woxikon.de/" class="mutelink" target="_blank">Buscar palabras & sinónimos</a>',
- "sponsors.gutscheine" => '<a href="http://www.gutschein-magazin.de/" class="mutelink" target="_blank">Vales actuales de Gutschein-Magazin.de</a>',
- "sponsors.kredite" => '<a href="https://www.finanzcheck.de/" class="mutelink" target="_blank">Comparar créditos económicos en FINANZCHECK.de</a>',
+ "sponsors.woxikon" => "<a href=\"http://www.woxikon.de/\" class=\"mutelink\" target=\"_blank\">Buscar palabras & sinónimos</a>",
+ "sponsors.gutscheine" => "<a href=\"http://www.gutschein-magazin.de/\" class=\"mutelink\" target=\"_blank\">Vales actuales de Gutschein-Magazin.de</a>",
+ "sponsors.kredite" => "<a href=\"https://www.finanzcheck.de/\" class=\"mutelink\" target=\"_blank\">Comparar créditos económicos en FINANZCHECK.de</a>",
"about.title" => "Sobre nosotros",
"about.1.1" => "Privacidad & protección de datos",
"about.1.2" => "son con nosotros simples & dado por sentado",
@@ -35,13 +35,47 @@ return [
"plugin.firefox.2" => "Ahora hacer click con la tecla derecha el ratón en el nuevo logo de MetaGer en la lista y en \"Usar por defecto\" (ver imagen)",
"plugin.firefox.3" => "Instalar MetaGer como página de inico en el :browser",
"plugin.firefox.4" => "Hacer click arriba a la derecha en los tres barras horizontales en su navegador (Menú) y abre \"Preferencias\"",
- "plugin.firefox.5" => "Introducir en el campo \"Pagina de inicio\" \"https:\/\/metager.de\"",
- "plugin.chrome.1" => "Haga click en su Chrome arriba a la derecha <span class=\"glyphicon glyphicon-option-vertical\"><\/span> y en el subsecuente menú en \"Preferencias\", para abrir las preferencias de su Chrome.",
+ "plugin.firefox.5" => "Introducir en el campo \"Pagina de inicio\" \"https:\\/\\/metager.de\"",
+ "plugin.chrome.1" => "Haga click en su Chrome arriba a la derecha <span class=\"glyphicon glyphicon-option-vertical\"><\\/span> y en el subsecuente menú en \"Preferencias\", para abrir las preferencias de su Chrome.",
"plugin.chrome.2" => "In la área de la búsqueda hacer click en administrar motores de búsqueda ...",
"plugin.chrome.3" => "En la lista que se ve ahora, busca la entrada \"MetaGer\". Cloquease con el ratón sobre la entrada \"Establecer como predeterminado\"",
"plugin.chrome.4" => "Definir MetaGer como pagina de inicio en el :browser ",
- "plugin.chrome.5" => "Hacer click arriba a la derecha en su navegador en <span class=\"glyphicon glyphicon-option-vertical\"><\/span> y abre \"Configuración\"",
+ "plugin.chrome.5" => "Hacer click arriba a la derecha en su navegador en <span class=\"glyphicon glyphicon-option-vertical\"><\\/span> y abre \"Configuración\"",
"plugin.chrome.6" => "En la sección \"Al abrir el navegador ... \" seleccionar \"Abrir una página especifica\" y haga click en \"Establecer páginas\" ",
- "plugin.chrome.7" => "Introduzca \"https:\/\/metager.de\" como URL en el campo \"Añadir una nueva página\" ",
- "plugin.chrome.8" => "Nota: Todos los sitios web visibles aquà se abren ahora cuando inicia el navegador. Usted puede borrarlos, poniéndose con el ratón encima y hacer click en la \"x\" al lado derecha."
+ "plugin.chrome.7" => "Introduzca \"https:\\/\\/metager.de\" como URL en el campo \"Añadir una nueva página\" ",
+ "plugin.chrome.8" => "Nota: Todos los sitios web visibles aquà se abren ahora cuando inicia el navegador. Usted puede borrarlos, poniéndose con el ratón encima y hacer click en la \"x\" al lado derecha.",
+ "plugin.opera.1" => "Haga click <a href=\"/\" target=\"_blank\">a</a> para abrir MetaGer en una nueva pestaña.",
+ "plugin.opera.2" => "En la nueva pestaña haga click en la barra de la búsqueda con el botón derecha del ratón.",
+ "plugin.opera.3" => "Elige en el menú de contexto \"editar buscadores\" ",
+ "plugin.opera.4" => "En la ventana popup hacer click en \"Añadir buscador\"",
+ "plugin.opera.5" => "(Desafortunadamente ya no es posible en Opera poner buscadores nuevos como estandard, pero <a href=\"https://www.mozilla.org/de/firefox/new/\" target=\"_blank\">aquÃ</a>puede instalar un navegador de código abierto que soporta esto.)",
+ "plugin.opera.6" => "Hacer MetaGer la página de inicio en :browser",
+ "plugin.opera.7" => "Hacer click en el menú del navegador en \"Editar\"->\"Configuración\"",
+ "plugin.opera.8" => "En la sección \"Inicio\" seleccione \"Abrir una página especifica\" y después \"Definir página\"",
+ "plugin.opera.9" => "En el campo \"Introducir URL\" ponga \"https://metager.de\" y confirma con introducir",
+ "plugin.opera.10" => "Haga click en \"Confirmar\"",
+ "plugin.IE.1" => "Haga click en <a href=\"javascript:window.external.addSearchProvider($('link[rel=search]').attr('href'));\"></a>, para añadir MetaGer como búscador",
+ "plugin.IE.4" => "Haga click en su navegador arriba derecha en Extras",
+ "plugin.IE.5" => "Escoge el punto del menú \"Administrar extensiones\"",
+ "plugin.IE.6" => "Busca Tipos de Extensiones y haga click en \"Máquinas de búsqueda\" y después al lado derecho click en \"MetaGer\"",
+ "plugin.IE.7" => "Escoge el botón \"Definir como predeterminado\"",
+ "plugin.IE.8" => "Definir MetaGer como página de inicio en :browser ",
+ "plugin.IE.9" => "Haga click arriba derecha en <span class=\"glyphicon glyphicon-cog\"></span> y abre \"Opciones de internet\"",
+ "plugin.IE.10" => "Si quiere definir MetaGer como única página de inicio, marca todo el texto en el campo del texto y reemplázalo por \"https://metager.de\"",
+ "plugin.IE.11" => "Haga click en \"Aceptar\"",
+ "plugin.edge.1" => "Haga click en su navegador arriba derecha en Extras (",
+ "plugin.edge.2" => ") y selecciona \"Configuración\"",
+ "plugin.edge.3" => "Haga scroll hacia abajo y haga click en \"Mostrar configuración avanzada\"",
+ "plugin.edge.4" => "Haga scroll de nuevo hacia abajo llegando al \"Buscar en la barra de direcciones con\" y haga click en \"Cambiar\"",
+ "plugin.edge.5" => "Selecciona \"MetaGer: Sicher suchen & finden...\" y clickea en \"Definir com predeterminado\"",
+ "plugin.edge.6" => "Hacer MetaGer la página de inicio en :browser",
+ "plugin.edge.7" => "Haga click arriba derecha en el navegador en <span class=\"glyphicon glyphicon-option-horizontal\"></span> y abre \"Configuraciones\"",
+ "plugin.edge.8" => "Selecciona en la sección \"Abrir con\" el Ãtem \"Página especÃfica\"",
+ "plugin.edge.9" => "En el menú de cascada selecciona \"Definido por el usuario\"",
+ "plugin.edge.10" => "En la área abajo ponga \"https://metager.de\" en el campo \"Introducir URL\" y haga click en el sÃmbolo \"+\"",
+ "plugin.edge.11" => "Borra todas las entradas, que no quiere abrir al inicio (p.ej. about:start), haciendo click en el pequeño \"x\" a la derecha.",
+ "plugin.safari.1" => "Instala la extensión de Safari <a href=\"http://www.opensearchforsafari.com/\" target=\"_blank\">OpenSearchforSafari</a>.",
+ "plugin.safari.2" => "Busca MetaGer y añade MetaGer con el botón OpenSearch (sÃmbolo de na lupa) en la barra de menú de Safari.",
+ "plugin.safari.3" => "Borra (según necesidad) los demás buscadores de la extension OpenSearch, haciendo click en el \"X\" a la par y confirma.",
+ "plugin.safari.4" => "Ahora puede buscar con MetaGer usando el botón de OpenSearch (la lupa)."
];
\ No newline at end of file
diff --git a/resources/views/faq.blade.php b/resources/views/faq.blade.php
index adb7e00a63e4fa6965433e4ac84794912721c2e1..4f7d76386e97336ba6319187ee8f4fc03d179eb2 100644
--- a/resources/views/faq.blade.php
+++ b/resources/views/faq.blade.php
@@ -5,8 +5,6 @@
@section('content')
<div class="alert alert-warning" role="alert">{!! trans('faq.achtung') !!}</div>
<h1>{!! trans('faq.title') !!}</h1>
-
-<h2 id="faq">{!! trans('faq.faq.title') !!}</h2>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{!! trans('faq.faq.1.h') !!}</h3>
diff --git a/resources/views/plugin.blade.php b/resources/views/plugin.blade.php
index 2f6c07d7fde99d5e0d0a5672db2b1c07aeb73b4a..6eb22f80b8e87137e53123a834435b4d47a5470e 100644
--- a/resources/views/plugin.blade.php
+++ b/resources/views/plugin.blade.php
@@ -1,7 +1,7 @@
<?xmlversion = "1.0"encoding = "UTF-8"?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
<ShortName>MetaGer</ShortName>
- <Description>MetaGer: Sicher suchen & finden, Privatsphäre schützen</Description>
+ <Description>{! trans('plugin.description') !}</Description>
<Contact>office@suma-ev.de</Contact>
<Image width="16" height="16" type="image/x-icon">{{ url('/favicon.ico') }}</Image>
<Url type="text/html" template="{{ $link }}&eingabe={searchTerms}" method="{{$request}}"></Url>
diff --git a/storage/app/public/ads.txt b/storage/app/public/ads.txt
old mode 100755
new mode 100644
index 34aa77935a04fdba26849d18b048bce2554571a9..e385a3590a9734ac5618f4738ca0baf4ced31f35
--- a/storage/app/public/ads.txt
+++ b/storage/app/public/ads.txt
@@ -1,7 +1,7 @@
[
{
"title" : "MetaGer4You:",
- "descr" : "Maßgeschneiderte Suchlösungen für Ihr Unternehmen - fragen Sie uns: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a>",
+ "descr" : "Maßgeschneiderte Suchlösungen für Ihr Unternehmen - fragen Sie uns: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a> - oder verwenden Sie unser einfaches und kostenloses <a href=\"https://metager.de/widget/\" target=_blank>Widget</a>.",
"URL" : "mailto:office@suma-ev.de"
}