Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Alexey Pelykh 2014-12-01 19:42:09 +02:00
commit a8d9dde8fa
23 changed files with 859 additions and 788 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/res/values-be/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="auto_zoom_none">Без аўтаматычнага масштабіраваньня</string>
<string name="auto_zoom_close">Зачыніць</string>
<string name="auto_zoom_far">Для сярэдняга масштаба</string>
@ -1959,4 +1959,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="show_map">ПАКАЗАЦЬ МАПУ</string>
<string name="show_all">ПАКАЗАЦЬ УСЁ</string>
<string name="coordinates">Каардынаты</string>
</resources>
<string name="error_avoid_specific_road">Бліжэйшая дарога не была знойдзена</string>
</resources>

21
OsmAnd/res/values-ca/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
<string name="map_widget_fluorescent">Rutes amb fluorescència</string>
<string name="map_widget_show_ruler">Mostra el regle</string>
@ -793,7 +793,7 @@
\n\t* S\'ha corregit Arabic, Kannada scripting i llenguatges RTL "</string>
<string name="gpxup_trackable">Seguible</string>
<string name="search_offline_geo_error">No s\'ha pogut analitzar la geo intenció «%s»</string>
<string name="amenity_type_geocache">Geoenmegatzament</string>
<string name="amenity_type_geocache">Geocerca</string>
<string name="use_osmand_routing_service_descr">L\'us de la navagacio fora de línia d\'OsmAnd s\'aplica nomes a rutes &gt; 20km (experimental)</string>
<string name="btn_advanced_mode">Mode avançat…</string>
<string name="poi_filter_parking">Aparcament</string>
@ -896,7 +896,7 @@
<string name="show_transport_over_map_description">Mostra les parades del transport públic al mapa</string>
<string name="search_history_int_streets">Intersecció: {0} x {1} a {2}</string>
<string name="favorite">Preferit</string>
<string name="history">Història</string>
<string name="history">Historial</string>
<string name="uploading">Enviant…</string>
<string name="search_osm_nominatim">Cerca una adreça utilitzant OSM Nominatim</string>
<string name="hint_search_online">Núm. de la casa, carrer, ciutat</string>
@ -1349,7 +1349,7 @@
<string name="android_19_location_disabled">"Des de la versió 4.4 d\'Android (KitKat) no es pot descarregar i actualitzar després els mapes a la mateixa carpeta (%s). Voleu canviar-la a un altre lloc permès i copiar-hi tots els arxius OsmAnd?
\n Nota 1: Els vostres arxius obsolets quedaran intactes (els podeu esborrar manualment).
\n Nota 2: En el nou lloc d\'emmagatzemament no serà possible compartir arxius entre l\'OsmAnd i l\'OsmAnd+."</string>
<string name="application_dir_change_warning2">Voleu que l\'OsmAnd intenti copiar els seus arxius de dades a la nova destinació?</string>
<string name="application_dir_change_warning2">Voleu que l\'OsmAnd també copiï els seus arxius de dades a la nova destinació?</string>
<string name="copying_osmand_one_file_descr">S\'està copiant el fitxer (%s) a la nova destinació...</string>
<string name="copying_osmand_files_descr">S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s)</string>
<string name="copying_osmand_files">S\'estan copiant fitxers de dades de l\'OsmAnd</string>
@ -1702,7 +1702,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
<string name="selected_track">Traces seleccionades</string>
<string name="my_tracks">Totes les traces</string>
<string name="my_favorites">Preferits</string>
<string name="my_data_Button">Llocs personals</string>
<string name="my_data_Button">Preferits</string>
<string name="my_data_activity">Llocs personals</string>
<string name="osmo_user_joined">L\'usuari %1$s s\'ha unit al grup %2$s</string>
<string name="osmo_user_left">L\'usuari %1$s ha deixat el grup %2$s</string>
@ -1895,10 +1895,11 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
<string name="advanced_settings">Avançat</string>
<string name="osmo_use_https_descr">Utilitzeu una connexió segura amb el servidor</string>
<string name="osmo_use_https">Utilitzeu https</string>
<string name="home_button">Casa</string>
<string name="search_for">Recerca de</string>
<string name="show_map">VEURE EL MAPA</string>
<string name="show_all">VEURE TOT</string>
<string name="home_button">Inici</string>
<string name="search_for">Cerca per</string>
<string name="show_map">MOSTRA EL MAPA</string>
<string name="show_all">MOSTRA\'LS TOTS</string>
<string name="coordinates">Coordenades</string>
<string name="map_update">Mapes</string>
</resources>
<string name="error_avoid_specific_road">No s\'ha trobat cap ruta aprop</string>
</resources>

44
OsmAnd/res/values-da/phrases.xml
View file

@ -24,8 +24,8 @@
<string name="poi_art_shop">Kunsthandler</string>
<string name="poi_baby_goods">Babyudstryr</string>
<string name="poi_bag_shop">Tasker</string>
<string name="poi_bathroom_furnishing_shop">Badeværelser</string>
<string name="poi_bed_shop">Senge</string>
<string name="poi_bathroom_furnishing_shop">Badeværelsesmøbler</string>
<string name="poi_bed_shop">Soveværelsesmøbler</string>
<string name="poi_boutique">Modebutik</string>
<string name="poi_carpet_shop">Tæppeforretning</string>
<string name="poi_chemist_shop">Materialist</string>
@ -52,7 +52,7 @@
<string name="poi_hardware_shop">Værktøj</string>
<string name="poi_hearing_aids_shop">Høreapparater</string>
<string name="poi_herbalist">Urter</string>
<string name="poi_hifi_shop">HiFi</string>
<string name="poi_hifi_shop">HiFi butik</string>
<string name="poi_houseware_shop">Husholdningsartikler</string>
<string name="poi_hunting_shop">Jagtudstyr</string>
<string name="poi_interior_decoration_shop">Boligindretning</string>
@ -70,7 +70,7 @@
<string name="poi_pet_shop">Dyrehandel</string>
<string name="poi_radiotechnics_shop">Radiodele</string>
<string name="poi_second_hand">Genbrugsbutik</string>
<string name="poi_ship_chandler">Skibsproviantere</string>
<string name="poi_ship_chandler">Skibsproviant</string>
<string name="poi_sports_shop">Sportsforretning</string>
<string name="poi_stationery_shop">Papirvare</string>
<string name="poi_tableware_shop">Isenkræmmer</string>
@ -130,16 +130,16 @@
<string name="poi_compressed_air">Trykluft</string>
<string name="poi_parking">Parkering</string>
<string name="poi_motorcycle_parking">Motorcykelparkering</string>
<string name="poi_parking_entrance">Parkering indgang</string>
<string name="poi_garages">Garager</string>
<string name="poi_parking_entrance">Indgang til parkering</string>
<string name="poi_garages">Garage</string>
<string name="poi_public_transport_platform">Offentlig transport stoppested</string>
<string name="poi_public_transport_platform_bus">Busstoppested</string>
<string name="poi_public_transport_platform_trolleybus">Trolley busstoppested</string>
<string name="poi_public_transport_platform_trolleybus">Trolleybus stoppested</string>
<string name="poi_bus_stop">Busstoppested (forældet)</string>
<string name="poi_public_transport_platform_tram">Sporvognsstoppested</string>
<string name="poi_tram_stop">Sporvognsstoppestedet (forældet)</string>
<string name="poi_public_transport_station">Offentlig transport station</string>
<string name="poi_public_transport_station">Offentligtransport station</string>
<string name="poi_bus_station">Busstation (forældet)</string>
<string name="poi_railway_station">Banegård (forældet)</string>
<string name="poi_railway_platform">Perron (forældet)</string>
@ -182,7 +182,7 @@
<string name="poi_water_well">Brønd</string>
<string name="poi_standpipe">Standrør</string>
<string name="poi_water_works">Vandværker</string>
<string name="poi_water_works">Vandværk</string>
<string name="poi_boatyard">Værft</string>
<string name="poi_wastewater_plant">Renseanlæg</string>
<string name="poi_water_tower">Vandtårn</string>
@ -214,7 +214,7 @@
<string name="poi_mineshaft">Mineskakt</string>
<string name="poi_adit">Stoll</string>
<string name="poi_petroleum_well">Oliebrønd</string>
<string name="poi_survey_point">Trianguleringspunkt</string>
<string name="poi_survey_point">Geodætisk punkt</string>
<string name="poi_windmill">Vindmølle</string>
<string name="poi_quarry">Stenbrud</string>
<string name="poi_vineyard">Vingård</string>
@ -244,7 +244,7 @@
<string name="poi_pharmacy">Apotek</string>
<string name="poi_hospital">Hospital</string>
<string name="poi_doctors">Læger</string>
<string name="poi_doctors">Læge</string>
<string name="poi_clinic">Klinik</string>
<string name="poi_first_aid">Førstehjælp</string>
<string name="poi_dentist">Tandlæge</string>
@ -270,7 +270,7 @@
<string name="poi_insurance">Forsikring</string>
<string name="poi_estate_agent">Ejendomsmægler</string>
<string name="poi_lawyer">Advokat</string>
<string name="poi_telecommunication_office">Teleselvskab</string>
<string name="poi_telecommunication_office">Telekommunikation selskab</string>
<string name="poi_ngo">NGO</string>
<string name="poi_town_hall">Rådhus</string>
<string name="poi_employment_agency">Arbejdsformidling</string>
@ -280,14 +280,14 @@
<string name="poi_architect_office">Arkitekt</string>
<string name="poi_advertising_agency">Reklamebureau</string>
<string name="poi_educational_institution">Uddannelsesinstitution</string>
<string name="poi_studio">Studio</string>
<string name="poi_studio">Lydstudio</string>
<string name="poi_bookmaker">Bookmaker</string>
<string name="poi_stadium">Stadium</string>
<string name="poi_sports_centre">Sportscenter</string>
<string name="poi_golf_course">Golfbane</string>
<string name="poi_ice_rink">Skøjtebane</string>
<string name="poi_pitch">Boldbane</string>
<string name="poi_pitch">Sportsplads</string>
<string name="poi_running_track">Løbebane</string>
<string name="poi_bicycle_track">Cykelbane</string>
<string name="poi_horse_track">Travbane</string>
@ -434,7 +434,7 @@
<string name="poi_stripclub">Stripklub</string>
<string name="poi_beach_resort">Badeby</string>
<string name="poi_dog_park">Hundeskov</string>
<string name="poi_fishing_place">Fiskested</string>
<string name="poi_fishing_place">Fiskeplads</string>
<string name="poi_hunting_stand">Jagtstand</string>
<string name="poi_marina">Marina</string>
<string name="poi_miniature_golf">Minigolf</string>
@ -474,7 +474,7 @@
<string name="poi_jeweller">Juvelér</string>
<string name="poi_locksmith">Låsesmed</string>
<string name="poi_key_cutter">Nøglebar</string>
<string name="poi_metal_construction_craft">Metalarbejder</string>
<string name="poi_metal_construction_craft">Metalarbejde</string>
<string name="poi_optician">Optiker</string>
<string name="poi_painter">Maler</string>
<string name="poi_parquet_layer">Gulvlægger</string>
@ -496,7 +496,7 @@
<string name="poi_sun_protection_craft">Solafskærmning</string>
<string name="poi_sweep">Skorstensfejer</string>
<string name="poi_tailor">Skrædder</string>
<string name="poi_tiler">Fliselægger</string>
<string name="poi_tiler">Brolægger</string>
<string name="poi_tinsmith">Blikkenslager</string>
<string name="poi_upholsterer">Møbelpolstrer</string>
<string name="poi_watchmaker">Urmager</string>
@ -592,11 +592,11 @@
<string name="poi_seamark_wreck">Vrag, sømærke</string>
<string name="poi_military_airfield">Militærflyveplads</string>
<string name="poi_military_bunker">Militærbunker</string>
<string name="poi_military_bunker">Bunker</string>
<string name="poi_military_barracks">Kaserne</string>
<string name="poi_military_danger_area">Farezone</string>
<string name="poi_military_range">Militærsøvelsesområde</string>
<string name="poi_military_naval_base">Militærflådebase</string>
<string name="poi_military_naval_base">Flådebase</string>
<string name="poi_military_nuclear_explosion_site">Nuklear eksplosionsområde</string>
<string name="poi_city">Storby</string>
<string name="poi_town">By</string>
@ -610,7 +610,7 @@
<string name="poi_healthcare_alternative">Alternativ medicin</string>
<string name="poi_audiologist">Audiolog</string>
<string name="poi_blood_bank">Blodbank</string>
<string name="poi_healthcare_centre">Medicinskcenter</string>
<string name="poi_healthcare_centre">Medicinsk center</string>
<string name="poi_midwife">Jordemoder</string>
<string name="poi_occupational_therapist">Ergoterapeut</string>
<string name="poi_optometrist">Optiker</string>
@ -632,4 +632,8 @@
<string name="poi_river">Flod</string>
<string name="poi_stream">Vandløb</string>
<string name="poi_military">Militærområde</string>
<string name="poi_observatory">Observatorium</string>
<string name="poi_astronomical_observatory">Astronomisk observatorium</string>
<string name="poi_hot_spring">Varm kilde</string>
<string name="poi_geyser">Gejser</string>
</resources>

5
OsmAnd/res/values-da/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
<string name="av_def_action_video">Optag video</string>
<string name="av_def_action_audio">Optag audio</string>
@ -1850,4 +1850,5 @@
<string name="show_all">VIS ALLE</string>
<string name="coordinates">Koordinater</string>
<string name="map_update">Kort</string>
</resources>
<string name="error_avoid_specific_road">Nærmeste vej blev ikke fundet</string>
</resources>

13
OsmAnd/res/values-de/strings.xml
View file

@ -2013,12 +2013,13 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="lock_screen_request_explanation">%1$s benötigt diese Berechtigung, um den Bildschirm auszuschalten (Energiesparfunktion).</string>
<string name="advanced_settings">Erweitert</string>
<string name="home_button">Start</string>
<string name="osmo_use_https_descr">Sichere Server-Verbindung verwenden</string>
<string name="osmo_use_https">Https nutzen</string>
<string name="map_update">Karten</string>
<string name="search_for">Suchen nach</string>
<string name="show_map">KARTE ZEIGEN</string>
<string name="show_all">ALLES ZEIGEN</string>
<string name="coordinates">Koordinaten</string>
<string name="error_avoid_specific_road">Nächstgelegene Straße konnte nicht gefunden werden</string>
<string name="osmo_use_https_descr">Sichere Verbindung zum Server</string>
<string name="osmo_use_https">Nutze https</string>
<string name="map_update">Karten</string>
<string name="show_map">KARTE ANZEIGEN</string>
<string name="show_all">ALLES ANZEIGEN</string>
<string name="coordinates">Koordinaten</string>
<string name="search_for">Suche nach</string>
</resources>

2
OsmAnd/res/values-es/strings.xml
View file

@ -1484,7 +1484,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="routing_preferences_descr">Preferencias de ruteo</string>
<string name="speech_rate_descr">Especifica la velocidad en el habla sintetizada (TTS)</string>
<string name="speech_rate">Velocidad del habla sintetizada (TTS)</string>
<string name="application_dir_change_warning2">¿Quieres que OsmAnd intente mover sus archivos de datos al nuevo destino?</string>
<string name="application_dir_change_warning2">¿Quieres que OsmAnd copie sus archivos de datos al nuevo destino?</string>
<string name="copying_osmand_one_file_descr">Copiando archivo (%s) al nuevo destino...</string>
<string name="copying_osmand_files_descr">Copiando archivos de OsmAnd al nuevo destino (%s)</string>
<string name="copying_osmand_files">Copiando archivos de datos de OsmAnd</string>

72
OsmAnd/res/values-fr/phrases.xml
View file

@ -46,7 +46,7 @@
<string name="poi_bicycle_shop">Magasin de vélos</string>
<string name="poi_bicycle_parking">Parking à vélos</string>
<string name="poi_bicycle_rental">Location de vélos</string>
<string name="poi_biergarten">Biergarten</string>
<string name="poi_biergarten">Brasserie en plein air</string>
<string name="poi_bitcoin_yes">Paiement par bitcoins</string>
<string name="poi_boat_sharing">Partage de voiliers</string>
<string name="poi_boatyard">Cale sèche</string>
@ -246,7 +246,7 @@
<string name="poi_orienteering">Course d\'orientation</string>
<string name="poi_outdoor_shop">Magasin d\'activités de plein air</string>
<string name="poi_paddle_tennis">Padel</string>
<string name="poi_parking">Parking</string>
<string name="poi_parking">Parc de stationnement</string>
<string name="poi_parking_entrance">Entrée de parking</string>
<string name="poi_pawnbroker">Mont-de-piété</string>
<string name="poi_peak">Sommet</string>
@ -304,7 +304,7 @@
<string name="poi_shoes">Magasin de chaussures</string>
<string name="poi_place_of_worship_sikh">Sikhisme</string>
<string name="poi_sinkhole">Doline</string>
<string name="poi_skateboard">Skateboard</string>
<string name="poi_skateboard">Planche à roulettes</string>
<string name="poi_skating">Patin à glace</string>
<string name="poi_skiing">Ski</string>
<string name="poi_slipway">Cale de lancement</string>
@ -407,4 +407,70 @@
<string name="poi_palaeontological_site">Site paléontologique</string>
<string name="poi_shop_farm">Vente à la ferme</string>
<string name="poi_anime_shop">Librairie spécialisée en bandes dessinées</string>
<string name="poi_antiques_shop">Antiquaire</string>
<string name="poi_hunting_shop">Equipement de chasse</string>
<string name="poi_interior_decoration_shop">Boutique de décoration</string>
<string name="poi_lift_gate">Pont levant</string>
<string name="poi_border_control">Poste frontière</string>
<string name="poi_traffic_calming_table">Table</string>
<string name="poi_vehicle_inspection">Centre de contrôle technique automobile</string>
<string name="poi_pier">Jetée</string>
<string name="poi_surveillance"/>
<string name="poi_government">Gouvernement</string>
<string name="poi_pension_fund">Fond de pension</string>
<string name="poi_tax_inspection">Centre des impôts</string>
<string name="poi_blood_bank">Banque de sang</string>
<string name="poi_midwife">Sage-femme</string>
<string name="poi_podiatrist">Podologue</string>
<string name="poi_psychotherapist">Psychothérapeute</string>
<string name="poi_company">Entreprise</string>
<string name="poi_town_hall">Mairie</string>
<string name="poi_educational_institution">Institution éducative</string>
<string name="poi_bicycle_track">Piste cycable</string>
<string name="poi_australian_football">Football autralien</string>
<string name="poi_handball">Handball</string>
<string name="poi_horse_racing">Course hippique</string>
<string name="poi_ice_skating">Patinoire</string>
<string name="poi_motor_sport">Sport mécanique</string>
<string name="poi_paragliding">Parapente</string>
<string name="poi_rowing">Aviron</string>
<string name="poi_ship_historic">Bateau du patrimoine</string>
<string name="poi_clock">Horloge</string>
<string name="poi_club_astronomy">Club d\'astronomie</string>
<string name="poi_club_sport">Club de sports</string>
<string name="poi_club_fishing">Association de pêche</string>
<string name="poi_club_linux">Association Linux</string>
<string name="poi_club_hunting">Club de chasse</string>
<string name="poi_cinema">Cinéma</string>
<string name="poi_theatre">Théâtre</string>
<string name="poi_circus">Cirque</string>
<string name="poi_fishing_place">Lieu de pêche</string>
<string name="poi_park">Parc</string>
<string name="poi_barbecue">Barbecue</string>
<string name="poi_boatbuilder">Chantier naval</string>
<string name="poi_clockmaker">Horloger</string>
<string name="poi_jeweller">Bijoutier</string>
<string name="poi_optician">Opticien</string>
<string name="poi_photographic_laboratory">Laboratoire photographique</string>
<string name="poi_sailmaker">Maître voilier</string>
<string name="poi_sculptor">Sculpteur</string>
<string name="poi_beauty_salon_nails">Salon de manucure</string>
<string name="poi_internet_cafe">Café Internet</string>
<string name="poi_accountant">Comptable</string>
<string name="poi_bay">Baie</string>
<string name="poi_fjord">Fjord</string>
<string name="poi_seamark_anchorage">Mouillage</string>
<string name="poi_seamark_beacon">Balise</string>
<string name="poi_seamark_building">Amer</string>
<string name="poi_seamark_buoy_special_purpose">Marque spéciale</string>
<string name="poi_seamark_dry_dock">Cale sèche</string>
<string name="poi_seamark_mooring">Mouillage</string>
<string name="poi_seamark_wreck">Épave</string>
<string name="poi_bag_shop">Maroquinerie</string>
<string name="poi_military_airfield">Aérodrome militaire</string>
</resources>

7
OsmAnd/res/values-fr/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
<string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :
@ -1860,10 +1860,11 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="advanced_settings">Avancé</string>
<string name="osmo_use_https_descr">Utiliser une connexion sécurisée avec le serveur</string>
<string name="osmo_use_https">Utiliser HTTPS</string>
<string name="home_button">Accueil</string>
<string name="home_button">Domicile</string>
<string name="search_for">Rechercher</string>
<string name="show_map">AFFICHER LA CARTE</string>
<string name="show_all">AFFICHER TOUT</string>
<string name="coordinates">Coordonnées</string>
<string name="map_update">Cartes</string>
</resources>
<string name="error_avoid_specific_road">Aucune route n\'a été trouvée à proximité</string>
</resources>

500
OsmAnd/res/values-it/phrases.xml
View file

@ -6,4 +6,504 @@
<string name="poi_vending_machine">Distributore automatico</string>
<string name="poi_bookshop">Libreria</string>
<string name="poi_palaeontological_site">Sito paleontologico</string>
<string name="poi_bakery">Panificio</string>
<string name="poi_alcohol">Alcolici</string>
<string name="poi_convenience">Drogheria</string>
<string name="poi_beverages">Negozio bevande</string>
<string name="poi_butcher">Macelleria</string>
<string name="poi_deli">Gastronomia</string>
<string name="poi_shop_farm">Vendita prodotti di fattoria</string>
<string name="poi_greengrocer">Fruttivendolo</string>
<string name="poi_confectionery">Negozio dolciumi</string>
<string name="poi_ice_cream">Gelateria</string>
<string name="poi_shop_tea">Negozio di té</string>
<string name="poi_dairy">Latteria</string>
<string name="poi_antiques_shop">Antiquariato</string>
<string name="poi_art_shop">Galleria</string>
<string name="poi_baby_goods">Negozio bambini</string>
<string name="poi_bag_shop">Valigeria</string>
<string name="poi_bathroom_furnishing_shop">Arredo bagno</string>
<string name="poi_bed_shop">Arredamento camera da letto</string>
<string name="poi_carpet_shop">Negozio tappeti</string>
<string name="poi_chemist_shop">Farmacia</string>
<string name="poi_clothes_shop">Abbigliamento</string>
<string name="poi_children_clothes_shop">Abbigliamento bambini</string>
<string name="poi_shoes">Negozio calzature</string>
<string name="poi_computer_shop">Negozio informatica</string>
<string name="poi_copyshop">Copisteria</string>
<string name="poi_curtain_shop">Negozio campeggio</string>
<string name="poi_fabric_shop">Negozio drappeggi</string>
<string name="poi_bedding_shop">Negozio materassi</string>
<string name="poi_dive_shop">Negozio articoli per immersione</string>
<string name="poi_doityourself_shop">Negozio per fai-da-te</string>
<string name="poi_erotic_shop">Sexy shop</string>
<string name="poi_fishing_shop">Negozio pesca</string>
<string name="poi_florist">Fioreria-fiorista</string>
<string name="poi_frame_shop">Cornici</string>
<string name="poi_furniture_shop">Negozio mobili</string>
<string name="poi_garden_centre">Articoli per Giardinaggio</string>
<string name="poi_gas_shop">Negozio gas</string>
<string name="poi_ford">Guado</string>
<string name="poi_mountain_pass">Passo montano</string>
<string name="poi_gate">Ponte</string>
<string name="poi_city_wall">Mura cittadine</string>
<string name="poi_lift_gate">Ponte levatoio</string>
<string name="poi_traffic_calming_bump">Dosso</string>
<string name="poi_traffic_calming_chicane">Chicane</string>
<string name="poi_traffic_calming_rumble_strip">Striscie rallentatrici</string>
<string name="poi_car_repair">Autoriparatore</string>
<string name="poi_service_tyres">Gommista</string>
<string name="poi_vehicle_inspection">Centro revisioni</string>
<string name="poi_car_wash">Autolavaggio</string>
<string name="poi_fuel">Rifornimento carburanti gassosi</string>
<string name="poi_charging_station">Stazione di ricarica</string>
<string name="poi_compressed_air">Aria compressa</string>
<string name="poi_parking">Parcheggio</string>
<string name="poi_motorcycle_parking">Parcheggio per moto</string>
<string name="poi_parking_entrance">Entrata parcheggio</string>
<string name="poi_garages">Garage</string>
<string name="poi_public_transport_platform">Fermata trasporto pubblico</string>
<string name="poi_public_transport_platform_bus">Fermata autobus</string>
<string name="poi_bus_stop">Fermata autobus (obsoleto)</string>
<string name="poi_public_transport_platform_tram">Fermata tram</string>
<string name="poi_public_transport_station">Stazione trasporto pubblico</string>
<string name="poi_bus_station">Stazione bus (obsoleto)</string>
<string name="poi_subway_entrance">Entrata metropolitana</string>
<string name="poi_subway_station">Stazione metropolitana</string>
<string name="poi_airport">Aeroporto</string>
<string name="poi_helipad">Eliporto</string>
<string name="poi_bicycle_rental">Noleggio bici</string>
<string name="poi_bicycle_parking">Parcheggio bici</string>
<string name="poi_anime_shop">Negozio anime</string>
<string name="poi_boutique">Boutique moda</string>
<string name="poi_general_shop">Emporio</string>
<string name="poi_gift_shop">Negozio regali</string>
<string name="poi_glaziery_shop">Vetreria</string>
<string name="poi_hardware_shop">Ferramenta</string>
<string name="poi_hearing_aids_shop">Negozi apparecchi acustici</string>
<string name="poi_herbalist">Negozio erba</string>
<string name="poi_hifi_shop">Negozio HiFi</string>
<string name="poi_hunting_shop">Negozio caccia-pesca</string>
<string name="poi_interior_decoration_shop">Negozio decorazione d\'interni</string>
<string name="poi_jewelry_shop">Gioielleria</string>
<string name="poi_kiosk">Chiosco</string>
<string name="poi_kitchen_shop">Negozio articoli da cucina</string>
<string name="poi_mobile_phone_shop">Negozio telefonia mobile</string>
<string name="poi_motorcycle_shop">Negozio moto</string>
<string name="poi_musical_instrument_shop">Strumenti musicali</string>
<string name="poi_optician_shop">Optometrista</string>
<string name="poi_organic_shop">Alimenti biologici</string>
<string name="poi_outdoor_shop">Negozio articoli per l\'attività all\'aperto</string>
<string name="poi_paint_shop">Negozio articoli per pittura</string>
<string name="poi_pet_shop">Negozio animali domestici</string>
<string name="poi_second_hand">Negozio usato</string>
<string name="poi_tobacco_shop">Tabaccheria</string>
<string name="poi_toys_shop">Negozio giocattoli</string>
<string name="poi_houseware_shop">Nogozio casalinghi</string>
<string name="poi_newsagent_shop">Agenzia di stampa</string>
<string name="poi_radiotechnics_shop">Negozio per radiotecnica</string>
<string name="poi_sports_shop">Articoli sportivi</string>
<string name="poi_ticket_shop">Biglietteria</string>
<string name="poi_vacuum_cleaner_shop">Negozio aspirapolvere</string>
<string name="poi_variety_store">Negozi articoli a basso costo</string>
<string name="poi_video_shop">Videonoleggio</string>
<string name="poi_window_blind_shop">Negozio finestre cieche</string>
<string name="poi_department_store">Grande magazzino</string>
<string name="poi_electronics_shop">Negozio elettronica</string>
<string name="poi_car_shop">Autosalone</string>
<string name="poi_car_parts_shop">Autoricambi</string>
<string name="poi_atv_shop">Negozio quad</string>
<string name="poi_cosmetics_shop">Negozio cosmetici</string>
<string name="poi_marketplace">Mercato</string>
<string name="poi_police">Polizia</string>
<string name="poi_fire_station">Pompieri</string>
<string name="poi_emergency_phone">Telefono di emergenza</string>
<string name="poi_fire_hydrant">Idrante</string>
<string name="poi_fire_extinguisher">Estintore</string>
<string name="poi_ambulance_station">Stazione ambulanze</string>
<string name="poi_ship_chandler">Negozio nautica</string>
<string name="poi_stationery_shop">Negozio per ufficio</string>
<string name="poi_tableware_shop">Negozio articoli per la tavola</string>
<string name="poi_aeroway_gate">Gate aeroporto</string>
<string name="poi_aerialway_gondola">Gondola</string>
<string name="poi_aerialway_chair_lift">Ascensore carrozzine</string>
<string name="poi_speed_camera">Autovelox</string>
<string name="poi_turning_circle">Rotonda per inversione di marcia</string>
<string name="poi_wastewater_plant">Depuratore acque</string>
<string name="poi_water_mill">Mulino ad acqua</string>
<string name="poi_power_substation">Sottostazione</string>
<string name="poi_power_transformer">Trasformatore</string>
<string name="poi_power_generator">Generatore elettrico</string>
<string name="poi_power_plant">Centrale elettrica</string>
<string name="poi_post_office">Ufficio postale</string>
<string name="poi_post_box">Cassetta postale</string>
<string name="poi_telephone">Telefono</string>
<string name="poi_communication_tower">Torre telecomunicazioni</string>
<string name="poi_recycling">Isola ecologica</string>
<string name="poi_waste_basket">Cestino rifiuti</string>
<string name="poi_pier">Pontile</string>
<string name="poi_surveillance">Videosorveglianza</string>
<string name="poi_construction">Costrizione in corso</string>
<string name="poi_works">Fabbrica</string>
<string name="poi_mineshaft">Tunnel verticale</string>
<string name="poi_adit">Ingresso di una galleria mineraria</string>
<string name="poi_petroleum_well">Pozzo petrolifero</string>
<string name="poi_survey_point">Punto geodetico</string>
<string name="poi_windmill">Mulino a vento</string>
<string name="poi_quarry">Cava</string>
<string name="poi_vineyard">Vigneto</string>
<string name="poi_orchard">Frutteto</string>
<string name="poi_salt_pond">Salina</string>
<string name="poi_cricket_nets">Campo da cricket circondato da reti</string>
<string name="poi_driving_school">Scuola guida</string>
<string name="poi_school">Scuola</string>
<string name="poi_kindergarten">Parco giochi</string>
<string name="poi_college">Collegio</string>
<string name="poi_university">Università</string>
<string name="poi_social_facility">Struttura che fornisce servizi sociali</string>
<string name="poi_courthouse">Tribunale</string>
<string name="poi_prison">Carcere</string>
<string name="poi_register_office">Anagrafe</string>
<string name="poi_embassy">Ambasciata</string>
<string name="poi_government">Ufficio pubblico</string>
<string name="poi_bailiff">Ufficiale giudiziario</string>
<string name="poi_migration">Ufficio migrazione</string>
<string name="poi_tax_inspection">Guardia di finanza</string>
<string name="poi_administrative_office">Ufficio amministrativo</string>
<string name="poi_city">Città capoluogo di provincia</string>
<string name="poi_town">Città</string>
<string name="poi_village">Paese</string>
<string name="poi_hamlet">Borgo-contrada</string>
<string name="poi_isolated_dwelling">Insediamento rurale isolato</string>
<string name="poi_suburb">Grande quartiere</string>
<string name="poi_neighbourhood">Quartiere</string>
<string name="poi_locality">Località</string>
<string name="poi_pharmacy">Farmacia</string>
<string name="poi_hospital">Ospedale</string>
<string name="poi_doctors">Medico</string>
<string name="poi_clinic">Clinica</string>
<string name="poi_first_aid">Pronto soccorso</string>
<string name="poi_dentist">Dentista</string>
<string name="poi_nursing_home">Servizi di assistenza continua</string>
<string name="poi_baby_hatch">Culla per la vita</string>
<string name="poi_veterinary">Veterinario</string>
<string name="poi_healthcare_alternative">Medicina alternativa</string>
<string name="poi_audiologist"/>
<string name="poi_blood_bank">Banca del sangue</string>
<string name="poi_healthcare_centre">Centro medico</string>
<string name="poi_midwife">Levatrice</string>
<string name="poi_optometrist">Optometrista</string>
<string name="poi_physiotherapist">Fisioterpista</string>
<string name="poi_psychotherapist">Psicoterapeuta</string>
<string name="poi_speech_therapist">Logopedista</string>
<string name="poi_insurance">Assicurazione</string>
<string name="poi_estate_agent">Negozio immobiliare</string>
<string name="poi_employment_agency">Ufficio per l\'impiego</string>
<string name="poi_bridge">Ponte</string>
<string name="poi_healthcare_rehabilitation">Riabilitazione</string>
<string name="poi_running_track">Pista atletica</string>
<string name="poi_bicycle_track">Pista per bicicletta</string>
<string name="poi_australian_football">Football australiano</string>
<string name="poi_baseball">Baseball</string>
<string name="poi_basketball">Basket</string>
<string name="poi_beachvolleyball">Beach volley</string>
<string name="poi_canoe">Canoa</string>
<string name="poi_chess">Scacchi</string>
<string name="poi_cricket">Cricket</string>
<string name="poi_dog_racing">Corse cani</string>
<string name="poi_equestrian">Equitazione</string>
<string name="poi_golf">Golf</string>
<string name="poi_handball">Pallamano</string>
<string name="poi_hockey">Hockey</string>
<string name="poi_horse_racing">Corse cavalli</string>
<string name="poi_ice_skating">Pattinaggio sul ghiaccio</string>
<string name="poi_paragliding">Parapendio</string>
<string name="poi_pelota">Pelota</string>
<string name="poi_roller_skating">Pattinaggio a rotelle</string>
<string name="poi_beach">Spiaggia</string>
<string name="poi_bay">Baia</string>
<string name="poi_rapids">Rapide</string>
<string name="poi_fjord">Fiordo</string>
<string name="poi_wetland">Zona umida</string>
<string name="poi_nature_reserve">Riserva naturale</string>
<string name="poi_island">Isola</string>
<string name="poi_military_naval_base">Base militare navale</string>
<string name="poi_military_nuclear_explosion_site">Sito esplosioni nucleari</string>
<string name="poi_military_range">Poligono militare</string>
<string name="poi_military_danger_area">Area pericolosa</string>
<string name="poi_military_barracks">Caserma</string>
<string name="poi_military_bunker">Bunker</string>
<string name="poi_military_airfield">Aeroporto militare</string>
<string name="poi_military">Area militare</string>
<string name="poi_seamark_wreck">Relitto</string>
<string name="poi_seamark_rock">Scoglio</string>
<string name="poi_seamark_radar_transponder">Transponder radar marittimo</string>
<string name="poi_waterfall">Cascata</string>
<string name="poi_sinkhole">Dolina</string>
<string name="poi_glacier">Ghiacciaio</string>
<string name="poi_ridge">Crinale</string>
<string name="poi_crater">Cratere</string>
<string name="poi_volcano">Vulcano</string>
<string name="poi_saddle">Sella</string>
<string name="poi_peak">Picco montuoso</string>
<string name="poi_cave_entrance">Entrata grotta/caverna</string>
<string name="poi_bitcoin_yes">Pagamento Bitcoin</string>
<string name="poi_atm">Bancomat</string>
<string name="poi_bank">Banca</string>
<string name="poi_internet_cafe">Internet caffè</string>
<string name="poi_crematorium">Crematorio</string>
<string name="poi_mortuary">Celle mortuarie</string>
<string name="poi_brothel">Bordello</string>
<string name="poi_sauna">Sauna</string>
<string name="poi_car_sharing">Car sharing</string>
<string name="poi_car_rental">Autonoleggio</string>
<string name="poi_laundry">Lavanderia</string>
<string name="poi_dry_cleaning">Lavasecco</string>
<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">Salone di bellezza</string>
<string name="poi_window_construction">Costruzione finestre</string>
<string name="poi_watchmaker">Costruttore orologi</string>
<string name="poi_tailor">Sarto</string>
<string name="poi_shoemaker">Produzione calzature</string>
<string name="poi_sculptor">Scultore</string>
<string name="poi_plumber">Idraulico</string>
<string name="poi_photographic_laboratory">Laboratorio fotografico</string>
<string name="poi_photographer">Fotografo</string>
<string name="poi_parquet_layer">Posatore di parquet</string>
<string name="poi_painter">Pittore</string>
<string name="poi_optician">Ottico</string>
<string name="poi_jeweller">Gioielliere</string>
<string name="poi_hvac">Riscaldamento, ventilazione e condizionamento</string>
<string name="poi_gardener">Giardiniere</string>
<string name="poi_electrician">Elettricista</string>
<string name="poi_dressmaker">Sarto</string>
<string name="poi_place_of_worship_christian">Luogo di culto: cristiano</string>
<string name="poi_place_of_worship">Luogo di culto</string>
<string name="poi_chalet">Chalet</string>
<string name="poi_alpine_hut">Rifugio alpino</string>
<string name="poi_motel">Motel</string>
<string name="poi_hostel">Ostello</string>
<string name="poi_guest_house">Pensione</string>
<string name="poi_hotel">Hotel</string>
<string name="poi_theme_park">Parco a tema</string>
<string name="poi_zoo">Zoo</string>
<string name="poi_monument">Monumento</string>
<string name="poi_wreck">Relitto navale</string>
<string name="poi_rune_stone">Pietra runica</string>
<string name="poi_ruins_historic">Rovine storiche</string>
<string name="poi_fountain">Fontana</string>
<string name="poi_fort">Forte</string>
<string name="poi_city_gate">Porta di ingresso della città</string>
<string name="poi_castle">Castello</string>
<string name="poi_boundary_stone">Pietra di confine</string>
<string name="poi_battlefield">Campo di battaglia</string>
<string name="poi_archaeological_site">Sito archeologico</string>
<string name="poi_memorial">Memoriale</string>
<string name="poi_attraction">Attrazione turistica</string>
<string name="poi_museum">Museo</string>
<string name="poi_volleyball">Pallavolo</string>
<string name="poi_toboggan">Toboga</string>
<string name="poi_tennis">Tennis</string>
<string name="poi_table_tennis">Tennis tavolo</string>
<string name="poi_swimming">Piscina</string>
<string name="poi_soccer">Calcio</string>
<string name="poi_skiing">Sci</string>
<string name="poi_skateboard">Skateboard</string>
<string name="poi_skating">Pattinaggio</string>
<string name="poi_shooting">Tiro</string>
<string name="poi_rowing">Canottaggio</string>
<string name="poi_rugby_union">Rugby a 15</string>
<string name="poi_rugby_league">Rugby a 13</string>
<string name="poi_racquet">Racquetball</string>
<string name="poi_fire_flapper">Pala battifuoco</string>
<string name="poi_fire_hose">Manichetta antincendio</string>
<string name="poi_ses_station">Stazione protezione civile</string>
<string name="poi_grit_bin">Cassone di sabbia</string>
<string name="poi_fire_water_pond">Laghetto acqua anti-incendio</string>
<string name="poi_emergency_access_point">Punto di accesso di emergenza</string>
<string name="poi_toll_booth">Casello</string>
<string name="poi_border_control">Posto di controllo</string>
<string name="poi_traffic_calming_hump">Dosso lungo</string>
<string name="poi_traffic_calming_cushion">Cuscini rallentatori</string>
<string name="poi_traffic_calming_table">Dosso tavola</string>
<string name="poi_traffic_calming_choker">Restringimento di carreggiata rallentatore</string>
<string name="poi_traffic_signals">Luce di stop</string>
<string name="poi_vehicle_ramp">Rampa per veicoli</string>
<string name="poi_tram_stop">Fermata tram (absoleta)</string>
<string name="poi_aeroway_terminal">Terminal aeroporto</string>
<string name="poi_slipway">Scivolo</string>
<string name="poi_ferry_terminal">Terminal traghetto</string>
<string name="poi_lighthouse">Faro</string>
<string name="poi_aerialway_station">Stazione skilift</string>
<string name="poi_aerialway_cable_car">Funivia</string>
<string name="poi_aerialway_t_bar">Skilift a àncora</string>
<string name="poi_aerialway_j_bar">Skilift a J</string>
<string name="poi_aerialway_platter">Skilift a piattello</string>
<string name="poi_aerialway_mixed_lift">Skilift misto</string>
<string name="poi_aerialway_drag_lift">Skilift</string>
<string name="poi_aerialway_rope_tow">Skilift a fune</string>
<string name="poi_aerialway_goods">Skilift per oggetti</string>
<string name="poi_aerialway_magic_carpet">Skilift a tappeto</string>
<string name="poi_tunnel">Tunnel</string>
<string name="poi_public_transport_platform_trolleybus">Fermata filobus</string>
<string name="poi_railway_station">Stazione ferroviaria</string>
<string name="poi_water_well">Pozzo</string>
<string name="poi_standpipe">Fontanella</string>
<string name="poi_water_works">Impianto idrico</string>
<string name="poi_boatyard">Cantiere navale</string>
<string name="poi_water_tower">Torre idrica</string>
<string name="poi_lock_gate">Chiuse</string>
<string name="poi_waterway_turning_point">Inversione di marcia per battelli</string>
<string name="poi_weir">Sbarramento</string>
<string name="poi_dam">Diga</string>
<string name="poi_telephone_exchange">Centralino telefonico</string>
<string name="poi_landfill">Discarica</string>
<string name="poi_waste_disposal">Zona raccolta di rifiuti</string>
<string name="poi_educational_institution">Istituto scolastico</string>
<string name="poi_bookmaker">Scommesse</string>
<string name="poi_stadium">Stadio</string>
<string name="poi_sports_centre">Centro sportivo</string>
<string name="poi_ice_rink">Pista pattinaggio sul ghiaccio</string>
<string name="poi_athletics">Atletica leggera</string>
<string name="poi_boules">Bocce</string>
<string name="poi_cycling">Ciclismo</string>
<string name="poi_gymnastics">Ginnastica</string>
<string name="poi_place_of_worship_buddhist">Luogo di culto: duddista</string>
<string name="poi_place_of_worship_hindu">Luogo di culto: induismo</string>
<string name="poi_place_of_worship_shinto">Luogo di culto: shintoismo</string>
<string name="poi_place_of_worship_taoist">Luogo di culto: taoismo</string>
<string name="poi_monastery">Monastero</string>
<string name="poi_historic_monastery">Monastero storico</string>
<string name="poi_wayside_cross">Croce storica</string>
<string name="poi_wayside_shrine">Tabernacolo storico</string>
<string name="poi_tourism_information">Informazioni turistiche</string>
<string name="poi_clock">Orologio</string>
<string name="poi_viewpoint">Punto panoramico</string>
<string name="poi_camp_site">Campeggio</string>
<string name="poi_caravan_site">Area caravan e camper</string>
<string name="poi_picnic_site">Area attrezzata per picnic</string>
<string name="poi_spring">Sorgente</string>
<string name="poi_cemetery">Zona cimiteriale</string>
<string name="poi_grave_yard">Cimitero</string>
<string name="poi_shelter">Pensilina o ricovero</string>
<string name="poi_funicular">Funicolare</string>
<string name="poi_club_art">Club artistico</string>
<string name="poi_club_astronomy">Club astrofili</string>
<string name="poi_club_computer">Club informatico</string>
<string name="poi_club_board_games">Club giochi da tavolo</string>
<string name="poi_club_motorcycle">Club motociclistico</string>
<string name="poi_club_sport">Club sportivo</string>
<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_fan">Fan club</string>
<string name="poi_club_fishing">Club pesca</string>
<string name="poi_club_veterans">Club veterani</string>
<string name="poi_club_linux">Club Linux Lug</string>
<string name="poi_club_theatre">Club teatrale</string>
<string name="poi_club_photography">Club fotografico</string>
<string name="poi_club_hunting">Club caccia</string>
<string name="poi_library">Libreria</string>
<string name="poi_theatre">Teatro</string>
<string name="poi_circus">Circo</string>
<string name="poi_dance_floor">Discoteca</string>
<string name="poi_nightclub">Night</string>
<string name="poi_stripclub">Stripclub</string>
<string name="poi_hunting_stand">Postazione di caccia</string>
<string name="poi_miniature_golf">Mini golf</string>
<string name="poi_playground">Parco giochi</string>
<string name="poi_swimming_pool">Piscina</string>
<string name="poi_water_park">Parco acquatico</string>
<string name="poi_park">Parco</string>
<string name="poi_cafe">Bar</string>
<string name="poi_restaurant">Ristorante</string>
<string name="poi_fast_food">Fast food</string>
<string name="poi_bar">Bar</string>
<string name="poi_pub">Pub</string>
<string name="poi_drinking_water">Acqua potabile</string>
<string name="poi_barbecue">Barbecue</string>
<string name="poi_beekeeper">Apicoltore</string>
<string name="poi_blacksmith">Fabbro</string>
<string name="poi_brewery">Birrificio</string>
<string name="poi_boatbuilder">Costruzione barche</string>
<string name="poi_bookbinder">Rilegatore</string>
<string name="poi_carpenter">Carpentiere</string>
<string name="poi_carpet_layer">Posatore di moquette</string>
<string name="poi_caterer">Servizio di catering</string>
<string name="poi_clockmaker">Orologiaio</string>
<string name="poi_glaziery_craft">Vetraio</string>
<string name="poi_handicraft">Artigiano</string>
<string name="poi_insulation_craft">Isolamento termico degli edifici</string>
<string name="poi_locksmith">Fabbro per serrature</string>
<string name="poi_key_cutter">Servizio di duplicazione chiavi</string>
<string name="poi_metal_construction_craft">Costruzioni metalliche</string>
<string name="poi_plasterer">Stuccatore</string>
<string name="poi_pottery_craft">Vasaio</string>
<string name="poi_rigger">Attrezzature per barche a vela</string>
<string name="poi_roofer">Costruzione e riparazione di tetti</string>
<string name="poi_saddler">Sellaio</string>
<string name="poi_sailmaker">Velaio</string>
<string name="poi_sawmill">Segheria</string>
<string name="poi_scaffolder">Ponteggi e impalcature</string>
<string name="poi_stand_builder">Allestimento di stand</string>
<string name="poi_stonemason">Scalpellino</string>
<string name="poi_sweep">Spazzacamino</string>
<string name="poi_sun_protection_craft">Tende da sole</string>
<string name="poi_tiler">Piastrellista</string>
<string name="poi_tinsmith">Lattoniere</string>
<string name="poi_upholsterer">Tappezziere</string>
<string name="poi_funeral_directors">Impresa di pompe funebri</string>
<string name="poi_town_hall">Municipio</string>
<string name="poi_research_office">Centro di ricerca e sviluppo</string>
<string name="poi_it_office">Ufficio IT</string>
<string name="poi_newspaper_office">Redazione giornalistica</string>
<string name="poi_architect_office">Studio di architettura</string>
<string name="poi_advertising_agency">Agenzia pubblicitaria</string>
<string name="poi_studio">Studio di registrazione</string>
<string name="poi_ship_historic">Nave storica</string>
<string name="poi_place_of_worship_muslim">Luogo di culto: musulmano</string>
<string name="poi_place_of_worship_sikh">Luogo di culto: sikhismo</string>
<string name="poi_travel_agent">Agenzia di viaggi</string>
<string name="poi_cinema">Cinema</string>
<string name="poi_casino">Casinò</string>
<string name="poi_social_centre">Centro sociale</string>
<string name="poi_money_lender">Prestasoldi</string>
<string name="poi_pawnbroker">Monte di pietà</string>
<string name="poi_currencyexchange">Cambia valute</string>
<string name="poi_accountant">Studio contabile</string>
<string name="poi_river">Fiume</string>
<string name="poi_stream">Ruscello</string>
<string name="poi_islet">Isoletta</string>
</resources>

21
OsmAnd/res/values-it/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
<string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
<string name="offline_edition">Modifiche offline</string>
@ -781,10 +781,10 @@
<string name="osmand_monitoring_description">Visualizza impostazioni per facilitare la registrazione dei tuoi spostamenti su un file GPX o il live tracking tramite un servizio web.</string>
<string name="osmand_extra_settings_description">Visualizza le impostazioni per la configurazione avanzata della mappa (come aumentarne i dettagli) e alcune di specifici dispositivi.</string>
<string name="osmand_development_plugin_description">Visualizza impostazioni per funzionalità in sviluppo e debug come la navigazione animata o visualizzare la prestazione del rendering.</string>
<string name="plugins_screen">Plugin</string>
<string name="select_plugin_to_activate">Seleziona un plugin per attivarlo o disattivarlo. (potrebbe essere richiesto il riavvio di OsmAnd.)</string>
<string name="plugins_screen">Componenti aggiuntivi</string>
<string name="select_plugin_to_activate">Seleziona un plugin per attivarlo o disattivarlo. (Potrebbe essere richiesto il riavvio di OsmAnd.)</string>
<string name="prefs_plugins_descr">I plugin abilitano funzionalità aggiuntive e impostazioni avanzate</string>
<string name="prefs_plugins">Plugin</string>
<string name="prefs_plugins">Componenti aggiuntivi</string>
<string name="tip_recent_changes_0_8_0_t">Novità nella versione 0.8.0:
\n\t- *Funzionalità a plugin*\n\t- Molte delle funzionalità sono raggruppate per caratteristiche e possono essere abilitate/disabilitate nel Plugin Manager.
Si possono abilitare sorgenti di mappe a tasselli (online o in cache), impostazioni per il tracking e molte altre funzionalità nuove o preesistenti.
@ -1547,7 +1547,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="announce_gpx_waypoints">Annuncia i punti GPX di passaggio</string>
<string name="osmodroid_mode_on">Ferma OsMoDroid</string>
<string name="osmodroid_mode_off">Avvia OsMoDroid</string>
<string name="driving_region_descr">Scegliete la regione di guida: USA, Europa, UK, Asia o Altre</string>
<string name="driving_region_descr">Scegliete la regione di guida: USA, Europa, UK, Asia o altre</string>
<string name="driving_region">Regione di guida</string>
<string name="driving_region_japan">Giappone</string>
<string name="driving_region_us">Stati Uniti</string>
@ -1583,7 +1583,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
</string>
<string name="about_version">Versione:</string>
<string name="about_settings">Informazioni</string>
<string name="about_settings_descr">Informazioni versione, licenze, membri del progetto</string>
<string name="about_settings_descr">Informazioni versione, licenze e membri del progetto</string>
<string name="tips_and_tricks">Aiuto</string>
<string name="tip_map_styles">Stili mappa</string>
<string name="tip_map_styles_t">"OsmAnd supporta le mappe vettoriali offline con stili di visualizzazione differenti per adattarsi alle tue esigenze:
@ -1638,7 +1638,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="android_19_location_disabled">Dalla versione KitKat non è più possibile scaricare e aggiornare le mappe nel precedente indirizzo di memorizzazione (%s). Vuoi sostituirlo con quello consentito e copiare lì tutti i file?
\n Nota: i file precedenti non verranno modificati.
\n Nota: non sarà possibile condividere i files fra OsmAnd and OsmAnd+.</string>
<string name="application_dir_change_warning2">Volete che OsmAnd provi a spostare i propri dati nella nuova destinazione?</string>
<string name="application_dir_change_warning2">Volete che OsmAnd sposti anche i propri dati nella nuova destinazione?</string>
<string name="copying_osmand_one_file_descr">Copia in corso del file (%s) nella nuova destinazione...</string>
<string name="copying_osmand_files_descr">Copia in corso dei file OsmAnd nella nuova destinazione (%s)</string>
<string name="copying_osmand_files">Copia dei file di dati di OsmAnd</string>
@ -1741,7 +1741,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="navigation_intent_invalid">Formato non valido: %s</string>
<string name="osmo_settings_uuid">ID univoco del dispositivo</string>
<string name="osmo_settings_descr">Configura le impostazioni di monitoraggio e imposta il canale di monitoraggio personale</string>
<string name="osmo_plugin_description">"OpenStreetMap monitoraggio avanzato in diretta, vedi http://osmo.mobi. Fornisce la possibilità di tracciare altri dispositivi e di essere tracciati. Crea gruppo anonimi, condivide reciprocamente la posizione e comunica. Sono disponibili varie impostazioni di monitoraggio, per la sessione in corso o permanenti. I gruppi anonimi sono limitate per il numero di giorni e alcune funzioni es. non c\'è il controllo remoto e l\'amministratore del gruppo. Gruppi con tutte le funzionalità possono essere creati dal sito e solo gli utenti registrati possono accedervi. "</string>
<string name="osmo_plugin_description">"OpenStreetMap monitoraggio avanzato in diretta, vedi http://osmo.mobi. Fornisce la possibilità di tracciare altri dispositivi e di essere tracciati. Crea gruppo anonimi, condivide reciprocamente la posizione e comunica. Sono disponibili varie impostazioni di monitoraggio, per la sessione in corso o permanenti. I gruppi anonimi sono limitati a un numero di giorni e alcune funzioni es. non c\'è il controllo remoto e l\'amministratore del gruppo. Gruppi con tutte le funzionalità possono essere creati dal sito e solo gli utenti registrati possono accedervi. "</string>
<string name="osmo_plugin_name">OsMo (Monitoraggio avanzato in tempo reale)</string>
<string name="osmo_settings">Monitoraggio OpenStreetMap</string>
<string name="keep_informing_never">Mai</string>
@ -1790,7 +1790,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="osmo_track_interval">Intervallo di registrazione</string>
<string name="osmo_track_interval_descr">Scegli l\'intervallo di tempo per l\'invio della posizione</string>
<string name="int_days">giorni</string>
<string name="osmo_connect_menu">Connetti</string>
<string name="osmo_connect_menu">Attiva</string>
<string name="osmo_expire_group">Scade fra</string>
<string name="osmo_group_description">Descrizione</string>
<string name="osmo_group_policy">Regole</string>
@ -2033,4 +2033,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="map_update">Mappe </string>
<string name="search_for">Cerca</string>
<string name="show_map">MOSTRA LA MAPPA</string>
</resources>
<string name="error_avoid_specific_road">Non è stata trovata una strada nelle vicinanze</string>
</resources>

45
OsmAnd/res/values-ja/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="installing_new_resources">新しいデータを展開中…</string>
<string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが
インターネット接続されていません。</string>
@ -505,8 +505,8 @@ POIの更新は利用できません</string>
<string name="settings_preset_descr">地図の表示とナビゲーションの設定はプロファイルごとに記憶されます。デフォルトのプロファイルを設定してください。</string>
<string name="settings_preset">デフォルトプロファイル</string>
<string name="settings">設定</string>
<string name="save_current_track_descr">今すぐ現在のトラックをSDに保存</string>
<string name="save_current_track">現在のトラックを保存</string>
<string name="save_current_track_descr">現在の経路を今すぐSDに保存</string>
<string name="save_current_track">現在の経路を保存</string>
<string name="save_track_interval_descr">ナビゲーション中の経路の記録間隔を選択</string>
<string name="save_track_interval">ナビゲーション中の経路記録間隔</string>
@ -783,8 +783,8 @@ POIの更新は利用できません</string>
<string name="download_using_mobile_internet">現在Wi-Fiに接続されていません。現在のインターネット接続のままでダウンロードを続行しますか？</string>
<string name="street_name">通り</string>
<string name="hno">家屋番号</string>
<string name="monitoring_settings">旅行についての記録</string>
<string name="monitoring_settings_descr">旅行の記録に関する設定します</string>
<string name="monitoring_settings">旅程の記録</string>
<string name="monitoring_settings_descr">移動中の経路記録に関する設定</string>
<string name="osmand_monitoring_plugin_description">スリープ（画面消灯）モード時のトラッキングとナビをGPSデバイスを定期的にウェイクアップすることで有効化します。
あなたの旅行のローカルのGPXファイルかオンラインのウェブサービスで記録するかを容易に設定する画面を表示します。</string>
<string name="osmand_monitoring_plugin_name">ロギングサービス</string>
@ -856,7 +856,7 @@ POIの更新は利用できません</string>
<string name="recording_description">記録中 %1$s %3$s の %2$s</string>
<string name="recording_default_name">記録中</string>
<string name="av_control_stop">停止</string>
<string name="av_control_start">開始</string>
<string name="av_control_start">記録</string>
<string name="map_widget_av_notes">音声/ビデオメモ</string>
<string name="osmand_srtm_short_description_80_chars">オフライン等高線のためのOsmAndプラグイン</string>
<string name="map_widget_distancemeasurement">距離の測定</string>
@ -1182,7 +1182,7 @@ ASTERはNASAと日本の経済産業省（METI）、そして宇宙システム
<string name="live_monitoring_interval_descr">オンライン追跡間隔を指定</string>
<string name="live_monitoring_interval">オンライン追跡間隔</string>
<string name="live_monitoring_url_descr">パラメータの構文を使用してWebアドレスを指定します:緯度={0}、経度={1}、タイムスタンプ={2}、HDOP={3}、標高={4}、速度={5}、ベアリング={6}</string>
<string name="live_monitoring_url_descr">指定したWebアドレスに経路データを送信／使えるパラメータ:緯度={0}、経度={1}、タイムスタンプ={2}、HDOP={3}、標高={4}、速度={5}、ベアリング={6}</string>
<string name="live_monitoring_url">オンライン追跡ウェブアドレス</string>
<string name="gpx_monitoring_disabled_warn">\'追跡ログをGPXに記録\'を有効にして下さい。</string>
<string name="show_current_gpx_title">現在のトラックを表示</string>
@ -1695,14 +1695,13 @@ OsmAndはオープンソースであり、活発に開発が進められいま
\n\t- TTSエンジンの改善(より正確な距離による指示、マイルを有効に)
\n\t- バグ修正
</string>
<string name="tip_recent_changes_0_6_6_t">0.6.6の変更と追加:
\n\t- 音声案内用にテキスト読み上げエンジン搭載
\n\t- 地図描写は、より詳細に
\n\t- 全世界用基本マップをアプリと一緒にパッケージ
\n\t- オフラインでのナビゲーションを微調整(実験段階)
\n\t- GPXのナビゲーションオプション
\n\t- ユーザーインターフェイスの更新と大きなバグを修正
</string>
<string name="tip_recent_changes_0_6_6_t">"0.6.6の変更と追加:
\n\t- 音声案内用にテキスト読み上げエンジン搭載
\n\t- マップ描写に、詳細(細かな施設)表示を追加
\n\t- 全世界用基本マップをアプリと一緒にパッケージ
\n\t- オフラインでのナビゲーションを微調整(実験段階)
\n\t- GPXのナビゲーションオプション
\n\t- ユーザーインターフェイスの更新と大きなバグを修正 "</string>
<string name="tip_map_switch_t_v2">マップソースとマップレイヤーの変更は「メニュー」→「マップレイヤー」から。
\n\n「マップソース」下の事前にロードされたオフラインベクター形式マップを選択することができます(オフラインナビゲーションには必要です)、もしくは事前定義された(オンラインまたはオフラインキャッシュ)タイルマップ(有効化するには「オンラインマップ」プラグインは「設定」→「プラグイン」)もしくはPC上のOsmAndMapCreatorで作成されたe.g.も使用できます。
\n\nOsmAndまた、カスタムソースをサポートしています。
@ -1769,8 +1768,8 @@ OsmAndはオープンソースであり、活発に開発が進められいま
<string name="lang_sw">スワヒリ語</string>
<string name="lang_he">ヘブライ語</string>
<string name="home">自宅</string>
<string name="live_monitoring_m_descr">GPX記録が有効になっている場合は、指定したWebサービスへデータを送信します。</string>
<string name="live_monitoring_m">オンライントラッキング(GPXが必要)</string>
<string name="live_monitoring_m_descr">GPX記録が有効になっている場合、指定したWebサービスへデータを送信。</string>
<string name="live_monitoring_m">オンライン追跡(GPXが必要)</string>
<string name="live_monitoring_start">オンライントラッキング開始</string>
<string name="live_monitoring_stop">オンライントラッキング停止</string>
<string name="gpx_monitoring_start">GPX記録開始</string>
@ -1780,7 +1779,7 @@ OsmAndはオープンソースであり、活発に開発が進められいま
<string name="rendering_attr_hideText_name">文字列を隠す</string>
<string name="rendering_attr_hideWoodScrubs_name">森林、低木等を隠す</string>
<string name="rendering_attr_buildings15zoom_name">ズーム15で建物表示</string>
<string name="rendering_attr_moreDetailed_name">より詳細に</string>
<string name="rendering_attr_moreDetailed_name">細かな施設も表示</string>
<string name="rendering_attr_lessDetailed_name">詳細を省く</string>
<string name="rendering_attr_hideAccess_name">アクセス制限を非表示</string>
<string name="rendering_attr_showAccess_name">アクセス制限を表示</string>
@ -1955,7 +1954,7 @@ OsmAndはオープンソースであり、活発に開発が進められいま
<string name="osmo_leave_confirmation_msg">グループ %1$sから退出しますか？</string>
<string name="osmo_specify_tracker_id">IDを指定してください</string>
<string name="continue_navigation">ナビゲーションを継続</string>
<string name="pause_navigation">ナビゲーションを一時停止</string>
<string name="pause_navigation">ナビを一時停止</string>
<string name="lang_bg">ブルガリア語</string>
<string name="lang_ca">カタロニア語</string>
<string name="lang_hr">クロアチア語</string>
@ -2025,7 +2024,7 @@ OsmAndはオープンソースであり、活発に開発が進められいま
<string name="navigation_intent_invalid">無効なフォーマット: %s</string>
<string name="hide_all_waypoints">すべて削除</string>
<string name="announce_nearby_favorites">近くのお気に入りを知らせる</string>
<string name="route_descr_destination">方向(仮翻訳)</string>
<string name="route_descr_destination">目的地(仮翻訳)</string>
<string name="index_tours">旅行</string>
<string name="flat_list_waypoints">全て</string>
<string name="waypoints">経由点</string>
@ -2102,4 +2101,10 @@ OsmAndはオープンソースであり、活発に開発が進められいま
<string name="anonymous_user_hint">以下は匿名ユーザーでは使用できません:↵\n- グループ作成;↵\n- サーバを利用してのグループやデバイスの同期;↵\n- 専用の場所でのグループやデバイスの管理.</string>
<string name="anonymous_user">匿名ユーザー</string>
<string name="logged_as">%1$sとしてログインしました</string>
<string name="home_button">ホーム画面</string>
<string name="map_update">マップ</string>
<string name="search_for">検索</string>
<string name="show_map">マップ表示</string>
<string name="show_all">全て表示</string>
<string name="coordinates">座標</string>
</resources>

7
OsmAnd/res/values-ko/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
@ -965,7 +965,7 @@
<string name="android_19_location_disabled">킷캣(KitKat) 버전 이후로 이전에 저장한 폴더 (%s)에 지도를 다운로드하고 업데이트 할 수 없습니다.
\n저장 위치를 변경하고 모든 파일을 그곳에 복사하는 것을 허락하겠습니까?
\n Note : 이전 파일은 그대로 유지됩니다. (그러나 수동으로 삭제할 수 있습니다)\n Note : 새로운 저장소는 OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다.</string>
<string name="application_dir_change_warning2">OsmAnd는 새 목적지로 데이터 파일을 복사하겠습니까?</string>
<string name="application_dir_change_warning2">OsmAnd에 새 목적지로 데이터 파일을 복사하겠습니까?</string>
<string name="copying_osmand_one_file_descr">새 목적지로 파일(%s)을 복사중...</string>
<string name="copying_osmand_files_descr">새로운 목적지에 OsmAnd 데이터 파일을 복사중 (%s)</string>
<string name="copying_osmand_files">OsmAnd 데이터 파일을 복사중</string>
@ -2089,4 +2089,5 @@
<string name="show_map">지도 표시</string>
<string name="show_all">모두 표시</string>
<string name="coordinates">좌표</string>
</resources>
<string name="error_avoid_specific_road">가장 가까운 도로를 찾을 수 없습니다</string>
</resources>

5
OsmAnd/res/values-lt/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
<string name="shared_location">Bendrinta vieta</string>
<string name="osmand_parking_warning">Dėmesio</string>
@ -1850,4 +1850,5 @@
<string name="show_map">RODYTI ŽEMĖLAPĮ</string>
<string name="show_all">RODYTI VISKĄ</string>
<string name="coordinates">Koordinatės</string>
</resources>
<string name="error_avoid_specific_road">Nerastas trumpiausias kelias</string>
</resources>

28
OsmAnd/res/values-pl/phrases.xml
View file

@ -11,4 +11,32 @@
<string name="poi_seafood">Sklep z owocami morza</string>
<string name="poi_confectionery">Cukiernia</string>
<string name="poi_ice_cream">Lodziarnia</string>
<string name="poi_palaeontological_site">Stanowisko paleontologiczne</string>
<string name="poi_supermarket">Supermarket</string>
<string name="poi_shop_tea">Sklep herbaciany</string>
<string name="poi_dairy">Sklep z nabiałem</string>
<string name="poi_vending_machine">Automat sprzedający</string>
<string name="poi_bookshop">Księgarnia</string>
<string name="poi_bicycle_shop">Sklep rowerowy</string>
<string name="poi_antiques_shop">Sklep z antykami</string>
<string name="poi_anime_shop">Sklep zoologiczny</string>
<string name="poi_art_shop">Sklep ze sztuką</string>
<string name="poi_baby_goods">Towary dziecięce</string>
<string name="poi_bag_shop">Sklep z torbami</string>
<string name="poi_bathroom_furnishing_shop">Wyposażenie łazienek</string>
<string name="poi_bed_shop">Wyposażenie pokoji</string>
<string name="poi_boutique">Butik</string>
<string name="poi_carpet_shop">Sklep z dywanami</string>
<string name="poi_chemist_shop">Sklep z narkotykami</string>
<string name="poi_clothes_shop">Sklep odzieżowy</string>
<string name="poi_children_clothes_shop">Sklep odzieżowy dla dzieci</string>
<string name="poi_shoes">Sklep obuwniczy</string>
<string name="poi_computer_shop">Sklep komputerowy</string>
<string name="poi_curtain_shop">Sklep z zasłonami</string>
<string name="poi_fabric_shop">Sklep z firankami</string>
<string name="poi_bedding_shop">Sklep z pościelą</string>
<string name="poi_dive_shop">Sprzęt do nurkowania</string>
<string name="poi_copyshop">Punkt ksero i drukowania</string>
</resources>

8
OsmAnd/res/values-pl/strings.xml
View file

@ -1556,7 +1556,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="copying_osmand_one_file_descr">Kopiowanie pliku (%s) do nowej lokalizacji...</string>
<string name="copying_osmand_files_descr">Kopiowanie plików OsmAnd do nowej lokalizacji (%s)</string>
<string name="copying_osmand_files">Kopiowanie plików OsmAnd</string>
<string name="application_dir_change_warning2">Czy chcesz aby OsmAnd spróbował przenieść dane do nowej lokalizacji?</string>
<string name="application_dir_change_warning2">Czy chcesz aby OsmAnd równierz skopiował dane do nowej lokalizacji?</string>
<string name="android_19_location_disabled">Od wersji 4.4 KitKat nie można pobierać ani aktualizować map w poprzedniej lokalizacji (%s). Czy chcesz ją zmienić na lokalizację dozwoloną i skopiować do niej wszystkie pliki?
\n Uwaga 1: Twoje stare pliki zostaną nienaruszone (mogą być usunięte manualnie).
\n Uwaga 2: W nowej lokalizacji nie będzie możliwe współdzielenie tych samych plików pomiędzy OsmAnd i OsmAnd+.</string>
@ -1949,4 +1949,10 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="osmo_use_https_descr">Użyj bezpiecznego połączenia z serwerem</string>
<string name="osmo_use_https">Użyj https</string>
<string name="advanced_settings">Zaawansowane</string>
<string name="home_button">Dom</string>
<string name="map_update">Mapy</string>
<string name="search_for">Wyszukaj</string>
<string name="show_map">POKAŻ MAPĘ</string>
<string name="show_all">POKAŻ WSZYSTKIE</string>
<string name="coordinates">Współrzędne</string>
</resources>

4
OsmAnd/res/values-ru/phrases.xml
View file

@ -615,4 +615,8 @@
<string name="poi_stream">Ручей</string>
<string name="poi_military">Военная зона</string>
<string name="poi_pier">Пирс</string>
<string name="poi_observatory">Обсерватория</string>
<string name="poi_astronomical_observatory">Астрономическая обсерватория</string>
<string name="poi_hot_spring">Горячий источник</string>
<string name="poi_geyser">Гейзер</string>
</resources>

2
OsmAnd/res/values-ru/strings.xml
View file

@ -125,7 +125,7 @@
<string name="online_map_settings_descr">Настройки источников онлайн карт и слоёв</string>
<string name="map_settings">Настройки карты</string>
<string name="map_settings_descr">Настроить отображение карты</string>
<string name="osmand_rastermaps_plugin_description">Этот плагин позволяет использовать различные источники онлайн карты, а также подготовленные растровые карты в качестве базовой карты или подложки/покрытия. Карты могут быть подготовлены на компьютере и скопированы в папку osmand на scard.</string>
<string name="osmand_rastermaps_plugin_description">Этот плагин позволяет использовать различные источники онлайн карт, а также подготовленные растровые карты в качестве базовой карты или подложки/покрытия. Карты могут быть подготовлены на компьютере и скопированы в папку данных OsmAnd.</string>
<string name="osmand_background_plugin_description">Этот плагин предоставляет навигацию и запись маршрутов в энергосберегающем режиме. Плагин работает в фоновом режиме и периодически активизирует GPS для записи маршрута или воспроизведения голосовых команд.</string>
<string name="osmand_accessibility_description">Этот плагин содержит настройки для дополнительных возможностей (accessibility).</string>
<string name="extra_settings">Дополнительные настройки</string>

137
OsmAnd/res/values-sc/phrases.xml Normal file
View file

@ -0,0 +1,137 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="poi_palaeontological_site">Giassu paleontològicu</string>
<string name="poi_bakery">Furru de su pane</string>
<string name="poi_alcohol">Alcòlicos</string>
<string name="poi_convenience">Drogheria</string>
<string name="poi_mall">Tzentru cummertziale</string>
<string name="poi_beverages">Butega de bèvidas</string>
<string name="poi_butcher">Bancu</string>
<string name="poi_deli">Gastronomia</string>
<string name="poi_shop_farm">Butega prodotos de fatoria</string>
<string name="poi_greengrocer">Bendidore de frùtora</string>
<string name="poi_seafood">Pischeria</string>
<string name="poi_confectionery">Butega de durches</string>
<string name="poi_ice_cream">Gelateria</string>
<string name="poi_supermarket">Supermercadu</string>
<string name="poi_shop_tea">Butega de su té</string>
<string name="poi_dairy">Lateria</string>
<string name="poi_vending_machine">Distribudore automàticu</string>
<string name="poi_bookshop">Libreria</string>
<string name="poi_bicycle_shop">Butega de bitziclètas</string>
<string name="poi_anime_shop">Butega de ànime</string>
<string name="poi_antiques_shop">Anticuariadu</string>
<string name="poi_art_shop">Butega d\'arte</string>
<string name="poi_baby_goods">Butega pro pitzinnos</string>
<string name="poi_bag_shop">Valigeria</string>
<string name="poi_bathroom_furnishing_shop">Arredu bagnu</string>
<string name="poi_bed_shop">Arredu aposentu de letu</string>
<string name="poi_boutique">Butega de moda</string>
<string name="poi_carpet_shop">Butega de tapetes</string>
<string name="poi_chemist_shop">Potecaria</string>
<string name="poi_clothes_shop">Bestimenta</string>
<string name="poi_children_clothes_shop">Bestimenta pro pitzinnos</string>
<string name="poi_shoes">Butega de iscarpas</string>
<string name="poi_computer_shop">Butega de informàtica</string>
<string name="poi_copyshop">Copisteria</string>
<string name="poi_curtain_shop">Butega pro su campègiu</string>
<string name="poi_fabric_shop">Butega de drapègios</string>
<string name="poi_bedding_shop">Butega de banitas</string>
<string name="poi_dive_shop">Butega de artìculos pro imberghidura</string>
<string name="poi_doityourself_shop">Butega de artìculos pro sa domo</string>
<string name="poi_erotic_shop">Sexy shop</string>
<string name="poi_fishing_shop">Butega pro sa pisca</string>
<string name="poi_florist">Froraju</string>
<string name="poi_frame_shop">Curnisas</string>
<string name="poi_furniture_shop">Butega de mòbiles</string>
<string name="poi_garden_centre">Artìculos pro su giardinu</string>
<string name="poi_gas_shop">Butega de gas lìcuidu</string>
<string name="poi_general_shop">Empòriu</string>
<string name="poi_gift_shop">Butega de donos</string>
<string name="poi_glaziery_shop">Bidreria</string>
<string name="poi_hardware_shop">Ferramenta</string>
<string name="poi_hearing_aids_shop">Butega aparitzos acùsticos</string>
<string name="poi_herbalist">Erboristeria</string>
<string name="poi_hifi_shop">Butega HiFi</string>
<string name="poi_hunting_shop">Atretzadura pro cassa e pisca</string>
<string name="poi_interior_decoration_shop">Butega de decoradura d\'intèrnos</string>
<string name="poi_jewelry_shop">Butega de prendas</string>
<string name="poi_kitchen_shop">Artìculos pro sa coghina</string>
<string name="poi_mobile_phone_shop">Butega de telefonia mòbile</string>
<string name="poi_motorcycle_shop">Butega de mototzicletas</string>
<string name="poi_musical_instrument_shop">Istrumentos musicales</string>
<string name="poi_newsagent_shop">Agentzia de imprenta</string>
<string name="poi_optician_shop">Optometrista</string>
<string name="poi_organic_shop">Alimentos biològicos</string>
<string name="poi_outdoor_shop">Artìculos pro s\'atividade a s\'abertu</string>
<string name="poi_paint_shop">Butega de artìculos pro sa pintadura</string>
<string name="poi_pet_shop">Butega de animales domèsticos</string>
<string name="poi_radiotechnics_shop">Butega pro radiotècnica</string>
<string name="poi_second_hand">Butega de cosas de segunda manu</string>
<string name="poi_ship_chandler">Butega de nàutica</string>
<string name="poi_sports_shop">Artìculos isportivos</string>
<string name="poi_stationery_shop">Butega pro s\'ufìtziu</string>
<string name="poi_ticket_shop">Billeteria</string>
<string name="poi_tobacco_shop">Istancu</string>
<string name="poi_toys_shop">Butega de gioghitos</string>
<string name="poi_vacuum_cleaner_shop">Butega de suspidoras</string>
<string name="poi_video_shop">Videonolègiu</string>
<string name="poi_electronics_shop">Butega de eletrònica</string>
<string name="poi_car_shop">Butega de automòbiles</string>
<string name="poi_car_parts_shop">Autoricàmbios</string>
<string name="poi_atv_shop">Butega de quad</string>
<string name="poi_cosmetics_shop">Butega de bellettos</string>
<string name="poi_marketplace">Mercadu</string>
<string name="poi_police">Politzia</string>
<string name="poi_fire_station">Pompieres</string>
<string name="poi_emergency_phone">Telèfonu de emergèntzia</string>
<string name="poi_fire_hydrant">Idrante</string>
<string name="poi_fire_extinguisher">Istudadore</string>
<string name="poi_ses_station">Istatzione \"protezione civile\"</string>
<string name="poi_emergency_access_point">Logu de intrada de emergèntzia</string>
<string name="poi_ford">Badu</string>
<string name="poi_mountain_pass">Coladòrgiu montanu</string>
<string name="poi_gate">Ponte</string>
<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_hump">Dossu longu</string>
<string name="poi_traffic_calming_chicane">Chicane</string>
<string name="poi_traffic_signals">Lughe de stop</string>
<string name="poi_car_repair">Mecànicu</string>
<string name="poi_service_tyres">Gommista</string>
<string name="poi_vehicle_inspection">Tzentru revisiones</string>
<string name="poi_parking">Parchègiu</string>
<string name="poi_motorcycle_parking">Parchègiu pro mototzicletas</string>
<string name="poi_parking_entrance">Intrada parchègiu</string>
<string name="poi_garages">Garàgiu</string>
<string name="poi_public_transport_platform">Firmada trasportu pùblicu</string>
<string name="poi_public_transport_platform_bus">Firmada àutobus</string>
<string name="poi_public_transport_platform_trolleybus">Firmada filobus</string>
<string name="poi_bus_stop">Firmada àutobus (disusadu)</string>
<string name="poi_public_transport_platform_tram">Firmada tram</string>
<string name="poi_tram_stop">Firmada tram (disusada)</string>
<string name="poi_public_transport_station">Istatzione trasportu pùblicu</string>
<string name="poi_bus_station">Istatzione bus (disusadu)</string>
<string name="poi_railway_station">Istatzione de sos trenos</string>
<string name="poi_railway_platform">Piattaredda ferroviària (disusasu)</string>
<string name="poi_railway_halt">Firmada de sos trenos (disusada)</string>
<string name="poi_subway_entrance">Intrada de sa metropolitana</string>
<string name="poi_subway_station">Istatzione de sa metropolitana</string>
<string name="poi_taxi">Postèggiu de sos taxi</string>
<string name="poi_airport">Aeroportu</string>
<string name="poi_helipad">Eliportu</string>
<string name="poi_runway">Pista d\'aterazu</string>
<string name="poi_slipway">Lassinadòrju</string>
<string name="poi_lighthouse">Faru</string>
<string name="poi_bicycle_parking">Parchègiu bitzicletas</string>
<string name="poi_aerialway_gondola">Gondola</string>
</resources>

9
OsmAnd/res/values-sc/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
<string name="voice_pref_title">Boghe</string>
<string name="misc_pref_title">Mistura</string>
@ -81,7 +81,7 @@
<string name="android_19_location_disabled">Dae sa versione Android 4.4 (KitKat) non podes prus iscarrigare e agiornare sas mapas in sa cartella bècia (%s). La bòles remplasare cun sa chi est acusentida e copiare in cue totus sos datos?
\n Nota 1: sos datos antepostos tuos non at a èssere mudados (ma podent essere burrados manualmente).
\n Nota 2: in sa cartella noa non at a èssere possìbile cumpartzire sos datos intra OsmAnd e OsmAnd+.</string>
<string name="application_dir_change_warning2">OsmAnd podet proare a copiare sos datos suos in sa destinatzione noa. Boles a lu fàghere?</string>
<string name="application_dir_change_warning2">Boles chi OsmAnd còpiet sos datos suos fintzas in sa destinatzione noa?</string>
<string name="copying_osmand_one_file_descr">Copiande su documentu (%s) in sa destinatzione noa...</string>
<string name="copying_osmand_files_descr">Copiande sos datos de OsmAnd in (%s), sa destinatzione noa</string>
<string name="copying_osmand_files">Copiande sos datos de OsmAnd</string>
@ -1783,8 +1783,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="osmo_use_https">Imprea https</string>
<string name="home_button">Domo</string>
<string name="search_for">Chirca pro</string>
<string name="show_map">AMMUSTRA MAPA</string>
<string name="show_map">AMMUSTRA SA MAPA</string>
<string name="show_all">AMMUSTRA TOTU</string>
<string name="coordinates">Coordinatas</string>
<string name="map_update">Mapas</string>
</resources>
<string name="error_avoid_specific_road">No est istada agatada peruna istada a curtzu</string>
</resources>

8
OsmAnd/res/values-sk/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="recording_context_menu_show">Zobraziť</string>
<string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
<string name="av_def_action_picture">Zachytiť fotografiu</string>
@ -1597,7 +1597,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="copying_osmand_files_descr">Kopírujem dátové súbory OsmAnd do nového cieľa (%s)</string>
<string name="copying_osmand_files">Kopírujem dátové súbory OsmAnd</string>
<string name="copying_osmand_one_file_descr">Kopírujem súbor (%s) do nového cieľa...</string>
<string name="application_dir_change_warning2">Chcete aby sa OsmAnd pokúsil presunúť údaje do nového cieľa?</string>
<string name="application_dir_change_warning2">Chcete aby OsmAnd presunul údajové súbory do nového cieľa?</string>
<string name="calculate_osmand_route_gpx">Vypočítať OsmAnd offline trasu</string>
<string name="android_19_location_disabled">Od Androidu verzie 4.4 (KitKat) nie je možné sťahovať a aktualizovať mapy v pôvodnom úložnom priečinku (%s). Chcete ho zmeniť na vhodné nové úložisko a skopírovať tam všetky súbory?
\n Poznámka 1: pôvodné súbory zostanú nedotknuté (môžete ich neskôr vymazať ručne).\n Poznámka 2: v novom úložisku nebude možné zdieľať súbory medzi OsmAnd a OsmAnd+.</string>
@ -1996,4 +1996,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="show_map">ZOBRAZIŤ MAPU</string>
<string name="show_all">ZOBRAZIŤ VŠETKO</string>
<string name="coordinates">Súradnice</string>
</resources>
<string name="map_update">Mapy</string>
<string name="error_avoid_specific_road">Nenašla sa najbližšia cesta</string>
</resources>

8
OsmAnd/res/values-sv/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
<string name="ChooseCountry">Välj land</string>
<string name="choose_city">Välj stad</string>
@ -1339,7 +1339,7 @@
<string name="android_19_location_disabled">Efter Androidversion 4.4 (KitKat) går det inte att hämta och uppdatera kartor på den tidigare lagringsmappen (%s). Vill du byta till en tillåten plats och kopiera alla OsmAnd-filerna dit?
\n OBS: Gamla filer berörs inte (men kan tas bort manuellt).
\n OBS: På den nya lagringsplatsen kommer det inte att vara möjligt att dela filer mellan OsmAnd och OsmAnd+.</string>
<string name="application_dir_change_warning2">Vill du att OsmAnd ska försöka kopiera datafilerna till den nya platsen?</string>
<string name="application_dir_change_warning2">Vill du att OsmAnd också ska kopiera datafilerna till den nya platsen?</string>
<string name="copying_osmand_one_file_descr">Kopierar filen (%s) till den nya platsen …</string>
<string name="copying_osmand_files_descr">Kopierar OsmAnd-datafiler till den nya platsen (%s)</string>
<string name="copying_osmand_files">Kopierar OsmAnd-datafiler</string>
@ -1736,4 +1736,6 @@
<string name="show_map">VISA KARTA</string>
<string name="show_all">VISA ALLA</string>
<string name="coordinates">Koordinater</string>
</resources>
<string name="map_update">Kartor</string>
<string name="error_avoid_specific_road">Hittar inte närmaste väg</string>
</resources>

3
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
<string name="map_widget_show_destination_arrow">顯示目的地方向</string>
@ -1838,4 +1838,5 @@
<string name="show_all">全部顯示</string>
<string name="coordinates">座標</string>
<string name="home_button">首頁</string>
<string name="error_avoid_specific_road">找不到最近的路</string>
</resources>

693
diff_turn_lanes
View file

@ -1,693 +0,0 @@
diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
index 1fa0b3a..0ba0981 100644
--- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
+++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
@@ -7,6 +7,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.HashSet;
import org.apache.commons.logging.Log;
@@ -388,6 +389,77 @@ public class RouteResultPreparation {
dist += result.get(i).getDistance();
}
}
+
+ for (int i = result.size() - 2; i >= 0; i--) {
+ RouteSegmentResult currentSegment = result.get(i);
+ RouteSegmentResult nextSegment = result.get(i + 1);
+
+ if (currentSegment.getTurnType() == null || currentSegment.getTurnType().getLanes() == null || nextSegment.getTurnType() == null || nextSegment.getTurnType().getLanes() == null) {
+ continue;
+ }
+
+ // Only allow slight turns to be merged.
+ if (currentSegment.getDistance() < 60 && nextSegment.getTurnType().getLanes().length <= currentSegment.getTurnType().getLanes().length
+ && (currentSegment.getTurnType().getValue() == TurnType.C
+ || currentSegment.getTurnType().getValue() == TurnType.TSLL
+ || currentSegment.getTurnType().getValue() == TurnType.TSLR
+ || currentSegment.getTurnType().getValue() == TurnType.KL
+ || currentSegment.getTurnType().getValue() == TurnType.KR)) {
+ mergeTurnLanes(leftside, currentSegment, nextSegment);
+ }
+ }
+ }
+
private static final int MAX_SPEAK_PRIORITY = 5;
@@ -439,6 +511,7 @@ public class RouteResultPreparation {
} else {
t = TurnType.valueOf(TurnType.TU, leftSide);
}
+ getLanesInfo(prev, t, leftSide);
} else if (mpi < -TURN_DEGREE_MIN) {
if (mpi > -60) {
t = TurnType.valueOf(TurnType.TSLR, leftSide);
@@ -449,6 +522,7 @@ public class RouteResultPreparation {
} else {
t = TurnType.valueOf(TurnType.TU, leftSide);
}
+ getLanesInfo(prev, t, leftSide);
} else {
t = attachKeepLeftInfoAndLanes(leftSide, prev, rr, t);
}
@@ -459,6 +533,82 @@ public class RouteResultPreparation {
return t;
}
private TurnType processRoundaboutTurn(List<RouteSegmentResult> result, int i, boolean leftSide, RouteSegmentResult prev,
RouteSegmentResult rr) {
@@ -491,21 +641,52 @@ public class RouteResultPreparation {
return t;
}
private TurnType attachKeepLeftInfoAndLanes(boolean leftSide, RouteSegmentResult prevSegm, RouteSegmentResult currentSegm, TurnType t) {
// keep left/right
int[] lanes = null;
boolean kl = false;
boolean kr = false;
+ List<OutboundRoad> outboundRoads = new ArrayList<OutboundRoad>();
List<RouteSegmentResult> attachedRoutes = currentSegm.getAttachedRoutes(currentSegm.getStartPointIndex());
- int ls = prevSegm.getObject().getLanes();
- if(ls >= 0 && prevSegm.getObject().getOneway() == 0) {
- ls = (ls + 1) / 2;
- }
- int left = 0;
- int right = 0;
boolean speak = false;
int speakPriority = Math.max(highwaySpeakPriority(prevSegm.getObject().getHighway()), highwaySpeakPriority(currentSegm.getObject().getHighway()));
+ boolean otherRoutesExist = false;
+ boolean rightTurnPossible = false;
+ boolean leftTurnPossible = false;
if (attachedRoutes != null) {
for (RouteSegmentResult attached : attachedRoutes) {
double ex = MapUtils.degreesDiff(attached.getBearingBegin(), currentSegm.getBearingBegin());
@@ -513,73 +694,439 @@ public class RouteResultPreparation {
int rsSpeakPriority = highwaySpeakPriority(attached.getObject().getHighway());
if (rsSpeakPriority != MAX_SPEAK_PRIORITY || speakPriority == MAX_SPEAK_PRIORITY) {
if ((ex < TURN_DEGREE_MIN || mpi < TURN_DEGREE_MIN) && ex >= 0) {
+ // It's ex >= 0 so that turns remaining on the current road are counted as well
kl = true;
int lns = attached.getObject().getLanes();
}
- if (lns > 0) {
- right += lns;
+ if (lns <= 0) {
+ lns = 1;
}
- speak = speak || rsSpeakPriority <= speakPriority;
+ outboundRoads.add(new OutboundRoad(ex, lns, attached));
+ speak |= rsSpeakPriority <= speakPriority;
} else if ((ex > -TURN_DEGREE_MIN || mpi < TURN_DEGREE_MIN) && ex <= 0) {
}
- if (lns > 0) {
- left += lns;
+ if (lns <= 0) {
+ lns = 1;
}
- speak = speak || rsSpeakPriority <= speakPriority;
+ outboundRoads.add(new OutboundRoad(ex, lns, attached));
+ speak |= rsSpeakPriority <= speakPriority;
+ }
+ }
+ if (mpi > TURN_DEGREE_MIN) {
+ otherRoutesExist = true;
+ if (ex > TURN_DEGREE_MIN) {
+ // A right turn is allowed at this intersection.
+ rightTurnPossible = true;
+ } else if (ex < TURN_DEGREE_MIN) {
+ // A left turn is allowed at this intersection.
+ leftTurnPossible = true;
}
}
}
}
- if(kr && left == 0) {
- left = 1;
- } else if(kl && right == 0) {
- right = 1;
- }
+
+ // attachedRoutes covers all allowed outbound routes at that point except currentSegm.
if (current <= 0) {
current = 1;
}
-// if(ls >= 0 /*&& current + left + right >= ls*/){
- lanes = new int[current + left + right];
- ls = current + left + right;
- for(int it=0; it< ls; it++) {
- if(it < left || it >= left + current) {
- lanes[it] = 0;
- } else {
- lanes[it] = 1;
+ outboundRoads.add(new OutboundRoad(0, current, currentSegm));
+
+ Collections.sort(outboundRoads);
+
+ int totalOutboundLanes = 0;
+ for (OutboundRoad road : outboundRoads) {
+ totalOutboundLanes += road.getLanes();
+ }
+
+ lanes = new int[totalOutboundLanes];
+ int i = 0;
+ int left = 0;
+ int right = 0;
+ for (OutboundRoad road : outboundRoads) {
+ for (int j = 0; i < lanes.length && j < road.getLanes(); i++, j++) {
+ lanes[i] = road.getAngle() == 0 ? TurnType.BIT_LANE_ALLOWED : 0;
+ if (road.getAngle() < 0) {
+ left++;
+ } else if (road.getAngle() > 0) {
+ right++;
}
}
- // sometimes links are
- if ((current <= left + right) && (left > 1 || right > 1)) {
- speak = true;
- }
-// }
+ }
+ // sometimes links are
+ if ((current <= left + right) && (left > 1 || right > 1)) {
+ speak = true;
+ }
+
+ double deviation = Math.abs(MapUtils.degreesDiff(prevSegm.getBearingEnd(), currentSegm.getBearingBegin()));
+ boolean makeSlightTurn = deviation > 5 && (!isMotorway(prevSegm) || !isMotorway(currentSegm));
+ if (kl && kr) {
+ t = TurnType.valueOf(TurnType.C, leftSide);
- double devation = Math.abs(MapUtils.degreesDiff(prevSegm.getBearingEnd(), currentSegm.getBearingBegin()));
- boolean makeSlightTurn = devation > 5 && (!isMotorway(prevSegm) || !isMotorway(currentSegm));
- if (kl) {
+ t.setSkipToSpeak(!speak);
+ } else if (kl) {
t = TurnType.valueOf(makeSlightTurn ? TurnType.TSLL : TurnType.KL, leftSide);
t.setSkipToSpeak(!speak);
- }
- if (kr) {
+ } else if (kr) {
t = TurnType.valueOf(makeSlightTurn ? TurnType.TSLR : TurnType.KR, leftSide);
t.setSkipToSpeak(!speak);
+ } else {
+ if (!otherRoutesExist) {
+ return null;
+ }
+ // Most likely, we're going straight at a 90-degree intersection with another road
+ t = TurnType.valueOf(TurnType.C, leftSide);
+ t.setSkipToSpeak(true); // Always skip the talking when going straight
+
+ int prevLanes = prevSegm.getObject().getLanes();
+ if(prevSegm.getObject().getOneway() == 0) {
+ if (prevSegm.isForwardDirection()
+ && prevSegm.getObject().getValue("lanes:forward") != null) {
+ prevLanes = Integer.parseInt(prevSegm.getObject().getValue("lanes:forward"));
+ } else if (!prevSegm.isForwardDirection()
+ && prevSegm.getObject().getValue("lanes:backward") != null) {
+ prevLanes = Integer.parseInt(prevSegm.getObject().getValue("lanes:backward"));
+ } else {
+ prevLanes = (prevLanes + 1) / 2;
+ }
+ }
+ if (prevLanes <= 0) {
+ return null;
+ }
+ lanes = new int[prevLanes];
+
+ String turnLanes;
+ if (prevSegm.getObject().getOneway() == 0) {
+ if (prevSegm.isForwardDirection()) {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes:forward");
+ } else {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes:backward");
+ }
+ } else {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes");
+ }
+
+ if (turnLanes == null) {
+ return null;
+ }
+
+ String[] splitLaneOptions = turnLanes.split("\\|", -1);
+ if (splitLaneOptions.length != lanes.length) {
+ // Error in data or missing data
+ return null;
+ }
+
+ t.setLanes(lanes);
+
+ assignTurns(splitLaneOptions, t);
+
+ // In some cases (at least in the US), the rightmost lane might not have a right turn indicator, but is allowed. This section adds in that indicator. The same applies for where leftSide is true.
+ if (leftSide) {
+ if (leftTurnPossible
+ && !t.isTurnAllowed(0, TurnType.Turn.LEFT)
+ && !t.isTurnAllowed(0, TurnType.Turn.SLIGHT_LEFT)
+ && !t.isTurnAllowed(0, TurnType.Turn.SHARP_LEFT)) {
+ if (t.getPrimaryTurn(0) != TurnType.Turn.UNKNOWN && t.getSecondaryTurn(0) == TurnType.Turn.UNKNOWN) {
+ // This was just to make sure that there's no bad data and that there's an empty slot.
+ t.setSecondaryTurn(0, TurnType.Turn.LEFT);
+ }
+ }
+ } else {
+ if (rightTurnPossible
+ && !t.isTurnAllowed(lanes.length - 1, TurnType.Turn.RIGHT)
+ && !t.isTurnAllowed(lanes.length - 1, TurnType.Turn.SLIGHT_RIGHT)
+ && !t.isTurnAllowed(lanes.length - 1, TurnType.Turn.SHARP_RIGHT)) {
+ if (t.getPrimaryTurn(lanes.length - 1) != TurnType.Turn.UNKNOWN && t.getSecondaryTurn(lanes.length - 1) == TurnType.Turn.UNKNOWN) {
+ // This was just to make sure that there's no bad data and that there's an empty slot.
+ t.setSecondaryTurn(lanes.length - 1, TurnType.Turn.RIGHT);
+ }
+ }
+ }
+
+ // Manually set the allowed lanes, in case the turn gets merged.
+ for (int j = 0; j < lanes.length; j++) {
+ if (t.isTurnAllowed(j, TurnType.Turn.STRAIGHT)) {
+ t.getLanes()[j] |= TurnType.BIT_LANE_ALLOWED;
+ }
+ }
+
+ return t;
}
+
if (t != null && lanes != null) {
t.setLanes(lanes);
+
+ // This code block, in the cases where turn:lanes is not available, replaces the straight arrows with slight-left or slight-right arrows. It compares the number of lanes going straight to the number of lanes turning to determine which symbol to display where.
+ boolean crossedLeftSide = false;
+ for (int j = 0; j < t.getLanes().length; j++) {
+ if (!crossedLeftSide && (t.getLanes()[j] & TurnType.BIT_LANE_ALLOWED) == 0) {
+ if (current > left + right || right != 0) {
+ t.setPrimaryTurn(j, TurnType.Turn.SLIGHT_LEFT);
+ } else {
+ t.setPrimaryTurn(j, TurnType.Turn.STRAIGHT);
+ }
+ } else {
+ crossedLeftSide = true;
+ if ((t.getLanes()[j] & TurnType.BIT_LANE_ALLOWED) == TurnType.BIT_LANE_ALLOWED) {
+ if (current > left + right || (left != 0 && right != 0)) {
+ t.setPrimaryTurn(j, TurnType.Turn.STRAIGHT);
+ } else if (left != 0) {
+ t.setPrimaryTurn(j, TurnType.Turn.SLIGHT_RIGHT);
+ } else if (right != 0) {
+ t.setPrimaryTurn(j, TurnType.Turn.SLIGHT_LEFT);
+ }
+ } else {
+ if (current > left + right || left != 0) {
+ t.setPrimaryTurn(j, TurnType.Turn.SLIGHT_RIGHT);
+ } else {
+ t.setPrimaryTurn(j, TurnType.Turn.STRAIGHT);
+ }
+ }
+ }
+ }
+
+ t = attachTurnLanesData(leftSide, prevSegm, t);
}
+
return t;
}
-
===============================================================================
+ private void mergeTurnLanes(boolean leftSide, RouteSegmentResult currentSegment, RouteSegmentResult nextSegment) {
+ if (currentSegment.getTurnType().isTurnLanesRendering() && nextSegment.getTurnType().isTurnLanesRendering()) {
+ int[] lanes = new int[currentSegment.getTurnType().getLanes().length];
+ for (int i = 0; i < lanes.length; i++) {
+ lanes[i] = currentSegment.getTurnType().getLanes()[i] & ~TurnType.BIT_LANE_ALLOWED;
+ }
+ int matchingIndex = 0;
+ int maxMatchedLanes = 0;
+ for (int i = 0; i < lanes.length; i++) {
+ int matchedLanes = 0;
+ for (int j = 0; j < nextSegment.getTurnType().getLanes().length - i; j++) {
+ if (nextSegment.getTurnType().getPrimaryTurn(j) == currentSegment.getTurnType().getPrimaryTurn(i + j)) {
+ matchedLanes++;
+ } else {
+ break;
+ }
+ }
+ if (matchedLanes > maxMatchedLanes) {
+ matchingIndex = i;
+ maxMatchedLanes = matchedLanes;
+ }
+ }
+ if (maxMatchedLanes <= 1) {
+ return;
+ }
+ for (int i = matchingIndex; i - matchingIndex < nextSegment.getTurnType().getLanes().length; i++) {
+ lanes[i] |= nextSegment.getTurnType().getLanes()[i - matchingIndex] & TurnType.BIT_LANE_ALLOWED;
+ }
+ currentSegment.getTurnType().setLanes(lanes);
+ currentSegment.setTurnType(inferTurnFromLanes(currentSegment.getTurnType(), leftSide));
+ } else if (!currentSegment.getTurnType().isTurnLanesRendering() && !nextSegment.getTurnType().isTurnLanesRendering()) {
+ int[] lanes = new int[currentSegment.getTurnType().getLanes().length];
+ int matchingIndex = 0;
+ int expectedLanes = 0;
+ for (int i = 0; i < lanes.length; i++) {
+ lanes[i] = currentSegment.getTurnType().getLanes()[i] & ~TurnType.BIT_LANE_ALLOWED;
+ if (currentSegment.getTurnType().getPrimaryTurn(i) == TurnType.Turn.SLIGHT_LEFT) {
+ matchingIndex++;
+ } else if (currentSegment.getTurnType().getPrimaryTurn(i) == TurnType.Turn.STRAIGHT) {
+ expectedLanes++;
+ }
+ }
+ if (nextSegment.getTurnType().getLanes().length != expectedLanes) {
+ return;
+ }
+ for (int i = matchingIndex; i - matchingIndex < nextSegment.getTurnType().getLanes().length; i++) {
+ lanes[i] = nextSegment.getTurnType().getLanes()[i - matchingIndex];
+ }
+ currentSegment.getTurnType().setLanes(lanes);
+ }
}
+ private class OutboundRoad implements Comparable<OutboundRoad>{
+ private final double angle;
+ private final int lanes;
+ private final RouteSegmentResult road;
+
+ public OutboundRoad(double angle, int lanes, RouteSegmentResult road) {
+ this.angle = angle;
+ this.lanes = lanes;
+ this.road = road;
+ }
+
+ public double getAngle() {
+ return angle;
+ }
+
+ public int getLanes() {
+ return lanes;
+ }
+
+ public RouteSegmentResult getRoad() {
+ return road;
+ }
+
+ public int compareTo(OutboundRoad other) {
+ if (other.angle - this.angle < 0) {
+ return 1;
+ } else if (other.angle - this.angle > 0) {
+ return -1;
+ } else {
+ return 0;
+ }
+ }
+ }
+ private void getLanesInfo(RouteSegmentResult prevSegm, TurnType t, boolean leftSide) {
+ int lanes = prevSegm.getObject().getLanes();
+ if(prevSegm.getObject().getOneway() == 0) {
+ if (prevSegm.isForwardDirection()
+ && prevSegm.getObject().getValue("lanes:forward") != null) {
+ lanes = Integer.parseInt(prevSegm.getObject().getValue("lanes:forward"));
+ } else if (!prevSegm.isForwardDirection()
+ && prevSegm.getObject().getValue("lanes:backward") != null) {
+ lanes = Integer.parseInt(prevSegm.getObject().getValue("lanes:backward"));
+ } else {
+ lanes = (lanes + 1) / 2;
+ }
+ }
+ if (lanes <= 0) {
+ return;
+ }
+
+ String turnLanes;
+ if (prevSegm.getObject().getOneway() == 0) {
+ if (prevSegm.isForwardDirection()) {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes:forward");
+ } else {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes:backward");
+ }
+ } else {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes");
+ }
+
+ if (turnLanes == null) {
+ return;
+ }
+
+ String[] splitLaneOptions = turnLanes.split("\\|", -1);
+ if (splitLaneOptions.length != lanes) {
+ // Error in data or missing data, go to old behavior
+ return;
+ }
+
+ int[] lanesArray = new int[lanes];
+
+ t.setLanes(lanesArray);
+
+ assignTurns(splitLaneOptions, t);
+
+ // In some cases (at least in the US), the rightmost lane might not have a right turn indicator, but is allowed. This section adds in that indicator. The same applies for where leftSide is true.
+ if (leftSide) {
+ if (t.getValue() == TurnType.TL
+ && !t.isTurnAllowed(0, TurnType.Turn.LEFT)
+ && !t.isTurnAllowed(0, TurnType.Turn.SLIGHT_LEFT)
+ && !t.isTurnAllowed(0, TurnType.Turn.SHARP_LEFT)) {
+ if (t.getPrimaryTurn(0) != TurnType.Turn.UNKNOWN && t.getSecondaryTurn(0) == TurnType.Turn.UNKNOWN) {
+ // This was just to make sure that there's no bad data and that there's an empty slot.
+ t.setSecondaryTurn(0, TurnType.Turn.LEFT);
+ lanesArray[0] |= TurnType.BIT_LANE_ALLOWED;
+ }
+ }
+ } else {
+ if (t.getValue() == TurnType.TR
+ && !t.isTurnAllowed(lanesArray.length - 1, TurnType.Turn.RIGHT)
+ && !t.isTurnAllowed(lanesArray.length - 1, TurnType.Turn.SLIGHT_RIGHT)
+ && !t.isTurnAllowed(lanesArray.length - 1, TurnType.Turn.SHARP_RIGHT)) {
+ if (t.getPrimaryTurn(lanesArray.length - 1) != TurnType.Turn.UNKNOWN && t.getSecondaryTurn(lanesArray.length - 1) == TurnType.Turn.UNKNOWN) {
+ // This was just to make sure that there's no bad data and that there's an empty slot.
+ t.setSecondaryTurn(lanesArray.length - 1, TurnType.Turn.RIGHT);
+ lanesArray[lanesArray.length - 1] |= TurnType.BIT_LANE_ALLOWED;
+ }
+ }
+ }
+
+ // Manually set the allowed lanes.
+ for (int i = 0; i < lanesArray.length; i++) {
+ if (t.getPrimaryTurn(i).getValue() == t.getValue() || t.getSecondaryTurn(i).getValue() == t.getValue()) {
+ lanesArray[i] |= TurnType.BIT_LANE_ALLOWED;
+ }
+ }
+ }
+
+ private TurnType attachTurnLanesData(boolean leftSide, RouteSegmentResult prevSegm, TurnType t) {
+ int lanes = prevSegm.getObject().getLanes();
+ String turnLanes;
+ if (prevSegm.getObject().getOneway() == 0) {
+ if (prevSegm.isForwardDirection()) {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes:forward");
+ } else {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes:backward");
+ }
+ } else {
+ turnLanes = prevSegm.getObject().getValue("turn:lanes");
+ }
+
+ if (turnLanes == null) {
+ return t;
+ }
+
+ String[] splitLaneOptions = turnLanes.split("\\|", -1);
+ if (splitLaneOptions.length != lanes) {
+ // Error in data or missing data, go to old behavior
+ return t;
+ }
+
+ if (t.getLanes().length != lanes) {
+ // The turn:lanes don't easily match up to the target road.
+
+ List<Integer> sourceLanes = new ArrayList<Integer>();
+
+ int outgoingLanesIndex = 0;
+ int sourceLanesIndex = 0;
+
+ while (outgoingLanesIndex < t.getLanes().length && sourceLanesIndex < lanes) {
+ if (splitLaneOptions[sourceLanesIndex].contains(";")) {
+ int options = countOccurrences(splitLaneOptions[sourceLanesIndex], ';');
+ if (options == 1) {
+ if (outgoingLanesIndex + 1 >= t.getLanes().length) {
+ // Likely an error in data
+ return t;
+ }
+ int usability = t.getLanes()[outgoingLanesIndex] | t.getLanes()[outgoingLanesIndex + 1];
+ sourceLanes.add(usability);
+ outgoingLanesIndex += 2;
+ sourceLanesIndex++;
+ } else {
+ // Not supported
+ return t;
+ }
+ } else {
+ sourceLanes.add(t.getLanes()[outgoingLanesIndex]);
+ outgoingLanesIndex++;
+ sourceLanesIndex++;
+ }
+ }
+
+ int[] newLanes = new int[sourceLanes.size()];
+
+ for (int i = 0; i < sourceLanes.size(); i++) {
+ newLanes[i] = sourceLanes.get(i);
+ }
+
+ t.setLanes(newLanes);
+ }
+
+ assignTurns(splitLaneOptions, t);
+
+ t = inferTurnFromLanes(t, leftSide);
+
+ return t;
+ }
+
+ private void assignTurns(String[] splitLaneOptions, TurnType t) {
+ for (int i = 0; i < splitLaneOptions.length; i++) {
+ String[] laneOptions = splitLaneOptions[i].split(";");
+
+ boolean primaryTurnSet = false;
+
+ for (int j = 0; j < laneOptions.length; j++) {
+ if (laneOptions[j].equals("none") || laneOptions[j].equals("through")) {
+ TurnType.Turn turn = TurnType.Turn.STRAIGHT;
+ if (!primaryTurnSet) {
+ t.setPrimaryTurn(i, turn);
+ primaryTurnSet = true;
+ } else {
+ t.setSecondaryTurn(i, turn);
+ continue;
+ }
+ } else if (laneOptions[j].equals("slight_right")) {
+ TurnType.Turn turn = TurnType.Turn.SLIGHT_RIGHT;
+ if (!primaryTurnSet) {
+ t.setPrimaryTurn(i, turn);
+ primaryTurnSet = true;
+ } else {
+ t.setSecondaryTurn(i, turn);
+ continue;
+ }
+ } else if (laneOptions[j].equals("slight_left")) {
+ TurnType.Turn turn = TurnType.Turn.SLIGHT_LEFT;
+ if (!primaryTurnSet) {
+ t.setPrimaryTurn(i, turn);
+ primaryTurnSet = true;
+ } else {
+ t.setSecondaryTurn(i, turn);
+ continue;
+ }
+ } else if (laneOptions[j].equals("right")) {
+ TurnType.Turn turn = TurnType.Turn.RIGHT;
+ if (!primaryTurnSet) {
+ t.setPrimaryTurn(i, turn);
+ primaryTurnSet = true;
+ } else {
+ t.setSecondaryTurn(i, turn);
+ continue;
+ }
+ } else if (laneOptions[j].equals("left")) {
+ TurnType.Turn turn = TurnType.Turn.LEFT;
+ if (!primaryTurnSet) {
+ t.setPrimaryTurn(i, turn);
+ primaryTurnSet = true;
+ } else {
+ t.setSecondaryTurn(i, turn);
+ continue;
+ }
+ } else if (laneOptions[j].equals("sharp_right")) {
+ TurnType.Turn turn = TurnType.Turn.SHARP_RIGHT;
+ if (!primaryTurnSet) {
+ t.setPrimaryTurn(i, turn);
+ primaryTurnSet = true;
+ } else {
+ t.setSecondaryTurn(i, turn);
+ continue;
+ }
+ } else if (laneOptions[j].equals("sharp_left")) {
+ TurnType.Turn turn = TurnType.Turn.SHARP_LEFT;
+ if (!primaryTurnSet) {
+ t.setPrimaryTurn(i, turn);
+ primaryTurnSet = true;
+ } else {
+ t.setSecondaryTurn(i, turn);
+ continue;
+ }
+ } else if (laneOptions[j].equals("reverse")) {
+ TurnType.Turn turn = TurnType.Turn.UTURN;
+ if (!primaryTurnSet) {
+ t.setPrimaryTurn(i, turn);
+ primaryTurnSet = true;
+ } else {
+ t.setSecondaryTurn(i, turn);
+ continue;
+ }
+ }
+ }
+ }
+
+ t.setTurnLanesRendering(true);
+ }
+
+ private TurnType inferTurnFromLanes(TurnType t, boolean leftSide) {
+ List<TurnType.Turn> possibleTurns = new ArrayList<TurnType.Turn>();
+ boolean filled = false;
+ for (int i = 0; i < t.getLanes().length; i++) {
+ if ((t.getLanes()[i] & TurnType.BIT_LANE_ALLOWED) == TurnType.BIT_LANE_ALLOWED) {
+ if (!filled) {
+ filled = true;
+ possibleTurns.add(t.getPrimaryTurn(i));
+ if (t.getSecondaryTurn(i) != TurnType.Turn.UNKNOWN) {
+ possibleTurns.add(t.getSecondaryTurn(i));
+ }
+ } else {
+ List<TurnType.Turn> laneTurns = new ArrayList<TurnType.Turn>();
+ laneTurns.add(t.getPrimaryTurn(i));
+ laneTurns.add(t.getSecondaryTurn(i));
+ possibleTurns.retainAll(laneTurns);
+ }
+ }
+ }
+
+ if (possibleTurns.size() > 1) {
+ for (int i = 0; i < t.getLanes().length; i++) {
+ if ((t.getLanes()[i] & TurnType.BIT_LANE_ALLOWED) == 0 && !possibleTurns.isEmpty()) {
+ List<TurnType.Turn> notLaneTurns = new ArrayList<TurnType.Turn>();
+ notLaneTurns.add(t.getPrimaryTurn(i));
+ notLaneTurns.add(t.getSecondaryTurn(i));
+ possibleTurns.removeAll(notLaneTurns);
+ }
+ }
+ }
+
+ // removing duplicates
+ if (new HashSet<TurnType.Turn>(possibleTurns).size() == 1) {
+ TurnType derivedTurnType = TurnType.valueOf(possibleTurns.get(0).getValue(), false);
+ derivedTurnType.setLanes(t.getLanes());
+ derivedTurnType.setSkipToSpeak(t.isSkipToSpeak());
+ derivedTurnType.setTurnLanesRendering(t.isTurnLanesRendering());
+ t = derivedTurnType;
+ }
+
+ return t;
+ }
+
+ private int countOccurrences(String haystack, char needle) {
+ int count = 0;
+ for (int i = 0; i < haystack.length(); i++) {
+ if (haystack.charAt(i) == needle) {
+ count++;
+ }
+ }
+ return count;
+ }
+