Merge branch 'master' of ssh://github.com/osmandapp/Osmand into add_ruler
This commit is contained in:
Alexander Sytnyk
commit
ffc1db435a
24 changed files with 1008 additions and 262 deletions
|
|
@ -72,17 +72,19 @@ public class BinaryInspector {
|
|||
// test cases show info
|
||||
if ("test".equals(args[0])) {
|
||||
in.inspector(new String[] {
|
||||
|
||||
// "-vpoi",
|
||||
// "-vmap", "-vmapobjects", // "-vmapcoordinates",
|
||||
"-vrouting",
|
||||
"-vmap", "-vmapobjects", // "-vmapcoordinates",
|
||||
// "-vrouting",
|
||||
// "-vtransport",
|
||||
// "-vaddress", "-vcities","-vstreetgroups",
|
||||
// "-vstreets", "-vbuildings", "-vintersections",
|
||||
// "-lang=ru",
|
||||
// "-bbox=30.4981,50.4424,30.5195,50.4351",
|
||||
// "-osm="+System.getProperty("maps.dir")+"/map.obf.osm",
|
||||
// "-osm="+System.getProperty("maps.dir")+"/map_full.obf.osm",
|
||||
System.getProperty("maps.dir")+"/Map.obf"
|
||||
// System.getProperty("maps.dir")+"/Ukraine_kiev-city_europe.obf"
|
||||
// System.getProperty("maps.dir")+"../temp/kiev/Ukraine_kiev-city_europe_17_06_05.obf",
|
||||
// System.getProperty("maps.dir")+"Ukraine_kiev-city_europe_2.obf",
|
||||
});
|
||||
} else {
|
||||
in.inspector(args);
|
||||
|
|
@ -258,7 +260,7 @@ public class BinaryInspector {
|
|||
println("\n" + extracted.size() + " parts were successfully extracted to " + args[1]);
|
||||
}
|
||||
}
|
||||
} else if (f.startsWith("-v")) {
|
||||
} else if (f.startsWith("-v") || f.startsWith("-osm")) {
|
||||
if (args.length < 2) {
|
||||
printUsage("Missing file parameter");
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -300,6 +300,7 @@ public abstract class MapRenderingTypes {
|
|||
rt.id = mapRulType.id;
|
||||
if(rt.isMain()) {
|
||||
mapRulType.main = true;
|
||||
mapRulType.order = rt.order;
|
||||
if(rt.minzoom != 0) {
|
||||
mapRulType.minzoom = Math.max(rt.minzoom, mapRulType.minzoom);
|
||||
}
|
||||
|
|
|
|||
BIN
OsmAnd/res/drawable-hdpi/map_ruler_center_day.png
Normal file
BIN
OsmAnd/res/drawable-hdpi/map_ruler_center_day.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
OsmAnd/res/drawable-hdpi/map_ruler_center_night.png
Normal file
BIN
OsmAnd/res/drawable-hdpi/map_ruler_center_night.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
OsmAnd/res/drawable-mdpi/map_ruler_center_day.png
Normal file
BIN
OsmAnd/res/drawable-mdpi/map_ruler_center_day.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
OsmAnd/res/drawable-mdpi/map_ruler_center_night.png
Normal file
BIN
OsmAnd/res/drawable-mdpi/map_ruler_center_night.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
OsmAnd/res/drawable-xhdpi/map_ruler_center_day.png
Normal file
BIN
OsmAnd/res/drawable-xhdpi/map_ruler_center_day.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
OsmAnd/res/drawable-xhdpi/map_ruler_center_night.png
Normal file
BIN
OsmAnd/res/drawable-xhdpi/map_ruler_center_night.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
BIN
OsmAnd/res/drawable-xxhdpi/map_ruler_center_day.png
Normal file
BIN
OsmAnd/res/drawable-xxhdpi/map_ruler_center_day.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
BIN
OsmAnd/res/drawable-xxhdpi/map_ruler_center_night.png
Normal file
BIN
OsmAnd/res/drawable-xxhdpi/map_ruler_center_night.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -74,4 +74,11 @@
|
|||
<string name="poi_wine">Şərab mağazası</string>
|
||||
<string name="poi_books">Kitab mağazası</string>
|
||||
<string name="poi_bicycle">Velosiped mağazası</string>
|
||||
<string name="poi_mobile_phone">Mobil telefon mağazası</string>
|
||||
<string name="poi_motorcycle">Motosiklet mağazası</string>
|
||||
<string name="poi_music">Musiqi mağazası</string>
|
||||
<string name="poi_musical_instrument">Musiqi alətləri</string>
|
||||
<string name="poi_outdoor">Açıq havada mağaza</string>
|
||||
<string name="poi_paint">Boya mağazası</string>
|
||||
<string name="poi_pet">Ev heyvanı mağazası</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1365,7 +1365,7 @@
|
|||
<string name="gpx_no_tracks_title">Sizin hələ izləriniz yoxdur</string>
|
||||
<string name="gpx_no_tracks_title_folder">Qovluğa izlər əlavə edə də bilərsiniz</string>
|
||||
<string name="gpx_add_track">İz əlavə et</string>
|
||||
<string name="storage_place_description">OsmAnd-ın məlumatlar yeri (xəritələr, izlər və s.): %1$s.</string>
|
||||
<string name="storage_place_description">OsmAnd-ın məlumat saxlama yeri (xəritələr, izlər və s.): %1$s.</string>
|
||||
<string name="shared_string_save_as_gpx">GPX izi olaraq saxla</string>
|
||||
<string name="shared_string_my_tracks">İzlərim</string>
|
||||
<string name="shared_string_currently_recording_track">Hazırki qeyd edilən iz</string>
|
||||
|
|
@ -1440,7 +1440,7 @@
|
|||
<string name="disable_complex_routing">Mürəkkəb marşrutlamanı söndür</string>
|
||||
<string name="amenity_type_seamark">Dəniz işarəsi</string>
|
||||
<string name="app_modes_choose_descr">Proqramda görünən istifadə profillərini seçin</string>
|
||||
<string name="map_widget_map_rendering">Xəritə göstərilməsi</string>
|
||||
<string name="map_widget_map_rendering">Xəritənin göstərilməsi</string>
|
||||
<string name="app_mode_hiking">Piyada turizm</string>
|
||||
<string name="app_mode_motorcycle">Motosiklet</string>
|
||||
<string name="local_osm_changes_delete_all_confirm">%1$d OSM dəyişikliyini silmək üzrəsiniz. Əminsiniz?</string>
|
||||
|
|
@ -1511,4 +1511,13 @@
|
|||
<string name="map_widget_config">Ekranı tənzimlə</string>
|
||||
<string name="quick_action_add_configure_map">Xəritəni tənzimlə</string>
|
||||
<string name="recording_delete_confirm">Bu qeydetməni silmək istəyirsiniz?</string>
|
||||
<string name="routing_attr_allow_motorway_name">Avtomagistrallara icazə ver</string>
|
||||
<string name="routing_attr_allow_motorway_description">Avtomagistrallara icazə ver</string>
|
||||
<string name="trip_rec_notification_settings">Səyahət qeydetmə (məlumat yoxdur)</string>
|
||||
<string name="trip_rec_notification_settings_desc">“Qeyd et” düyməsinə basaraq səyahət qeydetməni başlatmağa icazə verən bildirişi göstər</string>
|
||||
<string name="save_track_min_speed">Minimum qeydiyyat sürəti</string>
|
||||
<string name="new_filter_desc">Yeni filtr üçün ad daxil edin. Bu, sizin Kateqoriyalar bölmənizə əlavə olunur.</string>
|
||||
<string name="donation_to_osm">OpenStreetMap cəmiyyəti üçün ianə</string>
|
||||
<string name="donation_to_osm_desc">İanənizin bir hissəsi OpenStreetMap-a dəyişikliklər təqdim edən OSM istifadəçilərinə göndəriləcək. Abunəliyin qiyməti eyni qalır.</string>
|
||||
<string name="access_expanded_list">Genişlədilmiş siyahı</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -47,4 +47,8 @@
|
|||
<string name="poi_recycling_type">Triba</string>
|
||||
<string name="poi_shelter_type">Triba</string>
|
||||
<string name="poi_medical_system">Sistema mélicu</string>
|
||||
<string name="poi_vending_type">Tipu de máquina de venta</string>
|
||||
<string name="poi_self_service">Autoserviciu</string>
|
||||
<string name="poi_automated">Automatizáu</string>
|
||||
<string name="poi_covered">Cubiertu</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@
|
|||
<!-- string name="lat_lon_pattern">Lla: %1$.5f Llo: %2$.5f</string -->
|
||||
<string name="osmand_development_plugin_description">Esti complementu amuesa axustes pal desendolcu y depuración de carauterístiques pa probar o simular trayeutos, el rindimientu del renderizáu de pantalla o avisos per voz. Estos axustes tán pensaos pa desendolcadores y nun se precisen pal usuariu xeneral.</string>
|
||||
<string name="osmand_accessibility_description">Esti complementu fai que les carauterístiques d\'accesibilidá del preséu tean disponibles direutamente n\'OsmAnd. Facilita, por exemplu, l\'axuste de la tasa de fala pa voces TTS, configuración de la pantalla de navegación del mandu direicional, usu d\'un trackball pa controlar el zoom o usu de feedback pa testu a falar como pal anunciu automáticu de la to posición.</string>
|
||||
<string name="osm_editing_plugin_description">Pente esti complementu, OsmAnd pue usase pa facer collaboraciones n\'OSM como la creación o modificación d\'oxetos POI, apertura o comentar fallos y collaboración con ficheros GPX guardaos. OSM ta fechu pola comunidá, un proyeutu de cartografía de dominiu públicu. Pa detalles, por favor vete a https://openstreetmap.org. Agradezse la participación activa y les collaboraciones puen facese direutamente dende OsmAnd si especifiques les tos credenciales personales d\'OSM na aplicación.</string>
|
||||
<string name="osm_editing_plugin_description">Pente esti complementu, OsmAnd pue usase pa facer collaboraciones n\'OSM como la creación o modificación d\'oxetos POI, apertura o comentar notes y collaboración con ficheros GPX guardaos. OSM ta fechu pola comunidá, un proyeutu de cartografía de dominiu públicu. Pa detalles, por favor vete a https://openstreetmap.org. Agradezse la participación activa y les collaboraciones puen facese direutamente dende OsmAnd si especifiques les tos credenciales personales d\'OSM na aplicación.</string>
|
||||
<string name="osmand_distance_planning_plugin_description">Esti complementu apurre un widget cola pantalla del mapa pa crear caminos calcando nel mapa, o usar o modificar ficheros GPX esistentes pa planiar un viaxe y midir la distancia ente puntos. Los resultaos puen guardase como ficheru GPX pa usalos más sero como referencia.</string>
|
||||
<string name="osm_live_thanks">¡Gracies por soscribite a los anovamientos en direuto!</string>
|
||||
<string name="live_updates">En direuto</string>
|
||||
|
|
@ -411,7 +411,7 @@
|
|||
<string name="driving_region_japan">Xapón</string>
|
||||
<string name="driving_region_us">Estaos Xuníos</string>
|
||||
<string name="driving_region_canada">Canadá</string>
|
||||
<string name="driving_region_europe_asia">Europa y Asia</string>
|
||||
<string name="driving_region_europe_asia">Europa, Asia, América llatina y asemeyaos</string>
|
||||
<string name="driving_region_uk">RR.XX, India, y asemeyaos</string>
|
||||
<string name="speak_speed_limit">Llende de velocidá</string>
|
||||
<string name="speak_cameras">Radares de velocidá</string>
|
||||
|
|
@ -484,7 +484,7 @@ Llo %2$s</string>
|
|||
<string name="lang_hsb">Sorbiu (Altu)</string>
|
||||
<string name="lang_sw">Suaḥili</string>
|
||||
<string name="lang_he">Hebréu</string>
|
||||
<string name="coords_format_descr">Formatu pa les coordenaes xeográfiques</string>
|
||||
<string name="coords_format_descr">Formatu de coordenaes xeográfiques</string>
|
||||
<string name="access_direction_audio_feedback_descr">Indica la direición del puntu oxetivu sonóramente</string>
|
||||
<string name="access_direction_haptic_feedback_descr">Indica la direición del puntu oxetivu vibrando</string>
|
||||
<string name="access_hint_enter_description">Introduz la descripción</string>
|
||||
|
|
@ -718,14 +718,10 @@ Puntos</string>
|
|||
<string name="access_disable_wrong_direction_recalc_descr">Evita\'l recálculu automáticu de ruta cuando teas diendo pela direición incorreuta</string>
|
||||
<string name="osmo_tracker_id_descr">Primi pa ver la ID del rastrexador</string>
|
||||
<string name="osmo_plugin_description">"Esti complementu apurre de mou parcial la función de Siguimientu d\'OpenStreetMap, mira https://osmo.mobi
|
||||
|
||||
|
||||
|
||||
Pues siguir en tiempu real tolos preseos d\'un grupu participante. Tamién pues ver el puntu y les pistes xubíes al grupu que perteneces.
|
||||
|
||||
|
||||
El grupu nun se desanició dempués de meses, ponlu en llinia coles regles coles que crees grupos nel sitiu web OsMo.mobi
|
||||
"</string>
|
||||
\n
|
||||
\nPues siguir en tiempu real tolos preseos d\'un grupu participante. Tamién pues ver el puntu y les traces xubíes al grupu que perteneces.
|
||||
\n
|
||||
\nEl grupu nun se desanició dempués de meses, ponlu en llinia coles regles coles que crees grupos nel sitiu web OsMo.mobi "</string>
|
||||
<string name="simulate_your_location_stop_descr">Para de simular el to allugamientu</string>
|
||||
<string name="simulate_your_location_descr">Simula usando una ruta calculada o un GPX grabáu</string>
|
||||
<string name="disable_recording_once_app_killed_descrp">Posaráse\'l rexistru de GPX cuando s\'amortie l\'aplicación (per aplicaciones recientes). (La indicación de fondu d\'OsmAnd desapaecerá de la barra d\'avisos d\'Android).</string>
|
||||
|
|
@ -733,25 +729,25 @@ El grupu nun se desanició dempués de meses, ponlu en llinia coles regles coles
|
|||
<string name="fonts_header">Fontes pal mapa</string>
|
||||
<string name="right_side_navigation">Conducción pela derecha</string>
|
||||
<string name="driving_region_automatic">Automáticu</string>
|
||||
<string name="do_not_send_anonymous_app_usage">Nun unviar datos anónimos d\'usu de l\'aplicación</string>
|
||||
<string name="do_not_send_anonymous_app_usage">Nun unviar estadístiques anónimes d\'usu de l\'aplicación</string>
|
||||
<string name="do_not_send_anonymous_app_usage_desc">Osmand recueye información tocante a les partes qu\'abres de l\'aplicación. Enxamás s\'unvia\'l to allugamientu, nin nada qu\'introduzas n\'aplicación o nos detalles de les árees que veas, guetes o baxes.</string>
|
||||
<string name="do_not_show_startup_messages">Nun amosar los mensaxes nel aniciu</string>
|
||||
<string name="do_not_show_startup_messages_desc">Amuesa descuentos de l\'aplicación y mensaxes especiales d\'actividaes llocales</string>
|
||||
<string name="parking_options">Opciones d\'aparcamientu</string>
|
||||
<string name="full_version_thanks">¡Gracies por mercar la versión completa d\'OsmAnd!</string>
|
||||
<string name="routing_attr_relief_smoothness_factor_hills_name">Llombes</string>
|
||||
<string name="routing_attr_relief_smoothness_factor_plains_name">Llanos</string>
|
||||
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Más llanos</string>
|
||||
<string name="routing_attr_relief_smoothness_factor_hills_name">Pindio</string>
|
||||
<string name="routing_attr_relief_smoothness_factor_plains_name">Menos pindio</string>
|
||||
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Plano</string>
|
||||
<string name="routing_attr_driving_style_speed_name">Velocidá</string>
|
||||
<string name="routing_attr_driving_style_balance_name">Equilibráu</string>
|
||||
<string name="routing_attr_driving_style_safety_name">Seguru</string>
|
||||
<string name="relief_smoothness_factor_descr">Prioridá a llanos o llombes</string>
|
||||
<string name="relief_smoothness_factor_descr">Preferir terrén: llanu o pindiu</string>
|
||||
<string name="shared_string_slope">Cuesta</string>
|
||||
<string name="add_new_folder">Añadir carpeta nueva</string>
|
||||
<string name="points_delete_multiple_succesful">Puntu(os) desaniciáu(os) correutamente.</string>
|
||||
<string name="points_delete_multiple">Vas desaniciar %1$d puntu(os). ¿Tas seguru?</string>
|
||||
<string name="route_points_category_name">Puntos de pasu de la ruta</string>
|
||||
<string name="track_points_category_name">Puntos importantes d\'esta ruta</string>
|
||||
<string name="route_points_category_name">Xiros a pasar con esta ruta</string>
|
||||
<string name="track_points_category_name">Puntos destacaos d\'esta ruta</string>
|
||||
<string name="gpx_track">Traza</string>
|
||||
<string name="max_speed">Velocidá máxima</string>
|
||||
<string name="average_speed">Velocidá media</string>
|
||||
|
|
@ -773,35 +769,33 @@ El grupu nun se desanició dempués de meses, ponlu en llinia coles regles coles
|
|||
<string name="average_altitude">Altor mediu</string>
|
||||
<string name="shared_string_time">Tiempu</string>
|
||||
<string name="total_distance">Distancia total</string>
|
||||
<string name="routing_attr_relief_smoothness_factor_name">Factor d\'adondamientu del relieve</string>
|
||||
<string name="routing_attr_relief_smoothness_factor_name">Seleiciona la variación d\'altor</string>
|
||||
<string name="routing_attr_height_obstacles_name">Usar datos d\'elevación</string>
|
||||
<string name="routing_attr_height_obstacles_description">Usar los datos d\'elevación del terrén proporcionaos por SRTM, ASTER y UE-DEM</string>
|
||||
|
||||
<string name="rendering_attr_depthContours_description">Amosar les curves de nivel y puntos</string>
|
||||
<string name="rendering_attr_depthContours_name">Curves de nivel</string>
|
||||
<string name="release_2_6">"
|
||||
• Nueva función: Botón d\'aición rápida
|
||||
|
||||
• Respuesta ameyorada a xestos en pantalles táctiles
|
||||
|
||||
• Nueves tipografíes del mapa que cubren más llingües
|
||||
|
||||
• Soporte TTS pa variantes rexonales de llingua
|
||||
|
||||
• Ameyoramientos de visibilidá en dellos estilos de mapes y Wikipedia
|
||||
|
||||
• Encontu pa Open Location Code (OLC)
|
||||
|
||||
• Ver el perfil d\'elevación y pendiente para los GPX grabaos (tamién velocidá) y la ruta calculada
|
||||
|
||||
• Opción «Estilu de conducción» y ameyoramientos na llóxica del cálculu de rutes pa bicicletes
|
||||
|
||||
• Opciones para usar los datos d\'altitú nel cálculu de rutes pa bicicletes
|
||||
|
||||
• Dellos ameyoramientos y errores iguaos más
|
||||
|
||||
y más…
|
||||
"</string>
|
||||
<string name="rendering_attr_depthContours_name">Curves de fondura marina</string>
|
||||
<string name="release_2_6">" • Nueva función: Botón d\'aición rápida
|
||||
\n
|
||||
\n • Respuesta ameyorada a xestos en pantalles táctiles (p.ex. abasnar y ampliar al tiempu)
|
||||
\n
|
||||
\n • Nueves tipografíes del mapa que cubren más llingües
|
||||
\n
|
||||
\n • Soporte TTS pa variantes rexonales de llingua
|
||||
\n
|
||||
\n • Ameyoramientos de visibilidá en dellos estilos de mapes y Wikipedia
|
||||
\n
|
||||
\n • Encontu pa Open Location Code (OLC)
|
||||
\n
|
||||
\n • Ver el perfil d\'elevación, pendiente y velocidá pa les traces GPX grabaes y la ruta calculada
|
||||
\n
|
||||
\n • Opción «Estilu de conducción» y ameyoramientos na llóxica del cálculu de rutes pa bicicletes
|
||||
\n
|
||||
\n • Opciones para usar los datos d\'altitú nel cálculu de rutes pa bicicletes
|
||||
\n
|
||||
\n • Dellos ameyoramientos y errores iguaos más
|
||||
\n
|
||||
\n y más… "</string>
|
||||
<string name="search_another_country">Esbillar otra rexón</string>
|
||||
<string name="shared_string_change">Camudar</string>
|
||||
<string name="mapillary_image">Imaxe de Mapillary</string>
|
||||
|
|
@ -894,4 +888,7 @@ El grupu nun se desanició dempués de meses, ponlu en llinia coles regles coles
|
|||
<string name="shared_string_is_open_24_7">Abierto 24/7</string>
|
||||
<string name="current_track">Ruta actual</string>
|
||||
<string name="access_disable_offroute_recalc">Nun camudar la ruta al tar fuera de la carretera</string>
|
||||
<string name="shared_string_permissions">Permisos</string>
|
||||
<string name="import_gpx_failed_descr">OsmAnd nun pudo importar el ficheru. Comprueba si OsmAnd tien permisu pa lleer el ficheru dende\'l so allugamientu.</string>
|
||||
<string name="distance_moving">Distancia correxida</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1767,7 +1767,7 @@
|
|||
<string name="poi_payment_electronic_purses_yes">Elektronische Geldbörsen</string>
|
||||
<string name="poi_payment_uta_yes">UTA</string>
|
||||
<string name="poi_payment_uta_no">UTA Karten nicht akzeptiert</string>
|
||||
<string name="poi_payment_efectivo_yes">Bar</string>
|
||||
<string name="poi_payment_efectivo_yes">Efectivo</string>
|
||||
<string name="poi_payment_efectivo_no">Nachnahme nicht akzeptiert</string>
|
||||
<string name="poi_payment_girocard_yes">Girokarte</string>
|
||||
<string name="poi_payment_girocard_no">Girokarte nicht akzeptiert</string>
|
||||
|
|
|
|||
|
|
@ -3081,7 +3081,7 @@
|
|||
<string name="poi_covered">Cubierto</string>
|
||||
<string name="poi_subway_station_filter">Estación de metro</string>
|
||||
<string name="poi_ferry_terminal_cargo">Mercancías</string>
|
||||
<string name="poi_bicycle_parking_type">Tipo</string>
|
||||
<string name="poi_bicycle_parking_type">Tipu</string>
|
||||
<string name="poi_aerialway_bicycle">Transporte de bicicletas</string>
|
||||
<string name="poi_aerialway_heating">Calefacción</string>
|
||||
<string name="poi_pump">Bomba</string>
|
||||
|
|
@ -3408,4 +3408,40 @@
|
|||
|
||||
<string name="poi_life_ring">Aro salvavidas</string>
|
||||
|
||||
<string name="poi_zoo_type">Tipo de zoológico</string>
|
||||
<string name="poi_motorcycle_services">Servicios</string>
|
||||
<string name="poi_motorcycle_type">Tipo de motocicleta</string>
|
||||
|
||||
<string name="poi_zoo_petting_zoo">Zoológico interactivo</string>
|
||||
<string name="poi_zoo_wildlife_park">Reserva natural</string>
|
||||
<string name="poi_zoo_enclosure">Recinto</string>
|
||||
<string name="poi_zoo_safari_park">Parque safari</string>
|
||||
<string name="poi_zoo_birds">Aves</string>
|
||||
<string name="poi_zoo_aviary">Pajarera</string>
|
||||
<string name="poi_zoo_falconry">Cetrería</string>
|
||||
<string name="poi_zoo_reptile">Reptiles</string>
|
||||
|
||||
<string name="poi_stands">Gradas</string>
|
||||
|
||||
<string name="poi_motorcycle_sales_yes">Ventas</string>
|
||||
<string name="poi_motorcycle_sales_no">Venden motocicletas: no</string>
|
||||
<string name="poi_motorcycle_sales_yes_used">Venden motocicletas: si; usadas</string>
|
||||
<string name="poi_motorcycle_sales_used">Venden motocicletas: usadas</string>
|
||||
<string name="poi_motorcycle_rental_yes">Alquiler</string>
|
||||
<string name="poi_motorcycle_rental_no">Alquilan motocicletas: no</string>
|
||||
<string name="poi_motorcycle_repair_yes">Reparación</string>
|
||||
<string name="poi_motorcycle_repair_no">Reparan motocicletas: no</string>
|
||||
<string name="poi_motorcycle_parts_yes">Repuestos para motocicletas</string>
|
||||
<string name="poi_motorcycle_parts_no">Repuestos para motocicletas: no</string>
|
||||
<string name="poi_motorcycle_tyres_yes">Neumáticos</string>
|
||||
<string name="poi_motorcycle_tyres_no">Neumáticos: no</string>
|
||||
<string name="poi_motorcycle_clothes_yes">Ropa de motocicleta</string>
|
||||
<string name="poi_motorcycle_clothes_no">Ropa de motocicleta: no</string>
|
||||
<string name="poi_motorcycle_type_scooter">Scooter (motoneta)</string>
|
||||
<string name="poi_motorcycle_type_sportbike">Deportiva</string>
|
||||
<string name="poi_motorcycle_type_chopper">Chopper</string>
|
||||
<string name="poi_motorcycle_type_offroad">Todo terreno</string>
|
||||
<string name="poi_motorcycle_type_dualsport">Doble propósito</string>
|
||||
<string name="poi_motorcycle_type_standard">Estándar</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2719,8 +2719,8 @@ Algunas de las características principales:
|
|||
<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 más cercanas</string>
|
||||
<string name="select_city">Selecciona la ciudad</string>
|
||||
<string name="select_postcode">Selecciona el código postal</string>
|
||||
<string name="select_city">Seleccionar ciudad</string>
|
||||
<string name="select_postcode">Seleccionar código postal</string>
|
||||
<string name="shared_string_paused">Pausado</string>
|
||||
<string name="favorite_group_name">Nombre del grupo</string>
|
||||
<string name="change_color">Cambiar color</string>
|
||||
|
|
@ -2809,16 +2809,19 @@ Algunas de las características principales:
|
|||
<string name="mapillary_descr">Fotos a pie de calle para todos. Descubre lugares, colabora, captura el mundo.</string>
|
||||
<string name="mapillary">Mapillary</string>
|
||||
<string name="shared_string_add_photos">Añadir fotos</string>
|
||||
<string name="mapillary_action_descr">Contribuye con Mapillary con tus propias vistas a pie de calle de esta ubicación.</string>
|
||||
<string name="mapillary_action_descr">Contribuye con tus propias vistas a pie de calle de esta ubicación a través de Mapillary.</string>
|
||||
<string name="mapillary_widget_descr">Te permite la rápida contribución a Mapillary</string>
|
||||
<string name="plugin_mapillary_descr">Fotos a nivel de calle para todos. Descubre lugares, colabora, captura el mundo.</string>
|
||||
<string name="no_photos_descr">No tenemos fotos para esta ubicación</string>
|
||||
<string name="open_mapillary">Abrir Mapillary</string>
|
||||
<string name="shared_string_install">Instalar</string>
|
||||
<string name="improve_coverage_mapillary">Mejorar la cobertura con Mapillary</string>
|
||||
<string name="improve_coverage_mapillary">Mejorar la cobertura de fotos con Mapillary</string>
|
||||
<string name="improve_coverage_install_mapillary_desc">Puedes hacer tus propias fotos o serie de fotos y añadirlas a esta ubicación del mapa.
|
||||
\n
|
||||
\nPara ello debes instalar la aplicación Mapillary desde Google Play.</string>
|
||||
\nPara ello debes instalar la aplicación de Mapillary desde Google Play.</string>
|
||||
<string name="online_photos">Fotos en línea</string>
|
||||
<string name="mapillary_image">Imagen de Mapillary</string>
|
||||
<string name="shared_string_permissions">Permisos</string>
|
||||
<string name="import_gpx_failed_descr">OsmAnd no puede importar el archivo. Compruebe si OsmAnd tiene permiso para leer el archivo en esa ubicación.</string>
|
||||
<string name="distance_moving">Distancia corregida</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2914,7 +2914,7 @@ Kérlek adj meg egy teljes kódot</string>
|
|||
<string name="restart_search">Keresés újraindítása</string>
|
||||
<string name="increase_search_radius">Keresett terület szélesítése</string>
|
||||
<string name="nothing_found">Nincs találat :(</string>
|
||||
<string name="nothing_found_descr">A keresési sugár növeléséhez módosítsd a keresőkifejezést</string>
|
||||
<string name="nothing_found_descr">Módosítsd a keresőkifejezést vagy növeld a keresési sugarat</string>
|
||||
<string name="mapillary">Mapillary</string>
|
||||
<string name="shared_string_add_photos">Fényképek hozzáadása</string>
|
||||
<string name="no_photos_descr">Erről a helyről nincsenek fényképeink</string>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3020,7 +3020,7 @@ Van bijna alle landen is een kaart te downloaden: van Afghanistan tot Zimbabwe,
|
|||
<string name="mapillary_image">Foto van Mapillary</string>
|
||||
<string name="open_mapillary">Open Mapillary</string>
|
||||
<string name="shared_string_install">Installeren</string>
|
||||
<string name="improve_coverage_mapillary">Vergroot het bereik van Mapillary</string>
|
||||
<string name="improve_coverage_mapillary">Verbeter de fotocollectie van Mapillary</string>
|
||||
<string name="improve_coverage_install_mapillary_desc">Maak zelf een of meer foto\'s en voeg ze toe aan deze plek op de kaart.
|
||||
\nHiervoor moet je Mapillary installeren met Google Play.</string>
|
||||
<string name="mapillary_action_descr">Voeg zelf foto\'s van deze plek toe via Mapillary.</string>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources></resources>
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<resources><string name="poi_fuel_avia_type">类型</string>
|
||||
<string name="poi_payment_type">支付类别</string>
|
||||
<string name="poi_clothes_type">类型</string>
|
||||
<string name="poi_shoes_type">类型</string>
|
||||
<string name="poi_fire_hydrant_type">类型</string>
|
||||
<string name="poi_fire_hydrant_position">位置</string>
|
||||
<string name="poi_fire_hydrant_water_source">水源</string>
|
||||
<string name="poi_payment_toll_type">支付类别</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@
|
|||
<string name="shared_string_yes">是</string>
|
||||
<string name="shared_string_cancel">取消</string>
|
||||
<string name="shared_string_apply">应用</string>
|
||||
<string name="shared_string_add">加</string>
|
||||
<string name="shared_string_add">添加</string>
|
||||
<string name="shared_string_no">否</string>
|
||||
<string name="shared_string_delete">删除</string>
|
||||
|
||||
|
|
@ -1654,8 +1654,8 @@
|
|||
<string name="city_type_district">区</string>
|
||||
<string name="city_type_neighbourhood">邻近</string>
|
||||
<string name="map_widget_search">搜索</string>
|
||||
<string name="shared_string_is_open_24_7">开放的 24/7</string>
|
||||
<string name="storage_directory_card">存儲卡</string>
|
||||
<string name="shared_string_is_open_24_7">24小时开放</string>
|
||||
<string name="storage_directory_card">存储卡</string>
|
||||
<string name="coords_format">坐标格式</string>
|
||||
<string name="coords_format_descr">地理坐标格式</string>
|
||||
<string name="app_mode_bus">公交车</string>
|
||||
|
|
@ -1824,7 +1824,7 @@
|
|||
<string name="welcome_select_region">要正确地反映您的交通标志和法规，请选择您驾驶的地区：</string>
|
||||
<string name="welcome_text">OsmAnd 提供了全球的离线地图浏览和全球的离线导航 ！</string>
|
||||
<string name="osm_changes_added_to_local_edits">OSM 更改添加到本地的变更集</string>
|
||||
<string name="osmo_grop_name_length_alert">组名称应该至少 3 个字符 ！</string>
|
||||
<string name="osmo_grop_name_length_alert">组名称至少应有 3 个字符 ！</string>
|
||||
<string name="local_recordings_delete_all_confirm">要删除 %1$d 个注解。是否确定？</string>
|
||||
<string name="local_osm_changes_upload_all_confirm">你将要上传 %1$d 个更改到 OSM。是否确定？</string>
|
||||
<string name="delay_to_start_navigation_descr">指定等待时间以便继续留在航路规划屏幕</string>
|
||||
|
|
@ -2390,7 +2390,7 @@
|
|||
<string name="download_type_to_filter">要筛选类型</string>
|
||||
<string name="use_high_res_maps">高分辨率显示</string>
|
||||
<string name="use_high_res_maps_descr">在高清晰度的屏幕上不要拉伸（模糊）地图图砖</string>
|
||||
<string name="transport_searching_transport">交通运输结果（未设目的地）︰</string>
|
||||
<string name="transport_searching_transport">交通运输结果（未设目的地）：</string>
|
||||
<string name="transport_searching_route">交通运输结果（有 {0} 条路线可到目的地）︰</string>
|
||||
<string name="voices">语音提示</string>
|
||||
<string name="transport_context_menu">搜索公交站</string>
|
||||
|
|
|
|||
|
|
@ -3196,6 +3196,14 @@
|
|||
|
||||
<string name="poi_wiki_link">維基百科</string>
|
||||
|
||||
<string name="poi_xmas">耶誕節</string>
|
||||
<string name="poi_xmas">聖誕節</string>
|
||||
<string name="poi_xmas_tree">聖誕樹</string>
|
||||
<string name="poi_xmas_market">聖誕市集</string>
|
||||
<string name="poi_xmas_pyramid">聖誕樹</string>
|
||||
<string name="poi_xmas_shop">聖誕商店</string>
|
||||
<string name="poi_xmas_event">聖誕活動</string>
|
||||
<string name="poi_xmas_opening_hours">聖誕節：營業時間</string>
|
||||
<string name="poi_xmas_location">聖誕節：位置</string>
|
||||
<string name="poi_xmas_url">聖誕節：網站</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -687,125 +687,123 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
|
|||
|
||||
final List<File> dirs = new ArrayList<>();
|
||||
collectDirs(app.getAppPath(IndexConstants.GPX_INDEX_DIR), dirs, info.file.getParentFile());
|
||||
if (!dirs.isEmpty()) {
|
||||
if (!info.file.getParentFile().equals(app.getAppPath(IndexConstants.GPX_INDEX_DIR))) {
|
||||
dirs.add(0, app.getAppPath(IndexConstants.GPX_INDEX_DIR));
|
||||
}
|
||||
String gpxDir = app.getAppPath(IndexConstants.GPX_INDEX_DIR).getPath();
|
||||
int i = 0;
|
||||
for (File dir : dirs) {
|
||||
String dirName = dir.getPath();
|
||||
if (dirName.startsWith(gpxDir)) {
|
||||
if (dirName.length() == gpxDir.length()) {
|
||||
dirName = dir.getName();
|
||||
} else {
|
||||
dirName = dirName.substring(gpxDir.length() + 1);
|
||||
}
|
||||
if (!info.file.getParentFile().equals(app.getAppPath(IndexConstants.GPX_INDEX_DIR))) {
|
||||
dirs.add(0, app.getAppPath(IndexConstants.GPX_INDEX_DIR));
|
||||
}
|
||||
String gpxDir = app.getAppPath(IndexConstants.GPX_INDEX_DIR).getPath();
|
||||
int i = 0;
|
||||
for (File dir : dirs) {
|
||||
String dirName = dir.getPath();
|
||||
if (dirName.startsWith(gpxDir)) {
|
||||
if (dirName.length() == gpxDir.length()) {
|
||||
dirName = dir.getName();
|
||||
} else {
|
||||
dirName = dirName.substring(gpxDir.length() + 1);
|
||||
}
|
||||
menuAdapter.addItem(itemBuilder.setTitle(Algorithms.capitalizeFirstLetter(dirName))
|
||||
.setIcon(R.drawable.ic_action_folder_stroke).setTag(i).createItem());
|
||||
i++;
|
||||
}
|
||||
menuAdapter.addItem(itemBuilder.setTitleId(R.string.add_new_folder, app)
|
||||
.setIcon(R.drawable.map_zoom_in).setTag(-1).createItem());
|
||||
final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
final ArrayAdapter<ContextMenuItem> listAdapter =
|
||||
menuAdapter.createListAdapter(getActivity(), app.getSettings().isLightContent());
|
||||
builder.setTitle(R.string.select_gpx_folder);
|
||||
builder.setAdapter(listAdapter, new DialogInterface.OnClickListener() {
|
||||
menuAdapter.addItem(itemBuilder.setTitle(Algorithms.capitalizeFirstLetter(dirName))
|
||||
.setIcon(R.drawable.ic_action_folder_stroke).setTag(i).createItem());
|
||||
i++;
|
||||
}
|
||||
menuAdapter.addItem(itemBuilder.setTitleId(R.string.add_new_folder, app)
|
||||
.setIcon(R.drawable.map_zoom_in).setTag(-1).createItem());
|
||||
final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
final ArrayAdapter<ContextMenuItem> listAdapter =
|
||||
menuAdapter.createListAdapter(getActivity(), app.getSettings().isLightContent());
|
||||
builder.setTitle(R.string.select_gpx_folder);
|
||||
builder.setAdapter(listAdapter, new DialogInterface.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
ContextMenuItem item = menuAdapter.getItem(which);
|
||||
int index = item.getTag();
|
||||
if (index == -1) {
|
||||
Activity a = getActivity();
|
||||
AlertDialog.Builder b = new AlertDialog.Builder(a);
|
||||
b.setTitle(R.string.add_new_folder);
|
||||
final EditText editText = new EditText(a);
|
||||
editText.addTextChangedListener(new TextWatcher() {
|
||||
@Override
|
||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
||||
}
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
ContextMenuItem item = menuAdapter.getItem(which);
|
||||
int index = item.getTag();
|
||||
if (index == -1) {
|
||||
Activity a = getActivity();
|
||||
AlertDialog.Builder b = new AlertDialog.Builder(a);
|
||||
b.setTitle(R.string.add_new_folder);
|
||||
final EditText editText = new EditText(a);
|
||||
editText.addTextChangedListener(new TextWatcher() {
|
||||
@Override
|
||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
||||
}
|
||||
@Override
|
||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterTextChanged(Editable s) {
|
||||
Editable text = editText.getText();
|
||||
if (text.length() >= 1) {
|
||||
if (ILLEGAL_PATH_NAME_CHARACTERS.matcher(text).find()) {
|
||||
editText.setError(app.getString(R.string.file_name_containes_illegal_char));
|
||||
}
|
||||
@Override
|
||||
public void afterTextChanged(Editable s) {
|
||||
Editable text = editText.getText();
|
||||
if (text.length() >= 1) {
|
||||
if (ILLEGAL_PATH_NAME_CHARACTERS.matcher(text).find()) {
|
||||
editText.setError(app.getString(R.string.file_name_containes_illegal_char));
|
||||
}
|
||||
}
|
||||
});
|
||||
int leftPadding = AndroidUtils.dpToPx(a, 24f);
|
||||
int topPadding = AndroidUtils.dpToPx(a, 4f);
|
||||
b.setView(editText, leftPadding, topPadding, leftPadding, topPadding);
|
||||
// Behaviour will be overwritten later;
|
||||
b.setPositiveButton(R.string.shared_string_ok, null);
|
||||
b.setNegativeButton(R.string.shared_string_cancel, null);
|
||||
final AlertDialog alertDialog = b.create();
|
||||
alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||
@Override
|
||||
public void onShow(DialogInterface dialog) {
|
||||
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(
|
||||
new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
String newName = editText.getText().toString();
|
||||
if (ILLEGAL_PATH_NAME_CHARACTERS.matcher(newName).find()) {
|
||||
Toast.makeText(app, R.string.file_name_containes_illegal_char,
|
||||
Toast.LENGTH_LONG).show();
|
||||
return;
|
||||
}
|
||||
File destFolder = new File(app.getAppPath(IndexConstants.GPX_INDEX_DIR), newName);
|
||||
if (destFolder.exists()) {
|
||||
Toast.makeText(app, R.string.file_with_name_already_exists,
|
||||
Toast.LENGTH_LONG).show();
|
||||
return;
|
||||
} else if (destFolder.mkdirs()) {
|
||||
File dest = new File(destFolder, info.fileName);
|
||||
if (info.file.renameTo(dest)) {
|
||||
app.getGpxDatabase().rename(info.file, dest);
|
||||
asyncLoader = new LoadGpxTask();
|
||||
asyncLoader.execute(getActivity());
|
||||
} else {
|
||||
Toast.makeText(app, R.string.file_can_not_be_moved, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
int leftPadding = AndroidUtils.dpToPx(a, 24f);
|
||||
int topPadding = AndroidUtils.dpToPx(a, 4f);
|
||||
b.setView(editText, leftPadding, topPadding, leftPadding, topPadding);
|
||||
// Behaviour will be overwritten later;
|
||||
b.setPositiveButton(R.string.shared_string_ok, null);
|
||||
b.setNegativeButton(R.string.shared_string_cancel, null);
|
||||
final AlertDialog alertDialog = b.create();
|
||||
alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||
@Override
|
||||
public void onShow(DialogInterface dialog) {
|
||||
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(
|
||||
new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
String newName = editText.getText().toString();
|
||||
if (ILLEGAL_PATH_NAME_CHARACTERS.matcher(newName).find()) {
|
||||
Toast.makeText(app, R.string.file_name_containes_illegal_char,
|
||||
Toast.LENGTH_LONG).show();
|
||||
return;
|
||||
}
|
||||
File destFolder = new File(app.getAppPath(IndexConstants.GPX_INDEX_DIR), newName);
|
||||
if (destFolder.exists()) {
|
||||
Toast.makeText(app, R.string.file_with_name_already_exists,
|
||||
Toast.LENGTH_LONG).show();
|
||||
return;
|
||||
} else if (destFolder.mkdirs()) {
|
||||
File dest = new File(destFolder, info.fileName);
|
||||
if (info.file.renameTo(dest)) {
|
||||
app.getGpxDatabase().rename(info.file, dest);
|
||||
asyncLoader = new LoadGpxTask();
|
||||
asyncLoader.execute(getActivity());
|
||||
} else {
|
||||
Toast.makeText(app, R.string.file_can_not_be_moved, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
alertDialog.dismiss();
|
||||
|
||||
} else {
|
||||
Toast.makeText(app, R.string.file_can_not_be_moved, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
alertDialog.show();
|
||||
alertDialog.dismiss();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
alertDialog.show();
|
||||
} else {
|
||||
File dir = dirs.get(index);
|
||||
File dest = new File(dir, info.file.getName());
|
||||
if (dest.exists()) {
|
||||
Toast.makeText(app, R.string.file_with_name_already_exists, Toast.LENGTH_LONG).show();
|
||||
} else {
|
||||
File dir = dirs.get(index);
|
||||
File dest = new File(dir, info.file.getName());
|
||||
if (dest.exists()) {
|
||||
Toast.makeText(app, R.string.file_with_name_already_exists, Toast.LENGTH_LONG).show();
|
||||
if (info.file.renameTo(dest)) {
|
||||
app.getGpxDatabase().rename(info.file, dest);
|
||||
asyncLoader = new LoadGpxTask();
|
||||
asyncLoader.execute(getActivity());
|
||||
} else {
|
||||
if (info.file.renameTo(dest)) {
|
||||
app.getGpxDatabase().rename(info.file, dest);
|
||||
asyncLoader = new LoadGpxTask();
|
||||
asyncLoader.execute(getActivity());
|
||||
} else {
|
||||
Toast.makeText(app, R.string.file_can_not_be_moved, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
Toast.makeText(app, R.string.file_can_not_be_moved, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(R.string.shared_string_cancel, null);
|
||||
builder.create().show();
|
||||
}
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(R.string.shared_string_cancel, null);
|
||||
builder.create().show();
|
||||
}
|
||||
|
||||
public class LoadGpxTask extends AsyncTask<Activity, GpxInfo, List<GpxInfo>> {
|
||||
|
|
|
|||
Loading…
Reference in a new issue