aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/res/menu/map_activity.xml59
-rw-r--r--main/res/values-ca/strings.xml4
-rw-r--r--main/res/values-cs/strings.xml4
-rw-r--r--main/res/values-da/strings.xml1
-rw-r--r--main/res/values-de/strings.xml4
-rw-r--r--main/res/values-es/strings.xml3
-rw-r--r--main/res/values-fr/strings.xml4
-rw-r--r--main/res/values-hu/strings.xml2
-rw-r--r--main/res/values-it/strings.xml4
-rw-r--r--main/res/values-ja/strings.xml4
-rw-r--r--main/res/values-lt/strings.xml4
-rw-r--r--main/res/values-nb/strings.xml4
-rw-r--r--main/res/values-nl/strings.xml4
-rw-r--r--main/res/values-pl/strings.xml4
-rw-r--r--main/res/values-pt/strings.xml4
-rw-r--r--main/res/values-ro/strings.xml4
-rw-r--r--main/res/values-sk/strings.xml4
-rw-r--r--main/res/values-sl/strings.xml4
-rw-r--r--main/res/values-sv/strings.xml4
-rw-r--r--main/res/values/strings.xml4
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java18
21 files changed, 33 insertions, 114 deletions
diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml
index 8a41715..4c1dfd7 100644
--- a/main/res/menu/map_activity.xml
+++ b/main/res/menu/map_activity.xml
@@ -1,20 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
- <item android:id="@+id/menu_toggle_mypos"
- android:title="@string/menu_centerposition"
+ <item
+ android:id="@+id/menu_toggle_mypos"
android:icon="@drawable/ic_menu_myposition"
- cgeo:showAsAction="always"
android:showAsAction="always"
-
- />
-
+ android:title="@string/menu_centerposition"
+ cgeo:showAsAction="always"/>
<item
android:id="@+id/menu_select_mapview"
android:icon="@drawable/ic_menu_mapmode"
- cgeo:showAsAction="ifRoom|withText"
- android:title="@string/map_view_map">
+ android:title="@string/map_view_map"
+ cgeo:showAsAction="ifRoom|withText">
<menu>
<group
android:id="@+id/menu_group_map_sources"
@@ -25,48 +23,51 @@
<item
android:id="@+id/menu_map_live"
android:icon="@drawable/ic_menu_refresh"
- cgeo:showAsAction="ifRoom|withText"
- android:title="@string/map_live_disable">
+ android:title="@string/map_live_disable"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/menu_store_caches"
android:icon="@drawable/ic_menu_set_as"
- cgeo:showAsAction="ifRoom|withText"
- android:title="@string/caches_store_offline">
+ android:title="@string/caches_store_offline"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/submenu_modes"
android:icon="@drawable/ic_menu_mark"
- cgeo:showAsAction="ifRoom|withText"
- android:title="@string/map_modes">
+ android:title="@string/map_modes"
+ cgeo:showAsAction="ifRoom|withText">
<menu>
<item
android:id="@+id/menu_trail_mode"
+ android:checkable="true"
android:icon="@drawable/ic_menu_trail"
- cgeo:showAsAction="ifRoom|withText"
- android:title="@string/map_trail_hide">
+ android:title="@string/map_trail_show"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
android:id="@+id/menu_circle_mode"
+ android:checkable="true"
android:icon="@drawable/ic_menu_circle"
- cgeo:showAsAction="ifRoom|withText"
- android:title="@string/map_circles_hide">
+ android:title="@string/map_circles_show"
+ cgeo:showAsAction="ifRoom|withText">
</item>
<item
- android:id="@+id/menu_mycaches_mode"
- android:icon="@android:drawable/ic_menu_myplaces"
- cgeo:showAsAction="ifRoom|withText"
- android:title="@string/map_mycaches_hide">
- </item>
- <item
- android:id="@+id/menu_theme_mode"
- android:icon="@drawable/ic_menu_preferences"
- cgeo:showAsAction="ifRoom|withText"
- android:title="@string/map_theme_select">
+ android:id="@+id/menu_mycaches_mode"
+ android:checkable="true"
+ android:icon="@android:drawable/ic_menu_myplaces"
+ android:title="@string/map_mycaches_hide"
+ cgeo:showAsAction="ifRoom|withText">
</item>
</menu>
</item>
<item
+ android:id="@+id/menu_theme_mode"
+ android:icon="@drawable/ic_menu_preferences"
+ android:title="@string/map_theme_select"
+ cgeo:showAsAction="ifRoom|withText">
+ </item>
+ <item
android:id="@+id/submenu_strategy"
android:icon="@drawable/ic_menu_preferences"
android:title="@string/map_strategy">
diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml
index 92092ae..576030f 100644
--- a/main/res/values-ca/strings.xml
+++ b/main/res/values-ca/strings.xml
@@ -101,7 +101,6 @@
<string name="log_smilies">Emoticones</string>
<string name="log_image">Imatge</string>
<string name="log_image_attach">Adjunta una imatge</string>
- <string name="log_image_edit">Edita la imatge</string>
<string name="log_image_stored">Existent</string>
<string name="log_image_camera">Nou</string>
<string name="log_image_caption">Títol</string>
@@ -763,10 +762,7 @@
<string name="map_view_map">Tria el mapa</string>
<string name="map_modes">Configuració del mapa</string>
<string name="map_trail_show">Mostra la ruta</string>
- <string name="map_trail_hide">Amaga la ruta</string>
<string name="map_circles_show">Mostra els cercles</string>
- <string name="map_circles_hide">Amaga els cercles</string>
- <string name="map_mycaches_show">Mostra els catxés propis/trobats</string>
<string name="map_mycaches_hide">Amaga els catxés propis/trobats</string>
<string name="map_theme_builtin">Per defecte</string>
<string name="map_theme_select">Trieu els detalls del mapa</string>
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index e0b7886..8643756 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -99,7 +99,6 @@
<string name="log_smilies">Smajlíci</string>
<string name="log_image">Obrázek</string>
<string name="log_image_attach">Připojit obrázek</string>
- <string name="log_image_edit">Upravit obrázek</string>
<string name="log_image_stored">Existující</string>
<string name="log_image_camera">Nový</string>
<string name="log_image_caption">Titulek</string>
@@ -750,10 +749,7 @@
<string name="map_view_map">Vybrat typ mapy</string>
<string name="map_modes">Režimy mapy</string>
<string name="map_trail_show">Zobrazit záznam trasy</string>
- <string name="map_trail_hide">Skrýt záznam trasy</string>
<string name="map_circles_show">Zobrazit kruhy</string>
- <string name="map_circles_hide">Skrýt kruhy</string>
- <string name="map_mycaches_show">Zobrazovat vlastní/nalezené keše</string>
<string name="map_mycaches_hide">Skrývat vlastní/nalezené keše</string>
<string name="map_theme_builtin">Výchozí</string>
<string name="map_theme_select">Vyber téma mapy</string>
diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml
index 167f7b8..76b60f0 100644
--- a/main/res/values-da/strings.xml
+++ b/main/res/values-da/strings.xml
@@ -229,7 +229,6 @@
<string name="map_live">Live-kort</string>
<string name="map_view_map">Kort-view</string>
<string name="map_trail_show">Vis spor</string>
- <string name="map_trail_hide">Skjul spor</string>
<string name="map_live_enable">Aktivér live</string>
<string name="map_live_disable">Deaktivér live</string>
<string name="search_coordinates">Koordinater</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 0f14805..c24c4fa 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -101,7 +101,6 @@
<string name="log_smilies">Smilies</string>
<string name="log_image">Bild</string>
<string name="log_image_attach">Bild hinzufügen</string>
- <string name="log_image_edit">Bild bearbeiten</string>
<string name="log_image_stored">Vorhanden</string>
<string name="log_image_camera">Neu</string>
<string name="log_image_caption">Überschrift</string>
@@ -766,10 +765,7 @@
<string name="map_view_map">Karte</string>
<string name="map_modes">Karteneinstellungen</string>
<string name="map_trail_show">Spur einblenden</string>
- <string name="map_trail_hide">Spur ausblenden</string>
<string name="map_circles_show">Kreise anzeigen</string>
- <string name="map_circles_hide">Kreise verbergen</string>
- <string name="map_mycaches_show">Eigene/gefundene Caches anzeigen</string>
<string name="map_mycaches_hide">Eigene/gefundene Caches ausblenden</string>
<string name="map_theme_builtin">Standard</string>
<string name="map_theme_select">Kartendarstellung wählen</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 03fc14f..07f7a87 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -99,7 +99,6 @@
<string name="log_smilies">Emoticonos</string>
<string name="log_image">Imagen</string>
<string name="log_image_attach">Adjuntar imagen</string>
- <string name="log_image_edit">Editar imagen</string>
<string name="log_image_stored">Galería</string>
<string name="log_image_camera">Tomar foto</string>
<string name="log_image_caption">Título</string>
@@ -594,9 +593,7 @@
<string name="map_view_map">Ver mapa</string>
<string name="map_modes">Configuración del mapa</string>
<string name="map_trail_show">Mostrar rastro</string>
- <string name="map_trail_hide">Ocultar rastro</string>
<string name="map_circles_show">Mostrar círculos</string>
- <string name="map_circles_hide">Ocultar círculos</string>
<string name="map_theme_builtin">Por defecto</string>
<string name="map_live_enable">Activar en vivo</string>
<string name="map_live_disable">Desactivar en vivo</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index f30905d..f635d49 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -101,7 +101,6 @@
<string name="log_smilies">Sourillards</string>
<string name="log_image">Image</string>
<string name="log_image_attach">Ajouter une image</string>
- <string name="log_image_edit">Éditer l\'image</string>
<string name="log_image_stored">Existante</string>
<string name="log_image_camera">Nouvelle</string>
<string name="log_image_caption">Légende</string>
@@ -769,10 +768,7 @@
<string name="map_view_map">Voir carte</string>
<string name="map_modes">Marqueurs</string>
<string name="map_trail_show">Afficher le parcours</string>
- <string name="map_trail_hide">Cacher le parcours</string>
<string name="map_circles_show">Afficher les cercles</string>
- <string name="map_circles_hide">Cacher les cercles</string>
- <string name="map_mycaches_show">Montrer les caches placées/trouvées</string>
<string name="map_mycaches_hide">Cacher les caches placées/trouvées</string>
<string name="map_theme_builtin">Défault</string>
<string name="map_theme_select">Sélectionner le thème</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index a3747fd..4861657 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -548,9 +548,7 @@
<string name="map_view_map">Térkép nézet</string>
<string name="map_modes">Térkép módok</string>
<string name="map_trail_show">Ösvény mutatása</string>
- <string name="map_trail_hide">Ösvény elrejtése</string>
<string name="map_circles_show">Körök mutatása</string>
- <string name="map_circles_hide">Körök elrejtése</string>
<string name="map_theme_builtin">Alapértelmezett</string>
<string name="map_theme_select">Válassz térképtémát</string>
<string name="map_live_enable">Élő mód engedélyezése</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index eb332b6..80abf49 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -100,7 +100,6 @@
<string name="log_smilies">Faccine</string>
<string name="log_image">Immagine</string>
<string name="log_image_attach">Aggiungi immagine</string>
- <string name="log_image_edit">Modifica immagine</string>
<string name="log_image_stored">Esistente</string>
<string name="log_image_camera">Nuova</string>
<string name="log_image_caption">Didascalia</string>
@@ -750,10 +749,7 @@
<string name="map_view_map">Scegli mappa</string>
<string name="map_modes">Modi mappa</string>
<string name="map_trail_show">Mostra scia</string>
- <string name="map_trail_hide">Nasconde scia</string>
<string name="map_circles_show">Mostra area cache</string>
- <string name="map_circles_hide">Nascondi area cache</string>
- <string name="map_mycaches_show">Visualizza cache tuoi o che hai trovato</string>
<string name="map_mycaches_hide">Nascondi i tuoi cache o che hai trovato</string>
<string name="map_theme_builtin">Tema predefinito</string>
<string name="map_theme_select">Scegli un tema mappa</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 89aa62d..2a97026 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -98,7 +98,6 @@
<string name="log_smilies">スマイルマーク</string>
<string name="log_image">画像</string>
<string name="log_image_attach">画像を添付</string>
- <string name="log_image_edit">添付画像を変更</string>
<string name="log_image_stored">ファイル選択</string>
<string name="log_image_camera">撮影</string>
<string name="log_image_caption">タイトル</string>
@@ -699,10 +698,7 @@
<string name="map_view_map">地図の変更</string>
<string name="map_modes">表示切替</string>
<string name="map_trail_show">軌跡を表示</string>
- <string name="map_trail_hide">軌跡を非表示</string>
<string name="map_circles_show">0.1マイル円を表示</string>
- <string name="map_circles_hide">円を非表示</string>
- <string name="map_mycaches_show">所有/見つけたキャッシュを表示</string>
<string name="map_mycaches_hide">所有/見つけたキャッシュを非表示</string>
<string name="map_theme_builtin">デフォルト</string>
<string name="map_theme_select">地図のテーマを選択</string>
diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml
index 011f2cb..44849d1 100644
--- a/main/res/values-lt/strings.xml
+++ b/main/res/values-lt/strings.xml
@@ -101,7 +101,6 @@
<string name="log_smilies">Šypsenėlės</string>
<string name="log_image">Nuotrauka</string>
<string name="log_image_attach">Pridėti nuotrauką</string>
- <string name="log_image_edit">Taisyti nuotrauką</string>
<string name="log_image_stored">Esamą</string>
<string name="log_image_camera">Naują</string>
<string name="log_image_caption">Antraštė</string>
@@ -763,10 +762,7 @@
<string name="map_view_map">Žemėlapio šaltinis</string>
<string name="map_modes">Žemėlapio nustatymai</string>
<string name="map_trail_show">Rodyti pėdsaką</string>
- <string name="map_trail_hide">Slėpti pėdsaką</string>
<string name="map_circles_show">Rodyti apskritimus</string>
- <string name="map_circles_hide">Slėpti apskritimus</string>
- <string name="map_mycaches_show">Rodyti savo/rastas slėptuves</string>
<string name="map_mycaches_hide">Slėpti savo/rastas slėptuves</string>
<string name="map_theme_builtin">Numatyta</string>
<string name="map_theme_select">Pasirinkti žemėlapio temą</string>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index e88bf55..88dcdde 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -100,7 +100,6 @@
<string name="log_smilies">Smilefjes</string>
<string name="log_image">Bilde</string>
<string name="log_image_attach">Legg ved bilde</string>
- <string name="log_image_edit">Rediger bilde</string>
<string name="log_image_stored">Eksisterende</string>
<string name="log_image_camera">Nytt</string>
<string name="log_image_caption">Bildetekst</string>
@@ -744,10 +743,7 @@
<string name="map_view_map">Kart</string>
<string name="map_modes">Kartinnstillinger</string>
<string name="map_trail_show">Vis spor</string>
- <string name="map_trail_hide">Skjul spor</string>
<string name="map_circles_show">Vis sirkler</string>
- <string name="map_circles_hide">Skjul sirkler</string>
- <string name="map_mycaches_show">Vis egne og funnede cacher</string>
<string name="map_mycaches_hide">Skjul egne og funnede cacher</string>
<string name="map_theme_builtin">Standard</string>
<string name="map_theme_select">Velg karttema</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 7c76a0f..540ee03 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -101,7 +101,6 @@
<string name="log_smilies">Smilies</string>
<string name="log_image">Foto</string>
<string name="log_image_attach">Foto koppelen</string>
- <string name="log_image_edit">Foto bewerken</string>
<string name="log_image_stored">Bestaande</string>
<string name="log_image_camera">Nieuw</string>
<string name="log_image_caption">Bijschrift</string>
@@ -763,10 +762,7 @@
<string name="map_view_map">Kaart weergave</string>
<string name="map_modes">Kaartinstellingen</string>
<string name="map_trail_show">Toon spoor</string>
- <string name="map_trail_hide">Verberg spoor</string>
<string name="map_circles_show">Laat cirkels zien</string>
- <string name="map_circles_hide">Verberg cirkels</string>
- <string name="map_mycaches_show">Tonen eigen/gevonden caches</string>
<string name="map_mycaches_hide">Verbergen eigen/gevonden caches</string>
<string name="map_theme_builtin">Standaard</string>
<string name="map_theme_select">Selecteer mapthema</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 0336681..f3786a1 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -101,7 +101,6 @@
<string name="log_smilies">Uśmiechy</string>
<string name="log_image">Obraz</string>
<string name="log_image_attach">Załącz obraz</string>
- <string name="log_image_edit">Edytuj obraz</string>
<string name="log_image_stored">Zapisany</string>
<string name="log_image_camera">Nowy</string>
<string name="log_image_caption">Podpis</string>
@@ -758,10 +757,7 @@
<string name="map_view_map">Widok mapy</string>
<string name="map_modes">Tryb mapy</string>
<string name="map_trail_show">Pokaż szlak</string>
- <string name="map_trail_hide">Ukryj szlak</string>
<string name="map_circles_show">Pokaż okręgi</string>
- <string name="map_circles_hide">Ukryj okręgi</string>
- <string name="map_mycaches_show">Pokazuj własne/znalezione skrzynki</string>
<string name="map_mycaches_hide">Ukryj własne/znalezione skrzynki</string>
<string name="map_theme_builtin">Domyślny</string>
<string name="map_theme_select">Wybierz motyw mapy</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index b793006..8728d63 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -100,7 +100,6 @@
<string name="log_smilies">Smilies</string>
<string name="log_image">Imagem</string>
<string name="log_image_attach">Anexar Imagem</string>
- <string name="log_image_edit">Editar Imagem</string>
<string name="log_image_stored">Existente</string>
<string name="log_image_camera">Nova</string>
<string name="log_image_caption">Título</string>
@@ -753,10 +752,7 @@
<string name="map_view_map">Vista de mapa</string>
<string name="map_modes">Modos de mapa</string>
<string name="map_trail_show">Mostrar caminho</string>
- <string name="map_trail_hide">Esconder caminho</string>
<string name="map_circles_show">Mostrar círculos</string>
- <string name="map_circles_hide">Esconder círculos</string>
- <string name="map_mycaches_show">Mostrar caches encontradas e minhas</string>
<string name="map_mycaches_hide">Esconder caches encontradas e minhas</string>
<string name="map_theme_builtin">Padrão</string>
<string name="map_theme_select">Selecione o tema de mapa</string>
diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml
index 35be061..9f0ea98 100644
--- a/main/res/values-ro/strings.xml
+++ b/main/res/values-ro/strings.xml
@@ -101,7 +101,6 @@
<string name="log_smilies">Smilies</string>
<string name="log_image">Imagine</string>
<string name="log_image_attach">Ataşează imagine</string>
- <string name="log_image_edit">Modifică imagine</string>
<string name="log_image_stored">Existentă</string>
<string name="log_image_camera">Nouă</string>
<string name="log_image_caption">Titlu</string>
@@ -746,10 +745,7 @@
<string name="map_view_map">Hărţi</string>
<string name="map_modes">Opţiuni hărţi</string>
<string name="map_trail_show">Arată traseu</string>
- <string name="map_trail_hide">Ascunde traseu</string>
<string name="map_circles_show">Arată cercurile</string>
- <string name="map_circles_hide">Ascunde cercurile</string>
- <string name="map_mycaches_show">Arată geocutiile mele/găsite</string>
<string name="map_mycaches_hide">Ascunde geocutiile mele/găsite</string>
<string name="map_theme_builtin">Implicit</string>
<string name="map_theme_select">Alege un stil pentru hartă</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index dbd7124..5d77255 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -100,7 +100,6 @@
<string name="log_smilies">Smajlíci</string>
<string name="log_image">Obrázok</string>
<string name="log_image_attach">Pripojiť obrázok</string>
- <string name="log_image_edit">Upraviť obrázok</string>
<string name="log_image_stored">Existujúci</string>
<string name="log_image_camera">Nový</string>
<string name="log_image_caption">Titulok</string>
@@ -746,10 +745,7 @@
<string name="map_view_map">Zobrazenie mapy</string>
<string name="map_modes">Režimy mapy</string>
<string name="map_trail_show">Zobraziť záznam trasy</string>
- <string name="map_trail_hide">Skryť záznam trasy</string>
<string name="map_circles_show">Zobraziť kruhy</string>
- <string name="map_circles_hide">Skryť kruhy</string>
- <string name="map_mycaches_show">Zobraziť vlastné/nájdené cache</string>
<string name="map_mycaches_hide">Skryť vlastné/nájdené cache</string>
<string name="map_theme_builtin">Predvolené</string>
<string name="map_theme_select">Vybrať tému mapy</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index 92eab3b..5bc229e 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -100,7 +100,6 @@
<string name="log_smilies">Smeškoti</string>
<string name="log_image">Slika</string>
<string name="log_image_attach">Dodaj sliko</string>
- <string name="log_image_edit">Uredi sliko</string>
<string name="log_image_stored">Obstoječa</string>
<string name="log_image_camera">Nova</string>
<string name="log_image_caption">Naslov</string>
@@ -756,10 +755,7 @@
<string name="map_view_map">Pogled zemljevida</string>
<string name="map_modes">Možnosti</string>
<string name="map_trail_show">Pokaži sled</string>
- <string name="map_trail_hide">Skrij sled</string>
<string name="map_circles_show">Pokaži kroge</string>
- <string name="map_circles_hide">Skrij kroge</string>
- <string name="map_mycaches_show">Pokaži lastne ali najdene zaklade</string>
<string name="map_mycaches_hide">Skrij lastne ali najdene zaklade</string>
<string name="map_theme_builtin">Privzeto</string>
<string name="map_theme_select">Izberi temo zemljevida</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 6814ea0..6820ea1 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -101,7 +101,6 @@
<string name="log_smilies">Smileys</string>
<string name="log_image">Bild</string>
<string name="log_image_attach">Lägg till bild</string>
- <string name="log_image_edit">Redigera bild</string>
<string name="log_image_stored">Från fil</string>
<string name="log_image_camera">Ny</string>
<string name="log_image_caption">Bildtext</string>
@@ -763,10 +762,7 @@
<string name="map_view_map">Karttyp</string>
<string name="map_modes">Kartlägen</string>
<string name="map_trail_show">Visa spår</string>
- <string name="map_trail_hide">Dölj spår</string>
<string name="map_circles_show">Visa cirklar</string>
- <string name="map_circles_hide">Dölj cirklar</string>
- <string name="map_mycaches_show">Visa egna/funna cacher</string>
<string name="map_mycaches_hide">Dölj egna/funna cacher</string>
<string name="map_theme_builtin">Standard</string>
<string name="map_theme_select">Välj karttema</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 1204c05..9bd595f 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -113,7 +113,6 @@
<string name="log_smilies">Smilies</string>
<string name="log_image">Image</string>
<string name="log_image_attach">Attach Image</string>
- <string name="log_image_edit">Edit Image</string>
<string name="log_image_stored">Existing</string>
<string name="log_image_camera">New</string>
<string name="log_image_caption">Caption</string>
@@ -840,10 +839,7 @@
<string name="map_view_map">Map view</string>
<string name="map_modes">Map settings</string>
<string name="map_trail_show">Show trail</string>
- <string name="map_trail_hide">Hide trail</string>
<string name="map_circles_show">Show circles</string>
- <string name="map_circles_hide">Hide circles</string>
- <string name="map_mycaches_show">Show own/found caches</string>
<string name="map_mycaches_hide">Hide own/found caches</string>
<string name="map_theme_builtin">Default</string>
<string name="map_theme_select">Select map theme</string>
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 87d5366..15b2667 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -645,11 +645,7 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
try {
MenuItem item = menu.findItem(R.id.menu_trail_mode);
- if (Settings.isMapTrail()) {
- item.setTitle(res.getString(R.string.map_trail_hide));
- } else {
- item.setTitle(res.getString(R.string.map_trail_show));
- }
+ item.setChecked(Settings.isMapTrail());
item = menu.findItem(R.id.menu_map_live); // live map
if (isLiveEnabled) {
@@ -659,21 +655,13 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
}
item = menu.findItem(R.id.menu_mycaches_mode); // own & found caches
- if (Settings.isExcludeMyCaches()) {
- item.setTitle(res.getString(R.string.map_mycaches_show));
- } else {
- item.setTitle(res.getString(R.string.map_mycaches_hide));
- }
+ item.setChecked(Settings.isExcludeMyCaches());
final Set<String> geocodesInViewport = getGeocodesForCachesInViewport();
menu.findItem(R.id.menu_store_caches).setVisible(!isLoading() && CollectionUtils.isNotEmpty(geocodesInViewport) && new SearchResult(geocodesInViewport).hasUnsavedCaches());
item = menu.findItem(R.id.menu_circle_mode); // show circles
- if (overlayCaches != null && overlayCaches.getCircles()) {
- item.setTitle(res.getString(R.string.map_circles_hide));
- } else {
- item.setTitle(res.getString(R.string.map_circles_show));
- }
+ item.setChecked(overlayCaches != null && overlayCaches.getCircles());
item = menu.findItem(R.id.menu_theme_mode); // show theme selection
item.setVisible(mapView.hasMapThemes());
generated by cgit v1.1 at 2025-11-10 17:40:50 +0000