Combine the Yahoo search URLs. https://redmine.stoutner.com/issues/804

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ea2ac68ad7cff9cb75ddc1f245244231ce42cea2..02615fd80ebc32435b3bf4caef8e347f3b75f1d3 100644 (file)
--- 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>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>
             <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 4e2c4b2e0a1f4b41fcc01f52826f0fd9ef06af41..1c0902e8d9f996f4e1c1e5816c32b709edd7e589 100644 (file)
--- 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>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>
             <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 95e2510c15055a4eac21ecbb77edb5dc1057db36..e396dd1c5ea226bb97b7f90a2dfabcdad9928663 100644 (file)
--- 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>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>
             <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 c38a454f6733fe063514d5d58c1d6c03de1fa284..a668434c88e32df2a0b244e214dc7d884e280126 100644 (file)
--- 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>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>
             <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 676dc08db52bc74b2a56bc99f6fa95d53cb6c943..64b05cc3ff14f2850ee87136e831ff98a71e7289 100644 (file)
--- 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>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>
             <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 da1728ddbc84d8659062abcca68457e8ced0387d..5a7dbe2385e3d6c4c8ff7290921324979c8cd975 100644 (file)
--- 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>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>
             <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 2e799d3ef8f83a885b459a0a2070361ddfa76c4d..d4a36ba3316e99b4d485ec3be577c4387e937e73 100644 (file)
--- 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>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>
             <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 54e043c55434c62a6214489a970c87e8b30a37fb..46320087bb08b5290fdae94c027d2995f1db393d 100644 (file)
--- 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>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. -->
             <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://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>
             <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>