Skip to content
Snippets Groups Projects
Commit 068cb06b authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '365-settings-ubersetzung-indices-uberprufen' into 'development' 

Alle Übersetzungen sollten jetzt wieder korrekt zugeordnet sein

Closes #365

See merge request !601
parents cc9f0c35 cb667e31
No related branches found
No related tags found
2 merge requests!619Development,!601Alle Übersetzungen sollten jetzt wieder korrekt zugeordnet sein
Hide whitespace changes
Inline Side-by-side
resources/lang/de/settings.php
+ 16
− 23
View file @ 068cb06b
...@@ -6,29 +6,22 @@ return [ ...@@ -6,29 +6,22 @@ return [
'allgemein.1' => 'Allgemein', 'allgemein.1' => 'Allgemein',
'allgemein.2.1' => 'Sprüche', 'quotes.label' => 'Sprüche',
'allgemein.2.2' => 'anzeigen', 'quotes.on' => 'anzeigen',
'allgemein.2.3' => 'nicht anzeigen', 'quotes.off' => 'nicht anzeigen',
'allgemein.3.1' => 'Maps',
'allgemein.3.2' => 'anzeigen', 'maps.label' => 'Maps',
'allgemein.3.3' => 'nicht anzeigen', 'maps.on' => 'anzeigen',
'allgemein.4.1' => 'Ergebnisse öffnen:', 'maps.off' => 'nicht anzeigen',
'allgemein.4.2' => 'In einem neuen Tab',
'allgemein.4.3' => 'Im gleichen Tab', 'tab.label' => 'Ergebnisse öffnen:',
'tab.new' => 'In einem neuen Tab',
'allgemein.5' => 'Sprache auswählen:', 'tab.same' => 'Im gleichen Tab',
'allgemein.6' => 'Alle Sprachen',
'allgemein.7' => 'Deutsch', 'language.label' => 'Sprache auswählen:',
'allgemein.8' => 'Englisch', 'language.all' => 'Alle Sprachen',
'allgemein.9' => 'Anzahl der Ergebnisse pro Seite:', 'language.de' => 'Deutsch',
'allgemein.10' => 'Alle', 'language.en' => 'Englisch',
'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',
'suchmaschinen.1' => 'Suchmaschinen', 'suchmaschinen.1' => 'Suchmaschinen',
'suchmaschinen.2' => '(alle abwählen)', 'suchmaschinen.2' => '(alle abwählen)',
......
resources/lang/en/settings.php
+ 22
− 12
View file @ 068cb06b
...@@ -2,25 +2,35 @@ ...@@ -2,25 +2,35 @@
return [ return [
"head.1" => "Settings", "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>", "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.1" => "General",
"allgemein.5" => "all languages",
"allgemein.6" => "german", 'quotes.label' => 'Sayings',
"allgemein.6_1" => "english", 'quotes.on' => 'show',
"allgemein.7" => "number of results per page:", 'quotes.off' => 'hide',
"allgemein.8" => "all",
"zeit.1" => "maximum search time", 'maps.label' => 'Maps',
"zeit.2" => "1 second (standard)", 'maps.on' => 'show',
"zeit.3" => "2 seconds", 'maps.off' => 'hide',
"zeit.4" => "5 seconds",
"zeit.5" => "10 seconds", 'tab.label' => 'Show results:',
"zeit.6" => "20 seconds", 'tab.new' => 'in a new tab',
'tab.same' => 'in the same tab',
'language.label' => 'Select language',
"language.all" => "all languages",
"language.de" => "german",
"language.en" => "english",
"suchmaschinen.1" => "search engines", "suchmaschinen.1" => "search engines",
"suchmaschinen.2" => "(deselect all)", "suchmaschinen.2" => "(deselect all)",
"suchmaschinen.3" => "(select / deselect all)", "suchmaschinen.3" => "(select / deselect all)",
"speichern.1" => "Create a startpage for one-time use", "speichern.1" => "Create a startpage for one-time use",
"speichern.2" => "Save settings permanently", "speichern.2" => "Save settings permanently",
"speichern.3" => "Generate plugin with these settings", "speichern.3" => "Generate plugin with these settings",
"speichern.4" => "Reset saved settings", "speichern.4" => "Reset saved settings",
"request" => "Which method should query MetaGer (GET, POST)?", "request" => "Which method should query MetaGer (GET, POST)?",
]; ];
resources/lang/es/settings.php
+ 33
− 27
View file @ 068cb06b
<?php
return [
'head.1' => 'Especificaciónes',
'head.2' => 'Ajusta MetaGer aqui y garda suyo selecciónes perdurable o por una vez.',
<?php return [ 'allgemein.1' => 'En general',
'head.1' => 'Especificaciónes',
'head.2' => 'Ajusta MetaGer aqui y garda suyo selecciónes perdurable o por una vez.', 'quotes.label' => 'Presentar sentencias (solamente alemán)',
'allgemein.1' => 'En general', 'quotes.on' => 'sí',
'allgemein.2' => 'Sprüche ausblenden', 'quotes.off' => 'no',
'allgemein.3' => 'Abrir el links en el Tab mismo.',
'allgemein.4' => 'Escoge el idioma:', 'maps.label' => 'Presentar mapas',
'allgemein.5' => 'Todos los idiomas', 'maps.on' => 'sí',
'allgemein.6' => 'Alemán', 'maps.off' => 'no',
'allgemein.6_1' => 'Inglés',
'allgemein.7' => 'Resultados en cada página:', 'tab.label' => 'Abrir resultados',
'allgemein.8' => 'Todos', 'tab.new' => 'en un tab nuevo',
'zeit.1' => 'El tiempo máximo para buscar', 'tab.same' => 'en el tab mismo',
'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',
];
'language.label' => 'Escoge el idioma:',
'language.all' => 'Todos los idiomas',
'language.de' => 'Alemán',
'language.en' => 'Inglés',
'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' => 'El modo de interrogación',
];
resources/views/settings.blade.php
+ 13
− 33
View file @ 068cb06b
...@@ -12,52 +12,32 @@ ...@@ -12,52 +12,32 @@
<container> <container>
<div class="row"> <div class="row">
<div class="col-sm-6 col-md-4 col-lg-3"> <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"> <select class="form-control settings-form-control" name="param_sprueche">
<option value="on" selected>@lang("settings.allgemein.2.2")</option> <option value="on" selected>@lang("settings.quotes.on")</option>
<option value="off">@lang("settings.allgemein.2.3")</option> <option value="off">@lang("settings.quotes.off")</option>
</select> </select>
</div> </div>
<div class="col-sm-6 col-md-4 col-lg-3"> <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"> <select class="form-control settings-form-control" name="param_maps">
<option value="on" selected>@lang("settings.allgemein.3.2")</option> <option value="on" selected>@lang("settings.maps.on")</option>
<option value="off">@lang("settings.allgemein.3.3")</option> <option value="off">@lang("settings.maps.off")</option>
</select> </select>
</div> </div>
<div class="col-sm-6 col-md-4 col-lg-3"> <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"> <select class="form-control settings-form-control" name="param_newtab">
<option value="on" selected>@lang("settings.allgemein.4.2")</option> <option value="on" selected>@lang("settings.tab.new")</option>
<option value="off">@lang("settings.allgemein.4.3")</option> <option value="off">@lang("settings.tab.same")</option>
</select> </select>
</div> </div>
<div class="col-sm-6 col-md-4 col-lg-3"> <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"> <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="all" @if(App::isLocale('de')) selected @endif >{!! trans('settings.language.all') !!}</option>
<option value="de">{!! trans('settings.allgemein.7') !!}</option> <option value="de">{!! trans('settings.language.de') !!}</option>
<option value="en" @if(App::isLocale('en')) selected @endif>{!! trans('settings.allgemein.8') !!}</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>
<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>
</select> </select>
</div> </div>
<div class="col-sm-6 col-md-4 col-lg-3"> <div class="col-sm-6 col-md-4 col-lg-3">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment