From f0e5c878e1fda7007d674ea12104d957585d5964 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Tue, 22 Feb 2022 12:13:11 -0700
Subject: [PATCH] Combine the Yahoo search URLs.
 https://redmine.stoutner.com/issues/804

---
 app/src/main/res/values-de/strings.xml     | 3 +--
 app/src/main/res/values-es/strings.xml     | 3 +--
 app/src/main/res/values-fr/strings.xml     | 3 +--
 app/src/main/res/values-it/strings.xml     | 3 +--
 app/src/main/res/values-pt-rBR/strings.xml | 3 +--
 app/src/main/res/values-ru/strings.xml     | 3 +--
 app/src/main/res/values-tr/strings.xml     | 3 +--
 app/src/main/res/values/strings.xml        | 4 +---
 8 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ea2ac68a..02615fd8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -520,8 +520,7 @@
             <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - JavaScript deaktiviert</item>
-            <item>Yahoo - JavaScript aktiviert</item>
+            <item>Yahoo</item>
             <item>Eigene</item>
         </string-array>
         <string name="custom_url">Eigene URL</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4e2c4b2e..1c0902e8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -517,8 +517,7 @@
             <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - Javascript deshabilitado</item>
-            <item>Yahoo - Javascript habilitado</item>
+            <item>Yahoo</item>
             <item>Personalizado</item>
         </string-array>
         <string name="custom_url">URL personalizado</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 95e2510c..e396dd1c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -517,8 +517,7 @@
             <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - JavaScript désactivé</item>
-            <item>Yahoo - JavaScript activé</item>
+            <item>Yahoo</item>
             <item>Personnalisée</item>
         </string-array>
         <string name="custom_url">URL personnalisée</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c38a454f..a668434c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -517,8 +517,7 @@
             <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - JavaScript disabilitato</item>
-            <item>Yahoo - JavaScript abilitato</item>
+            <item>Yahoo</item>
             <item>Personalizzata</item>
         </string-array>
         <string name="custom_url">URL Personalizzata</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 676dc08d..64b05cc3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -513,8 +513,7 @@
             <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - JavaScript desativado</item>
-            <item>Yahoo - JavaScript ativado</item>
+            <item>Yahoo</item>
             <item>Custom</item>
         </string-array>
         <string name="custom_url">URL personalizado</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index da1728dd..5a7dbe23 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -513,8 +513,7 @@
             <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - JavaScript выключен</item>
-            <item>Yahoo - JavaScript включен</item>
+            <item>Yahoo</item>
             <item>Настраиваемый</item>
         </string-array>
         <string name="custom_url">Настраиваемый URL</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2e799d3e..d4a36ba3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -455,8 +455,7 @@
             <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - JavaScript devre dışı</item>
-            <item>Yahoo - JavaScript etkin</item>
+            <item>Yahoo</item>
             <item>Özel sayfa</item>
         </string-array>
         <string name="custom_url">Özel sayfa</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 54e043c5..46320087 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -552,8 +552,7 @@
             <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - JavaScript disabled</item>
-            <item>Yahoo - JavaScript enabled</item>
+            <item>Yahoo</item>
             <item>Custom</item>
         </string-array>
         <string-array name="search_entry_values" translatable="false">  <!-- None of the items in this string array should be translated. -->
@@ -562,7 +561,6 @@
             <item>https://metager.org/meta/meta.ger3?eingabe=</item>
             <item>https://www.google.com/search?q=</item>
             <item>https://www.bing.com/search?q=</item>
-            <item>https://search.yahoo.com/mobile/s?nojs=1&amp;p=</item>
             <item>https://search.yahoo.com/mobile/s?p=</item>
             <item>Custom URL</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
         </string-array>
-- 
2.43.0