From 971fa59aec0bc53f32896cfff8f83196a26cf209 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Wed, 11 Jun 2014 20:22:39 +0200
Subject: fix #3855: remove overflow menu option

---
 main/res/values-de/strings.xml      | 2 --
 main/res/values-fr/strings.xml      | 2 --
 main/res/values-lt/strings.xml      | 2 --
 main/res/values-nl/strings.xml      | 2 --
 main/res/values-ro/strings.xml      | 2 --
 main/res/values/preference_keys.xml | 1 -
 main/res/values/strings.xml         | 2 --
 main/res/xml/preferences.xml        | 6 ------
 8 files changed, 19 deletions(-)

(limited to 'main/res')

diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 1a29dbf..fd56a7f 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -415,8 +415,6 @@
   <string name="init_captcha">Zeige CAPTCHA</string>
   <string name="init_summary_captcha">Zeige CAPTCHA wenn notwendig (nur Basic Member)</string>
   <string name="init_useenglish">Auf Englisch</string>
-  <string name="init_showoverflowmenu">Menü-Symbol immer anzeigen</string>
-  <string name="init_showoverflow_summary">Zeigt das Menü-Symbol (Drei Punkte ⋮) auch an wenn das Gerät eine Menütaste hat (Neustart benötigt)</string>
   <string name="init_summary_useenglish">c:geo auf Englisch nutzen (Neustart erforderlich)</string>
   <string name="init_exclude">Eigene und gefundene Caches</string>
   <string name="init_summary_exclude">Eigene und gefundene Caches ausblenden</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 243c476..a10ff28 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -413,8 +413,6 @@
   <string name="init_captcha">Afficher le CAPTCHA si nécessaire</string>
   <string name="init_summary_captcha">Afficher le CAPTCHA si nécessaire</string>
   <string name="init_useenglish">Utiliser l\'anglais dans c:geo\n(redémarrage nécessaire)</string>
-  <string name="init_showoverflowmenu">Toujours afficher le menu</string>
-  <string name="init_showoverflow_summary">Toujours afficher le symbole pour obtenir le menu (trois points⋮) même si l\'appareil a un bouton menu (redémarrage nécessaire)</string>
   <string name="init_summary_useenglish">Utiliser l\'anglais dans c:geo\n(redémarrage nécessaire)</string>
   <string name="init_exclude">Exclure mes caches et les caches trouvées</string>
   <string name="init_summary_exclude">Exclure mes caches et les caches trouvées</string>
diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml
index bc7b446..15c9e01 100644
--- a/main/res/values-lt/strings.xml
+++ b/main/res/values-lt/strings.xml
@@ -412,8 +412,6 @@
   <string name="init_captcha">Rodyti CAPTCHA</string>
   <string name="init_summary_captcha">Jei reikia rodyti CAPTCHA (tik baziniams nariams)</string>
   <string name="init_useenglish">Anglu kalba</string>
-  <string name="init_showoverflowmenu">Visada rodyti papildomą meniu</string>
-  <string name="init_showoverflow_summary">Visada rodyti papildomą meniu (trys taškai ⋮) net jei prietaisas turi meniu mygtuką (reikia pakartotinai paleisti)</string>
   <string name="init_summary_useenglish">Naudoti anglų kalbą (reikia pakartotinai paleisti)</string>
   <string name="init_exclude">Atmesti savo ir rastas</string>
   <string name="init_summary_exclude">Atmesti nuosavas ir rastas slėptuves</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 0752d40..d1823db 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -415,8 +415,6 @@
   <string name="init_captcha">Tonen CAPTCHA</string>
   <string name="init_summary_captcha">Laat CAPTCHA zien indien noodzakelijk</string>
   <string name="init_useenglish">Use English language</string>
-  <string name="init_showoverflowmenu">Altijd overloop menu tonen</string>
-  <string name="init_showoverflow_summary">Altijd het overloop menu (drie puntjes ⋮) tonen zelfs als het apparaat een menu-knop heeft (opnieuw opstarten noodzakelijk)</string>
   <string name="init_summary_useenglish">Use English inside c:geo\n(restart needed)</string>
   <string name="init_exclude">Eigen en gevonden caches uitsluiten</string>
   <string name="init_summary_exclude">Eigen en gevonden caches uitsluiten</string>
diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml
index b9844cf..2fcfb1c 100644
--- a/main/res/values-ro/strings.xml
+++ b/main/res/values-ro/strings.xml
@@ -410,8 +410,6 @@
   <string name="init_captcha">Arată CAPTCHA</string>
   <string name="init_summary_captcha">Arată CAPTCHA dacă este necesar (doar Basic Member)</string>
   <string name="init_useenglish">Foloseşte limba engleză</string>
-  <string name="init_showoverflowmenu">Afişează întotdeauna meniul suprapus</string>
-  <string name="init_showoverflow_summary">Afişează întotdeauna meniul suprapus (trei puncte ⋮) chiar dacă dispozitivul are buton pentru meniu (necesită repornirea aplicaţiei)</string>
   <string name="init_summary_useenglish">Foloseşte limba engleză în c:geo (Aplicaţia trebuie repornită)</string>
   <string name="init_exclude">Exclude Găsite şi Ale mele</string>
   <string name="init_summary_exclude">Exclude cutiile găsite şi cele proprii</string>
diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml
index 797ff11..a443e25 100644
--- a/main/res/values/preference_keys.xml
+++ b/main/res/values/preference_keys.xml
@@ -46,7 +46,6 @@
     <string name="pref_showaddress">showaddress</string>
     <string name="pref_useenglish">useenglish</string>
     <string name="pref_units">units</string>
-    <string name="pref_alwaysshowoverflowmenu">alwaysshowoverflowmenu</string>
     <string name="pref_autoloaddesc">autoloaddesc</string>
     <string name="pref_ratingwanted">ratingwanted</string>
     <string name="pref_friendlogswanted">friendlogswanted</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 94a92d4..0a9f029 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -452,8 +452,6 @@
     <string name="init_captcha">Show CAPTCHA</string>
     <string name="init_summary_captcha">Show CAPTCHA if necessary (only Basic Member)</string>
     <string name="init_useenglish">Use English</string>
-    <string name="init_showoverflowmenu">Always show overflow menu</string>
-    <string name="init_showoverflow_summary">Always show the overflow menu (three dots ⋮) even if the device has a menu button (Restart needed)</string>
     <string name="init_summary_useenglish">Use English language for c:geo (Restart needed)</string>
     <string name="init_exclude">Exclude Own and Found</string>
     <string name="init_summary_exclude">Exclude caches you own or have found</string>
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index 90911ae..e406988 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -403,12 +403,6 @@
             android:key="@string/pref_units"
             android:summary="@string/init_summary_units"
             android:title="@string/init_units" />
-        <!-- this preference is only shown on < 4.4 devices, 4.4 unconditionally enables it -->
-        <CheckBoxPreference
-            android:title="@string/init_showoverflowmenu"
-            android:summary="@string/init_showoverflow_summary"
-            android:key="@string/pref_alwaysshowoverflowmenu"
-            android:defaultValue="false" />
     </PreferenceScreen>
     <PreferenceScreen
         android:icon="?attr/settings_details"
-- 
cgit v1.1