From 984bf87cef7886fdf1b8b213ff20af07082673c2 Mon Sep 17 00:00:00 2001
From: Carsten Riel <carsten@suma-ev.de>
Date: Thu, 14 Feb 2019 11:00:10 +0100
Subject: [PATCH] Update resources/lang/en/metaGer.php,
resources/lang/en/spende.php, resources/lang/en/faq.php,
resources/lang/en/bitpay.php, resources/lang/en/index.php,
resources/lang/de/index.php files
---
resources/lang/de/index.php | 95 ++++++++++++++++++-----------------
resources/lang/en/bitpay.php | 5 ++
resources/lang/en/faq.php | 2 +-
resources/lang/en/index.php | 6 ++-
resources/lang/en/metaGer.php | 95 +++++++++++++++++++++++++++++------
resources/lang/en/spende.php | 8 ++-
6 files changed, 143 insertions(+), 68 deletions(-)
create mode 100644 resources/lang/en/bitpay.php
diff --git a/resources/lang/de/index.php b/resources/lang/de/index.php
index 9c67140a5..649e7fa5a 100644
--- a/resources/lang/de/index.php
+++ b/resources/lang/de/index.php
@@ -1,51 +1,52 @@
<?php
return [
- 'foki.web' => 'Web',
- 'foki.bilder' => 'Bilder',
- 'foki.nachrichten' => 'News/Politik',
- 'foki.wissenschaft' => 'Wissenschaft',
- 'foki.produkte' => 'Produkte',
- 'foki.angepasst' => 'Angepasst',
- 'foki.maps' => 'Maps.metager.de',
-
- 'design' => 'Persönliches Design auswählen',
-
- 'conveyor' => 'Einkaufen bei MetaGer-Fördershops',
- 'partnertitle' => 'MetaGer unterstützen, ohne Mehrkosten für Sie',
- 'mapstitle' => 'Der MetaGer Kartenservice',
-
- 'plugin' => 'MetaGer-Plugin hinzufügen',
- 'plugin-title' => 'MetaGer zu Ihrem Browser hinzufügen',
-
- 'options.head' => 'Filter verwalten',
-
- 'focus-creator.description' => 'Suchen Sie sich aus unseren Suchmaschinen Ihre eigene Suche zusammen.',
- 'focus-creator.name-placeholder' => 'Name der eigenen Suche',
- 'focus-creator.save' => 'Eigene Suche durchführen',
- 'focus-creator.delete' => 'Eigene Suche löschen',
- 'focus-creator.focusname' => 'Suchname: ',
-
- 'slogan.title' => 'Besser suchen, schneller finden',
- 'slogan.1' => 'Datenschutz & Privatsphäre: Bei uns einfach und selbstverständlich.<br>Wir arbeiten nicht gewinnorientiert, wir sind ein gemeinnütziger Verein: <a href="/beitritt">Werden Sie Mitglied</a> oder <a href="/spende">spenden Sie</a>!',
- 'slogan.2' => 'Mit MetaGer bewahren Sie einen neutralen Blick auf’s Web!',
-
- 'sponsors.head' => 'Sponsoren',
- 'sponsors.woxikon' => 'SEO Agentur',
- 'sponsors.gutscheine' => 'STERN.de: Günstige Kredite im Kreditvergleich',
- 'sponsors.seo' => 'Weihnachtsfeier',
-
- 'about.title' => 'Ãœber uns',
- 'about.1.1' => '<a href="/datenschutz">Datenschutz & Privatsphäre</a>: Bei uns einfach & selbstverständlich.',
- 'about.2.1' => 'Wir arbeiten nicht gewinnorientiert, wir sind ein <a href="/spende">gemeinnütziger Verein</a>: <a href="/beitritt">Werden Sie Mitglied!</a>',
- 'about.3.1' => '',
-
- 'lang.tooltip' => 'Ergebnissprache wählen',
- 'key.placeholder' => 'Mitglieder-Key eingeben',
- 'key.tooltip' => 'Mitglieder-Key eingeben',
- 'placeholder' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
-
- 'tooltips.add-focus' => 'Suche anpassen',
- 'tooltips.edit-focus' => 'Aktuellen Fokus bearbeiten',
- 'tooltips.settings' => 'Allgemeine Einstellungen',
+ 'foki.web' => 'Web',
+ 'foki.bilder' => 'Bilder',
+ 'foki.nachrichten' => 'News/Politik',
+ 'foki.wissenschaft' => 'Wissenschaft',
+ 'foki.produkte' => 'Produkte',
+ 'foki.angepasst' => 'Angepasst',
+ 'foki.maps' => 'Maps.metager.de',
+
+ 'design' => 'Persönliches Design auswählen',
+
+ 'conveyor' => 'Einkaufen bei MetaGer-Fördershops',
+ 'partnertitle' => 'MetaGer unterstützen, ohne Mehrkosten für Sie',
+ 'mapstitle' => 'Der MetaGer Kartenservice',
+
+ 'plugin' => 'MetaGer-Plugin hinzufügen',
+ 'plugin-title' => 'MetaGer zu Ihrem Browser hinzufügen',
+
+ 'options.head' => 'Filter verwalten',
+
+ 'focus-creator.head' => 'Suche anpassen',
+ 'focus-creator.description' => 'Suchen Sie sich aus unseren Suchmaschinen Ihre eigene Suche zusammen.',
+ 'focus-creator.name-placeholder' => 'Name der eigenen Suche',
+ 'focus-creator.save' => 'Eigene Suche durchführen',
+ 'focus-creator.delete' => 'Eigene Suche löschen',
+ 'focus-creator.focusname' => 'Suchname: ',
+
+ 'slogan.title' => 'Besser suchen, schneller finden',
+ 'slogan.1' => 'Datenschutz & Privatsphäre: Bei uns einfach und selbstverständlich.<br>Wir arbeiten nicht gewinnorientiert, wir sind ein gemeinnütziger Verein: <a href="/beitritt">Werden Sie Mitglied</a> oder <a href="/spende">spenden Sie</a>!',
+ 'slogan.2' => 'Mit MetaGer bewahren Sie einen neutralen Blick auf’s Web!',
+
+ 'sponsors.head' => 'Sponsoren',
+ 'sponsors.woxikon' => 'SEO Agentur',
+ 'sponsors.gutscheine' => 'STERN.de: Günstige Kredite im Kreditvergleich',
+ 'sponsors.seo' => 'Weihnachtsfeier',
+
+ 'about.title' => 'Ãœber uns',
+ 'about.1.1' => '<a href="/datenschutz">Datenschutz & Privatsphäre</a>: Bei uns einfach & selbstverständlich.',
+ 'about.2.1' => 'Wir arbeiten nicht gewinnorientiert, wir sind ein <a href="/spende">gemeinnütziger Verein</a>: <a href="/beitritt">Werden Sie Mitglied!</a>',
+ 'about.3.1' => 'Überzeugen Sie sich von unseren Datenschutz- und Privatsphärefeatures',
+
+ 'lang.tooltip' => 'Ergebnissprache wählen',
+ 'key.placeholder' => 'Mitglieder-Key eingeben',
+ 'key.tooltip' => 'Mitglieder-Key eingeben',
+ 'placeholder' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
+
+ 'tooltips.add-focus' => 'Suche anpassen',
+ 'tooltips.edit-focus' => 'Aktuellen Fokus bearbeiten',
+ 'tooltips.settings' => 'Allgemeine Einstellungen',
];
diff --git a/resources/lang/en/bitpay.php b/resources/lang/en/bitpay.php
new file mode 100644
index 000000000..cc762a47e
--- /dev/null
+++ b/resources/lang/en/bitpay.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+ 'amount' => 'Amount',
+];
\ No newline at end of file
diff --git a/resources/lang/en/faq.php b/resources/lang/en/faq.php
index 6a688fa0d..0c4d3ff3c 100644
--- a/resources/lang/en/faq.php
+++ b/resources/lang/en/faq.php
@@ -5,7 +5,7 @@ return [
"title" => "MetaGer - FAQ",
"faq.1.h" => "What is MetaGer?",
"faq.1.b" => "MetaGer is primarily a meta search engine. Besides that MetaGer maintains a number of specialized crawlers and indexers of its own.",
- "faq.1.b2" => " ",
+ 'faq.1.b2' => 'Additionally: meta search engines provide a wider coverage and a better overview, because none of the searchengines knows the whole internet (Read more: <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank" rel="noopener">Wikipedia</a>. You see its origin attached to every single result. Where can I find more search engines? Try here: <a href="http://www.klug-suchen.de/" target="_blank" rel="noopener">klug-suchen.de</a>',
"faq.2.1.h" => "How does MetaGer query other search engines while preserving user anonymity?",
"faq.2.1.b" => "Since MetaGer is a meta-search engine, every search request you send to us will be stripped of information which could lead to your identification before being sent to e.g. Yahoo. Yahoo will send their response to us which we will then forward to you. This is how we handle every search request sent to us, no matter which one of the offered search engines you use. By doing this we commit ourselves to guarantee your privacy and do not save any personal data. It is possible to verify this, since the source code of MetaGer has been released under a free license <a href=\"https://gitlab.metager3.de/open-source/MetaGer\">(https://gitlab.metager3.de/open-source/MetaGer)</a>.",
"faq.4.h" => "Why don't you metacrawl search engine XY anymore?",
diff --git a/resources/lang/en/index.php b/resources/lang/en/index.php
index 36a88a0f2..5e6f5ccdb 100644
--- a/resources/lang/en/index.php
+++ b/resources/lang/en/index.php
@@ -9,14 +9,16 @@ return [
"foki.angepasst" => "Customized",
"foki.maps" => "maps.metager.de",
- "design" => "select personal theme",
+ "design" => "Select personal theme",
"conveyor" => "Purchase at affiliate shops",
"partnertitle" => "Support MetaGer without any costs to you",
"mapstitle" => "MetaGer Maps Service",
"plugin" => "Add MetaGer-Plugin",
- "plugin-title" => "add MetaGer to your browser",
+ "plugin-title" => "Add MetaGer to your browser",
+
+ 'options.head' => 'Customize filters',
"focus-creator.head" => "Customize search",
"focus-creator.description" => "Arrange a personal search",
diff --git a/resources/lang/en/metaGer.php b/resources/lang/en/metaGer.php
index 83f4359e1..e17c60d26 100644
--- a/resources/lang/en/metaGer.php
+++ b/resources/lang/en/metaGer.php
@@ -1,19 +1,82 @@
<?php
return [
- "results.failed" => "Unfortunately we have no results for your search.",
- "results.failedSitesearch" => 'Unfortunately we have no results for your search. This might be the case because your current search is restricted to the website ":site". If you want to remove this restriction, click here: <a href=":altSearch">New Search</a>',
- "settings.noneSelected" => "Attention: you did not choose any search engine.",
- "engines.noParser" => "There is an error: Requesting \":engine\" failed. Please report to: <a href=\"mailto:office@suma-ev.de?subject=Fehlender Parser: :engine\">office@suma-ev.de</a>",
- "formdata.cantLoad" => "Could not find suma-file",
- "formdata.noSearch" => "Attention: you did not type in any search word/s. Please type search words and try again",
- "formdata.dartEurope" => "Hint: you have activated Dart-Europe. Therefore the response time might be longer and is set to 10 sec",
- "formdata.hostBlacklist" => "Results of the following domains will not be shown: \":host\"",
- "formdata.domainBlacklist" => "These domains get ignored: \":domain\"",
- "formdata.urlBlacklist" => "Results containing \":url\" are not shown.",
- "formdata.stopwords" => "You have excluded results with the following words: \":stopwords\"",
- "formdata.phrase" => "You are doing a string search: :phrase",
- "sitesearch.failed" => "You intend to do a site search on :site. Unfortunately the chosen search engines do not support that. You can do a site search <a href=\":searchLink\">here</a> within the Web focus",
- "sitesearch.success" => "You are doing a site search. Only results of the website <a href=\"http://:site\" target=\"_blank\" rel=\"noopener\">\":site\"</a> will be shown.",
- "feedback" => "Not what you were looking for? Give us feedback: ",
-];
+ 'results.failed' => 'Unfortunately we have no results for your search.',
+ 'results.failedSitesearch' => 'Unfortunately we have no results for your search. This might be the case because your current search is restricted to the website ":site". If you want to remove this restriction, click here: <a href=":altSearch">New Search</a>',
+
+ 'settings.noneSelected' => 'Attention: you did not choose any search engine.',
+
+ 'engines.noParser' => 'There is an error: Requesting \":engine\" failed. Please report to: <a href=\"mailto:office@suma-ev.de?subject=Fehlender Parser: :engine\">office@suma-ev.de</a>',
+ 'engines.noSpecialSearch' => 'There was no search engine supporting one of your filter options. Filters currently active: ":filter".',
+
+ 'formdata.cantLoad' => 'Could not find suma-file',
+ 'formdata.noSearch' => 'Attention: you did not type in any search word/s. Please type search words and try again',
+ 'formdata.dartEurope' => 'Hint: you have activated Dart-Europe. Therefore the response time might be longer and is set to 10 sec',
+ 'formdata.hostBlacklist' => 'Results of the following domains will not be shown: \":host\"',
+ 'formdata.domainBlacklist' => 'These domains get ignored: \":domain\"',
+ 'formdata.urlBlacklist' => 'Results containing \":url\" are not shown.',
+ 'formdata.stopwords' => 'You have excluded results with the following words: \":stopwords\"',
+ 'formdata.phrase' => 'You are doing a string search: :phrase',
+
+ 'sitesearch.failed' => 'You intend to do a site search on :site. Unfortunately the chosen search engines do not support that. You can do a site search <a href=\":searchLink\">here</a> within the Web focus',
+ 'sitesearch.success' => 'You are doing a site search. Only results of the website <a href=\"http://:site\" target=\"_blank\" rel=\"noopener\">\":site\"</a> will be shown.',
+ 'feedback' => 'Not what you were looking for? Give us feedback: ',
+
+ 'filter.noFilter' => 'All',
+
+ 'filter.sitesearch' => 'Sitesearch',
+ 'filter.safesearch' => "Safe Search",
+ 'filter.safesearch.strict' => 'Strict',
+ 'filter.safesearch.moderate' => 'Moderate',
+ 'filter.safesearch.off' => 'Off',
+ 'filter.size' => 'Image size',
+ 'filter.size.small' => 'Small',
+ 'filter.size.medium' => 'Medium',
+ 'filter.size.large' => 'Large',
+ 'filter.size.xtralarge' => 'Extra large',
+
+ "filter.color" => "Colour",
+ "filter.color.colorOnly" => "Only coloured",
+ "filter.color.monochrome" => "Black and white",
+ "filter.color.black" => "Black",
+ "filter.color.blue" => "Blue",
+ "filter.color.brown" => "Brown",
+ "filter.color.gray" => "Grey",
+ "filter.color.green" => "Green",
+ "filter.color.orange" => "Orange",
+ "filter.color.pink" => "Pink",
+ "filter.color.purple" => "Purple",
+ "filter.color.red" => "Red",
+ "filter.color.teal" => "Teal",
+ "filter.color.white" => "White",
+ "filter.color.yellow" => "Yellow",
+
+ "filter.imagetype" => "Type",
+ "filter.imagetype.photo" => "Photo",
+ "filter.imagetype.clipart" => "Graphic",
+ "filter.imagetype.strich" => "Line drawing",
+ "filter.imagetype.gif" => "Animated GIF",
+ "filter.imagetype.transparent" => "Transparent",
+
+ "filter.imageaspect" => "Layout",
+ "filter.imageaspect.square" => "Rectangle",
+ "filter.imageaspect.wide" => "Wide",
+ "filter.imageaspect.tall" => "Portrait",
+
+ "filter.imagecontent" => "People",
+ "filter.imagecontent.face" => "Close look",
+ "filter.imagecontent.portrait" => "Head & Shoulders",
+
+ "filter.imagelicense" => "License",
+ "filter.imagelicense.any" => "Unselected",
+ "filter.imagelicense.public" => "Public Domain",
+ "filter.imagelicense.share" => "Share",
+ "filter.imagelicense.sharecommercially" => "Share (commercially)",
+ "filter.imagelicense.modify" => "Modify",
+ "filter.imagelicense.modifycommercially" => "Modify (commercially)",
+
+ "filter.freshness" => "Date",
+ "filter.freshness.day" => "Last 24h",
+ "filter.freshness.week" => "Last week",
+ "filter.freshness.month" => "Last month",
+];
\ No newline at end of file
diff --git a/resources/lang/en/spende.php b/resources/lang/en/spende.php
index 7b536371a..8f999560c 100644
--- a/resources/lang/en/spende.php
+++ b/resources/lang/en/spende.php
@@ -8,8 +8,6 @@ return [
"bankinfo.3" => "If you wish to receive a donation receipt,\r\nplease specify your full adress and (if available)\r\nyour E-Mail adress on the money transfer form.",
"paypal.1" => "Comfortably with Paypal<br>Via Paypal by credit card too (without PayPal registration),",
"paypal.2" => "Donate via Paypal - it's fast, safe and free",
- "bitcoins.1" => "or Bitcoins",
- "bitcoins.2" => "Our Bitcoin adress:",
"lastschrift.1" => "Donate by wire transfer",
"lastschrift.2" => "Enter your account data along with the desired amount. We will debit your bank account accordingly.",
"lastschrift.3" => "Please enter your name:",
@@ -38,4 +36,10 @@ return [
"bic" => "BIC/bank code",
'betrag' => 'Amount',
"danke.message" => "Your message"
+
+ 'paypal.title' => 'Donate via Paypal',
+ 'paypal.subtitle' => 'Comfortably with Paypal<br>Via Paypal by credit card too (without PayPal registration)',
+ 'paypal.2' => 'Donate via Paypal - it is fast, safe and free',
+
+ 'bitpay.title' => 'Donate via Bitpay',
];
\ No newline at end of file
--
GitLab