From 41e01ff3b9648960f81b67f1c70403be3e87b4df Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Mon, 17 Oct 2011 19:37:55 +0200 Subject: refactoring: remove duplicated cache type strings The filter labels are the same as the cache type names, so they can be removed. --- main/res/values-de/strings.xml | 15 --------------- main/res/values-es/strings.xml | 15 --------------- main/res/values-fr/strings.xml | 15 --------------- main/res/values-hu/strings.xml | 15 --------------- main/res/values-nl/strings.xml | 15 --------------- main/res/values-pl/strings.xml | 15 --------------- main/res/values-pt/strings.xml | 15 --------------- main/res/values-sk/strings.xml | 15 --------------- main/res/values-sv/strings.xml | 15 --------------- main/res/values/strings.xml | 15 --------------- main/src/cgeo/geocaching/cgeocaches.java | 30 +++++++++++++++--------------- 11 files changed, 15 insertions(+), 165 deletions(-) diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 8c69bd8..9fe2466 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -302,21 +302,6 @@ Filter zurücksetzen Größe wählen Wähle den Typ - Traditional-Cache - Multi-Cache - Mystery-Cache - Letterbox Hybrid - Event-Cache - Mega Event-Cache - Earth-Cache - Cache In Trash Out event - Webcam-Cache - Virtual-Cache - Wherigo-Cache - Lost & Found - Project APE-Cache - Groundspeak HQ - GPS Cache Exhibit Exportiere als Field-Notes… Lösche aus Verlauf… diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index 6282b1c..0908fc1 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -293,21 +293,6 @@ limpiar filtros Indica tamaño Indica tipo - Tradicional cache - Multi - Desconocido - Buzón híbrido - Evento - Mega-evento - Educativos (Earth) - Limpieza de escondites - Webcam - Virtual - Wherigo - Perdido y Encontrado - Projecto APE - Groundspeak HQ - GPS Cache exhibit Exportando como Notas de campo… Borrando del historial… diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 94f3e08..f1a2a56 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -303,21 +303,6 @@ effacer les filtres Choisir la taille Choisir le type - Traditionelle - Multiple - Mystère - Boîte aux lettres hybride - Événement - Mega-événement - Earth cache - Cache In Trash Out - Webcam - Virtuelle - Wherigo - Perdue & trouvée - Project APE cache - Groundspeak HQ - GPS Cache exhibit Exporter commme notes de terrain… Effacer de l\'historique… diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index 7ff02ce..47f8694 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -300,21 +300,6 @@ szűrők törlése Válassz méretet Válassz típust - Hagyományos láda - Multi-láda - Rejtvény láda - Postaláda hibrid - Esemény láda - Mega-esemény láda - Earth cache - CITO esemény - Webkamera láda - Virtuális láda - Wherigo láda - Elveszett & Megtalált - Project APE láda - Groundspeak székház - GPS láda kiállítás Exportálás terepjegyzetként… Eltávolítás a Előzményekből… diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index 0fcf86a..ec5d023 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -303,21 +303,6 @@ maak filters leeg Kies grootte Kies type - Traditional cache - Multi-cache - Unknown cache - Letterbox Hybrid - Event cache - Mega-event cache - Earth cache - Cache In Trash Out event - Webcam cache - Virtual cache - Wherigo cache - Lost & Found - Project APE cache - Groundspeak HQ - GPS Cache exhibit Exporteer als Field Notes… Verwijderen uit geschiedenis… diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index 2bd663f..6cfcfbf 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -289,21 +289,6 @@ wykasój filter Wybierz wielkość Wybierz typ - tradycyjna - wieloetapowa - zagadkowa - Letterbox Hybrydowa - wydarzeniowa - Mega-wydarzeniowa - Earthcache - CITO - webcam - wirtualna - Wherigo - Lost & Found - Project APE - Groundspeak HQ - GPS Cache wystawa Eksportuj jako notatki terenowe… Kasuję z historii… diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index c1056db..9873faf 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -289,21 +289,6 @@ Limpar filtros Escolha o tamanho Escolha o tipo - Cache tradicional - Multi-cache - Cache desconhecida - Caixa de correio híbrida - Cache evento - Cache mega-evento - Cache Terra - Evento Cache In Trash Out - Cache Webcam - Cache virtual - Cache wherigo - Perdidos & Achados - Cache projecto APE - Groundspeak HQ - Cache exposição GPS A exportar como Notas de Campo… A remover do histórico… diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index f4f6657..9f4bf61 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -303,21 +303,6 @@ vymazať filtre Výber veľkosti Výber typu - Tradičné skrýše - Multi skrýše - Neznáme skrýše - Hybridné veľkosti listu - Skrýše udalosti - Skrýše megaudalostí - Zemské skrýše - Skrýše v udalosti košov - Skrýše web kamier - Virtuálne skrýše - Wherigo skrýše - Straty a nálezy - Skrýše projektu APE - Centrála Groundspeak - Skrýša výstavy GPS Exportovanie ako poznámky… Odstraňovanie z histórie… diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 9b5cd50..2b992b4 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -303,21 +303,6 @@ rensa filter Välj storlek Välj typ - Traditionell cache - Multi-cache - Mysterie cache - Letterbox Hybrid - Event cache - Mega-event cache - Earth cache - Cache In Trash Out event - Webcam cache - Virtual cache - Wherigo cache - Lost & Found - Project APE cache - Groundspeak HQ - GPS Cache utställning Exporterar som Field Notes… Tar bort från historik… diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 26cd654..822cbc9 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -304,21 +304,6 @@ clear filters Choose size Choose type - Traditional cache - Multi-cache - Mystery cache - Letterbox Hybrid - Event cache - Mega-event cache - Earth cache - Cache In Trash Out event - Webcam cache - Virtual cache - Wherigo cache - Lost & Found - Project APE cache - Groundspeak HQ - GPS Cache exhibit Exporting as Field Notes… Removing from history… diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java index 4025301..10fa2a1 100644 --- a/main/src/cgeo/geocaching/cgeocaches.java +++ b/main/src/cgeo/geocaching/cgeocaches.java @@ -1129,21 +1129,21 @@ public class cgeocaches extends AbstractListActivity { menu.add(0, MENU_FILTER_SIZE_NOT_CHOSEN, 0, res.getString(CacheSize.NOT_CHOSEN.stringId)); } else if (selectedFilter.equals(res.getString(R.string.caches_filter_type))) { menu.setHeaderTitle(res.getString(R.string.caches_filter_type_title)); - menu.add(0, MENU_FILTER_TYPE_TRADITIONAL, 0, res.getString(R.string.caches_filter_type_traditional)); - menu.add(0, MENU_FILTER_TYPE_MULTI, 0, res.getString(R.string.caches_filter_type_multi)); - menu.add(0, MENU_FILTER_TYPE_MYSTERY, 0, res.getString(R.string.caches_filter_type_mystery)); - menu.add(0, MENU_FILTER_TYPE_LETTERBOX, 0, res.getString(R.string.caches_filter_type_letterbox)); - menu.add(0, MENU_FILTER_TYPE_EVENT, 0, res.getString(R.string.caches_filter_type_event)); - menu.add(0, MENU_FILTER_TYPE_MEGA, 0, res.getString(R.string.caches_filter_type_mega)); - menu.add(0, MENU_FILTER_TYPE_EARTH, 0, res.getString(R.string.caches_filter_type_earth)); - menu.add(0, MENU_FILTER_TYPE_CITO, 0, res.getString(R.string.caches_filter_type_cito)); - menu.add(0, MENU_FILTER_TYPE_WEBCAM, 0, res.getString(R.string.caches_filter_type_webcam)); - menu.add(0, MENU_FILTER_TYPE_VIRTUAL, 0, res.getString(R.string.caches_filter_type_virtual)); - menu.add(0, MENU_FILTER_TYPE_WHERIGO, 0, res.getString(R.string.caches_filter_type_wherigo)); - menu.add(0, MENU_FILTER_TYPE_LOSTFOUND, 0, res.getString(R.string.caches_filter_type_lostfound)); - menu.add(0, MENU_FILTER_TYPE_APE, 0, res.getString(R.string.caches_filter_type_ape)); - menu.add(0, MENU_FILTER_TYPE_GCHQ, 0, res.getString(R.string.caches_filter_type_gchq)); - menu.add(0, MENU_FILTER_TYPE_GPS, 0, res.getString(R.string.caches_filter_type_gps)); + menu.add(0, MENU_FILTER_TYPE_TRADITIONAL, 0, res.getString(CacheType.TRADITIONAL.stringId)); + menu.add(0, MENU_FILTER_TYPE_MULTI, 0, res.getString(CacheType.MULTI.stringId)); + menu.add(0, MENU_FILTER_TYPE_MYSTERY, 0, res.getString(CacheType.MYSTERY.stringId)); + menu.add(0, MENU_FILTER_TYPE_LETTERBOX, 0, res.getString(CacheType.LETTERBOX.stringId)); + menu.add(0, MENU_FILTER_TYPE_EVENT, 0, res.getString(CacheType.EVENT.stringId)); + menu.add(0, MENU_FILTER_TYPE_MEGA, 0, res.getString(CacheType.MEGA_EVENT.stringId)); + menu.add(0, MENU_FILTER_TYPE_EARTH, 0, res.getString(CacheType.EARTH.stringId)); + menu.add(0, MENU_FILTER_TYPE_CITO, 0, res.getString(CacheType.CITO.stringId)); + menu.add(0, MENU_FILTER_TYPE_WEBCAM, 0, res.getString(CacheType.WEBCAM.stringId)); + menu.add(0, MENU_FILTER_TYPE_VIRTUAL, 0, res.getString(CacheType.VIRTUAL.stringId)); + menu.add(0, MENU_FILTER_TYPE_WHERIGO, 0, res.getString(CacheType.WHERIGO.stringId)); + menu.add(0, MENU_FILTER_TYPE_LOSTFOUND, 0, res.getString(CacheType.LOSTANDFOUND.stringId)); + menu.add(0, MENU_FILTER_TYPE_APE, 0, res.getString(CacheType.PROJECT_APE.stringId)); + menu.add(0, MENU_FILTER_TYPE_GCHQ, 0, res.getString(CacheType.GCHQ.stringId)); + menu.add(0, MENU_FILTER_TYPE_GPS, 0, res.getString(CacheType.GPS_EXHIBIT.stringId)); } } else { if (adapterInfo.position >= adapter.getCount()) { -- cgit v1.1