aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'main/res')
-rw-r--r--main/res/layout/authorization_activity.xml24
-rw-r--r--main/res/layout/cachedetail_details_page.xml2
-rw-r--r--main/res/layout/logs_item.xml2
-rw-r--r--main/res/values-cs/strings.xml10
-rw-r--r--main/res/values-da/strings.xml9
-rw-r--r--main/res/values-de/strings.xml26
-rw-r--r--main/res/values-es/strings.xml9
-rw-r--r--main/res/values-fr/strings.xml42
-rw-r--r--main/res/values-hu/strings.xml10
-rw-r--r--main/res/values-it/strings.xml21
-rw-r--r--main/res/values-ja/strings.xml24
-rw-r--r--main/res/values-nb/strings.xml9
-rw-r--r--main/res/values-nl/strings.xml10
-rw-r--r--main/res/values-pl/strings.xml21
-rw-r--r--main/res/values-pt/strings.xml42
-rw-r--r--main/res/values-sk/strings.xml10
-rw-r--r--main/res/values-sl/strings.xml28
-rw-r--r--main/res/values-sv/strings.xml31
-rw-r--r--main/res/values/changelog_master.xml10
-rw-r--r--main/res/values/preference_keys.xml6
-rw-r--r--main/res/values/strings.xml42
-rw-r--r--main/res/xml/preferences.xml821
22 files changed, 482 insertions, 727 deletions
diff --git a/main/res/layout/authorization_activity.xml b/main/res/layout/authorization_activity.xml
index 771592d..28c1987 100644
--- a/main/res/layout/authorization_activity.xml
+++ b/main/res/layout/authorization_activity.xml
@@ -44,27 +44,11 @@
android:textColor="?text_color"
android:textSize="14sp" />
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="7dip" >
-
- <Button
- android:id="@+id/start"
- style="@style/button_full" />
-
- <EditText
- android:id="@+id/pin"
- style="@style/edittext_full"
- android:inputType="number"
- android:visibility="gone" />
+ <Button
+ android:id="@+id/start"
+ style="@style/button_full"
+ android:layout_margin="7dip" />
- <Button
- android:id="@+id/pin_button"
- style="@style/button_full"
- android:visibility="visible" />
- </LinearLayout>
</LinearLayout>
</ScrollView>
diff --git a/main/res/layout/cachedetail_details_page.xml b/main/res/layout/cachedetail_details_page.xml
index 484385e..e735699 100644
--- a/main/res/layout/cachedetail_details_page.xml
+++ b/main/res/layout/cachedetail_details_page.xml
@@ -261,7 +261,7 @@
<ImageView
android:id="@+id/map_preview"
android:layout_width="fill_parent"
- android:layout_height="80dip"
+ android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:onClick="showNavigationMenu"
diff --git a/main/res/layout/logs_item.xml b/main/res/layout/logs_item.xml
index 6bfe30a..6ce20bb 100644
--- a/main/res/layout/logs_item.xml
+++ b/main/res/layout/logs_item.xml
@@ -58,9 +58,7 @@
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="22dip"
- android:autoLink="web"
android:gravity="left"
- android:linksClickable="true"
android:textColor="?text_color"
android:textSize="14sp" />
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index f82e199..cfb304f 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -321,7 +321,6 @@
<!-- caches lists -->
<string name="list_menu">Seznam</string>
<string name="list_menu_create">Vytvořit nový seznam</string>
- <string name="list_menu_all_lists">Všechny keše</string>
<string name="list_menu_drop">Smazat aktuální seznam</string>
<string name="list_menu_change">Změnit seznam</string>
<string name="list_menu_rename">Přejmenovat aktuální seznam</string>
@@ -363,7 +362,7 @@
<string name="init_login_popup_ok">Přihlášení bylo úspěšné</string>
<string name="init_login_popup_failed">Přihlášení selhalo</string>
<string name="init_login_popup_failed_reason">Přihlášení se nezdařilo, protože:</string>
- <string name="init_twitter_authorize">Autorizovat c:geo</string>
+ <string name="settings_authorize">Autorizovat c:geo</string>
<string name="init_signature">Podpis</string>
<string name="init_signature_help_text">Zadej podpis k použití při logování.\nSpeciální řetězce, které můžeš použít jsou: [DATE] , [TIME], [DATETIME], [USER] &amp; [NUMBER].\nTyto řetězce budou nahrazeny při vkládání podpisu do Logu.</string>
<string name="init_signature_template_button">Vložit šablonu</string>
@@ -475,12 +474,7 @@
<string name="auth_authorize">Autorizovat c:geo</string>
<string name="auth_start">Zahájit autorizaci</string>
<string name="auth_again">Znovu autorizovat</string>
- <string name="auth_pin_hint">PIN přidělený Twitterem</string>
<string name="auth_finish">Dokončit</string>
- <string name="auth_dialog_wait">Čekání na Twitter…</string>
- <string name="auth_dialog_pin_title">PIN kód</string>
- <string name="auth_dialog_pin_message">Prosím, napiš PIN kód přidělený Twitterem. Je to nutné pro dokončení autorizace.</string>
- <string name="auth_dialog_completed">c:geo nyní může posílat zprávy na Tvůj Twitter.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -1040,8 +1034,6 @@
<string name="twitter">Twitter: <a href="">@android_GC</a></string>
<string name="nutshellmanual">Návod: <a href="">c:geo v Nutshell</a></string>
<string name="about_twitter">Má <b>c:geo</b> publikovat nový status na Twitteru vždy, když zaloguješ keš?</string>
- <string name="about_auth_1">Následující proces dovoluje aplikaci <b>c:geo</b> přístup na Twitter - pokud budeš souhlasit.</string>
- <string name="about_auth_2">Klepnutím na tlačítko \"Zahájit autorizaci\" bude proces zahájen. Tento proces otevře webový prohlížeč s Twitterem. Přihlaš se na této stránce a povol <b>c:geu</b> přístup k tvému účtu. Pokud je to povoleno, Twitter ti ukáže číselný PIN kód. Tento PIN kód musíš zadat do <b>c:geo</b> a potvrdit. To je vše.</string>
<!-- status (used via string based resource loading) -->
<string name="status_new_release" tools:ignore="UnusedResources">Dostupné nové vydání.\nKlepni pro instalaci.</string>
diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml
index 5deb999..e452af5 100644
--- a/main/res/values-da/strings.xml
+++ b/main/res/values-da/strings.xml
@@ -132,7 +132,7 @@
<string name="init_twitter">Twitter</string>
<string name="init_username">Brugernavn</string>
<string name="init_password">Password</string>
- <string name="init_twitter_authorize">Godkend c:geo</string>
+ <string name="settings_authorize">Godkend c:geo</string>
<string name="init_signature">Signatur</string>
<string name="init_skin">Light skin (genstart af c:geo nødvendig)</string>
<string name="init_summary_skin">Light skin (genstart af c:geo nødvendig)</string>
@@ -156,12 +156,7 @@
<string name="auth_authorize">Godkend c:geo</string>
<string name="auth_start">Start godkendelse</string>
<string name="auth_again">Start igen</string>
- <string name="auth_pin_hint">PIN tildelt af Twitter</string>
<string name="auth_finish">Færdig</string>
- <string name="auth_dialog_wait">Venter på Twitter…</string>
- <string name="auth_dialog_pin_title">PIN-kode</string>
- <string name="auth_dialog_pin_message">Indtast PIN-kode fra Twitter. PIN er påkrævet for at gennemføre godkendelse.</string>
- <string name="auth_dialog_completed">c:geo er nu godkendt til at poste beskeder på Twitter.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -287,7 +282,5 @@
<string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
<string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string>
<string name="about_twitter">Skal <b>c:geo</b> sende status til Twitter hvergang du logger en cache?</string>
- <string name="about_auth_1">Med denne proces tillader du at <b>c:geo</b> får adgang til din Twitter.</string>
- <string name="about_auth_2">Klik på \"godkend c:geo\" knappen for at starte godkendelsesprocessen. Det vil åbne Twitter i en webbrowser. Log ind på siden og tillad <b>c:geo</b> at tilgå din Twitter. Når godkendt, vil Twitter vise en PIN-kode. Denne PIN skal tastes ind i <b>c:geo</b> og bekræftes.</string>
</resources>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 80f5c38..fa526a7 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -293,7 +293,6 @@
<string name="caches_clear_offlinelogs_progress">Lösche Offline-Logs</string>
<string name="list_menu">Liste</string>
<string name="list_menu_create">Neue Liste</string>
- <string name="list_menu_all_lists">Alle</string>
<string name="list_menu_drop">Aktuelle Liste löschen</string>
<string name="list_menu_change">Andere Liste anzeigen</string>
<string name="list_menu_rename">Aktuelle Liste umbenennen</string>
@@ -346,13 +345,11 @@
<string name="init_oc">Opencaching.de</string>
<string name="settings_activate_oc">Aktivieren</string>
<string name="init_oc_de_description">Autorisiere c:geo auf opencaching.de zuzugreifen um Caches zu suchen und nach deinen Funden zu filtern.</string>
- <string name="init_register_oc_de">c:geo autorisieren</string>
- <string name="init_reregister_oc_de">c:geo neu autorisieren</string>
+ <string name="settings_authorize">c:geo autorisieren</string>
+ <string name="settings_reauthorize">c:geo neu autorisieren</string>
<string name="init_oc_pl">Opencaching.pl</string>
<string name="settings_activate_oc_pl">Aktiviere</string>
<string name="init_oc_pl_description">Autorisiere c:geo auf opencaching.pl zuzugreifen um Caches zu suchen und nach deinen Funden zu filtern.</string>
- <string name="init_register_oc_pl">c:geo autorisieren</string>
- <string name="init_reregister_oc_pl">c:geo neu autorisieren</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="settings_activate_twitter">Aktivieren</string>
@@ -365,8 +362,6 @@
<string name="init_login_popup_failed">Login fehlgeschlagen</string>
<string name="init_login_popup_failed_reason">Login fehlgeschlagen:</string>
<string name="init_login_popup_not_authorized">Nicht autorisiert</string>
- <string name="init_twitter_authorize">c:geo autorisieren</string>
- <string name="init_twitter_reauthorize">c:geo neu autorisieren</string>
<string name="init_signature">Signatur</string>
<string name="init_signature_help_text">Verwendete Signatur für Logtexte.\nErlaubte Platzhalter sind: [DATE], [TIME], [DATETIME], [USER] &amp; [NUMBER]. Diese werden beim Einfügen der Signatur durch die entsprechenden Werte ersetzt.</string>
<string name="init_signature_template_button">Platzhalter einfügen</string>
@@ -482,27 +477,10 @@
<string name="auth_authorize">c:geo autorisieren</string>
<string name="auth_start">Starte Autorisierung</string>
<string name="auth_again">Neustarten</string>
- <string name="auth_pin_hint">Twitter-PIN</string>
<string name="auth_finish">Fertig</string>
- <string name="auth_dialog_wait">Warten auf Twitter…</string>
- <string name="auth_dialog_pin_title">PIN Code</string>
- <string name="auth_dialog_pin_message">Bitte den Twitter-PIN-Code eingeben, dies ist notwendig um die Autorisierung abzuschließen.</string>
- <string name="auth_dialog_completed">c:geo ist nun autorisiert, Tweets bei Twitter zu erstellen.</string>
- <string name="about_auth_1">Der folgende Prozess erlaubt es <b>c:geo</b> auf den persönlichen Twitter-Account zuzugreifen, wenn zugestimmt wird.</string>
- <string name="about_auth_2">Ein Klick auf \"Starte Autorisierung\" öffnet eine Twitter-Seite in einem Browserfenster. Durch die Anmeldung und die Bestätigung wird <b>c:geo</b> ermöglicht, auf den persönlichen Twitter-Account zuzugreifen. Wird dies bestätigt, nennt Twitter eine numerische PIN, diese muss kopiert und in <b>c:geo</b> eingefügt werden. Das ist alles.</string>
<string name="auth_ocde">opencaching.de</string>
<string name="auth_ocpl">opencaching.pl</string>
- <string name="auth_authorize_oc">c:geo autorisieren</string>
- <string name="auth_start_oc">Starte Autorisierung</string>
- <string name="auth_again_oc">Neustarten</string>
- <string name="auth_pin_hint_oc">%s-PIN</string>
- <string name="auth_finish_oc">Fertig</string>
- <string name="auth_dialog_wait_oc">Warten auf %s…</string>
- <string name="auth_dialog_pin_title_oc">PIN Code</string>
- <string name="auth_dialog_pin_message_oc">Bitte den %s-PIN-Code eingeben, dies ist notwendig um die Autorisierung abzuschließen.</string>
<string name="auth_dialog_completed_oc">c:geo ist nun autorisiert, caches zu laden und auf %s zu loggen.</string>
- <string name="about_auth_1_oc">Der folgende Prozess erlaubt es <b>c:geo</b> auf den persönlichen %s-Account zuzugreifen, wenn zugestimmt wird.</string>
- <string name="about_auth_2_oc">Ein Klick auf \"Starte Autorisierung\" öffnet eine %s-Seite in einem Browserfenster. Durch die Anmeldung und die Bestätigung wird <b>c:geo</b> ermöglicht, auf den persönlichen Account zuzugreifen. Wird dies bestätigt, nennt %s eine numerische PIN, diese muss kopiert und in <b>c:geo</b> eingefügt werden. Das ist alles.</string>
<string name="cache_offline">Offline</string>
<string name="cache_offline_refresh">Aktualisieren</string>
<string name="cache_offline_drop">Löschen</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 26bbe73..e692f15 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -322,7 +322,7 @@
<string name="init_login_popup_ok">Acceso conseguido.</string>
<string name="init_login_popup_failed">Error en el acceso.</string>
<string name="init_login_popup_failed_reason">El acceso ha fallado debido a </string>
- <string name="init_twitter_authorize">Autorizar a c:geo</string>
+ <string name="settings_authorize">Autorizar a c:geo</string>
<string name="init_signature">Firma</string>
<string name="init_signature_help_text">Escribe la firma que quieres usar en los registros.\nLas palabras especiales que puedes usar son: [DATE], [TIME], [USER] y [NUMBER].\nSerán reemplazados por sus valores al insertar la firma.</string>
<string name="init_signature_template_button">Insertar plantilla</string>
@@ -386,12 +386,7 @@
<string name="auth_authorize">Autorizar c:geo</string>
<string name="auth_start">Iniciar autorización</string>
<string name="auth_again">Volver a iniciar</string>
- <string name="auth_pin_hint">PIN asignado por Twitter</string>
<string name="auth_finish">Fin</string>
- <string name="auth_dialog_wait">Esperando por Twitter…</string>
- <string name="auth_dialog_pin_title">Código PIN</string>
- <string name="auth_dialog_pin_message">Debes usar el codigo PIN suministrado por Twitter. Es obligatorio completar la autorización.</string>
- <string name="auth_dialog_completed">c:geo ahora está autorizado para publicar en Twitter.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -771,7 +766,5 @@
<string name="twitter">Twitter: <a href="">@android_GC</a></string>
<string name="nutshellmanual">Manual: <a href="">c:geo en breve</a></string>
<string name="about_twitter">¿Debe <b>c:geo</b> publicar el nuevo estado en Twitter cuando registras un escondite?</string>
- <string name="about_auth_1">El siguiente proceso permite a <b>c:geo</b> acceder a Twitter - si estás de acuerdo.</string>
- <string name="about_auth_2">Hacer clic en el botón \"autorizar c:geo\" iniciará el proceso. Este proceso abrirá un navegador con la web de Twitter. Identifícate y permite a <b>c:geo</b> acceder a tu cuenta. Si aceptas Twitter te mostrará un código PIN. Este PIN debe ser pegado en <b>c:geo</b> y ser confirmado. Eso es todo.</string>
</resources>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 539bf37..246a767 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -100,7 +100,7 @@
<string name="log_stars_4_description">plutôt bien</string>
<string name="log_stars_45_description">très bien</string>
<string name="log_stars_5_description">super</string>
- <string name="log_webcam">photo webcam prise</string>
+ <string name="log_webcam">Photo prise par la webcam</string>
<string name="log_new_log">Carnet</string>
<string name="log_new_log_text">Message</string>
<string name="log_announcement">Annonce</string>
@@ -293,7 +293,6 @@
<string name="caches_clear_offlinelogs_progress">Effacement des entrées de carnet hors-ligne</string>
<string name="list_menu">Listes</string>
<string name="list_menu_create">Nouvelle liste</string>
- <string name="list_menu_all_lists">Toutes les caches</string>
<string name="list_menu_drop">Effacer la liste courante</string>
<string name="list_menu_change">Changer de liste</string>
<string name="list_menu_rename">Renommer la liste courante</string>
@@ -343,16 +342,14 @@
<string name="settings_gc_legal_note">En utilisant les services de geocaching.com, vous acceptez les conditions d\'utilisation de Groundspeak.</string>
<string name="settings_info_facebook_login_title">Connexion Facebook</string>
<string name="settings_info_facebook_login">Vous ne pouvez pas faire que c:geo se connecte à geocaching.com avec votre compte Facebook. Mais il existe une solution simple…</string>
- <string name="init_oc">opencaching.de</string>
+ <string name="settings_authorize">Autoriser c:geo</string>
+ <string name="settings_reauthorize">Ré-autoriser c:geo</string>
+ <string name="init_oc">Opencaching.de</string>
<string name="settings_activate_oc">Activer</string>
<string name="init_oc_de_description">Autoriser c:geo à utiliser opencaching.de pour chercher des caches et accéder/filtrer vos caches trouvées.</string>
- <string name="init_register_oc_de">Autoriser c:geo</string>
- <string name="init_reregister_oc_de">Ré-autoriser c:geo</string>
<string name="init_oc_pl">Opencaching.pl</string>
<string name="settings_activate_oc_pl">Activer</string>
<string name="init_oc_pl_description">Autoriser c:geo à utiliser opencaching.pl pour chercher des caches et accéder/filtrer vos caches trouvées.</string>
- <string name="init_register_oc_pl">Autoriser c:geo</string>
- <string name="init_reregister_oc_pl">Ré-autoriser c:geo</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="settings_activate_twitter">Activer</string>
@@ -365,8 +362,6 @@
<string name="init_login_popup_failed">Erreur de connexion</string>
<string name="init_login_popup_failed_reason">Erreur de connexion: </string>
<string name="init_login_popup_not_authorized">Non autorisé</string>
- <string name="init_twitter_authorize">Autorisation de c:geo</string>
- <string name="init_twitter_reauthorize">Ré-autoriser c:geo</string>
<string name="init_signature">Signature</string>
<string name="init_signature_help_text">Écrivez votre propre signature pour vos visites.\nLes codes spéciaux supportés sont : [DATE] , [TIME], [DATETIME], [USER] &amp; [NUMBER].\nAu moment de l\'insertion de la signature, ces codes seront remplacés par la valeur correspondante.</string>
<string name="init_signature_template_button">Insérer un modèle</string>
@@ -427,10 +422,12 @@
<string name="init_backup_last">Sauvegarde disponible depuis</string>
<string name="init_backup_last_no">Il n\'y a pas de fichier avec une sauvegarde.</string>
<string name="settings_info_offline_maps_title">Informations sur les cartes hors-ligne</string>
- <string name="settings_info_offline_maps">c:geo prend en charge les cartes hors-ligne. Vous pouvez télécharger des cartes depuis Mapsforge ou même créer vos propres cartes à partir des données d\'OSM.</string>
+ <string name="settings_info_offline_maps">c:geo prend en charge les cartes hors-ligne. Vous pouvez télécharger des cartes depuis Mapsforge ou même créer vos propres cartes à partir des données d\'OSM. Vous devez d\'abord sélectionner le répertoire des cartes en mode hors-ligne pour pouvoir utiliser cette fonctionnalité.</string>
<string name="settings_info_themes_title">Informations sur les thèmes de cartes</string>
<string name="settings_info_themes">c:geo prend en charge des thèmes personnalisés pour les cartes en mode hors-ligne. Ils peuvent être utilisés pour modifier le style de couleur de la carte (par exemple d\'avoir une vue de nuit) ou mettre en évidence certains objets comme les pistes cyclables ou les lignes de niveau.</string>
<string name="init_mapsource_select">Choisir la source des cartes</string>
+ <string name="settings_title_scale_map_text">Zoom du texte</string>
+ <string name="settings_summary_scale_map_text">Mise à l\'échelle des textes sur la carte hors-ligne en fonction de la résolution de l\'appareil</string>
<string name="init_map_directory_description">Dossier contenant les cartes hors-ligne</string>
<string name="init_gpx_exportdir">Dossier d\'exportation GPX</string>
<string name="init_gpx_importdir">Dossier d\'importation GPX</string>
@@ -463,6 +460,9 @@
<string name="init_use_native_ua">S\'identifier comme le navigateur web Android. Peut résoudre des problèmes de connexion avec certains opérateurs mobiles.</string>
<string name="init_summary_use_native_ua">S\'identifier comme le navigateur Android. Résout les problèmes de connexion lors de l\'utilisation de certains fournisseurs d\'accès au réseau.</string>
<string name="init_rendertheme_folder">Dossier contenant les cartes hors-ligne personnelles (optionnelles).</string>
+ <string name="settings_open_website">Ouvrir le site dans un navigateur</string>
+ <string name="settings_settings">Paramètres</string>
+ <string name="settings_information">Information</string>
<string name="map_source_google_map">Google Maps : plan</string>
<string name="map_source_google_satellite">Google Maps : satellite</string>
<string name="map_source_osm_mapnik">OSM : rendu Mapnik</string>
@@ -482,27 +482,14 @@
<string name="auth_authorize">autorisation de c:geo</string>
<string name="auth_start">début d\'autorisation</string>
<string name="auth_again">redémarre</string>
- <string name="auth_pin_hint">code donné par Twitter</string>
<string name="auth_finish">terminé</string>
- <string name="auth_dialog_wait">en attente de Twitter…</string>
- <string name="auth_dialog_pin_title">code PIN</string>
- <string name="auth_dialog_pin_message">Veuillez saisir votre code PIN fourni par Twitter. Il est obligatoire pour finaliser l\'autorisation.</string>
- <string name="auth_dialog_completed">c:geo est maintenant autorisé à poster sur Twitter.</string>
- <string name="about_auth_1">Le processus suivant permet à <b>c:geo</b> d\'accéder à votre compte Twitter - si vous acceptez.</string>
- <string name="about_auth_2">Cliquer sur le bouton \"début d\'autorisation\" pour démarrer. Une fenêtre de navigateur va s\'ouvrir pour vous connecter sur Twitter. Accepter pour que <b>c:geo</b> accéde à votre compte. Twitter vous affichera alors une code PIN composé de chiffres. Merci de coller ce code dans <b>c:geo</b> puis confirmer. C\'est tout!</string>
+ <string name="auth_dialog_waiting">En attente de %s…</string>
+ <string name="auth_explain_short">Le processus suivant autorisera <b>c:geo</b> à accéder à %s.</string>
+ <string name="auth_explain_long">L\'appui sur \"Autoriser c:geo\" démarrera le processus. Un navigateur web ouvrira la page de %s. Vous pourrez vous connecter sur votre compte et en autoriser l\'accès à <b>c:geo</b>. C\'est tout.</string>
+ <string name="auth_dialog_completed_twitter">c:geo est maintenant autorisé à poster sur Twitter.</string>
<string name="auth_ocde">opencaching.de</string>
<string name="auth_ocpl">opencaching.pl</string>
- <string name="auth_authorize_oc">Autoriser c:geo</string>
- <string name="auth_start_oc">Commencer l\'autorisation</string>
- <string name="auth_again_oc">Recommencer</string>
- <string name="auth_pin_hint_oc">Code donné par %s</string>
- <string name="auth_finish_oc">Terminer</string>
- <string name="auth_dialog_wait_oc">En attente de %s…</string>
- <string name="auth_dialog_pin_title_oc">Code PIN</string>
- <string name="auth_dialog_pin_message_oc">Veuillez saisir votre code PIN fourni par %s. Il est nécessaire pour finaliser l\'autorisation.</string>
<string name="auth_dialog_completed_oc">c:geo est désormais autorisé à interagir avec %s.</string>
- <string name="about_auth_1_oc">La procédure suivante permet à <b>c:geo</b> d\'accéder à %s - si vous acceptez.</string>
- <string name="about_auth_2_oc">Cliquer sur le bouton \"début d\'autorisation\" pour démarrer. Une fenêtre de navigateur va s\'ouvrir pour vous connecter sur %s. Accepter pour que <b>c:geo</b> accède à votre compte. %s vous affichera alors un code PIN composé de chiffres. Merci de recopier ce code dans <b>c:geo</b> et de confirmer. C\'est tout.</string>
<string name="cache_offline">Hors ligne</string>
<string name="cache_offline_refresh">Recharger</string>
<string name="cache_offline_drop">Effacer</string>
@@ -798,6 +785,7 @@
<string name="destination_set">Définir une destination</string>
<string name="navigation_direct_navigation">Navigation directe</string>
<string name="navigation_target">Cible</string>
+ <string name="err_nav_no_coordinates">Impossible de démarrer la navigation en l\'absence de coordonnées</string>
<string name="license">Licence</string>
<string name="license_show">Afficher la licence</string>
<string name="license_dismiss">Rejeter</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index d2ae86c..3c63b2e 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -290,7 +290,6 @@
<!-- caches lists -->
<string name="list_menu">Lista</string>
<string name="list_menu_create">Új lista létrehozása</string>
- <string name="list_menu_all_lists">Az összes láda</string>
<string name="list_menu_drop">Jelenlegi lista elvetése</string>
<string name="list_menu_change">Lista megváltoztatása</string>
<string name="list_menu_rename">Az aktuális lista átnevezése</string>
@@ -328,7 +327,7 @@
<string name="init_login_popup_ok">Belépés ok.</string>
<string name="init_login_popup_failed">Belépés sikertelen.</string>
<string name="init_login_popup_failed_reason">Belépés sikertelen, mert </string>
- <string name="init_twitter_authorize">Engedélyezés</string>
+ <string name="settings_authorize">Engedélyezés</string>
<string name="init_signature">Aláírás</string>
<string name="init_signature_help_text">Add meg az aláírásod amit a bejegyzés szövegében szeretnél használni.\nHasználható speciális címkék: [DATE] , [TIME], [DATETIME], [USER] &amp; [NUMBER].\nEzek az aláírás beillesztése után válnak láthatóvá.</string>
<string name="init_signature_template_button">Sablon beillesztése</string>
@@ -438,12 +437,7 @@
<string name="auth_authorize">Hozzáférés engedélyezése a c:geo-nak</string>
<string name="auth_start">Engedélyezés indítása</string>
<string name="auth_again">Engedélyezés indítása újra</string>
- <string name="auth_pin_hint">PIN hozzárendelve a Twitter által</string>
<string name="auth_finish">Befejezés</string>
- <string name="auth_dialog_wait">Várakozás a Twitterre…</string>
- <string name="auth_dialog_pin_title">PIN kód</string>
- <string name="auth_dialog_pin_message">Kérlek írd be a PIN kódot amit a Twittertől kaptál. Ez szükséges lépés az engedélyezés befejezéséhez.</string>
- <string name="auth_dialog_completed">A c:geo engedélyt kapott, hogy bejegyzéseket küldjön a Twitterre.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -922,8 +916,6 @@
<string name="twitter">Twitter: <a href="">@android_GC</a></string>
<string name="nutshellmanual">Kézikönyv: <a href="">A c:geo dióhéjban</a></string>
<string name="about_twitter">Akarod, hogy <b>c:geo</b> új bejegyzést írjon Twitterre mindig mikor egy ládát megtalálsz?</string>
- <string name="about_auth_1">A következő folyamat engedélyezi a <b>c:geo</b>-nak, hogy hozzáférjen a Twitterhez – ha jóváhagyod.</string>
- <string name="about_auth_2">Kattints a \"c:geo engedélyezése\" gombra, hogy elindítsd a folyamatot. Ez a folyamat meg fog nyitni egy böngészőt a Twitter weboldallal. Lépj be ezen az oldalon és hagyd jóvá, hogy a <b>c:geo</b> hozzáférjen a felhasználói fiókodhoz. Ha elfogadod, a Twitter mutatni fog egy számokból álló PIN kódot. Ezt a PIN kódot kell a <b>c:geo</b>-ban beillesztened és jóváhagynod. Ilyen egyszerű.</string>
<!-- status -->
<string name="status_new_release" tools:ignore="UnusedResources">Új kiadás található.\nKattints a telepítéshez.</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index f5774fe..be357de 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -330,7 +330,6 @@
<!-- caches lists -->
<string name="list_menu">Lista</string>
<string name="list_menu_create">Crea nuova lista</string>
- <string name="list_menu_all_lists">Tutte i cache</string>
<string name="list_menu_drop">Elimina la lista corrente</string>
<string name="list_menu_change">Cambia lista</string>
<string name="list_menu_rename">Rinomina la lista corrente</string>
@@ -360,7 +359,7 @@
<!-- init -->
<string name="init_oc">opencaching.de</string>
<string name="init_oc_de_description">Autorizza c:geo a cercare cache ed accedere/filtrare i ritrovamenti su opencaching.de</string>
- <string name="init_register_oc_de">Autorizza c:geo</string>
+ <string name="settings_authorize">Autorizza c:geo</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="init_username">Utente</string>
@@ -371,7 +370,6 @@
<string name="init_login_popup_ok">Login OK.</string>
<string name="init_login_popup_failed">Login fallito.</string>
<string name="init_login_popup_failed_reason">Login fallito perché </string>
- <string name="init_twitter_authorize">Autorizza c:geo</string>
<string name="init_signature">Firma</string>
<string name="init_signature_help_text">Scrivi la tua firma da usare nei testi di log.\nStringhe speciali possono essere usate come: [DATE], [TIME], [DATETIME], [USER] e [NUMBER].\nSaranno espanse quando la firma viene inserita.</string>
<string name="init_signature_template_button">Stringhe speciali</string>
@@ -482,26 +480,11 @@
<string name="auth_authorize">Autorizza c:geo</string>
<string name="auth_start">Avvia autorizzazione</string>
<string name="auth_again">Avvia ancora</string>
- <string name="auth_pin_hint">PIN assegnato da Twitter</string>
<string name="auth_finish">Fine</string>
- <string name="auth_dialog_wait">In attesa di Twitter…</string>
- <string name="auth_dialog_pin_title">Codice PIN</string>
- <string name="auth_dialog_pin_message">Prego inserire il codice PIN fornito dal sito Twitter. È necessario per completare l\'autorizzazione.</string>
- <string name="auth_dialog_completed">c:geo è ora autorizzato ad inviare a Twitter.</string>
<!-- auth opencaching -->
<string name="auth_ocde">opencaching.de</string>
- <string name="auth_authorize_oc">Autorizza c:geo</string>
- <string name="auth_start_oc">Start autorizzazione</string>
- <string name="auth_again_oc">Start nuovamente</string>
- <string name="auth_pin_hint_oc">PIN assegnato da %s</string>
- <string name="auth_finish_oc">Fine</string>
- <string name="auth_dialog_wait_oc">In attesa di %s…</string>
- <string name="auth_dialog_pin_title_oc">PIN code</string>
- <string name="auth_dialog_pin_message_oc">Prego riportare il PIN fornito dal sito %s. È necessario per completare l\'autorizzazione.</string>
<string name="auth_dialog_completed_oc">c:geo è ora autorizzato ad accedere a %s.</string>
- <string name="about_auth_1_oc">La procedura seguente consentirà a <b>c:geo</b></string>
- <string name="about_auth_2_oc">Un click sul pulsante \"Autorizza c:geo\" inizierà la procedura. Verrà aperta la pagina %s nel browser. Effettua Login sulla pagina ed acconsenti a <b>c:geo</b></string>
<!-- cache -->
<plurals name="cache_counts">
@@ -1068,8 +1051,6 @@
<string name="nutshellmanual">Manuale: <a href="">c:geo in a Nutshell</a></string>
<string name="market">Android: <a href="">c:geo su Google Play</a></string>
<string name="about_twitter">Può <b>c:geo</b> pubblicare su Twitter ogni volta che logghi un cache?</string>
- <string name="about_auth_1">La procesura seguente autorizza <b>c:geo</b> ad accedere a Twitter - se confermato.</string>
- <string name="about_auth_2">Clicca sul pulsante \"Autorizza c:geo\" per iniziare. Questa procedura aprirà il browser sulla pagina Twitter. Fai Login su questa pagina e autorizza <b>c:geo</b> ad accedere al tuo account. Se accettato, Twitter mostrerà un PIN code numerico. Questo PIN deve essere riportato in <b>c:geo</b> e confermato.</string>
<!-- status -->
<string name="status_new_release" tools:ignore="UnusedResources">Una nuova versione è disponibile.\nClicca per installarla.</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 377b2b4..fab02c2 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -332,7 +332,6 @@
<!-- caches lists -->
<string name="list_menu">リスト</string>
<string name="list_menu_create">新しいリストを作成</string>
- <string name="list_menu_all_lists">全てのキャッシュ</string>
<string name="list_menu_drop">このリストを消去</string>
<string name="list_menu_change">別のリストにする</string>
<string name="list_menu_rename">このリスト名を変更</string>
@@ -386,8 +385,8 @@
<string name="init_oc">Opencaching.de</string>
<string name="settings_activate_oc">有効化</string>
<string name="init_oc_de_description">キャッシュを検索したり見つけたキャッシュにアクセス/フィルタリングしたりするためにc:geoにopencaching.deを認証させる。</string>
- <string name="init_register_oc_de">c:geoを認証</string>
- <string name="init_reregister_oc_de">再度c:geoを認証</string>
+ <string name="settings_authorize">c:geoを認証</string>
+ <string name="settings_reauthorize">再度c:geoを認証</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="settings_activate_twitter">有効化</string>
@@ -400,8 +399,6 @@
<string name="init_login_popup_failed">ログイン失敗</string>
<string name="init_login_popup_failed_reason">ログインに失敗しました。原因: </string>
<string name="init_login_popup_not_authorized">認証できませんでした</string>
- <string name="init_twitter_authorize">c:geoを認証</string>
- <string name="init_twitter_reauthorize">再度c:geoを認証</string>
<string name="init_signature">署名</string>
<string name="init_signature_help_text">ログ本文で使う署名を入力してください。\n特別な文字として、[DATE]、[TIME]、[DATETIME]、[USER]や[NUMBER]があります。\nこれらは署名の挿入時に、日付、時間、日時、ユーザ名や見つけたキャッシュ数+1に変換されます。</string>
<string name="init_signature_template_button">テンプレートを挿入</string>
@@ -519,28 +516,11 @@
<string name="auth_authorize">c:geoを認証</string>
<string name="auth_start">認証を開始</string>
<string name="auth_again">再度認証を開始</string>
- <string name="auth_pin_hint">TwitterのPINコード</string>
<string name="auth_finish">完了</string>
- <string name="auth_dialog_wait">Twitterからの返答を待っています…</string>
- <string name="auth_dialog_pin_title">PINコード</string>
- <string name="auth_dialog_pin_message">Twitterのサイトで表示されたPINコードを入力してください。認証を完了するために必要です。</string>
- <string name="auth_dialog_completed">c:geoはTwitterにポストするための認証を受けました。</string>
- <string name="about_auth_1"><b>c:geo</b>がTwitterにアクセスする許可を得るには次のようにしてください。</string>
- <string name="about_auth_2">「認証を開始する」ボタンを押すとブラウザでTwitterのページが開きます。そのページにログインすれば<b>c:geo</b>があなたのアカウントにアクセルする許可が得られます。ログインに成功したら数字のPINコードが表示されるので、この下の入力欄にコピー&amp;ペーストして「完了」ボタンを押してください。</string>
<!-- auth opencaching -->
<string name="auth_ocde">opencaching.de</string>
- <string name="auth_authorize_oc">c:geoを認証</string>
- <string name="auth_start_oc">認証を開始</string>
- <string name="auth_again_oc">再度認証を開始</string>
- <string name="auth_pin_hint_oc">%sのPINコード</string>
- <string name="auth_finish_oc">完了</string>
- <string name="auth_dialog_wait_oc">%sからの返答を待っています…</string>
- <string name="auth_dialog_pin_title_oc">PINコード</string>
- <string name="auth_dialog_pin_message_oc">%sのサイトで表示されたPINコードを入力してください。認証を完了するために必要です。</string>
<string name="auth_dialog_completed_oc">c:geoは%sと連携するための認証を受けました。</string>
- <string name="about_auth_1_oc"><b>c:geo</b>が%sにアクセスする許可を得るには次のようにしてください。</string>
- <string name="about_auth_2_oc">「認証を開始する」ボタンを押すとブラウザで%sのページが開きます。そのページにログインすれば<b>c:geo</b>があなたのアカウントにアクセルする許可が得られます。ログインに成功したら数字のPINコードが表示されるので、この下の入力欄にコピー&amp;ペーストして「完了」ボタンを押してください。</string>
<!-- cache -->
<plurals name="cache_counts">
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index d49583e..57545e6 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -196,7 +196,7 @@
<string name="init_login_popup_ok">Innlogging fullført.</string>
<string name="init_login_popup_failed">Innlogging mislyktes.</string>
<string name="init_login_popup_failed_reason">Innlogging mislyktes p.g.a.</string>
- <string name="init_twitter_authorize">Autoriser c:geo</string>
+ <string name="settings_authorize">Autoriser c:geo</string>
<string name="init_signature">Signatur</string>
<string name="init_skin">Hvitt tema</string>
<string name="init_summary_skin">Hvitt tema</string>
@@ -220,12 +220,7 @@
<string name="auth_authorize">Autoriser c:geo</string>
<string name="auth_start">Start autorisasjon</string>
<string name="auth_again">Prøv igjen</string>
- <string name="auth_pin_hint">PIN-kode oppgitt av Twitter</string>
<string name="auth_finish">Fullfør</string>
- <string name="auth_dialog_wait">venter på Twitter…</string>
- <string name="auth_dialog_pin_title">PIN-kode</string>
- <string name="auth_dialog_pin_message">Vennligst tast inn PIN-koden oppgitt av Twitter. Det er obligatorisk at du fullfører autorisasjonen.</string>
- <string name="auth_dialog_completed">c:geo kan nå poste på Twitter.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -389,7 +384,5 @@
<string name="website">web-side: <a href="http://cgeo.org/">cgeo.org</a></string>
<string name="facebook">facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
<string name="about_twitter">Ønsker du at <b>c:geo</b> skal poste en status på Twitter hver gang du logger ett funn via <b>c:geo</b>?</string>
- <string name="about_auth_1">Den følgende prosessen tillater <b>c:geo</b> tilgang til Twitter - hvis bruker samtykker.</string>
- <string name="about_auth_2">Trykk på \"Start autorisasjon\" knappen for å starte prosessen. Denne prosessen vil åpne Twitter i web-leseren. Logg inn, og tillat <b>c:geo</b> tilgang til kontoen din. Hvis du aksepterer, vil Twitter oppgi en numerisk PIN-kode. Denne PIN-koden må så limes inn i <b>c:geo</b>. Verre er det ikke.</string>
</resources>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index bdecc02..19829d4 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -305,7 +305,6 @@
<!-- caches lists -->
<string name="list_menu">Lijst</string>
<string name="list_menu_create">Maak nieuwe lijst</string>
- <string name="list_menu_all_lists">Alle caches</string>
<string name="list_menu_drop">Verwijder huidige lijst</string>
<string name="list_menu_change">Pas lijst aan</string>
<string name="list_menu_rename">Hernoem huidige lijst</string>
@@ -344,7 +343,7 @@
<string name="init_login_popup_ok">Ingelogd.</string>
<string name="init_login_popup_failed">Inloggen mislukt.</string>
<string name="init_login_popup_failed_reason">Inloggen mislukt omdat </string>
- <string name="init_twitter_authorize">c:geo Autoriseren</string>
+ <string name="settings_authorize">c:geo Autoriseren</string>
<string name="init_signature">Handtekening</string>
<string name="init_signature_help_text">Maak een handtekening om te gebruiken in logs.\nSpeciale teksten die gebruikt kunnen worden zijn: [DATE] , [TIME], [DATETIME], [USER] &amp; [NUMBER].\nDeze worden ingevuld op het moment dat de handtekening ingevoegd word.</string>
<string name="init_signature_template_button">Voeg template toe</string>
@@ -456,12 +455,7 @@
<string name="auth_authorize">c:geo Autoriseren</string>
<string name="auth_start">Start autorisatie</string>
<string name="auth_again">Nogmaals starten</string>
- <string name="auth_pin_hint">Door Twitter toegekende pin</string>
<string name="auth_finish">Afronden</string>
- <string name="auth_dialog_wait">Wachten op Twitter…</string>
- <string name="auth_dialog_pin_title">Pin code</string>
- <string name="auth_dialog_pin_message">Voer de door de Twitter website verstrekte PIN code in. Deze is verplicht om de autorisatie af te ronden.</string>
- <string name="auth_dialog_completed">c:geo Is nu geautoriseerd om naar Twitter te posten.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -1018,8 +1012,6 @@
<string name="twitter">Twitter: <a href="">@android_GC</a></string>
<string name="nutshellmanual">Handleiding: <a href="">c:geo in een notendop</a></string>
<string name="about_twitter">Moet <b>c:geo</b> elke cache vondst publiceren naar Twitter?</string>
- <string name="about_auth_1">Het volgende proces staat <b>c:geo</b> toe om Twitter toegang te verkrijgen bij goedkeuring.</string>
- <string name="about_auth_2">Klik op de \"autoriseer c:geo\" knop om het proces te starten. Dit proces zal een browser openen met een Twitter pagina. Login op deze pagina en sta <b>c:geo</b> toegang tot je account toe. Bij goedkeuring laat Twitter een numerieke PIN code zien. Deze PIN dien je te plakken en te bevestigen in <b>c:geo</b>.</string>
<!-- status (used via string based resource loading) -->
<string name="status_new_release" tools:ignore="UnusedResources">Nieuwe release beschikbaar.\nTik om te installeren.</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 9b1bc87..967098f 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -326,7 +326,6 @@
<!-- caches lists -->
<string name="list_menu">Lista</string>
<string name="list_menu_create">Utwórz nową listę</string>
- <string name="list_menu_all_lists">Wszystkie skrzynki</string>
<string name="list_menu_drop">Usuń aktualną listę</string>
<string name="list_menu_change">Zmień listę</string>
<string name="list_menu_rename">Zmień nazwę aktualnej listy</string>
@@ -381,7 +380,7 @@
<string name="init_oc">Opencaching.de</string>
<string name="settings_activate_oc">Aktywuj</string>
<string name="init_oc_de_description">Autoryzuj c:geo z opencaching.de aby wyszukiwać skrzynki i mieć dostęp/filtrować znalezione skrzynki.</string>
- <string name="init_register_oc_de">Autoryzuj c:geo</string>
+ <string name="settings_authorize">Autoryzuj c:geo</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="settings_activate_twitter">Aktywuj</string>
@@ -394,7 +393,6 @@
<string name="init_login_popup_failed">Logowanie nie powiodło się</string>
<string name="init_login_popup_failed_reason">Logowanie nie powiodło się, ponieważ </string>
<string name="init_login_popup_not_authorized">Brak autoryzacji</string>
- <string name="init_twitter_authorize">Autoryzacja c:geo</string>
<string name="init_signature">Podpis</string>
<string name="init_signature_help_text">Wprowadź Twój podpis, który będzie używany przy wpisie do dziennika.\nWyrażenia specjalne, które mogą być użyte to: [DATE] , [TIME], [DATETIME], [USER] &amp; [NUMBER].\nBędą one zastępowane w momencie wstawiania podpisu.</string>
<string name="init_signature_template_button">Wstaw szablon</string>
@@ -514,26 +512,11 @@
<string name="auth_authorize">Autoryzacja c:geo</string>
<string name="auth_start">Rozpoczynam autoryzację</string>
<string name="auth_again">Rozpoczynam ponownie autoryzację</string>
- <string name="auth_pin_hint">PIN nadany przez Twitter</string>
<string name="auth_finish">Gotowe</string>
- <string name="auth_dialog_wait">Czekam na Twitter…</string>
- <string name="auth_dialog_pin_title">Kod PIN</string>
- <string name="auth_dialog_pin_message">Proszę wpisać kod PIN dostarczony przez stronę Twitter. To jest obowiązkowe do ukończenia autoryzacji.</string>
- <string name="auth_dialog_completed">c:geo jest teraz upoważniony do postu na Twitter.</string>
<!-- auth opencaching -->
<string name="auth_ocde">opencaching.de</string>
- <string name="auth_authorize_oc">Autoryzuj c:geo</string>
- <string name="auth_start_oc">Rozpocznij autoryzację</string>
- <string name="auth_again_oc">Spróbuj ponownie</string>
- <string name="auth_pin_hint_oc">PIN przypisany przez %s</string>
- <string name="auth_finish_oc">Zakończ</string>
- <string name="auth_dialog_wait_oc">Czekam na %s…</string>
- <string name="auth_dialog_pin_title_oc">Kod PIN</string>
- <string name="auth_dialog_pin_message_oc">Proszę wpisz kod PIN dostarczony przez stronę %s. Jest to konieczne by zakończyć autoryzację.</string>
<string name="auth_dialog_completed_oc">c:geo został zautoryzowany by komunikować się z %s.</string>
- <string name="about_auth_1_oc">Następujący proces pozwolił <b>c:geo</b> aby uzyskać dostęp do %s - jeśli wyrażono zgodę.</string>
- <string name="about_auth_2_oc">Kliknięcie na przycisk \"autoryzuj c:geo\" rozpocznie proces. Zostanie otwarta przeglądarka ze stroną %s. Zaloguj się i pozwól <b>c:geo</b> uzyskać dostęp do Twojego konta. Po zaakceptowaniu, %s pokaże kod numeryczny PIN. Ten kod PIN musi być wklejony do <b>c:geo</b> i potwierdzony. To wszystko.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -1121,8 +1104,6 @@
<string name="nutshellmanual">Podręcznik: <a href="">c:geo skrócona instrukcja obsługi</a></string>
<string name="market">Android: <a href="">c:geo w Google Play</a></string>
<string name="about_twitter">Czy chczesz aby <b>c:geo</b> publikował nowy status na Twitter za każdym razem kiedy znajdziesz skrzynkę?</string>
- <string name="about_auth_1">Poniższy proces pozwala <b>c:geo</b> uzyskać dostęp do Twitter za Twoim pozwoleniem.</string>
- <string name="about_auth_2">Kliknięcie na \"Autoryzacja c:geo\" spowoduje rozpoczęcie procesu. Ten proces spowoduje otwarcie przeglądarki internetowej na stronie Twitter. Zaloguj się na tej stronie i pozwól <b>c:geo</b> uzyskać dostęp do Twojego konta. Jeśli zostanie zaakceptowany, Twitter wyświetli kod numeryczny PIN. Kod PIN musi zostać wklejony do <b>c:geo</b> i potwierdzony. To wszystko.</string>
<!-- status (used via string based resource loading) -->
<string name="status_new_release" tools:ignore="UnusedResources">Dostępna nowa wersja.\nKliknij aby zainstalować.</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index acd15a3..d0fdd9e 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -293,13 +293,12 @@
<string name="caches_clear_offlinelogs_progress">A limpar registos offline</string>
<string name="list_menu">Listas</string>
<string name="list_menu_create">Criar nova lista</string>
- <string name="list_menu_all_lists">caches todas</string>
<string name="list_menu_drop">Apagar lista actual</string>
<string name="list_menu_change">Mudar de lista</string>
<string name="list_menu_rename">Mudar o nome da lista corrente.</string>
<string name="list_title">Escolha uma lista</string>
<string name="list_inbox">Arquivadas</string>
- <string name="list_all_lists">caches todas</string>
+ <string name="list_all_lists">Todas as caches</string>
<string name="list_dialog_create_title">Nova lista</string>
<string name="list_dialog_create">Criar</string>
<string name="list_dialog_cancel">Cancelar</string>
@@ -346,13 +345,11 @@
<string name="init_oc">Opencaching.de</string>
<string name="settings_activate_oc">Activar</string>
<string name="init_oc_de_description">Autorizar c:geo com opencaching.de para pesquisar por caches e aceder/filtrar as suas caches encontradas.</string>
- <string name="init_register_oc_de">Autorizar c:geo</string>
- <string name="init_reregister_oc_de">Reautorizar c:geo</string>
+ <string name="settings_authorize">Autorizar c:geo</string>
+ <string name="settings_reauthorize">Reautorizar c:geo</string>
<string name="init_oc_pl">Opencaching.pl</string>
<string name="settings_activate_oc_pl">Activar</string>
<string name="init_oc_pl_description">Autorizar c:geo com opencaching.pl para pesquisar por caches e aceder/filtrar as suas caches encontradas.</string>
- <string name="init_register_oc_pl">Autorizar c:geo</string>
- <string name="init_reregister_oc_pl">Reautorizar c:geo</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="settings_activate_twitter">Activar</string>
@@ -365,8 +362,6 @@
<string name="init_login_popup_failed">Login falhado.</string>
<string name="init_login_popup_failed_reason">Login falhado porque </string>
<string name="init_login_popup_not_authorized">Não autorizado</string>
- <string name="init_twitter_authorize">Autorize o c:geo</string>
- <string name="init_twitter_reauthorize">Reautorizar c:geo</string>
<string name="init_signature">Assinatura</string>
<string name="init_signature_help_text">Escreva a sua assinatura, para adicionar ao texto de registo na cache.\nPode usar algumas palavras-chave: [DATE] , [TIME], [USER] &amp; [NUMBER].\nEstas serão expandidas quando a assinatura for inserida.</string>
<string name="init_signature_template_button">Inserir modelo</string>
@@ -427,10 +422,12 @@
<string name="init_backup_last">Disponível backup de</string>
<string name="init_backup_last_no">Não existe nenhum ficheiro de backup.</string>
<string name="settings_info_offline_maps_title">Informações sobre Offline Maps</string>
- <string name="settings_info_offline_maps">c: geo suporta mapas para uso offline. Pode baixar mapas de Mapsforge ou até mesmo criar seus próprios mapas a partir de dados OSM.</string>
+ <string name="settings_info_offline_maps">c:geo supports maps for offline use. You can download maps from Mapsforge or even create your own maps from OSM data. You need to select the offline map directory first to to get offline map support.</string>
<string name="settings_info_themes_title">Informações sobre Map Themes</string>
<string name="settings_info_themes">c: geo suporta temas customizados para os mapas off-line. Estes podem ser usados ​​para alterar o estilo de cores do mapa (por exemplo, ter um mapa para visão nocturna) ou para realçar certos objetos, como ciclovias ou linhas de altura dentro do mapa.</string>
<string name="init_mapsource_select">Seleccione a fonte de mapa</string>
+ <string name="settings_title_scale_map_text">Scale Map Text</string>
+ <string name="settings_summary_scale_map_text">Scale text labels on offline map according to device dpi</string>
<string name="init_map_directory_description">Directório com os mapas offline</string>
<string name="init_gpx_exportdir">Directório para exportar GPX</string>
<string name="init_gpx_importdir">Directório para importar GPX</string>
@@ -463,6 +460,9 @@
<string name="init_use_native_ua">Identificar como se fosse o browser do Android. Resolve os problemas de login em alguns provedores de rede.</string>
<string name="init_summary_use_native_ua">Identificar como se fosse o browser do Android. Resolve os problemas de login em alguns provedores de rede.</string>
<string name="init_rendertheme_folder">Directório de Temas de Mapas</string>
+ <string name="settings_open_website">Abrir o website</string>
+ <string name="settings_settings">Definições</string>
+ <string name="settings_information">Informações</string>
<string name="map_source_google_map">Google: Mapa</string>
<string name="map_source_google_satellite">Google: Satélite</string>
<string name="map_source_osm_mapnik">OSM: Mapnik</string>
@@ -482,27 +482,14 @@
<string name="auth_authorize">Autorizar c:geo</string>
<string name="auth_start">Iniciar autorização</string>
<string name="auth_again">Iniciar de novo</string>
- <string name="auth_pin_hint">PIN atribuído pelo Twitter</string>
<string name="auth_finish">Fim</string>
- <string name="auth_dialog_wait">A esperar pelo Twitter…</string>
- <string name="auth_dialog_pin_title">Código PIN</string>
- <string name="auth_dialog_pin_message">Por favor insira o código PIN fornecido pelo site do Twitter. É imperativo para que se complete a autorização.</string>
- <string name="auth_dialog_completed">O c:geo está agora autorizado a publicar no Twitter.</string>
- <string name="about_auth_1">O processo seguinte permite <b>c:geo</b> aceder ao Twitter - se concordar.</string>
- <string name="about_auth_2">Um clique sobre o botão \"autorizar c:geo \" irá iniciar o processo. Este processo irá abrir um navegador com uma página no Twitter. Entre nesta página e permita o <b>c:geo</b> aceder à sua conta. Se isso for aceite, o Twitter vai mostrar um código PIN numérico. Este PIN deve ser colado em <b>c:geo</b> e confirmado. É tudo.</string>
+ <string name="auth_dialog_waiting">Esperando por %s…</string>
+ <string name="auth_explain_short">O processo a seguir permitirá que <b>c:geo</b> acesse o %s.</string>
+ <string name="auth_explain_long">Pressing the \"authorize c:geo\" button will start the process. This process will open up a web browser with a %s page. Log in on this page and allow <b>c:geo</b> to access your account. That\'s all.</string>
+ <string name="auth_dialog_completed_twitter">O c:geo está agora autorizado a publicar no Twitter.</string>
<string name="auth_ocde">opencaching.de</string>
<string name="auth_ocpl">Opencaching.pl</string>
- <string name="auth_authorize_oc">Autorizar c:geo</string>
- <string name="auth_start_oc">Começar autorização</string>
- <string name="auth_again_oc">Iniciar de novo</string>
- <string name="auth_pin_hint_oc">PIN atribuído por %s</string>
- <string name="auth_finish_oc">Fim</string>
- <string name="auth_dialog_wait_oc">A esperar pot %s…</string>
- <string name="auth_dialog_pin_title_oc">Código PIN</string>
- <string name="auth_dialog_pin_message_oc">Por favor insira o código PIN fornecido pelo site %s. É imperativo para que se complete a autorização.</string>
<string name="auth_dialog_completed_oc">c:geo está agora autorizado a interagir com %s.</string>
- <string name="about_auth_1_oc">O processo seguinte permite <b>c:geo</b> aceder ao Twitter - se concordar.</string>
- <string name="about_auth_2_oc">Um clique sobre o botão \"autorizar c:geo \" irá iniciar o processo. Este processo irá abrir um navegador com uma página em %s. Entre nesta página e permita o <b>c:geo</b> aceder à sua conta. Se isso for aceite, %s vai mostrar um código PIN numérico. Este PIN deve ser colado em <b>c:geo</b> e confirmado. É tudo.</string>
<string name="cache_offline">Arquivo</string>
<string name="cache_offline_refresh">Actualizar</string>
<string name="cache_offline_drop">Apagar</string>
@@ -798,6 +785,7 @@
<string name="destination_set">Definir destino</string>
<string name="navigation_direct_navigation">Navegação directa</string>
<string name="navigation_target">Destino</string>
+ <string name="err_nav_no_coordinates">Não pode iniciar a navegação sem coordenadas</string>
<string name="license">Licença</string>
<string name="license_show">Mostrar licença</string>
<string name="license_dismiss">Dispensar</string>
@@ -1029,7 +1017,7 @@
<string name="twitter">Twitter: <a href="">@android_GC</a></string>
<string name="nutshellmanual">Manual: <a href="">o essencial do c:geo</a></string>
<string name="market">Android: <a href="">c:geo no Google Play</a></string>
- <string name="about_twitter">O <b>c:geo</b> deve publicar no Twitter de cada vez que uma cache for registada?</string>
+ <string name="about_twitter">O <b>c:geo</b> deve publicar no Twitter de cada vez que uma cache foi registrada?</string>
<string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
<string name="status_new_release" tools:ignore="UnusedResources">Nova versão disponível.\nClique para instalar.</string>
<string name="status_new_nightly" tools:ignore="UnusedResources">Nova \'nightly build\' disponível.\nClique para instalar.</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index de25c00..948ebf7 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -298,7 +298,6 @@
<!-- caches lists -->
<string name="list_menu">Zoznam</string>
<string name="list_menu_create">Vytvoriť nový zoznam</string>
- <string name="list_menu_all_lists">Všetky skrýše</string>
<string name="list_menu_drop">Zahodiť aktuálny zoznam</string>
<string name="list_menu_change">Zmeniť zoznam</string>
<string name="list_menu_rename">Premenovať tento zoznam</string>
@@ -336,7 +335,7 @@
<string name="init_login_popup_ok">Prihlásenie úspešné</string>
<string name="init_login_popup_failed">Prihlásenie neúspešné</string>
<string name="init_login_popup_failed_reason">Prihlásenie neúspešné: </string>
- <string name="init_twitter_authorize">Autorizovať c:geo</string>
+ <string name="settings_authorize">Autorizovať c:geo</string>
<string name="init_signature">Podpis</string>
<string name="init_signature_help_text">Zapíšte váš podpis, ktorý chcete použiť v texte záznamov.\nMôžete použiť špeciálne slová: [DATE] , [TIME], [DATETIME], [USER] a [NUMBER].\nTieto budú nahradené pri vložení podpisu.</string>
<string name="init_signature_template_button">Vložiť šablónu</string>
@@ -446,12 +445,7 @@
<string name="auth_authorize">autorizovať c:geo</string>
<string name="auth_start">Zahájiť autorizáciu</string>
<string name="auth_again">Znovu autorizovať</string>
- <string name="auth_pin_hint">PIN pridelený Twitterom</string>
<string name="auth_finish">Dokončiť</string>
- <string name="auth_dialog_wait">Čakanie na Twitter…</string>
- <string name="auth_dialog_pin_title">PIN kód</string>
- <string name="auth_dialog_pin_message">Prosím, napíšte PIN kód, ktorý vám zobrazil Twitter. Je to potrebné pre dokončenie autorizácie.</string>
- <string name="auth_dialog_completed">c:geo teraz môže posielať správy na váš Twitter.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -937,8 +931,6 @@
<string name="twitter">Twitter: <a href="">@android_GC</a></string>
<string name="nutshellmanual">Manuál: <a href="">c:geo v kocke</a></string>
<string name="about_twitter">Chcete, aby <b>c:geo</b> napísalo na váš Twitter vždy keď zapíšete nájdenie skrýše?</string>
- <string name="about_auth_1">Pomocou nasledujúceho procesu môžete aplikácii <b>c:geo</b> umožniť odosielanie príspevkov na váš Twitter. </string>
- <string name="about_auth_2">Ťuknutím na tlačidlo „Zahájiť autorizáciu“ celý proces začne. Tento proces otvorí webovú stránku Twitteru, kde sa sa prihlásite a tlačidlom „Authorize app“ umožníte aplikácii <b>c:geo</b> prístup k vášmu Twitter účtu. Potom čo ťuknete na „Authorize app“, Twitter vám pridelí PIN kód. Tento kód skopírujte a vložte do aplikácie <b>c:geo</b>. A potvrďte. To je všetko.</string>
<!-- status -->
<string name="status_new_release" tools:ignore="UnusedResources">Je dostupné nové vydanie.\nKliknite pre inštaláciu.</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index 11bf1a0..c42be97 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -335,7 +335,6 @@
<!-- caches lists -->
<string name="list_menu">Seznam</string>
<string name="list_menu_create">Ustvari nov seznam</string>
- <string name="list_menu_all_lists">Vsi zakladi</string>
<string name="list_menu_drop">Izbriši trenutni seznam</string>
<string name="list_menu_change">Spremeni seznam</string>
<string name="list_menu_rename">Preimenuj trenutni seznam</string>
@@ -395,13 +394,11 @@
<string name="init_oc">Opencaching.de</string>
<string name="settings_activate_oc">Aktiviraj</string>
<string name="init_oc_de_description">Poveži c:geo z opencaching.de za iskanje zakladov in dostop in filter najdenih zakladov.</string>
- <string name="init_register_oc_de">Poveži c:geo z opencaching.de</string>
- <string name="init_reregister_oc_de">Ponovno poveži c:geo</string>
+ <string name="settings_authorize">Poveži c:geo</string>
+ <string name="settings_reauthorize">Ponovno poveži c:geo</string>
<string name="init_oc_pl">Opencaching.pl</string>
<string name="settings_activate_oc_pl">Aktiviraj</string>
<string name="init_oc_pl_description">Poveži c:geo z opencaching.pl za iskanje zakladov in dostop in filter najdenih zakladov.</string>
- <string name="init_register_oc_pl">Poveži c:geo z opencaching.pl</string>
- <string name="init_reregister_oc_pl">Ponovno poveži c:geo</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="settings_activate_twitter">Aktiviraj</string>
@@ -414,8 +411,6 @@
<string name="init_login_popup_failed">Prijava neuspešna</string>
<string name="init_login_popup_failed_reason">Prijava neuspešna:</string>
<string name="init_login_popup_not_authorized">Ni avtoriziran</string>
- <string name="init_twitter_authorize">Poveži c:geo s Twitterjem</string>
- <string name="init_twitter_reauthorize">Ponovno poveži c:geo s Twitterjem</string>
<string name="init_signature">Podpis</string>
<string name="init_signature_help_text">Vnesite podpis, ki bo uporabljen b baših zapisih obiskov.\nPosebni nizi, ki jih lahko uporabite so: [DATE] - datum, [TIME] - ura, [DATETIME] - datum in ura, [USER] - uporabniško ime in [NUMBER] - število najdb.\nTi nizi bodo zamenjani s pravimi podatki ob vpisu.</string>
<string name="init_signature_template_button">Vnesi predlogo</string>
@@ -535,29 +530,12 @@
<string name="auth_authorize">Poveži c:geo s Twitterjem</string>
<string name="auth_start">Začni z avtorizacijo</string>
<string name="auth_again">Ponovno začni</string>
- <string name="auth_pin_hint">PIN, ki ga dodeli Twitter</string>
<string name="auth_finish">Končaj</string>
- <string name="auth_dialog_wait">Čakam na Twitter…</string>
- <string name="auth_dialog_pin_title">PIN koda</string>
- <string name="auth_dialog_pin_message">Vnesite PIN kodo, ki ste jo dobili na spletni strani Twitterja.</string>
- <string name="auth_dialog_completed">c:geo je sedaj povezan s Twitterjem za objavo sporočil.</string>
- <string name="about_auth_1">Sledeči postopek omogoča <b>c:geotu</b> povezavo s Twitterjem.</string>
- <string name="about_auth_2">Klik na gumb \"Poveži c:geo\" bo začel s postopkom avtorizacije. Med postopkom se bo odprl brskalnik s Twitterjem. V brskalniku se prijavite v Twitter in dovolite aplikaciji <b>c:geo</b> da dostopa do vašega računa. Ko to potrdite, vam bo Twitter izpisal PIN kodo. To kodo prepišite v <b>c:geo</b> in potrdite.</string>
<!-- auth opencaching -->
<string name="auth_ocde">opencaching.de</string>
<string name="auth_ocpl">opencaching.pl</string>
- <string name="auth_authorize_oc">Poveži c:geo</string>
- <string name="auth_start_oc">Začni z avtorizacijo</string>
- <string name="auth_again_oc">Ponovno začni</string>
- <string name="auth_pin_hint_oc">PIN, ki ga dodeli %s</string>
- <string name="auth_finish_oc">Končaj</string>
- <string name="auth_dialog_wait_oc">Čakam na %s…</string>
- <string name="auth_dialog_pin_title_oc">PIN koda</string>
- <string name="auth_dialog_pin_message_oc">Vnesite PIN kodo, ki ste jo dobili na spletni strani %s.</string>
<string name="auth_dialog_completed_oc">c:geo je sedaj povezan z %s.</string>
- <string name="about_auth_1_oc">Sledeči postopek omogoča <b>c:geotu</b> povezavo z %s.</string>
- <string name="about_auth_2_oc">Klik na gumb \"Poveži c:geo\" bo začel s postopkom avtorizacije. Med postopkom se bo odprl brskalnik s stranjo %s. V brskalniku se prijavite na to stran in dovolite aplikaciji <b>c:geo</b> da dostopa do vašega računa. Ko to potrdite, vam bo %s izpisal PIN kodo. To kodo prepišite v <b>c:geo</b> in potrdite.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -1171,4 +1149,4 @@
<item quantity="other">Pred %d dnevi</item>
</plurals>
-</resources> \ No newline at end of file
+</resources>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 6abc9a1..a232c06 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -333,7 +333,6 @@
<!-- caches lists -->
<string name="list_menu">Listor</string>
<string name="list_menu_create">Skapa en ny lista</string>
- <string name="list_menu_all_lists">Alla cacher</string>
<string name="list_menu_drop">Ta bort den här listan</string>
<string name="list_menu_change">Byt lista</string>
<string name="list_menu_rename">Byt namn på den här listan</string>
@@ -393,13 +392,11 @@
<string name="init_oc">Opencaching.de</string>
<string name="settings_activate_oc">Aktivera</string>
<string name="init_oc_de_description">Använd c:geo med opencaching.de för att söka efter cacher samt för att filtrera dina funna cacher.</string>
- <string name="init_register_oc_de">Konfigurera inloggning</string>
- <string name="init_reregister_oc_de">Konfigurera inloggning igen</string>
+ <string name="settings_authorize">Konfigurera inloggning</string>
+ <string name="settings_reauthorize">Konfigurera inloggning igen</string>
<string name="init_oc_pl">Opencaching.pl</string>
<string name="settings_activate_oc_pl">Aktivera</string>
<string name="init_oc_pl_description">Använd c:geo med opencaching.pl för att söka efter cacher samt för att filtrera dina funna cacher.</string>
- <string name="init_register_oc_pl">Konfigurera inloggning</string>
- <string name="init_reregister_oc_pl">Konfigurera inloggning igen</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="settings_activate_twitter">Aktivera</string>
@@ -412,8 +409,6 @@
<string name="init_login_popup_failed">Inloggning misslyckades</string>
<string name="init_login_popup_failed_reason">Inloggning misslyckades:</string>
<string name="init_login_popup_not_authorized">Ej godkänd</string>
- <string name="init_twitter_authorize">Inställningar för Twitter</string>
- <string name="init_twitter_reauthorize">Ändra inställningar för Twitter</string>
<string name="init_signature">Signatur</string>
<string name="init_signature_help_text">Skriv den signatur som du vill använda i dina loggtexter.\nDet finns några speciella texter som kan användas och som expanderas när signaturen läggs in: [DATE] , [TIME], [USER] &amp; [NUMBER].</string>
<string name="init_signature_template_button">Infoga makro</string>
@@ -510,6 +505,9 @@
<string name="init_use_native_ua">Identifiering</string>
<string name="init_summary_use_native_ua">Identifiera som en Android webbläsare. Löser problem med inloggning vid uppkoppling via vissa operatörer.</string>
<string name="init_rendertheme_folder">Katalog för kartteman</string>
+ <string name="settings_open_website">Öppna hemsida</string>
+ <string name="settings_settings">Inställningar</string>
+ <string name="settings_information">Information</string>
<!-- map sources -->
<string name="map_source_google_map">Google: Map</string>
@@ -533,29 +531,12 @@
<string name="auth_authorize">Koppla c:geo mot Twitter</string>
<string name="auth_start">Påbörja koppling mot Twitter</string>
<string name="auth_again">Koppla mot Twitter igen</string>
- <string name="auth_pin_hint">PIN erhållen från Twitter</string>
<string name="auth_finish">Bekräfta PIN</string>
- <string name="auth_dialog_wait">Väntar på Twitter…</string>
- <string name="auth_dialog_pin_title">PIN kod</string>
- <string name="auth_dialog_pin_message">Vänligen skriv in PIN koden du fick på Twitters hemsida. Den krävs för att slutföra kopplingen.</string>
- <string name="auth_dialog_completed">c:geo är nu godkänd att posta på Twitter.</string>
- <string name="about_auth_1">Nedan tillåter du <b>c:geo</b> att ansluta till Twitter.</string>
- <string name="about_auth_2">Klicka på \"Påbörja koppling mot Twitter\" om du vill koppla ihop <b>c:geo</b> med Twitter. Twitters hemsida kommer att öppnas i en webbläsare. Logga in på den sidan och tillåt <b>c:geo</b> att ansluta till ditt konto. När du godkänt så kommer Twitter att visa en PIN kod. Kom ihåg denna PIN kod, stäng webbläsaren och skriv in PIN koden i <b>c:geo</b> och bekräfta.</string>
<!-- auth opencaching -->
<string name="auth_ocde">opencaching.de</string>
<string name="auth_ocpl">opencaching.pl</string>
- <string name="auth_authorize_oc">Tillåt c:geo</string>
- <string name="auth_start_oc">Starta godkännande</string>
- <string name="auth_again_oc">Starta igen</string>
- <string name="auth_pin_hint_oc">PIN erhållen från %s</string>
- <string name="auth_finish_oc">Slutför</string>
- <string name="auth_dialog_wait_oc">Väntar på %s…</string>
- <string name="auth_dialog_pin_title_oc">PIN kod</string>
- <string name="auth_dialog_pin_message_oc">Vänlig ange PIN koden som du fått från %s. Den krävs för att slutföra godkännandet.</string>
<string name="auth_dialog_completed_oc">c:geo är nu godkänd för att kommunicera med %s.</string>
- <string name="about_auth_1_oc">Nedan tillåter du <b>c:geo</b> att kommunicera med %s.</string>
- <string name="about_auth_2_oc">Klicka på \"Tillåt c:geo\" nedan för att koppla ihop <b>c:geo</b> med %s. Logga in på den sida som kommer att öppnas i din webbläsare. Tillåt sedan <b>c:geo</b> att komma åt till konto. Efter detta kommer %s att visa en numerisk PIN kod. Denna PIN kod måste sedan anges i <b>c:geo</b> och godkännas.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -991,4 +972,4 @@
<item quantity="other">%d dagar sedan</item>
</plurals>
-</resources> \ No newline at end of file
+</resources>
diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml
index 09ed0f5..c01be4a 100644
--- a/main/res/values/changelog_master.xml
+++ b/main/res/values/changelog_master.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- changelog for the master branch -->
- <string name="changelog_master" translatable="false"></string>
+ <string name="changelog_master" translatable="false">
+ <b>Next feature release</b>\n
+ <b>New Features:</b>\n
+ · Popup on map shows date of event caches\n
+ · \n
+ \n
+ <b>Bugfixes:</b>\n
+ · \n
+ </string>
</resources>
diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml
index e82c9d6..38012f5 100644
--- a/main/res/values/preference_keys.xml
+++ b/main/res/values/preference_keys.xml
@@ -38,6 +38,7 @@
<string name="pref_choose_list">choose_list</string>
<string name="pref_mapsource">mapsource</string>
<string name="pref_mapDirectory">mapDirectory</string>
+ <string name="pref_mapsforge_scale_text">mapsforgeScaleText</string>
<string name="pref_renderthemepath">renderthemepath</string>
<string name="pref_showwaypointsthreshold">waypointsthreshold</string>
<string name="pref_maptrail">maptrail</string>
@@ -112,4 +113,9 @@
<string name="pref_ocpl_tokenpublic">ocpl_tokenpublic</string>
<string name="pref_temp_ocpl_token_secret">ocpl-temp-token-secret</string>
<string name="pref_temp_ocpl_token_public">ocpl-temp-token-public</string>
+ <string name="pref_fakekey_gc_website">fakekey_gc_website</string>
+ <string name="pref_fakekey_ocde_website">fakekey_ocde_website</string>
+ <string name="pref_fakekey_ocpl_website">fakekey_ocpl_website</string>
+ <string name="pref_fakekey_gcvote_website">fakekey_gcvote_website</string>
+ <string name="pref_fakekey_sendtocgeo_website">fakekey_sendtocgeo_website</string>
</resources>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 554ab0e..39b61d3 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -333,7 +333,6 @@
<!-- caches lists -->
<string name="list_menu">List</string>
<string name="list_menu_create">Create new list</string>
- <string name="list_menu_all_lists">All caches</string>
<string name="list_menu_drop">Drop current list</string>
<string name="list_menu_change">Change list</string>
<string name="list_menu_rename">Rename current list</string>
@@ -390,16 +389,14 @@
<string name="settings_gc_legal_note">With using the service of geocaching.com, you accept the Groundspeak Terms of Use.</string>
<string name="settings_info_facebook_login_title">Facebook Login</string>
<string name="settings_info_facebook_login">You can\'t make c:geo login to geocaching.com with your Facebook account. But there is a simple workaround …</string>
+ <string name="settings_authorize">Authorize c:geo</string>
+ <string name="settings_reauthorize">Authorize c:geo again</string>
<string name="init_oc">Opencaching.de</string>
<string name="settings_activate_oc">Activate</string>
<string name="init_oc_de_description">Authorize c:geo with opencaching.de to search for caches and access/filter your found caches.</string>
- <string name="init_register_oc_de">Authorize c:geo</string>
- <string name="init_reregister_oc_de">Authorize c:geo again</string>
<string name="init_oc_pl">Opencaching.pl</string>
<string name="settings_activate_oc_pl">Activate</string>
<string name="init_oc_pl_description">Authorize c:geo with opencaching.pl to search for caches and access/filter your found caches.</string>
- <string name="init_register_oc_pl">Authorize c:geo</string>
- <string name="init_reregister_oc_pl">Authorize c:geo again</string>
<string name="init_gcvote">GCvote.com</string>
<string name="init_twitter">Twitter</string>
<string name="settings_activate_twitter">Activate</string>
@@ -412,8 +409,6 @@
<string name="init_login_popup_failed">Login failed</string>
<string name="init_login_popup_failed_reason">Login failed:</string>
<string name="init_login_popup_not_authorized">Not authorized</string>
- <string name="init_twitter_authorize">Authorize c:geo</string>
- <string name="init_twitter_reauthorize">Authorize c:geo again</string>
<string name="init_signature">Signature</string>
<string name="init_signature_help_text">Enter a signature to be appended to your logs.\nSpecial strings that can be used are: [DATE] , [TIME], [DATETIME], [USER] &amp; [NUMBER].\nThese will be expanded when the signature is inserted.</string>
<string name="init_signature_template_button">Insert Template</string>
@@ -478,6 +473,8 @@
<string name="settings_info_themes_title">Info on Map Themes</string>
<string name="settings_info_themes">c:geo supports custom themes for offline maps. These can be used to change the color style of the map (e.g. to have a nightview map) or to highlight certain objects like cycle paths or height lines within the map.</string>
<string name="init_mapsource_select">Select Map Source</string>
+ <string name="settings_title_scale_map_text">Scale Map Text</string>
+ <string name="settings_summary_scale_map_text">Scale text labels on offline map according to device dpi</string>
<string name="init_map_directory_description">Directory with offline maps</string>
<string name="init_gpx_exportdir">GPX Export Directory</string>
<string name="init_gpx_importdir">GPX Import Directory</string>
@@ -510,7 +507,10 @@
<string name="init_use_native_ua">Android browser</string>
<string name="init_summary_use_native_ua">Identify as Android browser. Solves login problems when using certain network providers.</string>
<string name="init_rendertheme_folder">Map Themes Directory</string>
-
+ <string name="settings_open_website">Open website</string>
+ <string name="settings_settings">Settings</string>
+ <string name="settings_information">Information</string>
+
<!-- map sources -->
<string name="map_source_google_map">Google: Map</string>
<string name="map_source_google_satellite">Google: Satellite</string>
@@ -528,34 +528,23 @@
<string name="sendToCgeo_download_fail">c:geo failed to download caches. No internet connection, or send2c:geo is down.</string>
<string name="sendToCgeo_no_registration">c:geo failed to download caches. Registration for send2c:geo expired. Please register in settings.</string>
- <!-- auth twitter -->
+ <!-- auth generic -->
<string name="auth_twitter">Twitter</string>
<string name="auth_authorize">Authorize c:geo</string>
<string name="auth_start">Start authorization</string>
<string name="auth_again">Start again</string>
- <string name="auth_pin_hint">PIN assigned by Twitter</string>
<string name="auth_finish">Finish</string>
- <string name="auth_dialog_wait">Waiting for Twitter…</string>
- <string name="auth_dialog_pin_title">PIN code</string>
- <string name="auth_dialog_pin_message">Please type in the PIN code provided by Twitter. It is required to complete authorization.</string>
- <string name="auth_dialog_completed">c:geo is now authorized to post on Twitter.</string>
- <string name="about_auth_1">The following process will allow <b>c:geo</b> to access Twitter.</string>
- <string name="about_auth_2">Pressing the \"authorize c:geo\" button will start the process. This process will open up a web browser with a Twitter page. Log in on this page and allow <b>c:geo</b> to access your account. After this, Twitter will show up a numeric PIN code. This PIN must be pasted into <b>c:geo</b> and confirmed. That\'s all.</string>
+ <string name="auth_dialog_waiting">Waiting for %s…</string>
+ <string name="auth_explain_short">The following process will allow <b>c:geo</b> to access %s.</string>
+ <string name="auth_explain_long">Pressing the \"authorize c:geo\" button will start the process. This process will open up a web browser with a %s page. Log in on this page and allow <b>c:geo</b> to access your account. That\'s all.</string>
+
+ <!-- auth Twitter -->
+ <string name="auth_dialog_completed_twitter">c:geo is now authorized to post on Twitter.</string>
<!-- auth opencaching -->
<string name="auth_ocde">opencaching.de</string>
<string name="auth_ocpl">opencaching.pl</string>
- <string name="auth_authorize_oc">Authorize c:geo</string>
- <string name="auth_start_oc">Start authorization</string>
- <string name="auth_again_oc">Start again</string>
- <string name="auth_pin_hint_oc">PIN assigned by %s</string>
- <string name="auth_finish_oc">Finish</string>
- <string name="auth_dialog_wait_oc">Waiting for %s…</string>
- <string name="auth_dialog_pin_title_oc">PIN code</string>
- <string name="auth_dialog_pin_message_oc">Please type in PIN code provided by the %s website. It is required to complete authorization.</string>
<string name="auth_dialog_completed_oc">c:geo is now authorized to interact with %s.</string>
- <string name="about_auth_1_oc">The following process allows <b>c:geo</b> to access %s.</string>
- <string name="about_auth_2_oc">Pressing the \"authorize c:geo\" button will start the process. This process will open up a web browser with a %s page. Log in on this page and allow <b>c:geo</b> to access your account. After this, %s will show up a numeric PIN code. This PIN must be pasted into <b>c:geo</b> and confirmed. That\'s all.</string>
<!-- cache -->
<plurals name="cache_counts">
@@ -894,6 +883,7 @@
<string name="destination_set">Set destination</string>
<string name="navigation_direct_navigation">Direct Navigation</string>
<string name="navigation_target">Target</string>
+ <string name="err_nav_no_coordinates">Cannot start navigation with no coordinates</string>
<!-- license -->
<string name="license">License</string>
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index 7ea3b59..6001783 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -1,564 +1,531 @@
<?xml version="1.0" encoding="UTF-8"?>
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:cgeo="http://schemas.android.com/apk/res/cgeo.geocaching"
android:key="@string/pref_fakekey_main_screen" >
<PreferenceScreen
- android:title="@string/settings_title_services"
android:icon="?attr/settings_cloud"
- android:key="@string/pref_fakekey_services_screen" >
-
- <PreferenceCategory
- android:title="@string/settings_category_geocaching" >
-
- <PreferenceScreen
- android:title="@string/settings_title_gc" >
-
- <cgeo.geocaching.settings.CheckBoxWithPopupPreference
- android:key="@string/pref_connectorGCActive"
- android:title="@string/settings_activate_gc"
- cgeo:title="@string/settings_title_gc"
- cgeo:text="@string/settings_gc_legal_note"
- cgeo:url="@string/settings_gc_legal_note_url"
- cgeo:urlButton="@string/settings_goto_url_button"
- android:defaultValue="true" />
- <EditTextPreference
- android:key="@string/pref_username"
- android:title="@string/init_username"
- android:dialogTitle="@string/init_username"
- android:hint="@string/init_username"
- android:dependency="@string/pref_connectorGCActive"
- android:singleLine="true"
- android:imeOptions="actionDone" />
- <cgeo.geocaching.settings.EditPasswordPreference
- android:key="@string/pref_password"
- android:title="@string/init_password"
- android:dialogTitle="@string/init_password"
- android:hint="@string/init_password"
- android:inputType="textPassword"
- android:dependency="@string/pref_connectorGCActive"
- android:singleLine="true"
- android:imeOptions="actionDone" />
- <cgeo.geocaching.settings.CheckGcCredentialsPreference
- android:title="@string/init_login"
- android:dependency="@string/pref_connectorGCActive" />
- <PreferenceScreen
- android:title="@string/settings_title_basicmembers"
- android:key="@string/pref_fakekey_basicmembers_screen"
- android:dependency="@string/pref_connectorGCActive" >
- <CheckBoxPreference
- android:key="@string/pref_showcaptcha"
- android:title="@string/init_captcha"
- android:summary="@string/init_summary_captcha"
- android:defaultValue="false" />
- <CheckBoxPreference
- android:key="@string/pref_loaddirectionimg"
- android:title="@string/init_loaddirectionimg"
- android:summary="@string/init_summary_loaddirectionimg"
- android:defaultValue="true" />
- </PreferenceScreen>
- <cgeo.geocaching.settings.InfoPreference
- android:title="@string/settings_info_facebook_login_title"
- android:text="@string/settings_info_facebook_login"
- cgeo:url="@string/settings_facebook_login_url"
- cgeo:urlButton="@string/settings_goto_url_button" />
-
- </PreferenceScreen>
-
- <PreferenceScreen
- android:title="@string/init_oc" >
-
- <CheckBoxPreference
- android:key="@string/pref_connectorOCActive"
- android:title="@string/settings_activate_oc"
- android:defaultValue="false" />
- <cgeo.geocaching.settings.TextPreference
- android:layout="@layout/text_preference"
- android:text="@string/init_oc_de_description"
- android:dependency="@string/pref_connectorOCActive" />
- <cgeo.geocaching.settings.AuthorizeOcPreference
- android:key="@string/pref_fakekey_ocde_authorization"
- android:dependency="@string/pref_connectorOCActive" />
-
- </PreferenceScreen>
-
- <PreferenceScreen
- android:title="@string/init_oc_pl" >
-
- <CheckBoxPreference
- android:key="@string/pref_connectorOCPLActive"
- android:title="@string/settings_activate_oc_pl"
- android:defaultValue="false" />
- <cgeo.geocaching.settings.TextPreference
- android:layout="@layout/text_preference"
- android:text="@string/init_oc_pl_description"
- android:dependency="@string/pref_connectorOCPLActive" />
- <cgeo.geocaching.settings.AuthorizeOcPreference
- android:key="@string/pref_fakekey_ocpl_authorization"
- android:dependency="@string/pref_connectorOCPLActive" />
-
- </PreferenceScreen>
-
- <PreferenceScreen
- android:title="@string/init_gcvote" >
-
- <cgeo.geocaching.settings.EditPasswordPreference
- android:key="@string/pref_pass_vote"
- android:title="@string/init_password"
- android:dialogTitle="@string/init_password"
- android:hint="@string/init_password"
- android:inputType="textPassword"
- android:singleLine="true"
- android:imeOptions="actionDone" />
-
- </PreferenceScreen>
-
- <PreferenceScreen
- android:title="@string/init_sendToCgeo" >
-
- <cgeo.geocaching.settings.InfoPreference
- android:title="@string/settings_info_send2cgeo_title"
- android:text="@string/init_sendToCgeo_description"
- cgeo:url="@string/settings_send2cgeo_url"
- cgeo:urlButton="@string/settings_goto_url_button" />
- <EditTextPreference
- android:key="@string/pref_webDeviceName"
- android:title="@string/init_sendToCgeo_name"
- android:dialogTitle="@string/init_sendToCgeo_name"
- android:singleLine="true"
- android:imeOptions="actionDone" />
- <cgeo.geocaching.settings.RegisterSend2CgeoPreference
- android:title="@string/init_sendToCgeo_register" />
-
- </PreferenceScreen>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/settings_category_social" >
- <PreferenceScreen
- android:title="@string/init_twitter" >
-
- <CheckBoxPreference
- android:key="@string/pref_twitter"
- android:title="@string/settings_activate_twitter"
- android:defaultValue="false" />
- <cgeo.geocaching.settings.TextPreference
- android:layout="@layout/text_preference"
- android:text="@string/about_twitter"
- android:dependency="@string/pref_twitter" />
- <cgeo.geocaching.settings.AuthorizeTwitterPreference
- android:key="@string/pref_fakekey_twitter_authorization"
- android:dependency="@string/pref_twitter" />
-
- </PreferenceScreen>
+ android:key="@string/pref_fakekey_services_screen"
+ android:title="@string/settings_title_services" >
+ <PreferenceCategory android:title="@string/settings_category_geocaching" >
+ <PreferenceScreen android:title="@string/settings_title_gc" >
+ <PreferenceCategory android:title="@string/settings_settings" >
+ <cgeo.geocaching.settings.CheckBoxWithPopupPreference
+ android:defaultValue="true"
+ android:key="@string/pref_connectorGCActive"
+ android:title="@string/settings_activate_gc"
+ cgeo:text="@string/settings_gc_legal_note"
+ cgeo:title="@string/settings_title_gc"
+ cgeo:url="@string/settings_gc_legal_note_url"
+ cgeo:urlButton="@string/settings_goto_url_button" />
+
+ <EditTextPreference
+ android:dependency="@string/pref_connectorGCActive"
+ android:dialogTitle="@string/init_username"
+ android:hint="@string/init_username"
+ android:imeOptions="actionDone"
+ android:key="@string/pref_username"
+ android:singleLine="true"
+ android:title="@string/init_username" />
+
+ <cgeo.geocaching.settings.EditPasswordPreference
+ android:dependency="@string/pref_connectorGCActive"
+ android:dialogTitle="@string/init_password"
+ android:hint="@string/init_password"
+ android:imeOptions="actionDone"
+ android:inputType="textPassword"
+ android:key="@string/pref_password"
+ android:singleLine="true"
+ android:title="@string/init_password" />
+
+ <cgeo.geocaching.settings.CheckGcCredentialsPreference
+ android:dependency="@string/pref_connectorGCActive"
+ android:title="@string/init_login" />
+
+ <PreferenceScreen
+ android:dependency="@string/pref_connectorGCActive"
+ android:key="@string/pref_fakekey_basicmembers_screen"
+ android:title="@string/settings_title_basicmembers" >
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="@string/pref_showcaptcha"
+ android:summary="@string/init_summary_captcha"
+ android:title="@string/init_captcha" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="@string/pref_loaddirectionimg"
+ android:summary="@string/init_summary_loaddirectionimg"
+ android:title="@string/init_loaddirectionimg" />
+ </PreferenceScreen>
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/settings_information" >
+ <cgeo.geocaching.settings.InfoPreference
+ android:text="@string/settings_info_facebook_login"
+ android:title="@string/settings_info_facebook_login_title"
+ cgeo:url="@string/settings_facebook_login_url"
+ cgeo:urlButton="@string/settings_goto_url_button" />
+
+ <Preference
+ android:key="@string/pref_fakekey_gc_website"
+ android:title="@string/settings_open_website" />
+ </PreferenceCategory>
+ </PreferenceScreen>
+ <PreferenceScreen android:title="@string/init_oc" >
+ <PreferenceCategory android:title="@string/settings_settings" >
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="@string/pref_connectorOCActive"
+ android:title="@string/settings_activate_oc" />
+
+ <cgeo.geocaching.settings.TextPreference
+ android:dependency="@string/pref_connectorOCActive"
+ android:layout="@layout/text_preference"
+ android:text="@string/init_oc_de_description" />
+
+ <cgeo.geocaching.settings.OAuthPreference
+ android:dependency="@string/pref_connectorOCActive"
+ android:key="@string/pref_fakekey_ocde_authorization" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/settings_information" >
+ <Preference
+ android:key="@string/pref_fakekey_ocde_website"
+ android:title="@string/settings_open_website" />
+ </PreferenceCategory>
+ </PreferenceScreen>
+ <PreferenceScreen android:title="@string/init_oc_pl" >
+ <PreferenceCategory android:title="@string/settings_settings" >
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="@string/pref_connectorOCPLActive"
+ android:title="@string/settings_activate_oc_pl" />
+
+ <cgeo.geocaching.settings.TextPreference
+ android:dependency="@string/pref_connectorOCPLActive"
+ android:layout="@layout/text_preference"
+ android:text="@string/init_oc_pl_description" />
+
+ <cgeo.geocaching.settings.OAuthPreference
+ android:dependency="@string/pref_connectorOCPLActive"
+ android:key="@string/pref_fakekey_ocpl_authorization" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/settings_information" >
+ <Preference
+ android:key="@string/pref_fakekey_ocpl_website"
+ android:title="@string/settings_open_website" />
+ </PreferenceCategory>
+ </PreferenceScreen>
+ <PreferenceScreen android:title="@string/init_gcvote" >
+ <PreferenceCategory android:title="@string/settings_settings" >
+ <cgeo.geocaching.settings.EditPasswordPreference
+ android:dialogTitle="@string/init_password"
+ android:hint="@string/init_password"
+ android:imeOptions="actionDone"
+ android:inputType="textPassword"
+ android:key="@string/pref_pass_vote"
+ android:singleLine="true"
+ android:title="@string/init_password" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/settings_information" >
+ <Preference
+ android:key="@string/pref_fakekey_gcvote_website"
+ android:title="@string/settings_open_website" />
+ </PreferenceCategory>
+ </PreferenceScreen>
+ <PreferenceScreen android:title="@string/init_sendToCgeo" >
+ <PreferenceCategory android:title="@string/settings_settings" >
+ <EditTextPreference
+ android:dialogTitle="@string/init_sendToCgeo_name"
+ android:imeOptions="actionDone"
+ android:key="@string/pref_webDeviceName"
+ android:singleLine="true"
+ android:title="@string/init_sendToCgeo_name" />
+
+ <cgeo.geocaching.settings.RegisterSend2CgeoPreference android:title="@string/init_sendToCgeo_register" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/settings_information" >
+ <cgeo.geocaching.settings.InfoPreference
+ android:text="@string/init_sendToCgeo_description"
+ android:title="@string/settings_info_send2cgeo_title"
+ cgeo:url="@string/settings_send2cgeo_url"
+ cgeo:urlButton="@string/settings_goto_url_button" />
+
+ <Preference
+ android:key="@string/pref_fakekey_sendtocgeo_website"
+ android:title="@string/settings_open_website" />
+ </PreferenceCategory>
+ </PreferenceScreen>
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/settings_category_browser" >
-
- <CheckBoxPreference
+ <PreferenceCategory android:title="@string/settings_category_social" >
+ <PreferenceScreen android:title="@string/init_twitter" >
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="@string/pref_twitter"
+ android:title="@string/settings_activate_twitter" />
+
+ <cgeo.geocaching.settings.TextPreference
+ android:dependency="@string/pref_twitter"
+ android:layout="@layout/text_preference"
+ android:text="@string/about_twitter" />
+
+ <cgeo.geocaching.settings.OAuthPreference
+ android:dependency="@string/pref_twitter"
+ android:key="@string/pref_fakekey_twitter_authorization" />
+ </PreferenceScreen>
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/settings_category_browser" >
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_nativeUa"
- android:title="@string/init_use_native_ua"
android:summary="@string/init_summary_use_native_ua"
- android:defaultValue="false" />
-
+ android:title="@string/init_use_native_ua" />
</PreferenceCategory>
-
</PreferenceScreen>
-
<PreferenceScreen
- android:title="@string/settings_title_appearance"
- android:icon="?attr/settings_eye" >
-
- <CheckBoxPreference
+ android:icon="?attr/settings_eye"
+ android:title="@string/settings_title_appearance" >
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_skin"
- android:title="@string/init_skin"
android:summary="@string/init_summary_skin"
- android:defaultValue="false" />
- <CheckBoxPreference
+ android:title="@string/init_skin" />
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_showaddress"
- android:title="@string/init_address"
android:summary="@string/init_summary_address"
- android:defaultValue="true" />
- <CheckBoxPreference
+ android:title="@string/init_address" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_plainLogs"
- android:title="@string/init_plain_logs"
android:summary="@string/init_summary_plain_logs"
- android:defaultValue="false" />
- <CheckBoxPreference
+ android:title="@string/init_plain_logs" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_useenglish"
- android:title="@string/init_useenglish"
android:summary="@string/init_summary_useenglish"
- android:defaultValue="false" />
- <CheckBoxPreference
+ android:title="@string/init_useenglish" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_units"
- android:title="@string/init_units"
android:summary="@string/init_summary_units"
- android:defaultValue="false" />
-
+ android:title="@string/init_units" />
</PreferenceScreen>
-
<PreferenceScreen
- android:title="@string/settings_title_cachedetails"
- android:icon="?attr/settings_details" >
-
- <CheckBoxPreference
+ android:icon="?attr/settings_details"
+ android:title="@string/settings_title_cachedetails" >
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_autoloaddesc"
- android:title="@string/init_autoload"
android:summary="@string/init_summary_autoload"
- android:defaultValue="true" />
- <CheckBoxPreference
+ android:title="@string/init_autoload" />
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_ratingwanted"
- android:title="@string/init_ratingwanted"
android:summary="@string/init_summary_ratingwanted"
- android:defaultValue="true" />
- <CheckBoxPreference
+ android:title="@string/init_ratingwanted" />
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_friendlogswanted"
- android:title="@string/init_friendlogswanted"
android:summary="@string/init_summary_friendlogswanted"
- android:defaultValue="true" />
- <CheckBoxPreference
+ android:title="@string/init_friendlogswanted" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_opendetailslastpage"
- android:title="@string/init_openlastdetailspage"
android:summary="@string/init_summary_openlastdetailspage"
- android:defaultValue="false" />
- <CheckBoxPreference
+ android:title="@string/init_openlastdetailspage" />
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_livelist"
- android:title="@string/init_livelist"
android:summary="@string/init_summary_livelist"
- android:defaultValue="true" />
- <CheckBoxPreference
+ android:title="@string/init_livelist" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_excludemine"
- android:title="@string/init_exclude"
android:summary="@string/init_summary_exclude"
- android:defaultValue="false" />
- <CheckBoxPreference
+ android:title="@string/init_exclude" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_excludedisabled"
- android:title="@string/init_disabled"
android:summary="@string/init_summary_disabled"
- android:defaultValue="false" />
-
+ android:title="@string/init_disabled" />
</PreferenceScreen>
-
<PreferenceScreen
- android:title="@string/settings_title_map"
- android:icon="?attr/settings_map" >
-
- <PreferenceCategory
- android:title="@string/settings_title_map_data" >
-
+ android:icon="?attr/settings_map"
+ android:title="@string/settings_title_map" >
+ <PreferenceCategory android:title="@string/settings_title_map_data" >
<ListPreference
- android:key="@string/pref_mapsource"
- android:title="@string/init_mapsource_select"
+ android:defaultValue="0"
android:dialogTitle="@string/init_mapsource_select"
- android:defaultValue="0" />
-
- <cgeo.geocaching.settings.InfoPreference
- android:title="@string/settings_info_offline_maps_title"
+ android:key="@string/pref_mapsource"
+ android:title="@string/init_mapsource_select" />
+
+ <cgeo.geocaching.settings.InfoPreference
android:text="@string/settings_info_offline_maps"
+ android:title="@string/settings_info_offline_maps_title"
cgeo:url="@string/settings_offline_maps_url"
cgeo:urlButton="@string/settings_goto_url_button" />
-
+
<Preference
android:key="@string/pref_mapDirectory"
android:title="@string/init_map_directory_description" />
-
- <cgeo.geocaching.settings.InfoPreference
- android:title="@string/settings_info_themes_title"
+
+ <cgeo.geocaching.settings.InfoPreference
android:text="@string/settings_info_themes"
+ android:title="@string/settings_info_themes_title"
cgeo:url="@string/settings_themes_url"
cgeo:urlButton="@string/settings_goto_url_button" />
-
+
<Preference
android:key="@string/pref_renderthemepath"
android:title="@string/init_rendertheme_folder" />
+ <CheckBoxPreference
+ android:key="@string/pref_mapsforge_scale_text"
+ android:title="@string/settings_title_scale_map_text"
+ android:summary="@string/settings_summary_scale_map_text"
+ android:defaultValue="true" />
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/settings_title_map_content" >
-
+ <PreferenceCategory android:title="@string/settings_title_map_content" >
<Preference
- android:title="@string/init_showwaypoints"
+ android:selectable="false"
android:summary="@string/init_showwaypoint_description"
- android:selectable="false" />
+ android:title="@string/init_showwaypoints" />
+
<cgeo.geocaching.settings.WpThresholdPreference
android:key="@string/pref_showwaypointsthreshold"
android:layout="@layout/wp_threshold_preference" />
- <CheckBoxPreference
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_maptrail"
- android:title="@string/init_maptrail"
android:summary="@string/init_summary_maptrail"
- android:defaultValue="true" />
-
+ android:title="@string/init_maptrail" />
</PreferenceCategory>
-
</PreferenceScreen>
-
<PreferenceScreen
- android:title="@string/settings_title_logging"
- android:icon="?attr/settings_pen" >
-
- <PreferenceCategory
- android:title="@string/init_signature">
-
+ android:icon="?attr/settings_pen"
+ android:title="@string/settings_title_logging" >
+ <PreferenceCategory android:title="@string/init_signature" >
<cgeo.geocaching.settings.LogSignaturePreference
android:key="@string/pref_signature"
android:title="@string/init_signature" />
- <CheckBoxPreference
- android:key="@string/pref_sigautoinsert"
- android:title="@string/init_sigautoinsert"
- android:defaultValue="true" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="@string/pref_sigautoinsert"
+ android:title="@string/init_sigautoinsert" />
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/settings_category_logging_other">
-
- <CheckBoxPreference
+ <PreferenceCategory android:title="@string/settings_category_logging_other" >
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_trackautovisit"
- android:title="@string/init_trackautovisit"
android:summary="@string/init_summary_trackautovisit"
- android:defaultValue="false" />
- <CheckBoxPreference
+ android:title="@string/init_trackautovisit" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_log_offline"
- android:title="@string/init_log_offline"
android:summary="@string/init_summary_log_offline"
- android:defaultValue="false" />
-
+ android:title="@string/init_log_offline" />
</PreferenceCategory>
-
</PreferenceScreen>
-
<PreferenceScreen
- android:title="@string/settings_title_offlinedata"
- android:icon="?attr/settings_sdcard" >
-
- <CheckBoxPreference
+ android:icon="?attr/settings_sdcard"
+ android:title="@string/settings_title_offlinedata" >
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_offlinemaps"
- android:title="@string/init_offline"
android:summary="@string/init_summary_offline"
- android:defaultValue="true" />
- <CheckBoxPreference
+ android:title="@string/init_offline" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_offlinewpmaps"
- android:title="@string/init_offline_wp"
android:summary="@string/init_summary_offline_wp"
- android:defaultValue="false" />
- <CheckBoxPreference
+ android:title="@string/init_offline_wp" />
+ <CheckBoxPreference
+ android:defaultValue="false"
android:key="@string/pref_logimages"
- android:title="@string/init_save_log_img"
android:summary="@string/init_summary_save_log_img"
- android:defaultValue="false" />
- <CheckBoxPreference
+ android:title="@string/init_save_log_img" />
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_choose_list"
- android:title="@string/init_choose_list"
android:summary="@string/init_summary_choose_list"
- android:defaultValue="true" />
-
+ android:title="@string/init_choose_list" />
</PreferenceScreen>
-
<PreferenceScreen
- android:title="@string/settings_title_navigation"
- android:icon="?attr/settings_arrow" >
-
- <PreferenceCategory
- android:title="@string/init_default_navigation_tool" >
-
+ android:icon="?attr/settings_arrow"
+ android:title="@string/settings_title_navigation" >
+ <PreferenceCategory android:title="@string/init_default_navigation_tool" >
<cgeo.geocaching.settings.TextPreference
android:layout="@layout/text_preference"
android:text="@string/init_default_navigation_tool_description" />
<ListPreference
- android:key="@string/pref_defaultNavigationTool"
- android:title="@string/init_default_navigation_tool_select"
+ android:defaultValue="0"
android:dialogTitle="@string/init_default_navigation_tool_select"
- android:defaultValue="0" />
+ android:key="@string/pref_defaultNavigationTool"
+ android:title="@string/init_default_navigation_tool_select" />
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/init_secondary_navigation_tool" >
-
+ <PreferenceCategory android:title="@string/init_secondary_navigation_tool" >
<cgeo.geocaching.settings.TextPreference
android:layout="@layout/text_preference"
android:text="@string/init_default_navigation_tool_2_description" />
<ListPreference
- android:key="@string/pref_defaultNavigationTool2"
- android:title="@string/init_default_navigation_tool_select"
+ android:defaultValue="0"
android:dialogTitle="@string/init_default_navigation_tool_select"
- android:defaultValue="0" />
-
+ android:key="@string/pref_defaultNavigationTool2"
+ android:title="@string/init_default_navigation_tool_select" />
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/settings_title_navigation_menu" >
-
+ <PreferenceCategory android:title="@string/settings_title_navigation_menu" >
<cgeo.geocaching.settings.TextPreference
android:layout="@layout/text_preference"
android:text="@string/init_navigation_menu_description" />
-
+
<PreferenceScreen
- android:title="@string/settings_title_navigation_menu"
- android:key="@string/pref_fakekey_navigation_menu_screen" >
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_compass"
- android:title="@string/compass_title" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_radar"
- android:title="@string/cache_menu_radar" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_internal_map"
- android:title="@string/cache_menu_map" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_static_map"
- android:title="@string/cache_menu_map_static" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_static_map_download"
- android:title="@string/cache_menu_download_map_static" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_locus"
- android:title="@string/caches_map_locus" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_rmaps"
- android:title="@string/cache_menu_rmaps" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_google_maps"
- android:title="@string/cache_menu_map_ext" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_google_navigation"
- android:title="@string/cache_menu_navigation_drive" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_google_streetview"
- android:title="@string/cache_menu_streetview" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_oruxmaps"
- android:title="@string/cache_menu_oruxmaps" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_navigon"
- android:title="@string/cache_menu_navigon" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_sygic"
- android:title="@string/cache_menu_sygic" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_google_walk"
- android:title="@string/cache_menu_navigation_walk" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_google_bike"
- android:title="@string/cache_menu_navigation_bike" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_google_maps_directions"
- android:title="@string/cache_menu_maps_directions" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_cache_beacon"
- android:title="@string/cache_menu_cachebeacon" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_gcc"
- android:title="@string/cache_menu_gcc" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:enabled="false"
- android:key="@string/pref_navigation_menu_where_you_go"
- android:title="@string/cache_menu_whereyougo" />
- </PreferenceScreen>
- </PreferenceCategory>
+ android:key="@string/pref_fakekey_navigation_menu_screen"
+ android:title="@string/settings_title_navigation_menu" >
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_compass"
+ android:title="@string/compass_title" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_radar"
+ android:title="@string/cache_menu_radar" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_internal_map"
+ android:title="@string/cache_menu_map" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_static_map"
+ android:title="@string/cache_menu_map_static" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_static_map_download"
+ android:title="@string/cache_menu_download_map_static" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_locus"
+ android:title="@string/caches_map_locus" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_rmaps"
+ android:title="@string/cache_menu_rmaps" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_google_maps"
+ android:title="@string/cache_menu_map_ext" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_google_navigation"
+ android:title="@string/cache_menu_navigation_drive" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_google_streetview"
+ android:title="@string/cache_menu_streetview" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_oruxmaps"
+ android:title="@string/cache_menu_oruxmaps" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_navigon"
+ android:title="@string/cache_menu_navigon" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_sygic"
+ android:title="@string/cache_menu_sygic" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_google_walk"
+ android:title="@string/cache_menu_navigation_walk" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_google_bike"
+ android:title="@string/cache_menu_navigation_bike" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_google_maps_directions"
+ android:title="@string/cache_menu_maps_directions" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_cache_beacon"
+ android:title="@string/cache_menu_cachebeacon" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_gcc"
+ android:title="@string/cache_menu_gcc" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:enabled="false"
+ android:key="@string/pref_navigation_menu_where_you_go"
+ android:title="@string/cache_menu_whereyougo" />
+ </PreferenceScreen>
+ </PreferenceCategory>
</PreferenceScreen>
-
<PreferenceScreen
- android:title="@string/settings_title_system"
- android:icon="?attr/settings_nut" >
-
- <PreferenceCategory
- android:title="@string/settings_title_gpx" >
-
+ android:icon="?attr/settings_nut"
+ android:title="@string/settings_title_system" >
+ <PreferenceCategory android:title="@string/settings_title_gpx" >
<Preference
android:key="@string/pref_gpxExportDir"
android:title="@string/init_gpx_exportdir" />
<Preference
android:key="@string/pref_gpxImportDir"
android:title="@string/init_gpx_importdir" />
-
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/init_backup" >
-
+ <PreferenceCategory android:title="@string/init_backup" >
<cgeo.geocaching.settings.TextPreference
android:key="@string/pref_fakekey_preference_backup_info"
android:layout="@layout/text_preference"
android:text="@string/init_backup_note" />
- <Preference
+
+ <Preference
android:key="@string/pref_fakekey_preference_backup"
android:title="@string/init_backup_backup" />
- <Preference
+ <Preference
android:key="@string/pref_fakekey_preference_restore"
android:title="@string/init_backup_restore" />
-
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/init_dbonsdcard_title" >
-
+ <PreferenceCategory android:title="@string/init_dbonsdcard_title" >
<cgeo.geocaching.settings.TextPreference
android:layout="@layout/text_preference"
android:text="@string/init_dbonsdcard_note" />
- <CheckBoxPreference
- android:key="@string/pref_dbonsdcard"
- android:title="@string/init_dbonsdcard"
- android:defaultValue="false" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="@string/pref_dbonsdcard"
+ android:title="@string/init_dbonsdcard" />
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/init_debug_title" >
-
+ <PreferenceCategory android:title="@string/init_debug_title" >
<cgeo.geocaching.settings.TextPreference
android:layout="@layout/text_preference"
android:text="@string/init_debug_note" />
- <CheckBoxPreference
- android:key="@string/pref_debug"
- android:title="@string/init_debug"
- android:defaultValue="false" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="@string/pref_debug"
+ android:title="@string/init_debug" />
</PreferenceCategory>
-
</PreferenceScreen>
-</PreferenceScreen>
+</PreferenceScreen> \ No newline at end of file
generated by cgit v1.1 at 2025-11-16 22:20:43 +0000