Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramImprovements

This commit is contained in:
Chumva 2018-10-01 11:09:22 +03:00
commit 347cfb596a
39 changed files with 473 additions and 290 deletions

View file

@ -152,6 +152,7 @@ public class Way extends Entity {
}
}
// Returns top - as maximum latitude, bottom as minimum
public QuadRect getLatLonBBox() {
QuadRect qr = null;
if (nodes != null) {

View file

@ -389,9 +389,11 @@ public class GeneralRouter implements VehicleRouter {
public double getRightTurn() {
return rightTurn;
}
public double getRoundaboutTurn() {
return roundaboutTurn;
}
@Override
public double calculateTurnTime(RouteSegment segment, int segmentEnd, RouteSegment prev, int prevSegmentEnd) {
float ts = getPenaltyTransition(segment.getRoad());

View file

@ -393,6 +393,9 @@ dependencies {
// implementation 'com.ibm.icu:icu4j:50.1'
// implementation 'net.sf.trove4j:trove4j:3.0.3'
qtcoreImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
qtcoredebugImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"

View file

@ -1,4 +1,3 @@
# APP_STL := gnustl_shared
APP_STL := c++_shared
APP_CPPFLAGS := -std=c++11 -fexceptions -frtti
APP_SHORT_COMMANDS := true
@ -6,9 +5,6 @@ APP_SHORT_COMMANDS := true
# Specify least supported Android platform version
APP_PLATFORM := android-14
# NDK_TOOLCHAIN_VERSION := 4.7
# NDK_TOOLCHAIN_VERSION := 4.9
# NDK_TOOLCHAIN_VERSION := 4.8
NDK_TOOLCHAIN_VERSION := clang
APP_ABI := x86 armeabi-v7a arm64-v8a
ifdef ARMV7_ONLY

View file

@ -4,23 +4,19 @@ SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
NAME=$(basename $(dirname "${BASH_SOURCE[0]}") )
if [ -d "$ANDROID_HOME" ]; then
# for backwards compatbility
export ANDROID_SDK=$ANDROID_HOME
else
echo "ANDROID_HOME is not set, trying ANDROID_SDK:"
if [ -d "$ANDROID_SDK" ]; then
export ANDROID_HOME=$ANDROID_SDK
else
echo "ANDROID_SDK is also not set"
exit
fi
export ANDROID_SDK_ROOT=$ANDROID_HOME
fi
if [ ! -d "$ANDROID_NDK" ]; then
if [ -d "$ANDROID_NDK" ]; then
export ANDROID_NDK_ROOT=$ANDROID_NDK
fi
if [ ! -d "$ANDROID_SDK_ROOT" ]; then
echo "ANDROID_SDK is not set"
exit
fi
if [ ! -d "$ANDROID_NDK_ROOT" ]; then
echo "ANDROID_NDK is not set"
exit
fi
export ANDROID_SDK_ROOT=$ANDROID_HOME
export ANDROID_NDK_ROOT=$ANDROID_NDK
#export ANDROID_NDK_TOOLCHAIN_VERSION=4.7
export BUILD_ONLY_OLD_LIB=1
"$SCRIPT_LOC/../../core-legacy/externals/configure.sh"
(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j2)
(cd "$SCRIPT_LOC" && "$ANDROID_NDK_ROOT/ndk-build" -j2)

View file

@ -3020,4 +3020,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
\n "</string>
<string name="ask_for_location_permission">Per continuar cal que doneu a OsmAnd accés a la ubicació.</string>
<string name="rendering_value_black_name">Negre</string>
<string name="search_street">Cerca un carrer</string>
<string name="start_search_from_city">Comença la cerca des de la ciutat</string>
<string name="shared_string_restore">Restaura</string>
<string name="keep_passed_markers_descr">Els marcadors afegits a un grup de Preferits i les fites GPX ja assolides romandran al mapa. Si el grup no estigués activat, els marcadors no apareixerien al mapa.</string>
<string name="keep_passed_markers">Manté al mapa les fites assolides</string>
<string name="more_transport_on_stop_hint">Hi ha altres mitjans de transport en aquesta parada.</string>
</resources>

View file

@ -541,13 +541,13 @@
<string name="poi_townhall">Rathaus</string>
<string name="poi_toys">Spielwarenhandlung</string>
<string name="poi_trade">Baustoffhandlung</string>
<string name="poi_traffic_calming_bump">Bodenwelle</string>
<string name="poi_traffic_calming_bump">Bodenschwelle</string>
<string name="poi_traffic_calming_chicane">Schikane</string>
<string name="poi_traffic_calming_choker">Fahrbahnverengung</string>
<string name="poi_traffic_calming_cushion">Bodenwelle</string>
<string name="poi_traffic_calming_hump">Bodenwelle</string>
<string name="poi_traffic_calming_rumble_strip">Holperstreifen</string>
<string name="poi_traffic_calming_table">Bodenwelle</string>
<string name="poi_traffic_calming_table">Geschwindigkeitstabelle</string>
<string name="poi_traffic_signals">Ampel</string>
<string name="poi_tram_stop">Straßenbahnhaltestelle</string>
<string name="poi_travel_agent">Reisebüro</string>

View file

@ -3103,4 +3103,10 @@ Abgedeckte Fläche: %1$s x %2$s</string>
\n</string>
<string name="ask_for_location_permission">Bitte lassen Sie zu, dass OsmAnd auf den Standort zugreifen darf.</string>
<string name="rendering_value_black_name">Schwarz</string>
<string name="search_street">Straße suchen</string>
<string name="start_search_from_city">Suche von der Stadt aus starten</string>
<string name="shared_string_restore">Wiederherstellen</string>
<string name="keep_passed_markers_descr">Markierungen, die als Gruppe von Favoriten oder GPX-Wegpunkten hinzugefügt wurden, die als \'Passiert\' markiert sind, bleiben auf der Karte erhalten. Wenn die Gruppe nicht aktiv ist, verschwinden die Marker von der Karte.</string>
<string name="keep_passed_markers">Passierte Markierungen auf der Karte behalten</string>
<string name="more_transport_on_stop_hint">An dieser Haltestelle gibt es mehrere Verbindungen.</string>
</resources>

View file

@ -2975,4 +2975,9 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="ask_for_location_permission">Permesu al OsmAnd aliron al pozicio por pluigi.</string>
<string name="rendering_value_black_name">Nigra</string>
<string name="more_transport_on_stop_hint">Estas pliaj transportiloj ĉe tiu ĉi haltejo.</string>
<string name="search_street">Serĉi straton</string>
<string name="start_search_from_city">Ekigi serĉi de urbo</string>
<string name="shared_string_restore">Restarigi</string>
<string name="keep_passed_markers_descr">Markoj aldonitaj kiel grupo de ŝatataj aŭ pasigitaj GPX-navigadpunktoj restos sur la mapo. Se la grupo estas malaktiva, ĝiaj markoj malaperos de la mapo.</string>
<string name="keep_passed_markers">Ne kaŝi pasigitajn map-markojn de la mapo</string>
</resources>

View file

@ -158,8 +158,8 @@
<string name="poi_toll_booth">Cabina de peaje</string>
<string name="poi_border_control">Control fronterizo</string>
<string name="poi_traffic_calming_bump">Lomo de burro (pequeño);Reductor de velocidad;Lomada;Lomo de toro;Badén;Banda de frenado</string>
<string name="poi_traffic_calming_hump">Resalte (grande);Badén</string>
<string name="poi_traffic_calming_cushion">Cojín</string>
<string name="poi_traffic_calming_hump">Resalte (grande);Lomada (grande);Reductor de velocidad (lomada, grande)</string>
<string name="poi_traffic_calming_cushion">Cojín berlinés</string>
<string name="poi_traffic_calming_chicane">Chicana</string>
<string name="poi_traffic_calming_rumble_strip">Banda sonora</string>
<string name="poi_traffic_calming_table">Peatonal elevada;Plataforma elevada</string>

View file

@ -2148,7 +2148,7 @@ Lon %2$s</string>
<string name="dist_away_from_my_location">Buscar en %1$s alrededor</string>
<string name="confirmation_to_delete_history_items">¿Quitar elementos marcados del «Historial»?</string>
<string name="back_to_search">Volver a la búsqueda</string>
<string name="coords_search">Búsqueda de coordenadas</string>
<string name="coords_search">Buscar coordenadas</string>
<string name="advanced_coords_search">Búsqueda avanzada de coordenadas</string>
<string name="route_stops_before">%1$s parada(s) anterior(es)</string>
<string name="rendering_attr_hideOverground_name">Objetos en superficie</string>
@ -2542,8 +2542,8 @@ Lon %2$s</string>
<string name="type_city_town">Escribe la ciudad o pueblo</string>
<string name="type_postcode">Escribe el código postal</string>
<string name="nearest_cities">Ciudades cercanas</string>
<string name="select_city">Elegir ciudad o pueblo</string>
<string name="select_postcode">Elegir código postal</string>
<string name="select_city">Elegir la ciudad o pueblo</string>
<string name="select_postcode">Elegir el código postal</string>
<string name="type_address">Escribe la dirección</string>
<string name="select_street">Elegir la calle</string>
<string name="shared_string_in_name">en %1$s</string>
@ -3014,4 +3014,10 @@ Lon %2$s</string>
\n</string>
<string name="ask_for_location_permission">Para continuar, debe permitir la ubicación a OsmAnd.</string>
<string name="rendering_value_black_name">Negro</string>
<string name="more_transport_on_stop_hint">Hay más transportes en esta parada.</string>
<string name="search_street">Buscar la calle</string>
<string name="start_search_from_city">Elegir la ciudad o pueblo</string>
<string name="shared_string_restore">Restaurar</string>
<string name="keep_passed_markers_descr">Los marcadores añadidos como un grupo de Favoritos o puntos de ruta GPX marcados como «Usados», permanecerán en el mapa. Si el grupo no está activo, los marcadores desaparecerán del mapa.</string>
<string name="keep_passed_markers">Mantener en el mapa los marcadores ya usados</string>
</resources>

View file

@ -152,9 +152,9 @@
<string name="poi_lift_gate">Barrera levadiza</string>
<string name="poi_toll_booth">Cabina de peaje</string>
<string name="poi_border_control">Control fronterizo</string>
<string name="poi_traffic_calming_bump">Reductor de velocidad (lomada, pequeño);Lomo de burro;Lomo de toro;Badén;Banda de frenado;Rompemuelle;Policía acostado</string>
<string name="poi_traffic_calming_hump">Resalte (grande);Badén</string>
<string name="poi_traffic_calming_cushion">Cojín</string>
<string name="poi_traffic_calming_bump">Reductor de velocidad (lomada, pequeño);Lomo de burro;Banda de frenado;Rompemuelle;Policía acostado</string>
<string name="poi_traffic_calming_hump">Resalte (grande);Lomada (grande);Reductor de velocidad (lomada, grande)</string>
<string name="poi_traffic_calming_cushion">Cojín berlinés</string>
<string name="poi_traffic_calming_chicane">Chicana</string>
<string name="poi_traffic_calming_rumble_strip">Banda sonora</string>
<string name="poi_traffic_calming_table">Peatonal elevada;Plataforma elevada</string>

View file

@ -2148,7 +2148,7 @@ Lon %2$s</string>
<string name="show_something_on_map">Mostrar «%1$s» en el mapa</string>
<string name="dist_away_from_my_location">Buscar en %1$s alrededor</string>
<string name="back_to_search">Volver a la búsqueda</string>
<string name="coords_search">Búsqueda de coordenadas</string>
<string name="coords_search">Buscar coordenadas</string>
<string name="advanced_coords_search">Búsqueda avanzada de coordenadas</string>
<string name="route_stops_before">%1$s parada(s) anterior(es)</string>
<string name="rendering_attr_hideOverground_name">Objetos en superficie</string>
@ -2543,8 +2543,8 @@ Lon %2$s</string>
<string name="type_city_town">Escribe la ciudad o pueblo</string>
<string name="type_postcode">Escribe el código postal</string>
<string name="nearest_cities">Ciudades cercanas</string>
<string name="select_city">Elegir ciudad o pueblo</string>
<string name="select_postcode">Elegir código postal</string>
<string name="select_city">Elegir la ciudad o pueblo</string>
<string name="select_postcode">Elegir el código postal</string>
<string name="type_address">Escribe la dirección</string>
<string name="select_street">Elegir la calle</string>
<string name="shared_string_in_name">en %1$s</string>
@ -3015,4 +3015,10 @@ Lon %2$s</string>
\n</string>
<string name="ask_for_location_permission">Para continuar, debe permitir la ubicación a OsmAnd.</string>
<string name="rendering_value_black_name">Negro</string>
<string name="more_transport_on_stop_hint">Hay más transportes en esta parada.</string>
<string name="search_street">Buscar la calle</string>
<string name="start_search_from_city">Elegir la ciudad o pueblo</string>
<string name="shared_string_restore">Restaurar</string>
<string name="keep_passed_markers_descr">Los marcadores añadidos como un grupo de Favoritos o puntos de ruta GPX marcados como «Usados», permanecerán en el mapa. Si el grupo no está activo, los marcadores desaparecerán del mapa.</string>
<string name="keep_passed_markers">Mantener en el mapa los marcadores ya usados</string>
</resources>

View file

@ -2986,12 +2986,19 @@
\nDenos su opinión</string>
<string name="commiting_way">Enviando vía…</string>
<string name="test_voice_desrc">Pulsa un botón y escucha el aviso de voz correspondiente para identificar las indicaciones que faltan o son defectuosas.</string>
<string name="release_3_2_pre">• Corregido el fallo en el inicio que se producía con los mapas no latinos
<string name="release_3_2_pre">"• Corregido el fallo en el inicio que se producía con los mapas no latinos
\n
\n • Mejora en los problemas de velocidad de renderizado en dispositivos Android 8.0
\n
\n • Soporte para la edición de objetos poligonales (no servicios)
\n
\n • Mejora en los problemas de velocidad de renderizado en dispositivos Android 8.0
\n
\n • Soporte para la edición de objetos poligonales (no servicios)
\n</string>
\n • Medir distancia: agregar botón Medir en Acciones en el menú contextual "</string>
<string name="ask_for_location_permission">Para continuar, debe permitir la ubicación a OsmAnd.</string>
<string name="rendering_value_black_name">Negro</string>
<string name="search_street">Buscar calle</string>
<string name="start_search_from_city">Iniciar búsqueda desde ciudad</string>
<string name="shared_string_restore">Restaurar</string>
<string name="keep_passed_markers_descr">Los marcadores añadidos como un grupo de Favoritos o puntos de ruta GPX marcados como Pasados permanecerán en el mapa. Si el grupo no está activo, los marcadores desaparecerán del mapa.</string>
<string name="keep_passed_markers">Mantener marcadores pasados en el mapa</string>
<string name="more_transport_on_stop_hint">Hay más transporte en esta parada.</string>
</resources>

View file

@ -3206,4 +3206,9 @@
<string name="commiting_way">در حال ثبت راه…</string>
<string name="ask_for_location_permission">برای ادامه، لطفاً به OsmAnd اجازهٔ دسترسی به موقعیت مکانی را بدهید.</string>
<string name="rendering_value_black_name">سیاه</string>
<string name="search_street">جست‌وجوی خیابان</string>
<string name="start_search_from_city">آغاز جست‌وجو از شهر</string>
<string name="shared_string_restore">بازیابی</string>
<string name="keep_passed_markers_descr">نشانه‌هایی که در قالب گروهی از برگزیده‌ها یا نقاط بین‌راهی GPX وارد شده‌اند و از آن‌ها عبور کرده‌اید روی نقشه باقی می‌مانند. اگر گروه مربوط به آن‌ها را غیرفعال کنید، نشانه‌ها از روی نقشه محو می‌شوند.</string>
<string name="keep_passed_markers">نشانه‌های پشت سر گذاشته را روی نقشه نگه دار</string>
</resources>

View file

@ -2854,7 +2854,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="shared_string_groups">Groupes</string>
<string name="last_seven_days">Ces 7 derniers jours</string>
<string name="this_year">Cette année</string>
<string name="make_active">Activer la marque</string>
<string name="make_active">Activer cette marque</string>
<string name="remove_from_map_markers">Supprimer des marques</string>
<string name="descendingly">Ordre décroissant</string>
@ -2949,9 +2949,9 @@ représentant la zone : %1$s x %2$s</string>
<string name="shared_string_deleted">Supprimé</string>
<string name="shared_string_edited">Modifié</string>
<string name="shared_string_added">Ajouté</string>
<string name="marker_activated">Marque %s activée.</string>
<string name="one_tap_active_descr">Appuyez sur une marque de la carte pour la déplacer en première position des marques actives sans ouvrir le menu contextuel.</string>
<string name="one_tap_active">\'Appui simple\' activé</string>
<string name="marker_activated">Marque %s activée</string>
<string name="one_tap_active_descr">Appuyez sur une marque de la carte pour qu\'elle devienne immédiatement la première marque active sans utiliser le menu contextuel.</string>
<string name="one_tap_active">Appui court sur une marque</string>
<string name="empty_state_av_notes">Prenez des notes !</string>
<string name="empty_state_av_notes_desc">Associez des notes sonore, vidéo ou photo à n\'importe quel point de la carte depuis le gadget ou le menu contextuel.</string>
<string name="notes_by_date">Notes par date</string>
@ -3144,7 +3144,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="quick_action_edit_actions">Modifier les actions</string>
<string name="error_notification_desc">Merci d\'envoyer une capture écran de cette notification à support@osmand.net</string>
<string name="coord_input_edit_point">Modifier le point</string>
<string name="coord_input_add_point">Ajouter point</string>
<string name="coord_input_add_point">Ajouter un point</string>
<string name="coord_input_save_as_track">Enregistrer comme trace</string>
<string name="coord_input_save_as_track_descr">Vous avez ajouté %1$s points. Donnez un nom au fichier et cliquez sur Enregistrer.</string>
<string name="point_deleted">Point %1$s supprimé</string>
@ -3182,4 +3182,9 @@ représentant la zone : %1$s x %2$s</string>
<string name="ask_for_location_permission">Afin de continuer, veuillez accorder à OsmAnd l\'autorisation dutiliser votre position.</string>
<string name="rendering_value_black_name">Noir</string>
<string name="more_transport_on_stop_hint">Il y a d\'autres moyens de transport à cet arrêt.</string>
<string name="search_street">Rechercher une rue</string>
<string name="start_search_from_city">Démarrer la recherche à partir de la ville</string>
<string name="shared_string_restore">Restaurer</string>
<string name="keep_passed_markers_descr">Les marques visitées resteront affichées sur la carte, que les marques appartiennent à un groupe de favoris ou qu\'il s\'agisse de points de passage GPX. Ces marques ne disparaîtront que lorsque le groupe ou la trace sera désactivé.</string>
<string name="keep_passed_markers">Afficher sur la carte les marques visitées</string>
</resources>

View file

@ -2118,4 +2118,6 @@
<string name="poi_bicycle_parking_shed">צריף</string>
<string name="poi_bicycle_parking_informal">לא מוכרז</string>
<string name="poi_ruins">חורבות</string>
</resources>

View file

@ -3098,4 +3098,9 @@
<string name="ask_for_location_permission">נא לאפשר ל־OsmAnd לגשת למיקום כדי להמשיך.</string>
<string name="rendering_value_black_name">שחור</string>
<string name="more_transport_on_stop_hint">יש תחבורה נוספת בתחנה הזו.</string>
<string name="search_street">חיפוש רחוב</string>
<string name="start_search_from_city">התחלת חיפוש מעיר</string>
<string name="shared_string_restore">שחזור</string>
<string name="keep_passed_markers_descr">סמנים נוספים כקבוצות של מועדפים או נקודות דרך GPX שמסומנות ככאלו שעברת יישארו על המפה. אם הקבוצה אינה פעילה, הסמנים ייעלמו מהמפה.</string>
<string name="keep_passed_markers">להשאיר סמנים שעברת בהם על המפה</string>
</resources>

View file

@ -3887,4 +3887,8 @@
<string name="poi_car_pooling">Telekocsihely</string>
<string name="poi_course">Turistaút</string>
</resources>
<string name="poi_ruins">Romok</string>
<string name="poi_license_classes">Jogosítványkategóriák</string>
</resources>

View file

@ -60,7 +60,7 @@
<string name="i_am_here">Itt vagyok</string>
<string name="zoom_by_trackball_descr">Térképnagyítás vízszintes \'trackball\' mozgatással.</string>
<string name="zoom_by_trackball">\'trackball\' használata térképnagyításhoz</string>
<string name="accessibility_preferences_descr">Akadálymentesítéssel kapcsolatos beállítások.</string>
<string name="accessibility_preferences_descr">Akadálymentességgel kapcsolatos beállítások.</string>
<string name="shared_string_accessibility">Akadálymentesítés</string>
<string name="rendering_out_of_memory">Nincs elég folyamatmemória a kijelölt terület megjelenítéséhez</string>
<string name="use_fluorescent_overlays">Fluoreszkáló rátétrétegek</string>
@ -1090,8 +1090,8 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
<string name="av_use_external_camera">Kamera alkalmazás használata</string>
<string name="index_name_openmaps">OpenMaps EU</string>
<string name="max_speed_none">nincs</string>
<string name="prefer_motorways">Autópályák preferálása</string>
<string name="prefer_in_routing_title">Preferálás</string>
<string name="prefer_motorways">Autópályák előnyben részesítése</string>
<string name="prefer_in_routing_title">A következők előnyben részesítése</string>
<string name="prefer_in_routing_descr">Autópályák előnyben részesítése.</string>
<string name="access_arrival_time">Érkezési idő</string>
<string name="item_checked">kijelölt</string>
@ -1263,10 +1263,10 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
<string name="route_descr_select_destination">Célpont kijelölése</string>
<string name="shared_string_select_on_map">Kijelölése a térképen</string>
<string name="shared_string_favorite">Kedvenc</string>
<string name="route_preferences">Útvonal beállítások</string>
<string name="route_preferences">Útvonal-beállítások</string>
<string name="route_info">Útvonal információ</string>
<string name="routing_attr_prefer_motorway_name">Autópályák preferálása</string>
<string name="routing_attr_prefer_motorway_description">Autópályák preferálása</string>
<string name="routing_attr_prefer_motorway_name">Autópályák előnyben részesítése</string>
<string name="routing_attr_prefer_motorway_description">Autópályák előnyben részesítése</string>
<string name="routing_attr_avoid_toll_name">Fizetős utak elkerülése</string>
@ -1289,7 +1289,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
<string name="calculate_osmand_route_gpx">Offline OsmAnd útvonaltervezés</string>
<string name="app_mode_truck">Teherautó</string>
<string name="guidance_preferences_descr">Navigációs beállítások</string>
<string name="routing_preferences_descr">Útvonaltervezési beállítások</string>
<string name="routing_preferences_descr">Útvonal-tervezési beállítások</string>
<string name="speech_rate_descr">TTS beszédsebesség megadása.</string>
<string name="speech_rate">Beszédsebesség</string>
@ -1493,7 +1493,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
<string name="gps_wake_up_timer">GPS felébresztési intervallum</string>
<string name="sleep_mode_stop_dialog">Leállítod a GPS háttér módot?</string>
<string name="map_preferred_locale_descr">A térképfeliratok előnyben részesített nyelve (ha nem elérhető, angolul vagy a helyi nyelven fogja mutatni).</string>
<string name="map_preferred_locale">Térkép preferált nyelve</string>
<string name="map_preferred_locale">Térkép előnyben részesített nyelve</string>
<string name="local_map_names">Helyi név</string>
<string name="lang_sw">szuahéli</string>
<string name="lang_he">héber</string>
@ -1582,7 +1582,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
<string name="record_plugin_description">Ez a bővítmény aktiválja a nyomvonalak rögzítésének és mentésének lehetőségét, ha megnyomod a GPX naplózó gombot a térkép képernyőn, valamint képes minden navigációs útvonalat automatikusan egy GPX fájlba naplózni.
\n
\nA rögzített nyomvonalak megoszthatók az ismerősökkel, vagy használhatók az OSM hozzájárulásoknál. A sportolók a rögzített nyomvonalakat az edzéseik megfigyeléséhez használhatják. Néhány alapvető nyomvonalelemzés közvetlenül az OsmAnd programon belül is végrehajtható, mint például köridők, átlagsebesség, stb., és természetesen a nyomvonalak később harmadik féltől származó elemzőeszközökkel is elemezhetők.</string>
<string name="record_plugin_name">Útvonal rögzítése</string>
<string name="record_plugin_name">Útvonalrögzítés</string>
<string name="int_hour">ó</string>
<string name="duration">Időtartam</string>
<string name="distance">Távolság</string>
@ -1680,9 +1680,9 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
<string name="rendering_value_default_name">Alapértelmezett</string>
<string name="rendering_value_orange_name">Narancs</string>
<string name="rendering_value_germanRoadAtlas_name">Német autós atlasz</string>
<string name="traffic_warning_railways">Vasúti kereszteződés</string>
<string name="traffic_warning_railways">Vasúti átjáró</string>
<string name="traffic_warning_pedestrian">Gyalogátkelőhely</string>
<string name="show_railway_warnings">Vasúti kereszteződések</string>
<string name="show_railway_warnings">Vasúti átjárók</string>
<string name="show_pedestrian_warnings">Gyalogátkelőhelyek</string>
<string name="rendering_value_americanRoadAtlas_name">Amerikai autós atlasz</string>
<string name="routing_attr_no_new_routing_name">Nincsenek v1.9-es útvonalszabályok</string>
@ -2391,11 +2391,11 @@ Jelenleg csak {2} MB érhető el.</string>
<string name="shared_string_trip">Túra</string>
<string name="shared_string_recorded">Felvett</string>
<string name="shared_string_record">Felvétel</string>
<string name="save_track_min_speed">Rögzítési minimum sebesség</string>
<string name="save_track_min_speed">Legkisebb naplózási sebesség</string>
<string name="save_track_min_speed_descr">Szűrő: Ez alatti sebességnél nem rögzít pontot.</string>
<string name="save_track_min_distance">Rögzítési minimális elmozdulás</string>
<string name="save_track_min_distance">Legkisebb naplózási elmozdulás</string>
<string name="save_track_min_distance_descr">Szűrő: Az előző ponttól mért legkisebb távolság, aminél új pontot fog rögzíteni.</string>
<string name="save_track_precision">Rögzítési minimum pontosság</string>
<string name="save_track_precision">Legkisebb naplózási pontosság</string>
<string name="save_track_precision_descr">Szűrő: Nem rögzít, amíg el nem éri ezt a vételi pontosságot.</string>
<string name="christmas_poi">Karácsonyi POI</string>
<string name="christmas_desc">A karácsonyra és újévi ünnepekre készülve bekapcsolhatod a karácsonyi POI-k megjelenítését: karácsonyfák, vásárok, stb.</string>
@ -2547,14 +2547,14 @@ Kérlek adj meg egy teljes kódot</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Sík</string>
<string name="routing_attr_driving_style_speed_name">Rövidebb útvonal</string>
<string name="routing_attr_driving_style_balance_name">Kiegyensúlyozott</string>
<string name="routing_attr_driving_style_safety_name">Mellékutak preferálása</string>
<string name="routing_attr_driving_style_safety_name">Mellékutak előnyben részesítése</string>
<string name="relief_smoothness_factor_descr">Előnyben részesített terep: sík vagy dombos.</string>
<string name="shared_string_slope">Lejtő</string>
<string name="add_new_folder">Új könyvtár létrehozása</string>
<string name="points_delete_multiple_succesful">Pont(ok) törölve.</string>
<string name="points_delete_multiple">%1$d pont törlésére készülsz. Biztosan vagy benne?</string>
<string name="route_points_category_name">Érintendő fordulók az útvonalon</string>
<string name="track_points_category_name">Útpontok és érdekes, vagy elnevezett helyek</string>
<string name="track_points_category_name">Útpontok, érdekes pontok (POI-k) és elnevezett helyek</string>
<string name="shared_string_gpx_track">Nyomvonal</string>
<string name="lang_ber">berber</string>
<string name="do_not_send_anonymous_app_usage">Ne küldjön anonim használati statisztikát</string>
@ -2701,7 +2701,7 @@ Kérlek adj meg egy teljes kódot</string>
<string name="shared_string_markers">Jelölők</string>
<string name="coordinates_format">Koordinátaformátum</string>
<string name="use_system_keyboard">Rendszer billentyűzetének használata</string>
<string name="fast_coordinates_input_descr">Koordinátabeviteli formátum kiválasztása. Bármikor megváltoztathatod az „Beállítások”-ra koppintva.</string>
<string name="fast_coordinates_input_descr">Koordinátabeviteli formátum kiválasztása. Bármikor megváltoztatható a „Beállítások”-ra koppintva.</string>
<string name="fast_coordinates_input">Gyors koordinátabevitel</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Jeges utak, gázlók elkerülése</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Jeges utak és gázlók elkerülése.</string>
@ -2818,16 +2818,16 @@ Kérlek adj meg egy teljes kódot</string>
<string name="looking_for_tracks_with_waypoints">Útpontokat tartalmazó nyomvonalak keresése</string>
<string name="shared_string_more_without_dots">Többi</string>
<string name="appearance_on_the_map">Megjelenítés a térképen</string>
<string name="add_track_to_markers_descr">Válassz egy nyomvonalat, aminek útpontjaiból a jelölők készüljenek.</string>
<string name="add_track_to_markers_descr">Nyomvonal kijelölése ahhoz, hogy útpontjai a jelölők közé kerüljenek.</string>
<string name="add_favourites_group_to_markers_descr">Válassz egy kedvencek kategóriát, amikből jelölőt készítenél.</string>
<string name="shared_string_gpx_waypoints">Nyomvonal útpontok</string>
<string name="shared_string_gpx_waypoints">Nyomvonal útpontjai</string>
<string name="favourites_group">Kedvencek kategória</string>
<string name="add_group">Csoport hozzáadása</string>
<string name="add_group_descr">Csoportok importálása Kedvencekből vagy GPX útpontból.</string>
<string name="add_group_descr">Csoportok importálása Kedvencekből vagy GPX útpontokból.</string>
<string name="empty_state_markers_active">Készíts térképjelölőket!</string>
<string name="empty_state_markers_active_desc">Koppints hosszan vagy röviden egy helyre, majd koppints a jelölőzászló gombjára.</string>
<string name="empty_state_markers_groups">Csoportok importálása</string>
<string name="empty_state_markers_groups_desc">Jelölők importálása kedvencek csoportokból, vagy útpontokból.</string>
<string name="empty_state_markers_groups_desc">Jelölők importálása a Kedvencek csoportokból, vagy útpontokból.</string>
<string name="shared_string_two">Kettő</string>
<string name="shared_string_one">Egy</string>
<string name="show_guide_line_descr">Irányjelző vonalat jelenít meg az aktuális pozíciódtól az aktív térképjelölőkig.</string>
@ -2962,8 +2962,8 @@ Kérlek adj meg egy teljes kódot</string>
<string name="purchase_dialog_title">Konstrukció kiválasztása</string>
<string name="shared_string_only_with_wifi">Csak Wi-Fi</string>
<string name="wikivoyage_download_pics">Képek letöltése</string>
<string name="wikivoyage_download_pics_descr">A cikkekben szereplő képek letölthetőek offline használatra.
\n Később itt éred el: „Felfedezés” → „Beállítások”.</string>
<string name="wikivoyage_download_pics_descr">A cikkekben szereplő képek letölthetőek offline használatra.
\nKésőbb itt éred el: „Felfedezés” → „Beállítások”.</string>
<string name="shared_string_wifi_only">Csak Wi-Fin</string>
<string name="select_travel_book">Útikönyv kiválasztása</string>
<string name="shared_string_travel_book">Útikönyv</string>
@ -3001,7 +3001,7 @@ Kérlek adj meg egy teljes kódot</string>
<string name="shared_string_travel_guides">Utazás</string>
<string name="waypoints_removed_from_map_markers">Útpontok eltávolítva a térképjelölők közül</string>
<string name="nothing_found_in_radius">Nincs találat:</string>
<string name="select_waypoints_category_description">A nyomvonal összes útpontjának hozzáadása, vagy válassz külön kategóriát.</string>
<string name="select_waypoints_category_description">A nyomvonal összes útpontjának hozzáadása vagy külön kategóriák kijelölése.</string>
<string name="clear_all_intermediates">Összes köztes pont törlése</string>
<string name="group_deleted">Csoport törölve</string>
<string name="rendering_attr_whiteWaterSports_name">Vadvízi sportok</string>
@ -3032,11 +3032,12 @@ Kérlek adj meg egy teljes kódot</string>
<string name="shared_string_dont">Nem</string>
<string name="shared_string_do">Igen</string>
<string name="shared_string_total">Összesen</string>
<string name="poi_cannot_be_found">A pont vagy útvonal nem található.</string>
<string name="poi_cannot_be_found">A pont vagy vonal nem található.</string>
<string name="search_no_results_feedback">Nincs találat?
\nAdj visszajelzést</string>
<string name="shared_string_world">Világ</string>
<string name="coord_input_edit_point">Pont szerkesztése</string>
<string name="coord_input_add_point">Pont hozzáadása</string>
<string name="coord_input_save_as_track">Mentés nyomvonalként</string>
<string name="more_transport_on_stop_hint">Ebben a megállóban több közlekedési eszköz is előfordul.</string>
</resources>

View file

@ -277,7 +277,7 @@
<string name="poi_tattoo">Tatuatore</string>
<string name="poi_massage">Centro massaggi</string>
<string name="poi_hairdresser">Parrucchiere</string>
<string name="poi_beauty_salon_nails">Centro unghie</string>
<string name="poi_beauty_salon_nails">"Manicure "</string>
<string name="poi_beauty">Salone di bellezza</string>
<string name="poi_craft_window_construction">Costruzione finestre</string>
@ -424,7 +424,7 @@
<string name="poi_club_game">Club giochi</string>
<string name="poi_club_automobile">Club automobilistico</string>
<string name="poi_club_chess">Club scacchistico</string>
<string name="poi_club_cinema">Club cinefili</string>
<string name="poi_club_cinema">Cineclub</string>
<string name="poi_club_fan">Fan club</string>
<string name="poi_club_fishing">Club di pesca</string>
<string name="poi_club_veterans">Club di veterani</string>
@ -532,7 +532,7 @@
<string name="poi_ice_stock">Stock sport</string>
<string name="poi_korfbal">Korfball</string>
<string name="poi_orienteering">Orientamento</string>
<string name="poi_paddle_tennis">Paddle tennis</string>
<string name="poi_paddle_tennis">"Paddle tennis "</string>
<string name="poi_surfing">Surf</string>
<string name="poi_artwork">Opera d\'arte</string>
<string name="poi_historic_cannon">Cannone storico</string>
@ -546,7 +546,7 @@
<string name="poi_arts_centre">Centro artistico</string>
<string name="poi_leisure_fishing">Postazione di pesca</string>
<string name="poi_harbour">Porto</string>
<string name="poi_biergarten">Biergarten</string>
<string name="poi_biergarten">"Biergarten "</string>
<string name="poi_craft_agricultural_engines">Motori agricoli</string>
<string name="poi_craft_basket_maker">Cestaio</string>
<string name="poi_cape">Capo</string>
@ -673,7 +673,7 @@
<string name="poi_water_transport">Trasporto navale</string>
<string name="poi_bicycle_transport">Trasporto in bici</string>
<string name="poi_aerialway_transport">Trasporto a fune</string>
<string name="poi_node_networks">Nodo ciclistico/pedonale</string>
<string name="poi_node_networks">Nodo di rete ciclistico/pedonale</string>
<string name="poi_hiking_routes">Percorso escursionistico</string>
<string name="poi_power">Energia</string>
<string name="poi_communication">Comunicazioni</string>
@ -759,7 +759,7 @@
<string name="poi_parking_type">Tipo</string>
<string name="poi_covered">Coperto</string>
<string name="poi_subway_station_filter">Stazione della metropolitana</string>
<string name="poi_ferry_terminal_cargo">Cargo</string>
<string name="poi_ferry_terminal_cargo">"Cargo "</string>
<string name="poi_bicycle_parking_type">Tipo</string>
<string name="poi_aerialway_bicycle">Trasporto di biciclette</string>
<string name="poi_aerialway_heating">Riscaldamento</string>
@ -786,7 +786,7 @@
<string name="poi_fee">Costi</string>
<string name="poi_smoking">Fumatori</string>
<string name="poi_delivery">Consegna</string>
<string name="poi_drive_in">Drive in</string>
<string name="poi_drive_in">"Drive in "</string>
<string name="poi_takeaway">A portar via</string>
<string name="poi_cocktails">Cocktail</string>
<string name="poi_microbrewery">Microbirrificio</string>
@ -904,7 +904,7 @@
<string name="poi_mast">Palo</string>
<string name="poi_reservoir">Serbatoio</string>
<string name="poi_gasometer">Gasometro</string>
<string name="poi_silo">Silo</string>
<string name="poi_silo">"Silo "</string>
<string name="poi_pension_fund">Fondo pensione</string>
<string name="poi_quarter">Quartiere</string>
<string name="poi_residential">Area residenziale</string>
@ -967,8 +967,8 @@
<string name="poi_collection_times">Tempi di raccolta</string>
<string name="poi_email">Email</string>
<string name="poi_fax">Fax</string>
<string name="facebook">Facebook</string>
<string name="twitter">Twitter</string>
<string name="facebook">"Facebook "</string>
<string name="twitter">"Twitter "</string>
<string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string>
@ -1054,7 +1054,7 @@
<string name="poi_trees_plum">Prugna</string>
<string name="poi_trees_peach">Pesca</string>
<string name="poi_trees_tea"></string>
<string name="poi_trees_coca">Coca</string>
<string name="poi_trees_coca">"Coca "</string>
<string name="poi_trees_kiwi">Kiwi</string>
<string name="poi_trees_nectorine">Nettarina</string>
<string name="poi_trees_mango">Mango</string>
@ -1220,23 +1220,23 @@
<string name="poi_payment_account_cards_yes">Schede conto</string>
<string name="poi_payment_maestro_yes">Maestro</string>
<string name="poi_payment_maestro_no">Maestro non accettato</string>
<string name="poi_payment_american_express_yes">American Express (AMEX)</string>
<string name="poi_payment_american_express_yes">"American Express (AMEX) "</string>
<string name="poi_payment_american_express_no">American Express (AMEX) non accettato</string>
<string name="poi_payment_diners_club_yes">Diners Club</string>
<string name="poi_payment_diners_club_yes">"Diners Club "</string>
<string name="poi_payment_diners_club_no">Diners Club non accettate</string>
<string name="poi_payment_dkv_yes">DKV</string>
<string name="poi_payment_dkv_no">DKV non accettato</string>
<string name="poi_payment_uta_yes">UTA</string>
<string name="poi_payment_uta_no">Carte UTA non accettato</string>
<string name="poi_payment_efectivo_yes">Efectivo</string>
<string name="poi_payment_efectivo_yes">"Efectivo "</string>
<string name="poi_payment_efectivo_no">Efectivo non accettato</string>
<string name="poi_payment_girocard_yes">Girocard</string>
<string name="poi_payment_girocard_yes">"Girocard "</string>
<string name="poi_payment_girocard_no">Girocard non accettato</string>
<string name="poi_payment_discover_card_yes">Discover Card</string>
<string name="poi_payment_discover_card_yes">"Discover Card "</string>
<string name="poi_payment_discover_card_no">Discover Card non accettata</string>
<string name="poi_payment_visa_electron_yes">Visa Electron</string>
<string name="poi_payment_visa_electron_yes">"Visa Electron "</string>
<string name="poi_payment_visa_electron_no">Visa Electron non accettato</string>
<string name="poi_payment_litecoin_yes">Litecoin</string>
<string name="poi_payment_litecoin_yes">"Litecoin "</string>
<string name="poi_payment_litecoin_no">Litecoin non accettato</string>
<string name="poi_payment_cheque_yes">Assegni</string>
<string name="poi_payment_pikepass_yes">PIKEPASS</string>
@ -1247,19 +1247,19 @@
<string name="poi_payment_cryptocurrencies_no">Cryptomonete non accettate</string>
<string name="poi_payment_others_yes">Altro</string>
<string name="poi_payment_others_no">Altri metodi di pagamento non accettati</string>
<string name="poi_payment_routex_yes">Routex</string>
<string name="poi_payment_routex_yes">"Routex "</string>
<string name="poi_payment_bancomat_yes">Bancomat</string>
<string name="poi_payment_bancomat_no">Bancomat non accettato</string>
<string name="poi_payment_prepaid_ticket_yes">Biglietti prepagati</string>
<string name="poi_payment_jcb_yes">JCB</string>
<string name="poi_payment_ep_quick_yes">Quick</string>
<string name="poi_payment_eurowag_yes">Eurowag</string>
<string name="poi_payment_e_zpass_yes">EZPass</string>
<string name="poi_payment_ep_quick_yes">"Quick "</string>
<string name="poi_payment_eurowag_yes">"Eurowag "</string>
<string name="poi_payment_e_zpass_yes">"EZPass "</string>
<string name="poi_payment_e_zpass_no">EZPass non accettato</string>
<string name="poi_payment_euroshell_yes">EuroShell</string>
<string name="poi_payment_kitcard_yes">KITCard</string>
<string name="poi_payment_kitcard_yes">"KITCard "</string>
<string name="poi_payment_kitcard_no">KITCard non accettato</string>
<string name="poi_payment_westfalen_card_yes">Westfalen</string>
<string name="poi_payment_westfalen_card_yes">"Westfalen "</string>
<string name="poi_payment_wire_transfer_yes">Bonifici</string>
<string name="poi_payment_wire_transfer_no">Bonifici non accettati</string>
<string name="poi_payment_sms_yes">Pagamenti tramite SMS</string>
@ -1302,7 +1302,7 @@
<string name="poi_recycling_plasterboard">Cartongesso</string>
<string name="poi_monitoring_station">Stazione di monitoraggio</string>
<string name="poi_country">Paese</string>
<string name="poi_base">Base jumping</string>
<string name="poi_base">"Base jumping "</string>
<string name="poi_religion_jain">Giainismo</string>
<string name="poi_religion_bahai">Bahaismo</string>
<string name="poi_religion_scientologist">Scientologismo</string>
@ -1402,41 +1402,41 @@
<string name="poi_payment_electronic_purses_no">Portafogli elettronici non accettati</string>
<string name="poi_payment_laser_yes">Laser</string>
<string name="poi_payment_v_pay_yes">V PAY</string>
<string name="poi_payment_dogecoin_yes">Dogecoin</string>
<string name="poi_payment_dogecoin_yes">"Dogecoin "</string>
<string name="poi_payment_dogecoin_no">Dogecoin non accettato</string>
<string name="poi_payment_cibus_yes">Cibus</string>
<string name="poi_payment_cibus_yes">"Cibus "</string>
<string name="poi_payment_ep_avant_yes">AvantCard</string>
<string name="poi_payment_ep_avant_no">AvantCard non accettato</string>
<string name="poi_payment_ep_mep_yes">MEP</string>
<string name="poi_payment_ep_mep_no">MEP non accettato</string>
<string name="poi_payment_ep_minipay_yes">Minipay</string>
<string name="poi_payment_ep_minipay_yes">"Minipay "</string>
<string name="poi_payment_ep_minipay_no">Minipay non accettato</string>
<string name="poi_payment_ep_minicash_yes">MiniCash</string>
<string name="poi_payment_ep_minicash_no">MiniCash non accettato</string>
<string name="poi_payment_ep_moneo_yes">Moneo</string>
<string name="poi_payment_ep_moneo_yes">"Moneo "</string>
<string name="poi_payment_ep_moneo_no">Moneo non accettato</string>
<string name="poi_payment_ep_monedero4b_yes">Monedero 4B</string>
<string name="poi_payment_ep_monedero4b_yes">"Monedero 4B "</string>
<string name="poi_payment_ep_monedero4b_no">Monedero 4B non accettato</string>
<string name="poi_payment_ep_monedero_yes">Monedero</string>
<string name="poi_payment_ep_monedero_yes">"Monedero "</string>
<string name="poi_payment_ep_monedero_no">Monedero non accettato</string>
<string name="poi_payment_bankaxess_yes">BankAxess</string>
<string name="poi_payment_bankaxess_yes">"BankAxess "</string>
<string name="poi_payment_bankaxess_no">BankAxess non accettato</string>
<string name="poi_payment_coinkite_yes">Coinkite</string>
<string name="poi_payment_coinkite_yes">"Coinkite "</string>
<string name="poi_payment_coinkite_no">Coinkite non accettato</string>
<string name="poi_payment_roadrunner_yes">Roadrunner</string>
<string name="poi_payment_roadrunner_yes">"Roadrunner "</string>
<string name="poi_payment_svg_yes">SVG</string>
<string name="poi_payment_svg_no">SVG non accettato</string>
<string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
<string name="poi_payment_ov_chipkaart_yes">"OV-Chipkaart "</string>
<string name="poi_payment_ov_chipkaart_no">OV-Chipkaart non accettato</string>
<string name="poi_payment_oyster_yes">Oyster</string>
<string name="poi_payment_oyster_yes">"Oyster "</string>
<string name="poi_payment_sube_yes">SUBE</string>
<string name="poi_payment_via_verde_yes">Via Verde</string>
<string name="poi_payment_via_verde_yes">"Via Verde "</string>
<string name="poi_payment_via_verde_no">Via Verde non accettato</string>
<string name="poi_payment_meal_voucher_yes">Buoni pasto</string>
<string name="poi_payment_meal_voucher_no">Buoni pasto non accettati</string>
<string name="poi_payment_u_key_yes">U-Key</string>
<string name="poi_payment_u_key_yes">"U-Key "</string>
<string name="poi_payment_u_key_no">U-Key non accettato</string>
<string name="poi_payment_pro100_yes">"PRO100 "</string>
<string name="poi_payment_pro100_yes">"PRO100 "</string>
<string name="poi_payment_yandexmoney_yes">Yandex. Money</string>
<string name="poi_payment_yandexmoney_no">Yandex. Money non accettato</string>
<string name="poi_diet_vegetarian_filter_yes">Vegetariana</string>
@ -1448,7 +1448,7 @@
<string name="poi_diet_gluten_free_yes">Senza glutine</string>
<string name="poi_diet_gluten_free_no">Dieta senza glutine: no</string>
<string name="poi_drive_in_yes"></string>
<string name="poi_drive_in_no">Drive-in: no</string>
<string name="poi_drive_in_no">"Drive-in: no "</string>
<string name="poi_drive_through_yes"></string>
<string name="poi_microbrewery_yes">Microbirrificio</string>
<string name="poi_takeaway_filter_yes"></string>
@ -1533,7 +1533,7 @@
<string name="poi_resource_coal">Carbone</string>
<string name="poi_resource_copper">Rame</string>
<string name="poi_resource_diamond">Diamante</string>
<string name="poi_resource_dolomite">Dolomite</string>
<string name="poi_resource_dolomite">"Dolomite "</string>
<string name="poi_resource_gas">Gas</string>
<string name="poi_resource_gold">Oro</string>
<string name="poi_resource_graphite">Grafite</string>
@ -1641,7 +1641,7 @@
<string name="poi_route_bus_ref">Autobus</string>
<string name="poi_route_trolleybus_ref">Filobus</string>
<string name="poi_route_tram_ref">Tram</string>
<string name="poi_route_tram_ref">"Tram "</string>
<string name="poi_route_train_ref">Treno</string>
<string name="poi_route_funicular_ref">Funicolare</string>
<string name="poi_route_ferry_ref">Traghetto</string>
@ -1662,7 +1662,7 @@
<string name="poi_service_bicycle_cleaning_yes">Pulizia</string>
<string name="poi_service_bicycle_cleaning_no">Pulizia biciclette: no</string>
<string name="poi_service_bicycle_charging_yes">Ricarica biciclette: Sì</string>
<string name="poi_service_bicycle_charging_no">Ricarica biciclette: no</string>
<string name="poi_service_bicycle_charging_no">Ricarica: no</string>
<string name="poi_wildlife_hide">Posto per osservare la fauna selvatica</string>
<string name="poi_monument_yes">Oggetto monumentale</string>
@ -1690,7 +1690,7 @@
<string name="poi_office_forestry">Ufficio forestale</string>
<string name="poi_fuel_91ul">Carburante 91UL</string>
<string name="poi_fuel_100ll">Carburante 100LL</string>
<string name="poi_fuel_autogas">Autogas</string>
<string name="poi_fuel_autogas">"Autogas "</string>
<string name="poi_fuel_jeta1">Carburante Jet A-1</string>
<string name="poi_fuel_adblue">Carburante AdBlue</string>
@ -1749,7 +1749,7 @@
<string name="poi_openfire_yes">Caminetto ammessi</string>
<string name="poi_openfire_no">Caminetto non ammessi</string>
<string name="poi_backcountry_yes"></string>
<string name="poi_backcountry_no">No</string>
<string name="poi_backcountry_no">"No "</string>
<string name="poi_washing_machine_yes"></string>
<string name="poi_washing_machine_no">Lavatrice: no</string>
<string name="poi_shower_filter_yes"></string>
@ -1781,12 +1781,12 @@
<string name="poi_social_facility_for_homeless">Senzatetto</string>
<string name="poi_social_facility_for_migrant">Migranti</string>
<string name="poi_social_facility_for_unemployed">Disoccupati</string>
<string name="poi_social_facility_for_child_juvenile">Bambini; giovanile</string>
<string name="poi_social_facility_for_child_juvenile">Bambini giovanile</string>
<string name="poi_theatre_genre_philharmonic">Filarmonica</string>
<string name="poi_theatre_genre_drama">Dramma</string>
<string name="poi_theatre_genre_opera">Opera</string>
<string name="poi_theatre_genre_cabaret">Cabaret</string>
<string name="poi_theatre_genre_cabaret">"Cabaret "</string>
<string name="poi_theatre_genre_comedy">Commedia</string>
<string name="poi_theatre_genre_marionette">Marionetta</string>
<string name="poi_theatre_genre_ballet">Balletto</string>
@ -1843,7 +1843,7 @@
<string name="poi_material_brick">Materiale: mattoni</string>
<string name="poi_material_plastic">Materiale: plastica</string>
<string name="poi_material_granite_stone">Materiale: granito</string>
<string name="poi_material_metal_wood">Materiale: metallo; legno</string>
<string name="poi_material_metal_wood">Materiale: metallo, legno</string>
<string name="poi_material_glass">Materiale: vetro</string>
<string name="poi_material_bronze">Materiale: bronzo</string>
<string name="poi_material_earth">Materiale: terra</string>
@ -1880,8 +1880,8 @@
<string name="poi_concentration_camp_gulag">Tipo: gulag</string>
<string name="poi_temperature">Temperatura</string>
<string name="poi_bridge_ref">Nr ponte</string>
<string name="poi_tunnel_ref">Nr tunnel</string>
<string name="poi_bridge_ref">Nr° ponte</string>
<string name="poi_tunnel_ref">Nr° tunnel</string>
<string name="poi_ref">Nr</string>
@ -1891,7 +1891,7 @@
<string name="poi_aerialway_length">Lunghezza</string>
<string name="poi_fitness_centre">Centro fitness</string>
<string name="poi_fitness">Fitness</string>
<string name="poi_fitness">"Fitness "</string>
<string name="poi_billiards">Biliardo</string>
@ -1901,11 +1901,11 @@
<string name="poi_water_heater_no">Riscaldatore di acqua: no</string>
<string name="poi_parking_surface">Tipo: superficie</string>
<string name="poi_dojo">Dojo</string>
<string name="poi_dojo">"Dojo "</string>
<string name="poi_gaelic_games">Giochi Gaelic</string>
<string name="poi_netball">Netball</string>
<string name="poi_judo">Judo</string>
<string name="poi_netball">"Netball "</string>
<string name="poi_judo">"Judo "</string>
<string name="poi_disc_golf">Disc golf</string>
<string name="poi_boxing">Boxe</string>
@ -1938,7 +1938,7 @@
<string name="poi_button_operated_yes">Sgancio a pulsante: Sì</string>
<string name="poi_button_operated_no">Sgancio a pulsante: no</string>
<string name="poi_tanning_salon">Solarium</string>
<string name="poi_tanning_salon">"Solarium "</string>
<string name="poi_fire_hydrant_type_pillar">Pilastro</string>
<string name="poi_fire_hydrant_type_pond">Stagno</string>
@ -1952,8 +1952,8 @@
<string name="poi_home_visit_no">Visita a domicilio: no</string>
<string name="poi_fire_hydrant_diameter">Diametro idrante</string>
<string name="poi_fire_hydrant_position_sidewalk">Posizione idrante: marciapiede</string>
<string name="poi_fire_hydrant_position_street">Posizione idrante: strada</string>
<string name="poi_fire_hydrant_position_sidewalk">Marciapiede</string>
<string name="poi_fire_hydrant_position_street">Strada</string>
<string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
<string name="poi_in_service_yes">In servizio: Sì</string>
@ -1980,13 +1980,13 @@
<string name="poi_ventilation_shaft">Pozzo di ventilazione</string>
<string name="poi_payment_troika_yes">Troika</string>
<string name="poi_payment_troika_yes">"Troika "</string>
<string name="poi_payment_troika_no">Carta Troika non accettata</string>
<string name="poi_telescope">Telescopio</string>
<string name="poi_telescope_type_optical">Telescopio: ottico</string>
<string name="poi_telescope_type_radio">Telescopio: radio</string>
<string name="poi_telescope_type_gamma">Telescopio: gamma</string>
<string name="poi_telescope_type_optical">Ottico</string>
<string name="poi_telescope_type_radio">Radio</string>
<string name="poi_telescope_type_gamma">"Gamma "</string>
<string name="poi_telescope_diameter">Diametro</string>
<string name="poi_telescope_usage_espionage">Utilizzo: spionaggio</string>
<string name="poi_observatory_type_espionage">Utilizzo: spionaggio</string>
@ -2055,28 +2055,28 @@
<string name="poi_cuisine_seafood">Frutti di mare</string>
<string name="poi_cuisine_breakfast">Colazione</string>
<string name="poi_cuisine_steak">Bistecca</string>
<string name="poi_cuisine_tapas">Tapas</string>
<string name="poi_cuisine_heuriger">Heuriger</string>
<string name="poi_cuisine_tapas">"Tapas "</string>
<string name="poi_cuisine_heuriger">"Heuriger "</string>
<string name="poi_cuisine_curry">Curry</string>
<string name="poi_cuisine_buschenschank">Buschenschank</string>
<string name="poi_cuisine_buschenschank">"Buschenschank "</string>
<string name="poi_cuisine_grill">Griglia</string>
<string name="poi_cuisine_bagel">Bagel</string>
<string name="poi_cuisine_pasta">Pasta</string>
<string name="poi_cuisine_pasta">"Pasta "</string>
<string name="poi_cuisine_juice">Succo di frutta</string>
<string name="poi_cuisine_tea"></string>
<string name="poi_cuisine_tea_shop">Negozio tè</string>
<string name="poi_cuisine_soup">Zuppa</string>
<string name="poi_cuisine_hotdog">Hot Dog</string>
<string name="poi_cuisine_salad">Insalata</string>
<string name="poi_cuisine_bistro">Bistro</string>
<string name="poi_cuisine_bistro">"Bistro "</string>
<string name="poi_cuisine_couscous">Cous cous</string>
<string name="poi_cuisine_fried_chicken">Pollo fritto</string>
<string name="poi_cuisine_dessert">Dessert</string>
<string name="poi_cuisine_dessert">"Dessert "</string>
<string name="poi_cuisine_canteen">Mensa</string>
<string name="poi_cuisine_tacos">Tacos</string>
<string name="poi_cuisine_falafel">Falafel</string>
<string name="poi_cuisine_smoothie">Smoothie</string>
<string name="poi_cuisine_gyros">Gyros</string>
<string name="poi_cuisine_tacos">"Tacos "</string>
<string name="poi_cuisine_falafel">"Falafel "</string>
<string name="poi_cuisine_smoothie">"Smoothie "</string>
<string name="poi_cuisine_gyros">"Gyros "</string>
<string name="poi_cuisine_crepes">Crepes</string>
<string name="poi_cuisine_meat">Carne</string>
<string name="poi_cuisine_chocolate">Cioccolato</string>
@ -2127,14 +2127,14 @@
<string name="poi_cuisine_irish">Irlandese</string>
<string name="poi_cuisine_ethiopian">Etiope</string>
<string name="poi_cuisine_hungarian">Ungherese</string>
<string name="poi_cuisine_lao">Lao</string>
<string name="poi_cuisine_lao">Laotiano</string>
<string name="poi_cuisine_european">Europeo</string>
<string name="poi_cuisine_uzbek">Uzbeco</string>
<string name="poi_cuisine_czech">Ceco</string>
<string name="poi_cuisine_cuban">Cubano</string>
<string name="poi_cuisine_british">Britannico</string>
<string name="poi_cuisine_latin_american">Latino-americana</string>
<string name="poi_cuisine_nepalese">Nepalese</string>
<string name="poi_cuisine_nepalese">"Nepalese "</string>
<string name="poi_cuisine_mongolian">Mongolo</string>
<string name="poi_cuisine_middle_eastern">Mediorientale</string>
<string name="poi_cuisine_ukrainian">Ucraino</string>
@ -2150,12 +2150,12 @@
<string name="poi_cuisine_english">Inglese</string>
<string name="poi_cuisine_pakistani">Pakistano</string>
<string name="poi_cuisine_taiwanese">Taiwan</string>
<string name="poi_cuisine_tex_mex">Tex-mex</string>
<string name="poi_cuisine_tex_mex">"Tex-mex "</string>
<string name="poi_cuisine_dutch">Olandese</string>
<string name="poi_cuisine_syrian">Siriano</string>
<string name="poi_cuisine_australian">Australiano</string>
<string name="poi_cuisine_egyptian">Egiziano</string>
<string name="poi_cuisine_senegalese">Senegalese</string>
<string name="poi_cuisine_senegalese">"Senegalese "</string>
<string name="poi_cuisine_jewish">Ebraico</string>
<string name="poi_cuisine_bulgarian">Bulgaro</string>
<string name="poi_cuisine_tibetan">Tibetano</string>
@ -2431,7 +2431,7 @@
<string name="poi_socket_schuko_output_filter">Uscita Schuko</string>
<string name="poi_operational_status">Stato delle operazioni</string>
<string name="poi_via_ferrata">Via ferrata</string>
<string name="poi_via_ferrata">"Via ferrata "</string>
<string name="poi_via_ferrata_scale">Difficoltà</string>
<string name="poi_boat_sharing">Condivisione di barche</string>
@ -2464,14 +2464,14 @@
<string name="poi_lodging">Alloggio</string>
<string name="poi_hunting_lodge">Alloggio di caccia</string>
<string name="poi_religion_tenrikyo">Tenrikyo</string>
<string name="poi_religion_tenrikyo">"Tenrikyo "</string>
<string name="poi_denomination_united">Unito</string>
<string name="poi_denomination_bulgarian_orthodox">Ortodosso bulgaro</string>
<string name="poi_denomination_armenian_apostolic">Apostolico armeno</string>
<string name="poi_denomination_coptic_orthodox">Ortodosso copto</string>
<string name="poi_anchor_berth">Ormeggio ancoraggio</string>
<string name="poi_berth">Ormeggio</string>
<string name="poi_wiki_lang_af">Africaans wiki</string>
<string name="poi_wiki_lang_af">"Africaans wiki "</string>
<string name="poi_full_height_turnstile">Tornello a tutta altezza</string>
<string name="poi_stile">Scaletta</string>
<string name="poi_aerialway_pylon">Pilone di sollevamento aereo</string>
@ -2529,4 +2529,82 @@
<string name="poi_boat_kayak_rental_rental_yes">Kayak: sì</string>
<string name="poi_boat_kayak_rental_rental_no">Kayak: no</string>
<string name="poi_surface_tartan">"Tartan "</string>
</resources>
<string name="poi_checkpoint_type">Tipo Checkpoint</string>
<string name="poi_bowls">Ciotole</string>
<string name="poi_water_place_access">Posto accesso all\'acqua</string>
<string name="poi_resort">"Resort "</string>
<string name="poi_recreation_ground">Terreno ricreativo</string>
<string name="poi_cuisine_donut">"Donut "</string>
<string name="poi_cuisine_crepe">"Crepe "</string>
<string name="poi_cuisine_bakery">Panificio</string>
<string name="poi_cuisine_snack">Spuntino</string>
<string name="poi_cuisine_yogurt">"Yogurt "</string>
<string name="poi_cuisine_cajun">"Cajun "</string>
<string name="poi_motorcycle_type_standard">"Standard "</string>
<string name="poi_surface_clay">Argilla</string>
<string name="poi_operational_status_needs_maintenance">Necessità di manutenzione</string>
<string name="poi_water_supply_pump">Pompa</string>
<string name="poi_socket_schuko">Presa: Schuko</string>
<string name="poi_car_yes">Auto: sì</string>
<string name="poi_car_no">Auto: no</string>
<string name="poi_bicycle_yes">Bicicletta: sì</string>
<string name="poi_bicycle_no">Bicicletta: no</string>
<string name="poi_truck_yes">Camion: sì</string>
<string name="poi_truck_no">Camion: no</string>
<string name="poi_parking_fee_yes">Parcheggio a pagamento: sì</string>
<string name="poi_parking_fee_no">Parcheggio a pagamento: no</string>
<string name="poi_parking_fee">Parcheggio a pagamento</string>
<string name="poi_amperage">Amperaggio</string>
<string name="poi_charging_station_filter">Stazione di ricarica</string>
<string name="poi_post_street">Strada</string>
<string name="poi_post_housenumber">Numero civico</string>
<string name="poi_ref_post">Codice postale</string>
<string name="poi_climbing_ice_yes">Ghiaccio: sì</string>
<string name="poi_climbing_ice_no">Ghiaccio: no</string>
<string name="poi_frozen_food">Alimenti surgelati</string>
<string name="poi_socket_chademo_yes">"CHAdeMO "</string>
<string name="poi_socket_schuko_yes">"Schuko "</string>
<string name="poi_socket_chademo_output_low">Bassa</string>
<string name="poi_socket_type2_output_medium">Medio</string>
<string name="poi_barbecue_grill">Griglia barbecue: Sì</string>
<string name="poi_service_vehicle_oil_change_yes">Cambio olio</string>
<string name="poi_service_vehicle_used_car_sales_yes">Vendita auto usate</string>
<string name="poi_service_vehicle_brakes_yes">Freni</string>
<string name="poi_service_vehicle_new_car_sales_yes">Vendita auto nuove</string>
<string name="poi_service_vehicle_diagnostics_yes">Diagnostica</string>
<string name="poi_service_vehicle_batteries_yes">Batterie</string>
<string name="poi_service_vehicle_air_conditioning_yes">Aria condizionata</string>
<string name="poi_service_vehicle_wheels_yes">Ruote</string>
<string name="poi_service_vehicle_glass_yes">Vetro</string>
<string name="poi_service_vehicle_truck_repair_yes">Riparazione di camion</string>
<string name="poi_service_vehicle_motor_yes">Motore</string>
<string name="poi_service_vehicle_insurance_yes">Assicurazione</string>
<string name="poi_service_vehicle_tyres_yes">Pneumatici</string>
<string name="poi_cable_number">Numero cavi</string>
<string name="poi_glacier_type_valley">Valle</string>
<string name="poi_glacier_type_mountain">Montagna</string>
<string name="poi_glacier_type_rock">Roccia</string>
<string name="poi_checkpoint_type_code">Codice</string>
<string name="poi_rock">Roccia</string>
<string name="poi_end_date">Data di fine</string>
<string name="poi_payment_contactless_yes">Senza contatto</string>
<string name="poi_hazard_avalanche">Pericolo valanghe</string>
<string name="poi_hazard_minefield">Campo minato</string>
<string name="poi_ruins">Rovine</string>
<string name="poi_license_classes">Classi di licenza</string>
</resources>

View file

@ -2192,7 +2192,7 @@ Sono disponibili solo {2} MB.</string>
<string name="download_files_question_space_with_temp">Scaricare {0} file?
Servirebbero {3} MB temporaneamente e {1} MB permanentemente.
(Attualmente sono disponibili {2} MB.)</string>
<string name="upload_osm_note_description">Puoi inviare le tue note OSM anonimamente utilizzando il tuo profilo OpenStreetMap.org.</string>
<string name="upload_osm_note_description">Puoi inviare le tue note OSM anonimamente, o utilizzando il tuo profilo OpenStreetMap.org.</string>
<string name="upload_osm_note">Carica nota OSM</string>
<string name="donations">Donazioni</string>
<string name="number_of_recipients">Numero di destinatari</string>
@ -2388,8 +2388,8 @@ Se ami OsmAnd e OSM e vuoi sostenerli, questo è un modo perfetto per farlo.</st
<string name="trip_rec_notification_settings_desc">Mostra una notifica che permette di iniziare a registrare il viaggio.</string>
<string name="shared_string_notifications">Notifiche</string>
<string name="route_calculation">Calcolo del percorso</string>
<string name="gpx_no_tracks_title">Non hai tracce al momento</string>
<string name="gpx_no_tracks_title_folder">Puoi anche aggiungere tracce alla cartella</string>
<string name="gpx_no_tracks_title">Non hai ancora nessun file GPX</string>
<string name="gpx_no_tracks_title_folder">È inoltre possibile aggiungere file GPX alla cartella</string>
<string name="gpx_add_track">Aggiungi traccia</string>
<string name="gpx_appearance">Aspetto</string>
@ -2415,7 +2415,7 @@ Se ami OsmAnd e OSM e vuoi sostenerli, questo è un modo perfetto per farlo.</st
<string name="rendering_attr_contourWidth_name">Spessore linee isoipse</string>
<string name="rendering_attr_hideWaterPolygons_description">Acqua</string>
<string name="rendering_attr_hideWaterPolygons_name">Non visualizzare l\'acqua</string>
<string name="rendering_attr_contourDensity_description">Densità delle linee isoipse</string>
<string name="rendering_attr_contourDensity_description">Densità linee isoipse</string>
<string name="configure_screen_quick_action">Azione veloce</string>
<string name="quick_action_item_action">Azione %d</string>
@ -2517,20 +2517,20 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="routing_attr_height_obstacles_name">Utilizza dati altitudine</string>
<string name="routing_attr_height_obstacles_description">Utilizza i dati di elevazione del terreno forniti da SRTM, ASTER, e EU-DEM.</string>
<string name="routing_attr_height_obstacles_description">Fattore di elevazione del terreno (tramite i dati SRTM, ASTER e EU-DEM).</string>
<string name="shared_string_time_span">Intervallo di tempo</string>
<string name="shared_string_max">Massimo</string>
<string name="shared_string_start_time">Ora d\'inizio</string>
<string name="shared_string_end_time">Ora di fine</string>
<string name="shared_string_color">Colore</string>
<string name="select_gpx_folder">Scegli la cartella delle tracce</string>
<string name="select_gpx_folder">Seleziona cartella dei file GPX</string>
<string name="file_can_not_be_moved">Il file non può essere spostato.</string>
<string name="shared_string_move">Sposta</string>
<string name="shared_string_gpx_tracks">Tracce</string>
<string name="average_speed">Velocità media</string>
<string name="shared_string_time_moving">Tempo in movimento</string>
<string name="points_delete_multiple_succesful">Cancellazione punto(i) riuscita.</string>
<string name="points_delete_multiple_succesful">Punti cancellati.</string>
<string name="points_delete_multiple">Stai cancellando %1$d punto(i). Confermi?</string>
<string name="route_points_category_name">Svolte di questo percorso</string>
<string name="track_points_category_name">Punti importanti di questo percorso</string>
@ -3108,13 +3108,19 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="coord_input_save_as_track">Salva come traccia</string>
<string name="coord_input_save_as_track_descr">Hai aggiunto %1$s punti. Digita il nome del file e tappa su \"Salva\".</string>
<string name="test_voice_desrc">Tap sul pulsante e ascolta l\'avviso vocale corrispondente per identificare gli avvisi errati o mancanti</string>
<string name="release_3_2_pre">• Corretto l\'arresto in avvio con le mappe non latine
\n
\n • Migliorati i problemi di velocità di disegno nei dispositivi Android 8.0
\n
\n • Supporto alla modifica degli oggetti poligonali (non amenità)
<string name="release_3_2_pre">• Corretto l\'arresto in avvio con le mappe non latine
\n
\n• Migliorati i problemi di velocità di disegno nei dispositivi Android 8.0
\n
\n• Supporto alla modifica degli oggetti poligonali (non amenità)
\n
\n
\n</string>
<string name="ask_for_location_permission">Per favore dai OsmAnd il permesso alla localizzazione per continuare.</string>
<string name="thank_you_for_feedback">Grazie per il feedback</string>
<string name="search_street">Ricerca per strada</string>
<string name="start_search_from_city">Inizia la ricerca dalla città</string>
<string name="shared_string_restore">Ripristina</string>
<string name="keep_passed_markers">Tenere passati marcatori sulla mappa</string>
<string name="more_transport_on_stop_hint">C\'è più trasporto su questa fermata.</string>
</resources>

View file

@ -2990,4 +2990,10 @@
\n</string>
<string name="ask_for_location_permission">Пожалуйста, для продолжения дайте OsmAnd разрешение на определение местоположения.</string>
<string name="rendering_value_black_name">Чёрный</string>
<string name="search_street">Поиск улицы</string>
<string name="start_search_from_city">Начать поиск с города</string>
<string name="shared_string_restore">Восстановить</string>
<string name="keep_passed_markers_descr">Маркеры, добавленные как группа избранных или GPX путевых точек и отмеченные как пройденные, останутся на карте. Если группа не активна, маркеры исчезнут с карты.</string>
<string name="keep_passed_markers">Оставить пройденные маркеры на карте</string>
<string name="more_transport_on_stop_hint">На этой остановке есть другие транспортные средства.</string>
</resources>

View file

@ -97,7 +97,7 @@
<string name="poi_city_wall">Murallas de sa tzitade</string>
<string name="poi_lift_gate">Ponte levatòiu</string>
<string name="poi_toll_booth">Casellu</string>
<string name="poi_traffic_calming_bump">Dossu</string>
<string name="poi_traffic_calming_bump">Dossu istradale</string>
<string name="poi_traffic_calming_hump">Dossu longu</string>
<string name="poi_traffic_calming_chicane">Chicane</string>
<string name="poi_traffic_signals">Lughe de stop</string>

View file

@ -310,9 +310,9 @@
<string name="shared_string_control_start">Avia/Inghitza</string>
<string name="map_widget_av_notes">Notas àudio/vìdeo</string>
<string name="osmand_srtm_short_description_80_chars">Estensione OsmAnd pro sas curvas de livellu chene lìnia</string>
<string name="osmand_srtm_long_description_1000_chars">Custa estensione frunit sas curvas de livellu e sas umbraduras de sos rilievos, chi podent èssere ammustradas in supra de sas mapas regulares de OsmAnd. Custa funtzionalidade at a èssere appretziada meda dae sos atletas, sos escursionistas, e totu sos chi sunt interessados in s\'orografia e su paesàggiu.
<string name="osmand_srtm_long_description_1000_chars">Custa estensione frunit sas curvas de livellu e sas umbraduras de sos rilievos, chi podent èssere ammustradas in supra de sas mapas regulares de OsmAnd. Custa funtzionalidade at a èssere appretziada meda dae sos atletas, sos escursionistas, e totu sos chi sunt interessados in s\'orografia e su paesàgiu.
\n
\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de sASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), unaina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est unisfortzu de coperassione intre sa NASA, su Ministeru de sEconomia Cummèrtziu e Industria (METI) de su Giapne, e su sistema ispatziale giaponesu (J-spacesystems).</string>
\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de sASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), unaina medidora in subra de Terra, su satèllite de su sistema di osservatzione de sa terra de sa NASA. ASTER est unisfortzu de cooperatzione intre sa NASA, su Ministeru de sEconomia Cummèrtziu e Industria (METI) de su Giapone, e su sistema ispatziale giaponesu (J-spacesystems).</string>
<string name="map_widget_distancemeasurement">Medidura de sa distantzia</string>
<string name="audionotes_location_not_defined">Sa positzione da assotziare cun sa nota non est galu dessinida. \"Imprea positzione…\" pro assinzare una nota a sa positzione dislindada.</string>
@ -323,7 +323,7 @@
<string name="index_srtm_ele">Curvas de livellu</string>
<string name="srtm_plugin_description">Custa estensione frunit sas lìnias/curvas de livellu e sas umbraduras de sos rilievos, chi podent èssere ammustradas in supra de sas mapas regulares de OsmAnd. Custa funtzionalidade at a èssere apretziada meda dae sos atletas, sos escursionistas, e totu sos chi sunt interessados in s\'orografia e su paesàgiu. (Pro praghere ammentade·bos chi sos datos de sas curvas de livellu e sos de sos rilievos sunt separados, e ant a èssere disponìbiles pro s\'iscarrigamentu a pustis de àere allutu s\'estensione).
\n
\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de sASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), unaina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est unisfortzu de coperassione intre NASA, su Ministeru de sEconomia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giaponesu (J-spacesystems).</string>
\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de sASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), unaina medidora in subra de Terra, su satèllite de su sistema di osservatzione de sa terra de sa NASA. ASTER est unisfortzu de cooperatzione intre NASA, su Ministeru de sEconomia Cummèrtziu e Industria (METI) de su Giapone, e su sistema ispatziale giaponesu (J-spacesystems).</string>
<string name="srtm_plugin_name">Curvas de livellu</string>
<string name="download_select_map_types">Àteras mapas</string>
<string name="download_roads_only_item">Petzi istradas</string>
@ -3131,12 +3131,21 @@ Pro praghere iscrie su còdighe intreu</string>
\nDaghe·nos s\'opinione tua</string>
<string name="commiting_way">Imbiende sa bia…</string>
<string name="test_voice_desrc">Toca unu butone e ascurta s\'annùntziu vocale chi li currispondet, pro identificare sos annùntzios chi mancant o chi sunt isballiados.</string>
<string name="release_3_2_pre">• Errore de istudada a s\'allughidura cun mapas cun caràteres non latinos curretu
<string name="release_3_2_pre">• Errore de istudada a s\'allughidura cun mapas cun caràteres non latinos curretu
\n
\n • Lestresa de sa renderizatzione in sos dispositivos Android 8.0 megiorada
\n
\n • Suportu a sa modìfica de ogetos poligonales (non amenidades)
\n
\n • Lestresa de sa renderizatzione in sos dispositivos Android 8.0 megiorada
\n • Medida de distàntzias: butone pro sas medidas annantu a su butone de sas atziones in su menù de cuntestu
\n
\n • Suportu a sa modìfica de ogetos poligonales (non amenidades)
\n</string>
<string name="ask_for_location_permission">Pro praghere permite a OsmAnd de atzèdere a sa positzione pro sighire.</string>
<string name="rendering_value_black_name">Nieddu</string>
<string name="more_transport_on_stop_hint">In custa firmada bi sunt àteros mesos de trasportu.</string>
<string name="search_street">Chirca una carrera</string>
<string name="start_search_from_city">Incumintza sa chirca dae sa tzitade</string>
<string name="shared_string_restore">Riprìstina</string>
<string name="keep_passed_markers_descr">Sos marcadores annantos comente grupu de Preferidos e sos puntos de coladòrgiu GPX sinnados comente colados ant a abarrare in sa mapa. Si su grupu no est ativu, sos marcadores ant a isparèssere dae sa mapa.</string>
<string name="keep_passed_markers">Mantene sos marcadores colados in sa mapa</string>
</resources>

View file

@ -3000,4 +3000,10 @@ Zodpovedá oblasti: %1$s x %2$s</string>
\n</string>
<string name="ask_for_location_permission">Prosím udeľte OsmAnd oprávnenie na prístup k polohe, aby mohol pokračovať.</string>
<string name="rendering_value_black_name">Čierna</string>
<string name="more_transport_on_stop_hint">Na tejto zastávke je ešte ďalšia doprava.</string>
<string name="search_street">Hľadať ulicu</string>
<string name="start_search_from_city">Začať hľadanie z mesta</string>
<string name="shared_string_restore">Obnoviť</string>
<string name="keep_passed_markers_descr">Značky pridané ako skupina Obľúbených alebo bodov GPX, označené ako Prejdené, zostanú na mape. Ak skupina nie je aktívna, značky zmiznú z mapy.</string>
<string name="keep_passed_markers">Ponechať prejdené značky na mape</string>
</resources>

View file

@ -218,8 +218,8 @@
<string name="poi_lift_gate">Капија лифта</string>
<string name="poi_toll_booth">Телефонска говорница</string>
<string name="poi_border_control">Пасошка контрола</string>
<string name="poi_traffic_calming_bump">Лежећи</string>
<string name="poi_traffic_calming_cushion">Јастуче</string>
<string name="poi_traffic_calming_bump">Лежећи полицајац</string>
<string name="poi_traffic_calming_cushion">Јастуче (брзинско)</string>
<string name="poi_traffic_calming_chicane">Шикана</string>
<string name="poi_traffic_calming_island">Саобраћајно острво</string>
<string name="poi_traffic_signals">Стоп светло</string>
@ -1570,9 +1570,9 @@
<string name="poi_fire_water_pond">Противпожарни базен</string>
<string name="poi_grit_bin">Сандук соли</string>
<string name="poi_ford_stepping_stones">Пешачки камени мост</string>
<string name="poi_traffic_calming_hump">Испупчење</string>
<string name="poi_traffic_calming_hump">Испупчење (брзинско)</string>
<string name="poi_traffic_calming_rumble_strip">Трака неравнине</string>
<string name="poi_traffic_calming_table">Успоривачки сто</string>
<string name="poi_traffic_calming_table">Успоривачки прелаз</string>
<string name="poi_traffic_calming_choker">Потискивач</string>
<string name="poi_public_transport_stop_position">Стоп позиција јавног превоза</string>
<string name="poi_railway_platform">Перон пруге</string>
@ -2438,4 +2438,47 @@
<string name="poi_historic_civilization_minoan">Цивилизација: минонска</string>
<string name="poi_historic_civilization_tiahuanacota">Цивилизација: тиахунакотска</string>
<string name="poi_animal_training">Тренинг животиња</string>
<string name="poi_animal_training_dog">Пас</string>
<string name="poi_animal_training_horse">Коњ</string>
<string name="poi_horse_yes">Дозвољено коњима</string>
<string name="poi_horse_no">Недозвољено коњима</string>
<string name="poi_animal_yes">Дозвољено животињама</string>
<string name="poi_animal_no">Недозвољено животињама</string>
<string name="poi_historic_period_nuragic">Историјски период: нурагски</string>
<string name="poi_historic_period_stone_bronze_undetermined">Историјски период: камено доба / бронзано доба (неодређено)</string>
<string name="poi_historic_period_bronze_age">Историјски период: бронзано доба</string>
<string name="poi_historic_period_principate">Историјски период: принципат (27.г. пре.Х - 284.г. посл.Х)</string>
<string name="poi_historic_period_classical_greece">Историјски период: класично грчки (5.в. - 4.в. пре.Х)</string>
<string name="poi_historic_period_archaic_greece">Историјски период: архаично грчки</string>
<string name="poi_historic_period_iron_age">Историјски период: гвоздено доба</string>
<string name="poi_historic_period_roman_republic">Историјски период: Римска република (508.г. пре.Х - 27.г. пре.Х)</string>
<string name="poi_historic_period_hellenistic_greece">Историјски период: хеленско грчки</string>
<string name="poi_historic_period_new_kingdom">Историјски период: ново царство (1550 - 1069 пре.Х)</string>
<string name="poi_historic_period_middle_kingdom">Историјски период: средње царство (2055 - 1650 пре.Х)</string>
<string name="poi_historic_period_predynastic_egypt">Историјски период: прединастијско египадски</string>
<string name="poi_historic_period_early_dynastic_period">Историјски период: рано династијски период (3100 - 2686 пре.Х)</string>
<string name="poi_historic_period_old_kingdom">Историјски период: старо царство (2686 - 2181 пре.Х)</string>
<string name="poi_historic_period_first_intermediate_period">Историјски период: први међупериод (2181 - 2055 пре.Х)</string>
<string name="poi_historic_period_second_intermediate_period">Историјски период: други међупериод (1650 - 1550 пре.Х)</string>
<string name="poi_historic_period_third_intermediate_period">Историјски период: трећи међупериод (1069 - 664 пре.Х)</string>
<string name="poi_historic_period_first_persian_period">Историјски период: први персијски период</string>
<string name="poi_historic_period_late_period">Историјски период: касни период (664 - 332 пре.Х)</string>
<string name="poi_historic_period_second_persian_period">Историјски период: други персијски период</string>
<string name="poi_historic_period_alexander_the_great">Историјски период: Александра Великог</string>
<string name="poi_historic_period_ptolemaic_egypt">Историјски период: птоломејско египадски (305 пре.Х - 30 пре.Х)</string>
<string name="poi_historic_period_christian_egypt">Историјски период: хришћанско египадски</string>
<string name="poi_historic_period_byzantine_egypt">Историјски период: византијско египадски (30 пре.Х - 641 посл.Х)</string>
<string name="poi_historic_period_persian_occupation">Историјски период: персијска окупација</string>
<string name="poi_historic_period_greek_dark_ages">Историјски период: Грчки Средњи Век (1100 - 800 пре.Х)</string>
<string name="poi_historic_period_roman_greece">Историјски период: Римско Грчки (146 пре.Х - 330 посл.Х)</string>
<string name="poi_historic_period_roman_kingdom">Историјски период: Римско царство (753.г. пре.Х - 509.г. пре.Х)</string>
<string name="poi_historic_period_dominate">Историјски период: доминирајући (285.г. посл.Х - 476.г. посл.Х)</string>
<string name="poi_historic_period_villager">Историјски период: сељачки (епоха 1., 2., 1580 пре.Х - 133 посл.Х)</string>
<string name="poi_historic_period_urban">Историјски период: урбански (епоха 3., 133 посл.Х - 374 посл.Х)</string>
<string name="poi_historic_period_classical">Историјски период: класични (епоха 4., 374 посл.Х - 900 посл.Х)</string>
<string name="poi_historic_period_imperial">Историјски период: иперијални (епоха 5., 900 посл.Х - 1200 посл.Х)</string>
</resources>

View file

@ -3005,4 +3005,9 @@
<string name="ask_for_location_permission">Молим дајте ОсмАнду дозволу приступа локацији ради наставка.</string>
<string name="rendering_value_black_name">Црна</string>
<string name="more_transport_on_stop_hint">Постоје још превоза на овој станици.</string>
<string name="search_street">Тражи улицу</string>
<string name="start_search_from_city">Тражи почевши од града</string>
<string name="shared_string_restore">Поврати</string>
<string name="keep_passed_markers_descr">Маркери додати као група Омиљених или ГПИкс пролазних тачака означени као Одобрени остаће на мапи. Ако група није активна, маркери ће се изгубиће са мапе.</string>
<string name="keep_passed_markers">Задржи одобрене маркере на мапи</string>
</resources>

View file

@ -301,12 +301,12 @@
<string name="poi_lift_gate">Lift gate</string>
<string name="poi_toll_booth">Toll booth</string>
<string name="poi_border_control">Border control</string>
<string name="poi_traffic_calming_bump">Bump</string>
<string name="poi_traffic_calming_hump">Hump</string>
<string name="poi_traffic_calming_cushion">Cushion</string>
<string name="poi_traffic_calming_bump">Speed Bump</string>
<string name="poi_traffic_calming_hump">Speed Hump</string>
<string name="poi_traffic_calming_cushion">Speed Cushion</string>
<string name="poi_traffic_calming_chicane">Chicane</string>
<string name="poi_traffic_calming_rumble_strip">Rumble strip</string>
<string name="poi_traffic_calming_table">Table</string>
<string name="poi_traffic_calming_table">Speed Table</string>
<string name="poi_traffic_calming_choker">Choker</string>
<string name="poi_traffic_calming_island">Traffic island</string>
<string name="poi_traffic_signals">Stop light</string>

View file

@ -528,9 +528,6 @@
<string name="rendering_attr_contourWidth_name">Contour line width</string>
<string name="rendering_attr_hideWaterPolygons_description">Water</string>
<string name="rendering_attr_hideWaterPolygons_name">Hide water</string>
<string name="legacy_search">Legacy search</string>
<string name="show_legacy_search">Show legacy search</string>
<string name="show_legacy_search_desc">Add the legacy search to the drawer list.</string>
<string name="routing_attr_allow_motorway_name">Allow motorways</string>
<string name="routing_attr_allow_motorway_description">Allow motorways.</string>
<string name="upload_osm_note_description">Upload your OSM Note anonymously or by using your OpenStreetMap.org profile.</string>
@ -615,8 +612,6 @@
<string name="allow_access_location">Allow location access</string>
<string name="first_usage_greeting">Get directions and discover new places without an Internet connection</string>
<string name="search_my_location">Find my position</string>
<string name="no_update_info_desc">Do not check for new versions or OsmAnd related discounts.</string>
<string name="no_update_info">Do not show new versions</string>
<string name="update_all_maps_now">Update all maps now?</string>
<string name="clear_tile_data">Clear all tiles</string>
<string name="routing_attr_short_way_name">Fuel-efficient way</string>

View file

@ -56,10 +56,6 @@ public class OsmAndAppCustomization {
return MapActivity.class;
}
public Class<SearchActivity> getSearchActivity(){
return SearchActivity.class;
}
public Class<TrackActivity> getTrackActivity(){
return TrackActivity.class;
}

View file

@ -1192,10 +1192,6 @@ public class OsmandSettings {
}
public final OsmandPreference<Boolean> NO_DISCOUNT_INFO = new BooleanPreference("no_discount_info", false).makeGlobal();
public final OsmandPreference<Boolean> SHOW_LEGACY_SEARCH = new BooleanPreference("show_legacy_search", false).makeGlobal();
// this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<Boolean> DEBUG_RENDERING_INFO = new BooleanPreference("debug_rendering", false).makeGlobal();

View file

@ -1367,19 +1367,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
uiHandler.sendMessageDelayed(msg, LONG_KEYPRESS_DELAY);
}
return true;
} else if (keyCode == KeyEvent.KEYCODE_SEARCH && event.getRepeatCount() == 0) {
Intent newIntent = new Intent(MapActivity.this, getMyApplication().getAppCustomization()
.getSearchActivity());
// causes wrong position caching: newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
LatLon loc = getMapLocation();
newIntent.putExtra(SearchActivity.SEARCH_LAT, loc.getLatitude());
newIntent.putExtra(SearchActivity.SEARCH_LON, loc.getLongitude());
if (mapViewTrackingUtilities.isMapLinkedToLocation()) {
newIntent.putExtra(SearchActivity.SEARCH_NEARBY, true);
}
startActivity(newIntent);
newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
return true;
}
return super.onKeyDown(keyCode, event);
}

View file

@ -696,28 +696,7 @@ public class MapActivityActions implements DialogProvider {
}
}).createItem());
if (settings.SHOW_LEGACY_SEARCH.get()) {
optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.legacy_search, mapActivity)
.setIcon(R.drawable.ic_action_search_dark)
.setListener(new ContextMenuAdapter.ItemClickListener() {
@Override
public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
app.logEvent(mapActivity, "drawer_legacy_search_open");
Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
.getSearchActivity());
LatLon loc = mapActivity.getMapLocation();
newIntent.putExtra(SearchActivity.SEARCH_LAT, loc.getLatitude());
newIntent.putExtra(SearchActivity.SEARCH_LON, loc.getLongitude());
if (mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation()) {
newIntent.putExtra(SearchActivity.SEARCH_NEARBY, true);
}
newIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
mapActivity.startActivity(newIntent);
return true;
}
}).createItem());
}
optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.get_directions, mapActivity)
.setIcon(R.drawable.ic_action_gdirections_dark)
.setListener(new ContextMenuAdapter.ItemClickListener() {

View file

@ -868,7 +868,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
switch (itemId) {
case android.R.id.home:
if (getIntent().hasExtra(MapActivity.INTENT_KEY_PARENT_MAP_ACTIVITY)) {
Intent newIntent = new Intent(this, app.getAppCustomization().getSearchActivity());
Intent newIntent = new Intent(this, SearchActivity.class);
if (location != null) {
newIntent.putExtra(SearchActivity.SEARCH_LAT, location.getLatitude());
newIntent.putExtra(SearchActivity.SEARCH_LON, location.getLongitude());

View file

@ -40,66 +40,42 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
super.onCreate(savedInstanceState);
getToolbar().setTitle(R.string.debugging_and_development);
PreferenceScreen cat = getPreferenceScreen();
CheckBoxPreference dbg = createCheckBoxPreference(settings.DEBUG_RENDERING_INFO,
R.string.trace_rendering, R.string.trace_rendering_descr);
cat.addPreference(dbg);
Preference pref;
cat.addPreference(createCheckBoxPreference(settings.DISABLE_COMPLEX_ROUTING,
R.string.disable_complex_routing, R.string.disable_complex_routing_descr));
cat.addPreference(createCheckBoxPreference(settings.USE_FAST_RECALCULATION,
R.string.use_fast_recalculation, R.string.use_fast_recalculation_desc));
final CheckBoxPreference openGlRender = createCheckBoxPreference(settings.USE_OPENGL_RENDER, R.string.use_opengl_render,R.string.use_opengl_render_descr);
cat.addPreference(openGlRender);
cat.addPreference(createCheckBoxPreference(settings.USE_OSM_LIVE_FOR_ROUTING,
R.string.use_osm_live_routing,
R.string.use_osm_live_routing_description));
// 2 should be in main settings
cat.addPreference(createCheckBoxPreference(settings.USE_OPENGL_RENDER,
R.string.use_opengl_render,R.string.use_opengl_render_descr));
cat.addPreference(createCheckBoxPreference(settings.ANIMATE_MY_LOCATION,
R.string.animate_my_location,
R.string.animate_my_location_desc));
R.string.animate_my_location, R.string.animate_my_location_desc));
final Preference firstRunPreference = new Preference(this);
firstRunPreference.setTitle(R.string.simulate_initial_startup);
firstRunPreference.setSummary(R.string.simulate_initial_startup_descr);
firstRunPreference.setSelectable(true);
firstRunPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
pref = new Preference(this);
pref.setTitle(R.string.app_modes_choose);
pref.setSummary(R.string.app_modes_choose_descr);
pref.setKey("available_application_modes");
pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
getMyApplication().getAppInitializer().resetFirstTimeRun();
OsmandSettings settings = getMyApplication().getSettings();
settings.FIRST_MAP_IS_DOWNLOADED.set(false);
settings.MAPILLARY_FIRST_DIALOG_SHOWN.set(false);
settings.WEBGL_SUPPORTED.set(true);
settings.METRIC_SYSTEM_CHANGED_MANUALLY.set(false);
settings.WIKI_ARTICLE_SHOW_IMAGES_ASKED.set(false);
getMyApplication().showToastMessage(R.string.shared_string_ok);
availableProfileDialog();
return true;
}
});
cat.addPreference(firstRunPreference);
cat.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
R.string.show_free_version_banner,
R.string.show_free_version_banner_description));
cat.addPreference(createCheckBoxPreference(settings.NO_DISCOUNT_INFO,
R.string.no_update_info, R.string.no_update_info_desc));
cat.addPreference(pref);
cat.addPreference(createCheckBoxPreference(settings.SHOW_LEGACY_SEARCH,
R.string.show_legacy_search, R.string.show_legacy_search_desc));
PreferenceCategory navigation = new PreferenceCategory(this);
navigation.setTitle(R.string.routing_settings);
cat.addPreference(navigation);
navigation.addPreference(createCheckBoxPreference(settings.DISABLE_COMPLEX_ROUTING,
R.string.disable_complex_routing, R.string.disable_complex_routing_descr));
// FIXME delete USE_MAP_MARKERS
// cat.addPreference(createCheckBoxPreference(settings.USE_MAP_MARKERS,
// R.string.map_markers,
// R.string.show_map_markers_description));
navigation.addPreference(createCheckBoxPreference(settings.USE_FAST_RECALCULATION,
R.string.use_fast_recalculation, R.string.use_fast_recalculation_desc));
Preference pref = new Preference(this);
navigation.addPreference(createCheckBoxPreference(settings.USE_OSM_LIVE_FOR_ROUTING,
R.string.use_osm_live_routing,
R.string.use_osm_live_routing_description));
pref = new Preference(this);
final Preference simulate = pref;
final OsmAndLocationSimulation sim = getMyApplication().getLocationProvider().getLocationSimulation();
final Runnable updateTitle = new Runnable(){
@ -121,7 +97,43 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
return true;
}
});
cat.addPreference(pref);
navigation.addPreference(pref);
PreferenceCategory debug = new PreferenceCategory(this);
debug.setTitle(R.string.debugging_and_development);
cat.addPreference(debug);
CheckBoxPreference dbg = createCheckBoxPreference(settings.DEBUG_RENDERING_INFO,
R.string.trace_rendering, R.string.trace_rendering_descr);
debug.addPreference(dbg);
final Preference firstRunPreference = new Preference(this);
firstRunPreference.setTitle(R.string.simulate_initial_startup);
firstRunPreference.setSummary(R.string.simulate_initial_startup_descr);
firstRunPreference.setSelectable(true);
firstRunPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
getMyApplication().getAppInitializer().resetFirstTimeRun();
OsmandSettings settings = getMyApplication().getSettings();
settings.FIRST_MAP_IS_DOWNLOADED.set(false);
settings.MAPILLARY_FIRST_DIALOG_SHOWN.set(false);
settings.WEBGL_SUPPORTED.set(true);
settings.METRIC_SYSTEM_CHANGED_MANUALLY.set(false);
settings.WIKI_ARTICLE_SHOW_IMAGES_ASKED.set(false);
getMyApplication().showToastMessage(R.string.shared_string_ok);
return true;
}
});
debug.addPreference(firstRunPreference);
debug.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
R.string.show_free_version_banner,
R.string.show_free_version_banner_description));
@ -138,19 +150,6 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
});
cat.addPreference(pref);
pref = new Preference(this);
pref.setTitle(R.string.app_modes_choose);
pref.setSummary(R.string.app_modes_choose_descr);
pref.setKey("available_application_modes");
pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
availableProfileDialog();
return true;
}
});
cat.addPreference(pref);
PreferenceCategory info = new PreferenceCategory(this);
info.setTitle(R.string.info_button);
cat.addPreference(info);

View file

@ -52,8 +52,7 @@ public class DiscountHelper {
showDiscountBanner(mapActivity, mTitle, mDescription, mIcon, mUrl);
}
if (System.currentTimeMillis() - mLastCheckTime < 1000 * 60 * 60 * 24
|| !settings.isInternetConnectionAvailable()
|| settings.NO_DISCOUNT_INFO.get()) {
|| !settings.isInternetConnectionAvailable()) {
return;
}
mLastCheckTime = System.currentTimeMillis();

View file

@ -8,6 +8,7 @@ import net.osmand.PlatformUtil;
import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
import net.osmand.binary.CachedOsmandIndexes;
import net.osmand.binary.GeocodingUtilities;
import net.osmand.binary.GeocodingUtilities.GeocodingResult;
import net.osmand.binary.RouteDataObject;
@ -48,16 +49,30 @@ public class CurrentPositionHelper {
File appPath = app.getAppPath(null);
SampleUtils.collectFiles(appPath, IndexConstants.BINARY_MAP_INDEX_EXT, files);
CachedOsmandIndexes cachedOsmandIndexes = new CachedOsmandIndexes();
File indCache = app.getAppPath("ind_core.cache");
if (indCache.exists()) {
try {
cachedOsmandIndexes.readFromFile(indCache, CachedOsmandIndexes.VERSION);
} catch (Exception e) {
}
}
readers.clear();
for (File f : files) {
try {
RandomAccessFile mf = new RandomAccessFile(f.getPath(), "r");
BinaryMapIndexReader reader = new BinaryMapIndexReader(mf, f);
BinaryMapIndexReader reader = cachedOsmandIndexes.getReader(f);
readers.add(reader);
} catch (IOException e) {
e.printStackTrace();
}
}
if (files.size() > 0 && (!indCache.exists() || indCache.canWrite())) {
try {
cachedOsmandIndexes.writeToFile(indCache);
} catch (Exception e) {
log.error("Index file could not be written", e);
}
}
}
public Location getLastAskedLocation() {

View file

@ -2,6 +2,7 @@ package net.osmand.core.samples.android.sample1.search;
import net.osmand.IndexConstants;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.CachedOsmandIndexes;
import net.osmand.core.samples.android.sample1.SampleApplication;
import net.osmand.core.samples.android.sample1.SampleUtils;
import net.osmand.search.SearchUICore;
@ -51,11 +52,18 @@ public class QuickSearchHelper {
SampleUtils.collectFiles(appPath, IndexConstants.BINARY_MAP_INDEX_EXT, files);
SampleUtils.collectFiles(app.getAppPath(IndexConstants.WIKI_INDEX_DIR), IndexConstants.BINARY_MAP_INDEX_EXT, files);
CachedOsmandIndexes cachedOsmandIndexes = new CachedOsmandIndexes();
File indCache = app.getAppPath("ind_core.cache");
if (indCache.exists()) {
try {
cachedOsmandIndexes.readFromFile(indCache, CachedOsmandIndexes.VERSION);
} catch (Exception e) {
}
}
List<BinaryMapIndexReader> readers = new ArrayList<>();
for (File f : files) {
try {
RandomAccessFile mf = new RandomAccessFile(f.getPath(), "r");
BinaryMapIndexReader reader = new BinaryMapIndexReader(mf, f);
BinaryMapIndexReader reader = cachedOsmandIndexes.getReader(f);
readers.add(reader);
} catch (IOException e) {
e.printStackTrace();