Updated plugin page for firefox

resources/lang/de/plugin-page.php

@@ -11,20 +11,19 @@ return [
     'head.6' => 'MetaGer zum Safari hinzufügen',
     'head.7' => 'MetaGer zum Vivaldi hinzufügen',
     'head.8' => 'MetaGer zum Firefox Klar hinzufügen',
-    'head.info'        => '(aktuelle Sucheinstellungen werden übernommen)',
 
     'default-search' => 'MetaGer als Standardsuchmaschine einrichten',
 
-    'firefox.plugin'   => 'Das Plugin für Firefox können Sie <a href="https://addons.mozilla.org/de/firefox/addon/metager-suche/?src=search" target="_blank">hier</a> herunterladen. Dadurch bleiben Ihre Sucheinstellungen jederzeit erhalten.',
+    'firefox.plugin' => 'Das Plugin für Firefox können Sie <a href="https://addons.mozilla.org/de/firefox/addon/metager-suche/?src=search" target="_blank">hier</a> herunterladen.',
     'firefox.1' => 'Klicken Sie in Ihrem Browser oben rechts in der Adressleiste auf "<i class="fas fa-ellipsis-h"></i>" um das Menü der Seitenaktionen zu öffnen und dann auf "Suchmaschine hinzufügen" (siehe Bild)',
-    'firefox.2'        => 'Öffnen Sie die Firefox Einstellungen. Geben Sie hierfür z.B. "about:preferences" in die Adressleiste ein. Geben Sie nun in das Suchfeld oben rechts "Suchmaschine" ein. Im Bereich "Standardsuchmaschine" wählen Sie MetaGer aus (siehe Bild).',
+    'firefox.2' => 'Öffnen Sie die Firefox Einstellungen. Geben Sie hierfür "about:preferences#search" in die Adressleiste ein. Im Bereich "Standardsuchmaschine" wählen Sie MetaGer aus (siehe Bild).',
     'firefox.3' => 'MetaGer als Startseite im :browser einrichten',
     'firefox.4' => 'Klicken Sie oben rechts im Browser auf <i class="fa fa-bars" aria-hidden="true"></i><span class="sr-only">die drei horizontalen Striche</span> (Menü) und öffnen Sie die "Einstellungen"',
     'firefox.5' => 'Tragen Sie im Feld "Startseite" "https://metager.de" ein.',
 
     'firefox-klar.1' => 'Öffnen Sie die Einstellungen Ihres Browsers über das Zahnrad (unter Android <i class="fa fa-ellipsis-v"></i>) rechts neben der Suchleiste',
-    'firefox-klar.2'   => 'Klicken Sie unter dem Menüpunkt "Suche" auf "Suchmaschine". Aktuell wird die voreingestellte Suchmaschine angezeigt (siehe Bild)',
-    'firefox-klar.3'   => 'Klicken Sie auf "Weitere Suchmaschine hinzufügen" und füllen Sie die Felder aus. Als Such-String geben Sie „https://metager.de/meta/meta.ger3?focus=web&encoding=utf8&lang=all&eingabe=%s“ an.',
+    'firefox-klar.2' => 'Klicken Sie unter dem Menüpunkt "Suche" auf "Suchmaschine". Aktuell wird die voreingestellte Suchmaschine angezeigt.',
+    'firefox-klar.3' => 'Klicken Sie auf "Weitere Suchmaschine hinzufügen": Geben Sie "MetaGer" als Namen und "https://metager.de/meta/meta.ger3?eingabe=%s" als Suchstring ein.',
     'firefox-klar.4' => 'Achten Sie hierbei darauf, dass sich keine Leerzeichen am Ende des Suchstrings "einschleichen", da Firefox Klar die Speicherung der Einstellung sonst verweigert.',
 
     'chrome.1' => 'Klicken Sie in Ihrem Chrome oben rechts auf <i class="fa fa-ellipsis-v"></i> und im folgenden Menü auf "Einstellungen", um die Einstellungen Ihres Chromes zu öffnen.',

resources/lang/en/plugin-page.php

@@ -11,19 +11,18 @@ return [
     "head.6" => "Add MetaGer to your Safari",
     "head.7" => "Add Metager to your Vivaldi",
     "head.8" => "Add MetaGer to your Firefox Focus",
-    "head.info"        => "(selected search preferences will be used)",
     'default-search' => 'Set MetaGer as the default search engine',
 
-    'firefox.plugin'   => 'You can download the plugin for Firefox <a href="https://addons.mozilla.org/en-GB/firefox/addon/metager-suche/?src=search" target="_blank">here</a>. Using the plugin allows you to keep your search settings even when deleting your history data. Alternatively you can set MetaGer as your default search engine:',
+    'firefox.plugin' => '',
     "firefox.1" => 'In your browser, click on "<i class="fa fa-ellipsis-h"></i>" in the upper right corner of the address bar to open the page action menu and then click on "Add search engine" (see picture)',
-    "firefox.2"        => 'Open the Firefox settings. For this, enter "about: preferences" in the address bar. Now enter "search engine" in the search box in the upper right corner. In the section "Default search engine" select MetaGer (see picture).',
+    "firefox.2" => 'Open the Firefox settings. For this, enter "about:preferences#search" in the address bar. In the section "Default search engine" select MetaGer (see picture).',
     "firefox.3" => "Use MetaGer as start page in :browser",
     "firefox.4" => "Click top right in your browser on <i class=\"fa fa-menu\" aria-hidden=\"true\"></i><span class=\"sr-only\">the three small horizontal lines</span> (menu) and open \"Preferences\"",
-    "firefox.5"        => "Type in field \"Home Page\" => \"https://metager.de/en/\"",
+    "firefox.5" => "Type in field \"Home Page\" => \"https://metager.org\"",
 
     'firefox-klar.1' => 'Click on the cog icon next to the searchbar to open your browser settings (click on <i class="fa fa-ellipsis-v"></i> when using an Android device)',
-    'firefox-klar.2'   => 'Select \'Searchengine\' under the \'Search\' menu item (see picture below).',
-    'firefox-klar.3'   => 'Click on \'Add another search engine\' and fill in the textfields as seen in the picture below.',
+    'firefox-klar.2' => 'Select \'Searchengine\' under the \'Search\' menu item .',
+    'firefox-klar.3' => 'Click on \'Add another search engine\': enter "MetaGer" as Name and "https://metager.org/meta/meta.ger3?eingabe=%s" as query string.',
     'firefox-klar.4' => 'Be careful not to add whitespaces at the end of the searchstring, otherwise Firefox Focus won\'t let you save your changes.',
 
     "chrome.1" => "Click in your Chrome browser on <i class=\"fa fa-ellipsis-v\"></i> and in the next menu on \"Preferences\" to open the settings of your Chrome browser",
@@ -32,7 +31,7 @@ return [
     "chrome.4" => "Set up MetaGer as start page in your browser",
     "chrome.5" => "Click in your browser on<i class=\"fa fa-ellipsis-v\"></i> and open \"Preferences\"",
     "chrome.6" => "In the field \"Start\" choose \"Open specific Page/s\" and then click on \"Choose Page/s\"",
-    "chrome.7"         => "Type in https://metager.de/en/\" as URL at \"Add new page\"",
+    "chrome.7" => "Type in https://metager.org\" as URL at \"Add new page\"",
     "chrome.8" => "Hint: Every Webpage in this field will be opened when you start your browser. You can delete entries by moving the mouse on it and click \"x\"",
 
     "opera.1" => "Click on <a href=\"/\" target=\"_blank\" rel=\"noopener\">hier</a> to open MetaGer in a new TAB",
@@ -43,7 +42,7 @@ return [
     "opera.6" => "Set up MetaGer as start page in your browser",
     "opera.7" => "Click in browser menu on \"Edit\" and them \"Preferences\"",
     "opera.8" => "In the field \"Start\" choose \"Open specific Page\\/s\" and then click on \"Choose Page\\/s\"",
-    "opera.9"          => "Type in https://metager.de/en/\" as URL at \"Add new page\"",
+    "opera.9" => "Type in https://metager.org\" as URL at \"Add new page\"",
     "opera.10" => "Click on OK",
 
     "IE.1" => "Click <a href=\"javascript:window.external.addSearchProvider($('link[rel=search]').attr('href'));\">here</a> to add MetaGer as search engine",
@@ -53,7 +52,7 @@ return [
     "IE.7" => "Coose button \"Standard\"",
     "IE.8" => "Set up MetaGer as start page in your browser",
     "IE.9" => "Click at top right in your browser on <i class=\"fa fa-cog\"></i> and open \"Internet Options\"",
-    "IE.10"            => "If MetaGer should be your only startpage mark the existing text within the text field, and replace it by \"https://metager.de/en/\"",
+    "IE.10" => "If MetaGer should be your only startpage mark the existing text within the text field, and replace it by \"https://metager.org\"",
     "IE.11" => "Click on OK",
 
     "edge.1" => "Click in your browser top right on Extras (",
@@ -65,7 +64,7 @@ return [
     "edge.7" => "Click at top right in your browser on <i class=\"fa fa-ellipsis-h\"></i> and open \"Preferences\"",
     "edge.8" => "Choose in the field \"Open\" the topic \"Specific pages\"",
     "edge.9" => "Choose \"User defined\" within drop down menu",
-    "edge.10"          => "Type \"https://metager.de/en/\" in field \"Webaddress\" and click on \"+\"",
+    "edge.10" => "Type \"https://metager.org\" in field \"Webaddress\" and click on \"+\"",
     "edge.11" => "Delete all entries which should not be opened at start (for example \"about:start\") by click on \"x\"",
 
     "safari.1" => "Install the Safari-PlugIn <a href=\"http://www.opensearchforsafari.com/\" target=\"_blank\" rel=\"noopener\">OpenSearchforSafari</a>.",

resources/lang/en/spende.php

@@ -4,7 +4,7 @@ return [
     "headline.1" => "Your Donation for MetaGer to SUMA-EV",
     "headline.2" => 'With your donation: you support maintenance and development of the independent search engine metager.org and its supporting association SUMA-EV. <a href="https://metager.org/about" rel="noopener" target=_blank>Read more</a> and <a href="https://metager.org/beitritt" target="_blank" rel="noopener">become a member.</a>
 
-    Please help to keep free and open search engines free and open on the Internet.  The digital knowledge of the world must stay free from surveillance and control by governments or companies and must be publicly accessible to everyone. Please click <a href="https://metager.de/en/about" rel="noopener" target=_blank>here</a> for more information about us.',
+    Please help to keep free and open search engines free and open on the Internet.  The digital knowledge of the world must stay free from surveillance and control by governments or companies and must be publicly accessible to everyone. Please click <a href="https://metager.org" rel="noopener" target=_blank>here</a> for more information about us.',
     "bankinfo.1" => "By bank transfer",
     "bankinfo.2" => "SUMA-EV",
     'bankinfo.2.1' => 'DE64 4306 0967 4075 0332 01',

resources/lang/es/plugin-page.php

@@ -8,9 +8,8 @@ return [
     "head.4" => "Añadir MetaGer a Internet Explorer",
     "head.5" => "Añadir MetaGer a Microsoft Edge",
     "head.6" => "Añadir MetaGer a Safari",
-    "head.info" => "(los criterios actuales de búsqueda serán asumidos)",
     "firefox.1" => 'En su navegador, haga clic en "<i class =" fa fa-ellipsis-h "> </i>" en la esquina superior derecha de la barra de direcciones para abrir el menú de acción de la página y luego haga clic en "Agregar motor de búsqueda" ( ver foto)',
-    "firefox.2" => 'Abre la configuración de Firefox. Para esto, ingrese "about: preferences" en la barra de direcciones. Ahora ingrese "motor de búsqueda" en el cuadro de búsqueda en la esquina superior derecha. En la sección "Motor de búsqueda predeterminado", seleccione MetaGer (ver imagen).',
+    "firefox.2" => 'Abre la configuración de Firefox. Para esto, ingrese "about:preferences#search" en la barra de direcciones. En la sección "Motor de búsqueda predeterminado", seleccione MetaGer (ver imagen).',
     "firefox.3" => "Instalar MetaGer como página de inico en el :browser",
     "firefox.4" => "Hacer click arriba a la derecha en los tres barras horizontales en su navegador (Menú) y abre \"Preferencias\"",
     "firefox.5" => "Introducir en el campo \"Pagina de inicio\" \"https:\\/\\/metager.de\"",

resources/views/plugin-page.blade.php

@@ -24,7 +24,6 @@
 			$(".seperator").addClass("hidden");
 		@endif
 	</h1>
-	<h2 class="subheading">{{ trans('plugin-page.head.info') }}</h2>
 	@if ($browser === 'Firefox' || $browser === 'Mozilla')
 		<div class="card-medium">
 			<h3>{!! trans('plugin-page.firefox.plugin') !!}</h3>
@@ -32,8 +31,24 @@
 		<div class="card-heavy">
 			<h3>{!! trans('plugin-page.default-search', ['browser' => $browser]) !!}</h3>
 			<ol>
-				<li>{!! trans('plugin-page.firefox.1') !!}<img src="/img/Firefox.png" width="100%" /></li>
-				<li>{!! trans('plugin-page.firefox.2') !!}<img src="/img/Firefox_Standard.png" width="100%" /></li>
+				<li>{!! trans('plugin-page.firefox.1') !!}
+					@if(LaravelLocalization::getCurrentLocale() == "de")
+					<img src="/img/Firefox.png" width="100%" />
+					@elseif(LaravelLocalization::getCurrentLocale() == "es")
+					<img src="/img/FirefoxEs.png" width="100%" />
+					@else
+					<img src="/img/FirefoxEn.png" width="100%" />
+					@endif
+				</li>
+				<li>{!! trans('plugin-page.firefox.2') !!}
+					@if(LaravelLocalization::getCurrentLocale() == "de")
+					<img src="/img/Firefox_Standard.png" width="100%" />
+					@elseif(LaravelLocalization::getCurrentLocale() == "es")
+					<img src="/img/FirefoxEs_Standard.png" width="100%" />
+					@else
+					<img src="/img/FirefoxEn_Standard.png" width="100%" />
+					@endif
+				</li>
 			</ol>
 		</div>
 		<div class="card-heavy">
@@ -47,8 +62,8 @@
 			<h4>{{ trans('plugin-page.head.8') }}</h4>
 			<ol>
 				<li>{!! trans('plugin-page.firefox-klar.1') !!}</li>
-				<li>{{ trans('plugin-page.firefox-klar.2')}}<img src="/img/FirefoxKlar-Settings.png" width="100%"/></li>
-				<li>{{ trans('plugin-page.firefox-klar.3') }}<img src="/img/FirefoxKlar-addSearchengine.png" width="100%"/></li>
+				<li>{{ trans('plugin-page.firefox-klar.2')}}</li>
+				<li>{{ trans('plugin-page.firefox-klar.3') }}</li>
 				<li>{{ trans('plugin-page.firefox-klar.4') }}</li>
 			</ol>
 		</div>