From 22708aa5c70650f5455f9fef99a32948ed0143d2 Mon Sep 17 00:00:00 2001
From: Karl <Karl Hasselbring>
Date: Thu, 1 Dec 2016 09:13:02 +0100
Subject: [PATCH] =?UTF-8?q?Alle=20=C3=9Cbersetzungen=20sollten=20jetzt=20w?=
=?UTF-8?q?ieder=20korrekt=20zugeordnet=20sein?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/lang/de/settings.php | 46 ++++++++++++------------
resources/lang/en/settings.php | 26 ++++++++------
resources/lang/es/settings.php | 58 ++++++++++++++++--------------
resources/views/settings.blade.php | 48 ++++++++++---------------
4 files changed, 88 insertions(+), 90 deletions(-)
diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php
index 6bdb27b1a..6942ca70d 100644
--- a/resources/lang/de/settings.php
+++ b/resources/lang/de/settings.php
@@ -6,29 +6,29 @@ return [
'allgemein.1' => 'Allgemein',
- 'allgemein.2.1' => 'Sprüche',
- 'allgemein.2.2' => 'anzeigen',
- 'allgemein.2.3' => 'nicht anzeigen',
- 'allgemein.3.1' => 'Maps',
- 'allgemein.3.2' => 'anzeigen',
- 'allgemein.3.3' => 'nicht anzeigen',
- 'allgemein.4.1' => 'Ergebnisse öffnen:',
- 'allgemein.4.2' => 'In einem neuen Tab',
- 'allgemein.4.3' => 'Im gleichen Tab',
-
- 'allgemein.5' => 'Sprache auswählen:',
- 'allgemein.6' => 'Alle Sprachen',
- 'allgemein.7' => 'Deutsch',
- 'allgemein.8' => 'Englisch',
- 'allgemein.9' => 'Anzahl der Ergebnisse pro Seite:',
- 'allgemein.10' => 'Alle',
-
- 'zeit.1' => 'Maximale Suchzeit',
- 'zeit.2' => '1 Sekunde (Standard)',
- 'zeit.3' => '2 Sekunden',
- 'zeit.4' => '5 Sekunden',
- 'zeit.5' => '10 Sekunden',
- 'zeit.6' => '20 Sekunden',
+ 'quotes.label' => 'Sprüche',
+ 'quotes.on' => 'anzeigen',
+ 'quotes.off' => 'nicht anzeigen',
+
+ 'maps.label' => 'Maps',
+ 'maps.on' => 'anzeigen',
+ 'maps.off' => 'nicht anzeigen',
+
+ 'tab.label' => 'Ergebnisse öffnen:',
+ 'tab.new' => 'In einem neuen Tab',
+ 'tab.same' => 'Im gleichen Tab',
+
+ 'language.label' => 'Sprache auswählen:',
+ 'language.all' => 'Alle Sprachen',
+ 'language.de' => 'Deutsch',
+ 'language.en' => 'Englisch',
+
+ 'zeit.label' => 'Maximale Suchzeit',
+ 'zeit.1' => '1 Sekunde (Standard)',
+ 'zeit.2' => '2 Sekunden',
+ 'zeit.3' => '5 Sekunden',
+ 'zeit.4' => '10 Sekunden',
+ 'zeit.5' => '20 Sekunden',
'suchmaschinen.1' => 'Suchmaschinen',
'suchmaschinen.2' => '(alle abwählen)',
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 58b82b75e..3e8701c5d 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -3,24 +3,28 @@
return [
"head.1" => "Settings",
"head.2" => "Here you can customize your MetaGer: After selecting your desired settings, you have to choose, whether you want to save the settings permanently, or just for once, <a href=\"#unten\">on the bottom of this page.</a>",
+
"allgemein.1" => "General",
- "allgemein.5" => "all languages",
- "allgemein.6" => "german",
- "allgemein.6_1" => "english",
- "allgemein.7" => "number of results per page:",
- "allgemein.8" => "all",
- "zeit.1" => "maximum search time",
- "zeit.2" => "1 second (standard)",
- "zeit.3" => "2 seconds",
- "zeit.4" => "5 seconds",
- "zeit.5" => "10 seconds",
- "zeit.6" => "20 seconds",
+
+ "language.all" => "all languages",
+ "language.de" => "german",
+ "language.en" => "english",
+
+ "zeit.label" => "maximum search time",
+ "zeit.1" => "1 second (standard)",
+ "zeit.2" => "2 seconds",
+ "zeit.3" => "5 seconds",
+ "zeit.4" => "10 seconds",
+ "zeit.5" => "20 seconds",
+
"suchmaschinen.1" => "search engines",
"suchmaschinen.2" => "(deselect all)",
"suchmaschinen.3" => "(select / deselect all)",
+
"speichern.1" => "Create a startpage for one-time use",
"speichern.2" => "Save settings permanently",
"speichern.3" => "Generate plugin with these settings",
"speichern.4" => "Reset saved settings",
+
"request" => "Which method should query MetaGer (GET, POST)?",
];
diff --git a/resources/lang/es/settings.php b/resources/lang/es/settings.php
index 3410524bb..6c13f27c4 100644
--- a/resources/lang/es/settings.php
+++ b/resources/lang/es/settings.php
@@ -1,30 +1,34 @@
+<?php
+return [
+ 'head.1' => 'Especificaciónes',
+ 'head.2' => 'Ajusta MetaGer aqui y garda suyo selecciónes perdurable o por una vez.',
-<?php return [
- 'head.1' => 'Especificaciónes',
- 'head.2' => 'Ajusta MetaGer aqui y garda suyo selecciónes perdurable o por una vez.',
- 'allgemein.1' => 'En general',
- 'allgemein.2' => 'Sprüche ausblenden',
- 'allgemein.3' => 'Abrir el links en el Tab mismo.',
- 'allgemein.4' => 'Escoge el idioma:',
- 'allgemein.5' => 'Todos los idiomas',
- 'allgemein.6' => 'Alemán',
- 'allgemein.6_1' => 'Inglés',
- 'allgemein.7' => 'Resultados en cada página:',
- 'allgemein.8' => 'Todos',
- 'zeit.1' => 'El tiempo máximo para buscar',
- 'zeit.2' => '1 segundo (Standard)',
- 'zeit.3' => '2 segundos',
- 'zeit.4' => '5 segundos',
- 'zeit.5' => '10 segundos',
- 'zeit.6' => '20 segundos',
- 'suchmaschinen.1' => 'Motores de búsqueda',
- 'suchmaschinen.2' => '(seleccionar todos)',
- 'suchmaschinen.3' => '(seleccionar todos / ningunos)',
- 'speichern.1' => 'Hacer una página inicial por una vez',
- 'speichern.2' => 'Gardar especificaciónes perdurable',
- 'speichern.3' => 'Crear un plugin con esos especificaciónes',
- 'speichern.4' => 'Reiniciar especificaciónes',
- 'request' => 'Mit welcher Methode soll MetaGer abgefragt werden',
-];
+ 'allgemein.1' => 'En general',
+
+ 'tab.label' => 'Abrir el links en el Tab mismo.',
+
+ 'language.label' => 'Escoge el idioma:',
+ 'language.all' => 'Todos los idiomas',
+ 'language.de' => 'Alemán',
+ 'language.en' => 'Inglés',
+
+ 'allgemein.7' => 'Resultados en cada página:',
+ 'allgemein.8' => 'Todos',
+ 'zeit.label' => 'El tiempo máximo para buscar',
+ 'zeit.1' => '1 segundo (Standard)',
+ 'zeit.2' => '2 segundos',
+ 'zeit.3' => '5 segundos',
+ 'zeit.4' => '10 segundos',
+ 'zeit.5' => '20 segundos',
+
+ 'suchmaschinen.1' => 'Motores de búsqueda',
+ 'suchmaschinen.2' => '(seleccionar todos)',
+ 'suchmaschinen.3' => '(seleccionar todos / ningunos)',
+
+ 'speichern.1' => 'Hacer una página inicial por una vez',
+ 'speichern.2' => 'Gardar especificaciónes perdurable',
+ 'speichern.3' => 'Crear un plugin con esos especificaciónes',
+ 'speichern.4' => 'Reiniciar especificaciónes',
+];
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 4d713cc77..92fffe108 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -12,52 +12,42 @@
<container>
<div class="row">
<div class="col-sm-6 col-md-4 col-lg-3">
- <label class="select-label">@lang("settings.allgemein.2.1")</label>
+ <label class="select-label">@lang("settings.quotes.label")</label>
<select class="form-control settings-form-control" name="param_sprueche">
- <option value="on" selected>@lang("settings.allgemein.2.2")</option>
- <option value="off">@lang("settings.allgemein.2.3")</option>
+ <option value="on" selected>@lang("settings.quotes.on")</option>
+ <option value="off">@lang("settings.quotes.off")</option>
</select>
</div>
<div class="col-sm-6 col-md-4 col-lg-3">
- <label class="select-label">@lang("settings.allgemein.3.1")</label>
+ <label class="select-label">@lang("settings.maps.label")</label>
<select class="form-control settings-form-control" name="param_maps">
- <option value="on" selected>@lang("settings.allgemein.3.2")</option>
- <option value="off">@lang("settings.allgemein.3.3")</option>
+ <option value="on" selected>@lang("settings.maps.on")</option>
+ <option value="off">@lang("settings.maps.off")</option>
</select>
</div>
<div class="col-sm-6 col-md-4 col-lg-3">
- <label class="select-label">@lang("settings.allgemein.4.1")</label>
+ <label class="select-label">@lang("settings.tab.label")</label>
<select class="form-control settings-form-control" name="param_newtab">
- <option value="on" selected>@lang("settings.allgemein.4.2")</option>
- <option value="off">@lang("settings.allgemein.4.3")</option>
+ <option value="on" selected>@lang("settings.tab.new")</option>
+ <option value="off">@lang("settings.tab.same")</option>
</select>
</div>
<div class="col-sm-6 col-md-4 col-lg-3">
- <label class="select-label">{!! trans('settings.allgemein.5') !!}</label>
+ <label class="select-label">{!! trans('settings.language.label') !!}</label>
<select class="form-control settings-form-control" name="param_lang">
- <option value="all" @if(App::isLocale('de')) selected @endif >{!! trans('settings.allgemein.6') !!}</option>
- <option value="de">{!! trans('settings.allgemein.7') !!}</option>
- <option value="en" @if(App::isLocale('en')) selected @endif>{!! trans('settings.allgemein.8') !!}</option>
+ <option value="all" @if(App::isLocale('de')) selected @endif >{!! trans('settings.language.all') !!}</option>
+ <option value="de">{!! trans('settings.language.de') !!}</option>
+ <option value="en" @if(App::isLocale('en')) selected @endif>{!! trans('settings.language.en') !!}</option>
</select>
</div>
<div class="col-sm-6 col-md-4 col-lg-3">
- <label class="select-label">{!! trans('settings.allgemein.9') !!}</label>
- <select class="form-control settings-form-control" name="param_resultCount">
- <option value="10">10</option>
- <option value="20" selected>20</option>
- <option value="50">50</option>
- <option value="100">100</option>
- <option value="0">{!! trans('settings.allgemein.10') !!}</option>
- </select>
- </div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <label class="select-label">{!! trans('settings.zeit.1') !!}:</label>
+ <label class="select-label">{!! trans('settings.zeit.label') !!}:</label>
<select class="form-control settings-form-control" name="param_time">
- <option value="1000" selected>{!! trans('settings.zeit.2') !!}</option>
- <option value="2000">{!! trans('settings.zeit.3') !!}</option>
- <option value="5000">{!! trans('settings.zeit.4') !!}</option>
- <option value="10000">{!! trans('settings.zeit.5') !!}</option>
- <option value="20000">{!! trans('settings.zeit.6') !!}</option>
+ <option value="1000" selected>{!! trans('settings.zeit.1') !!}</option>
+ <option value="2000">{!! trans('settings.zeit.2') !!}</option>
+ <option value="5000">{!! trans('settings.zeit.3') !!}</option>
+ <option value="10000">{!! trans('settings.zeit.4') !!}</option>
+ <option value="20000">{!! trans('settings.zeit.5') !!}</option>
</select>
</div>
<div class="col-sm-6 col-md-4 col-lg-3">
--
GitLab