From 2228524003b033e901fecd53854f4325d8ecd42b Mon Sep 17 00:00:00 2001
From: Kim <kim@suma-ev.de>
Date: Mon, 28 Jun 2021 08:50:51 +0200
Subject: [PATCH] change translation and fix tiny errors
---
resources/lang/en/search-engine.php | 107 +++++++++++++-----------
resources/views/search-engine.blade.php | 6 +-
2 files changed, 60 insertions(+), 53 deletions(-)
diff --git a/resources/lang/en/search-engine.php b/resources/lang/en/search-engine.php
index 86c2dc4f2..254cf1bf4 100644
--- a/resources/lang/en/search-engine.php
+++ b/resources/lang/en/search-engine.php
@@ -6,69 +6,76 @@ return [
'head.3' => 'Yahoo!',
'head.4' => 'Bing',
'head.5' => 'Scopia',
- 'head.5' => 'Netluchs',
- 'head.5' => 'Yandex',
- 'head.5' => 'Die ZEIT',
- 'head.5' => 'OneNewspage (Germany)',
- 'head.5' => 'OneNewspage (Video)',
+ 'head.6' => 'Netluchs',
+ 'head.7' => 'Yandex',
+ 'head.8' => 'Die ZEIT',
+ 'head.9' => 'OneNewspage',
+ 'head.10' => 'OneNewspage (Video)',
'text.1' => 'MetaGer is a <a href=":transparenz">metasearch engine</a>.',
- 'text.2.1' => 'Name: Yahoo!',
- 'text.2.2' => 'Used Index: Microsoft Bing',
- 'text.2.3' => 'Founded: 2. March 1995',
- 'text.2.4' => 'Headquarters: New York City, United States',
- 'text.2.5' => 'Maintainer: Altaba Inc. previously Yahoo Inc.',
- 'text.2.6' => 'Estimated pages in the index: around 8-14 billion',
- 'text.2.7' => 'Used MetaGer version: German search',
+ 'text.2.1' => 'Name: ',
+ 'text.2.1.1' => 'Yahoo!',
+ 'text.2.2' => 'Used index: ',
+ 'text.2.2.1' => 'Microsoft Bing',
+ 'text.2.3' => 'founded: ',
+ 'text.2.3.1' => '2. March 1995',
+ 'text.2.4' => 'Headquarters: ',
+ 'text.2.4.1' => 'New York City, United States',
+ 'text.2.5' => 'Maintainer: ',
+ 'text.2.5.1' => 'Altaba Inc. (previously Yahoo Inc.)',
+ 'text.2.6' => 'Estimated pages in the index: ',
+ 'text.2.6.1' => 'around 8-14 billion',
+ 'text.2.7' => 'Used MetaGer version: ',
+ 'text.2.7.1' => 'german search',
- 'text.3.1' => 'Name: Bing',
- 'text.3.2' => 'Used Index: Microsoft Bing',
- 'text.3.3' => 'Founded: 3. June 2009',
- 'text.3.4' => 'Headquarters: Remond, Washington, United States',
- 'text.3.5' => 'Maintainer (business form): Microsoft Inc',
- 'text.3.6' => 'Estimated pages in the index: around 8-14 billion',
- 'text.3.7' => 'Used MetaGer version: English search, German search (members only)',
+ 'text.3.1' => 'Bing',
+ 'text.3.2' => 'Microsoft Bing',
+ 'text.3.3' => '3. June 2009',
+ 'text.3.4' => 'Remond, Washington, United States',
+ 'text.3.5' => 'Microsoft Inc',
+ 'text.3.6' => 'around 8-14 billion',
+ 'text.3.7' => 'English search, German search (members only)',
- 'text.4.1' => 'Name: Scopia',
- 'text.4.2' => 'Founded: around 5 years ago ',
- 'text.4.3' => 'Headquarters: Newark, New Jersey, United States',
- 'text.4.4' => 'Maintainer (business from): Scopia Technologies ASPEN LLC',
- 'text.4.5' => 'Used MetaGer version: German search, English search',
+ 'text.4.1' => 'Scopia',
+ 'text.4.2' => 'around 5 years ago ',
+ 'text.4.3' => 'Newark, New Jersey, United States',
+ 'text.4.4' => 'Scopia Technologies ASPEN LLC',
+ 'text.4.5' => 'German search, English search',
- 'text.5.1' => 'Name: Netluchs',
- 'text.5.2' => 'Founded: 2005',
- 'text.5.3' => 'Headquarters: Hamburg, Germany',
- 'text.5.4' => 'Maintainer (business form): Michael Nebel (private person)',
- 'text.5.5' => 'Estimated pages in the index: 6 Million (updated: 2005)',
- 'text.5.6' => 'Used MetaGer version: German search',
+ 'text.5.1' => 'Netluchs',
+ 'text.5.2' => '2005',
+ 'text.5.3' => 'Hamburg, Germany',
+ 'text.5.4' => 'Michael Nebel (private person)',
+ 'text.5.5' => '6 Million (updated: 2005)',
+ 'text.5.6' => 'German search',
- 'text.6.1' => 'Name: Yandex',
- 'text.6.2' => 'Founded: 1997',
- 'text.6.3' => 'Headquarters: Mäntsälä, Finland (Europe)',
- 'text.6.4' => 'Maintainer (business form): Yandex OY (Cooperation)',
- 'text.6.5' => 'Used MetaGer version: German search',
+ 'text.6.1' => 'Yandex',
+ 'text.6.2' => '1997',
+ 'text.6.3' => 'Mäntsälä, Finland (Europe)',
+ 'text.6.4' => 'Yandex OY (Cooperation)',
+ 'text.6.5' => 'German search',
- 'text.7.1' => 'Name: Die ZEIT',
- 'text.7.2' => 'Founded: 6. September 2009',
- 'text.7.3' => 'Headquarters: Hamburg, Germany',
- 'text.7.4' => 'Maintainer (buisness form): Zeit Online GmbH',
- 'text.7.5' => 'Used MetaGer version: German search',
+ 'text.7.1' => 'Die ZEIT',
+ 'text.7.2' => '6. September 2009',
+ 'text.7.3' => 'Hamburg, Germany',
+ 'text.7.4' => 'Zeit Online GmbH',
+ 'text.7.5' => 'German search',
- 'text.8.1' => 'Name: OneNewspage (Deutschland)',
- 'text.8.2' => 'Founded: 2008',
- 'text.8.3' => 'Headquarters: Wales, England',
- 'text.8.4' => 'Maintainer (business form): One News Page Ltd.',
- 'text.8.5' => 'Used MetaGer version: German search (Deutschland), English search',
+ 'text.8.1' => 'OneNewspage (Deutschland)',
+ 'text.8.2' => '2008',
+ 'text.8.3' => 'Wales, England',
+ 'text.8.4' => 'One News Page Ltd.',
+ 'text.8.5' => 'German search (Deutschland), English search',
- 'text.9.1' => 'Name: OneNewspage Video (Deutschland)',
- 'text.9.2' => 'Founded: 2008',
- 'text.9.3' => 'Headquarters: Wales, England',
- 'text.9.4' => 'Maintainer (buisness form): One News Page Ltd.',
- 'text.9.5' => 'Used MetaGer version: German search (Deutschland), English search',
+ 'text.9.1' => 'OneNewspage Video (Deutschland)',
+ 'text.9.2' => '2008',
+ 'text.9.3' => 'Wales, England',
+ 'text.9.4' => 'One News Page Ltd.',
+ 'text.9.5' => 'German search (Deutschland), English search',
diff --git a/resources/views/search-engine.blade.php b/resources/views/search-engine.blade.php
index b40df6c7c..263d17c7f 100644
--- a/resources/views/search-engine.blade.php
+++ b/resources/views/search-engine.blade.php
@@ -17,7 +17,7 @@
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.1') }}</span>{{ trans('search-engine.text.2.1.1') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.2') }}</span>{{ trans('search-engine.text.2.2.1') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.3') }}</span>{{ trans('search-engine.text.2.3.1') }}</p>
- <p><span class="search-engine-dt">{{ trans('search-engine.text.2.4.1') }}</span>{{ trans('search-engine.text.2.4') }}</p>
+ <p><span class="search-engine-dt">{{ trans('search-engine.text.2.4') }}</span>{{ trans('search-engine.text.2.4.1') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.5') }}</span>{{ trans('search-engine.text.2.5.1') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.6') }}</span>{{ trans('search-engine.text.2.6.1') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.7') }}</span>{{ trans('search-engine.text.2.7.1') }}</p>
@@ -25,7 +25,7 @@
</div>
<div class="card-heavy">
- <h2>{{ trans('search-engine.head.3') }}</h2>
+ <h2>{{ trans('search-engine.head.4') }}</h2>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.1') }}</span>{{ trans('search-engine.text.3.1') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.2') }}</span>{{ trans('search-engine.text.3.2') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.3') }}</span>{{ trans('search-engine.text.3.3') }}</p>
@@ -82,7 +82,7 @@
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.1')}}</span>{{ trans('search-engine.text.9.1')}}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.3') }}</span>{{ trans('search-engine.text.9.2') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.4') }}</span>{{ trans('search-engine.text.9.3') }}</p>
- <p><span class="search-engine-dt">{{ trans('search-engine.text.2.5') }}</span>{ trans('search-engine.text.9.4') }}</p>
+ <p><span class="search-engine-dt">{{ trans('search-engine.text.2.5') }}</span>{{ trans('search-engine.text.9.4') }}</p>
<p><span class="search-engine-dt">{{ trans('search-engine.text.2.7') }}</span>{{ trans('search-engine.text.9.5') }}</p>
</div>
</div>
--
GitLab