aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/AndroidManifest.xml14
-rw-r--r--main/res/values-de/strings.xml7
-rw-r--r--main/res/values-it/strings.xml11
-rw-r--r--main/res/values/changelog_release.xml5
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java4
5 files changed, 25 insertions, 16 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 2cdbc2c..fe86b15 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -44,20 +44,6 @@
android:name="com.google.android.maps"
android:required="false" />
- <!-- Samsung Multi-Window support -->
- <uses-library
- android:name="com.sec.android.app.multiwindow"
- android:required="false" />
-
- <meta-data
- android:name="com.sec.android.support.multiwindow"
- android:value="true" />
- <meta-data
- android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W"
- android:resource="@dimen/app_defaultsize_w" />
- <meta-data
- android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H"
- android:resource="@dimen/app_defaultsize_h" />
<meta-data
android:name="android.app.default_searchable"
android:value=".SearchActivity" />
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index a8ccc9b..6b0fc8e 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -268,6 +268,11 @@
<string name="caches_select_invert">Auswahl invertieren</string>
<string name="caches_nearby">In der Nähe</string>
<string name="caches_manage">Verwalten</string>
+ <string name="caches_remove_all">Alle löschen</string>
+ <string name="caches_remove_all_confirm">Sollen alle %s Caches gelöscht werden?</string>
+ <string name="caches_remove_selected">Ausgewählte löschen</string>
+ <string name="caches_remove_selected_confirm">Sollen die %s Caches gelöscht werden?</string>
+ <string name="caches_remove_progress">Entferne Caches…</string>
<string name="caches_delete_events">Vergangene Events löschen</string>
<string name="caches_refresh_selected">Ausgewählte aktualisieren</string>
<string name="caches_refresh_all">Alle aktualisieren</string>
@@ -298,6 +303,7 @@
<string name="list_menu_create">Neue Liste</string>
<string name="list_menu_drop">Aktuelle Liste löschen</string>
<string name="list_menu_rename">Aktuelle Liste umbenennen</string>
+ <string name="list_menu_import">Importieren</string>
<string name="list_title">Liste wählen</string>
<string name="list_inbox">Standardliste</string>
<string name="list_all_lists">Alle</string>
@@ -832,6 +838,7 @@
<string name="user_menu_open_contact">Kontakt öffnen</string>
<string name="navigation">Navigation</string>
<string name="compass_title">Kompass</string>
+ <string name="compass_sensors">Aktive Sensoren</string>
<string name="use_gps">Nur GPS nutzen</string>
<string name="use_compass">GPS und Kompass nutzen</string>
<string name="destination_select">Ziel auswählen</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index f542e04..9c2dbf8 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -17,6 +17,7 @@
<string name="letterbox">Letterbox hybrid</string>
<string name="event">Cache Evento</string>
<string name="mega">Mega-event cache</string>
+ <string name="giga">Giga-event cache</string>
<string name="earth">Earthcache</string>
<string name="cito">Evento Cache In Trash Out</string>
<string name="webcam">Webcam cache</string>
@@ -206,6 +207,7 @@
<string name="info_select_logimage_cancelled">Selezione o cattura immagine annulata.</string>
<string name="info_stored_image">Nuova immagine salvata su:</string>
<string name="info_storing_static_maps">Tento di salvare le mappe statiche</string>
+ <string name="info_cache_saved">Il cache è stato salvato localmente</string>
<string name="loc_last">Ultima nota</string>
<string name="loc_net">Network</string>
<string name="loc_gps">GPS</string>
@@ -213,6 +215,7 @@
<string name="loc_trying">Localizzazione in corso</string>
<string name="loc_no_addr">Indirizzo sconosciuto</string>
<string name="loc_gps_disabled">GPS non attivo</string>
+ <string name="menu_centerposition">Centra sulla mia posizione</string>
<string name="menu_about">Info su c:geo</string>
<string name="menu_helpers">Programmi utili</string>
<string name="menu_settings">Impostazioni</string>
@@ -387,6 +390,8 @@
<string name="init_signature_template_log">Testo di Log</string>
<string name="init_ratingwanted">Rating da GCvote.com</string>
<string name="init_summary_ratingwanted">Carica il rating del cache da GCvote.com</string>
+ <string name="init_friends_and_own_logs_wanted">Visualizza i tuoi/dei tuoi amici</string>
+ <string name="init_summary_friends_and_own_logs_wanted">Visualizza una pagina di log addizionale per i log dei tuoi amici e i tuoi log</string>
<string name="init_openlastdetailspage">Carica ultima pagina usata nei dettagli</string>
<string name="init_summary_openlastdetailspage">Ricorda l\'ultima pagina usata nei dettagli</string>
<string name="init_autoload">Descrizione estesa</string>
@@ -475,6 +480,9 @@
<string name="init_maintenance">Manutenzione</string>
<string name="init_maintenance_directories_note">c:geo memorizza immagini, immagini log e altri file (correlati a un cache) in una cartella separata. In alcuni casi (es.: dopo import/esport del database) questa cartella potrebbe contenere file obsoleti, che possono essere cancellati da qui.</string>
<string name="init_maintenance_directories">Elimina file orfani</string>
+ <string name="init_create_memory_dump">Salva la memoria del programma</string>
+ <string name="init_memory_dump">Salvataggio memoria</string>
+ <string name="init_memory_dumped">Memoria salvata in %s</string>
<string name="settings_open_website">Apri il sito</string>
<string name="settings_settings">Impostazioni</string>
<string name="settings_information">Informazioni</string>
@@ -574,6 +582,7 @@
<string name="cache_waypoints_add">Aggiungi waypoint</string>
<string name="cache_hint">Aiuto (spoiler)</string>
<string name="cache_logs">Logbook</string>
+ <string name="cache_logs_friends_and_own">Log tuoi e degli amici</string>
<string name="cache_dialog_loading_details">Caricamento dettagli del cache…</string>
<string name="cache_dialog_loading_details_status_loadpage">Caricamento pagina</string>
<string name="cache_dialog_loading_details_status_details">Elaborazione dettagli</string>
@@ -626,6 +635,7 @@
<string name="cache_status">Stato</string>
<string name="cache_status_offline_log">Log salvato</string>
<string name="cache_status_found">Trovato</string>
+ <string name="cache_not_status_found">Non trovato</string>
<string name="cache_status_archived">Archiviato</string>
<string name="cache_status_disabled">Non attivo</string>
<string name="cache_status_premium">Solo per utenti Premium</string>
@@ -1138,4 +1148,5 @@
<string name="percent_favorite_points">%\ preferiti</string>
<string name="cgeo_shortcut">collegamento a c:geo</string>
<string name="create_shortcut">Crea collegamento</string>
+ <string name="send">Invia</string>
</resources>
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index c7c06f8..3413249 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,12 +2,13 @@
<resources>
<!-- changelog for the release branch -->
<string name="changelog_release" translatable="false">\n
- <b>Next bugfix release:</b>\n
+ <b>2014.06.11:</b>\n
+ · Fix: Adapting to changes on gc.com\n
· Fix: New gc.com GPX waypoint types recognized\n
· Fix: Do not crop static maps to prevent the copyright notice being cut off\n
\n
<b>2014.05.14:</b>\n
- · Fix: Adapting to changes on geocaching.com\n
+ · Fix: Adapting to changes on gc.com\n
\n
<b>2014.04.30:</b>\n
· New: Support new cache type: Giga Event\n
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 062c97a..3c9bb0b 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -550,6 +550,10 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
}
private void notifyDataSetChanged() {
+ // This might get called asynchronically when the activity is shut down
+ if (isFinishing())
+ return;
+
if (search == null) {
return;
}
generated by cgit v1.1 at 2025-11-10 11:55:16 +0000