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

OsmAnd/res/values-ca/strings.xml

@@ -1934,4 +1934,6 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
     <string name="lock_screen_request_explanation">"%1$s necessita  aquest permís per la funcionalitat de posar la pantalla en mode d\'estalvi d\'energia."</string>
     <string name="wake_on_voice_never">Mai</string>
     <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>
 	</resources>

OsmAnd/res/values-cs/phrases.xml

@@ -6,9 +6,9 @@
 	<string name="poi_beverages">Obchod s nápoji</string>
 	<string name="poi_butcher">Masna</string>
 	<string name="poi_deli">Delikatesy</string>
-	<string name="poi_shop_farm"/>
-	<string name="poi_greengrocer"/>
-	<string name="poi_seafood"/>
+	<string name="poi_shop_farm">Farmářský obchod</string>
+	<string name="poi_greengrocer">Zelinářství</string>
+	<string name="poi_seafood">Obchod mořskými plody</string>
 	<string name="poi_supermarket">Supermarket</string>
 	<string name="poi_bookshop">Knihkupectví</string>
 	<string name="poi_bicycle_shop"/>
@@ -23,7 +23,7 @@
 	<string name="poi_carpet_shop"/>
 	<string name="poi_chemist_shop">Drogerie</string>
 	<string name="poi_clothes_shop"/>
-	<string name="poi_children_clothes_shop"/>
+	<string name="poi_children_clothes_shop">Dětské oblečení</string>
 	<string name="poi_shoes">Obuv</string>
 	<string name="poi_computer_shop"/>
 	<string name="poi_copyshop"/>
@@ -196,4 +196,20 @@
 	<string name="poi_seamark_harbour">Přístav</string>
 	<string name="poi_military_barracks">Kasárna</string>
 	<string name="poi_military_danger_area">Nebezpečná oblast</string>
+	<string name="poi_confectionery">Cukrárna</string>
+	<string name="poi_shop_tea">Obchod čajem</string>
+	<string name="poi_dairy">Mlékárna</string>
+	<string name="poi_vending_machine">Prodejní automat</string>
+
+	<string name="poi_florist">Květinářství</string>
+	<string name="poi_furniture_shop">Nábytek</string>
+	<string name="poi_garden_centre">Zahradní centrum</string>
+	<string name="poi_glaziery_shop">Sklenářství</string>
+	<string name="poi_hearing_aids_shop">Sluchové pomůcky</string>
+	<string name="poi_herbalist">Obchod bylinkami</string>
+	<string name="poi_houseware_shop">Domácí potřeby</string>
+	<string name="poi_interior_decoration_shop">Dekorace interiéru</string>
+	<string name="poi_newsagent_shop">Zpravodajská agentura</string>
+	<string name="poi_stationery_shop">Kancelářské potřeby</string>
+	<string name="poi_trade_shop">Obchodní místo</string>
 	</resources>

OsmAnd/res/values-da/phrases.xml

@@ -6,7 +6,7 @@
         <string name="poi_mall">Butikscenter</string>
         <string name="poi_beverages">Drikkevarebutik</string>
         <string name="poi_butcher">Kødmarked</string>
-        <string name="poi_deli">Delikatesser</string>
+        <string name="poi_deli">Delikatesse</string>
         <string name="poi_shop_farm">Gårdbutik</string>
         <string name="poi_greengrocer">Grønthandler</string>
         <string name="poi_seafood">Fiskehandler</string>
@@ -53,7 +53,7 @@
         <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_houseware_shop">Isenkræmmer</string>
+        <string name="poi_houseware_shop">Husholdningsartikler</string>
         <string name="poi_hunting_shop">Jagtudstyr</string>
         <string name="poi_interior_decoration_shop">Boligindretning</string>
         <string name="poi_jewelry_shop">Smykkeforretning</string>
@@ -100,7 +100,7 @@
         <string name="poi_fire_hose">Brandslange</string>
         <string name="poi_fire_water_pond">Branddam</string>
         <string name="poi_grit_bin">Grusbeholder</string>
-        <string name="poi_ambulance_station">Ambulance station</string>
+        <string name="poi_ambulance_station">Ambulancestation</string>
         <string name="poi_ses_station">SES station</string>
         <string name="poi_emergency_access_point">Nødstilfælde punkt</string>
 
@@ -136,15 +136,15 @@
         <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_bus_stop">Busstoppested</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</string>
+        <string name="poi_tram_stop">Sporvognsstoppestedet (forældet)</string>
         <string name="poi_public_transport_station">Offentlig transport station</string>
-        <string name="poi_bus_station">Busstation</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>
-        <string name="poi_railway_halt">Trinbrædt</string>
-        <string name="poi_subway_entrance">Metro indgang</string>
+        <string name="poi_railway_halt">Trinbrædt (forældet)</string>
+        <string name="poi_subway_entrance">Metroindgang</string>
         <string name="poi_subway_station">Metrostation</string>
         <string name="poi_taxi">Taxaholdeplads</string>
 
@@ -167,7 +167,7 @@
         <string name="poi_aerialway_chair_lift">Stolelift</string>
         <string name="poi_aerialway_t_bar">T-bar lift</string>
         <string name="poi_aerialway_j_bar">J-bar lift</string>
-        <string name="poi_aerialway_platter">Tallerken lift</string>
+        <string name="poi_aerialway_platter">Tallerkenlift</string>
         <string name="poi_aerialway_mixed_lift">Blandet lift</string>
         <string name="poi_aerialway_drag_lift">Træklift</string>
         <string name="poi_aerialway_rope_tow">Reblift</string>
@@ -200,7 +200,7 @@
         <string name="poi_post_office">Posthus</string>
         <string name="poi_post_box">Postkasse</string>
         <string name="poi_telephone">Telefon</string>
-        <string name="poi_communication_tower">Kommunikation tårn</string>
+        <string name="poi_communication_tower">Kommunikationstårn</string>
         <string name="poi_telephone_exchange">Telefoncentral</string>
 
         <string name="poi_recycling">Genbrugsplads</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">Landmålings punkt</string>
+        <string name="poi_survey_point">Trianguleringspunkt</string>
         <string name="poi_windmill">Vindmølle</string>
         <string name="poi_quarry">Stenbrud</string>
         <string name="poi_vineyard">Vingård</string>
@@ -493,7 +493,7 @@
         <string name="poi_shoemaker">Skomager</string>
         <string name="poi_stand_builder">Udstillingsbygger</string>
         <string name="poi_stonemason">Stenhugger</string>
-        <string name="poi_sun_protection_craft">Solbeskyttelse håndværk</string>
+        <string name="poi_sun_protection_craft">Solafskærmning håndværk</string>
         <string name="poi_sweep">Skorstensfejer</string>
         <string name="poi_tailor">Skrædder</string>
         <string name="poi_tiler">Fliselægger</string>
@@ -607,10 +607,10 @@
 	<string name="poi_neighbourhood">Kvarter</string>
 	<string name="poi_locality">Lokalitet</string>
 
-	<string name="poi_healthcare_alternative">Alternativ sundhedspleje</string>
+	<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">Sundhedscenter</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>
@@ -619,6 +619,6 @@
 	<string name="poi_psychotherapist">Psykoterapeut</string>
 	<string name="poi_healthcare_rehabilitation">Rehabilitering</string>
 	<string name="poi_speech_therapist">Talepædagog</string>
-	<string name="poi_healthcare_yes">Sundhedspleje</string>
+	<string name="poi_healthcare_yes">Medicinsk facilitet</string>
 
 	</resources>

OsmAnd/res/values-nl/strings.xml

@@ -1953,7 +1953,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="save_track_to_gpx_globally">Track maken in GPX-bestand</string>
 	<string name="save_track_to_gpx_globally_descr">Het registreren van de afgelegde weg in een GPX-bestand kan worden aan- en uitgeschakeld met een knop op het kaartscherm</string>
 	<string name="save_track_interval_globally">Interval tussen geregistreerde punten</string>
-	<string name="rendering_attr_publicTransportMode_name">Bus-, trolleybus- en minibuslijnen</string>
+	<string name="rendering_attr_publicTransportMode_name">Bus-, trolleybus- en pendelbuslijnen</string>
 	<string name="confirm_every_run">Altijd vragen</string>
 	<string name="save_global_track_interval_descr">Selecteer de loggings-interval voor de standaard track opname (te starten via de GPX opname widget in het scherm)</string>
 	<string name="save_global_track_interval">Standaard loggings-interval</string>
@@ -1994,7 +1994,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="tip_recent_changes_1_9_t">"Aanpassingen in 1.9: * Verbeterde kaart stijlen met weg-weergave, vervoerslaag en wandelsymbolen * Zoek bezienswaardigheden langs de route * Markeer per route, een weg als onbegaanbaar * Eenvoudiger downloaden en updaten van kaarten * Krijg visuele- en geluidsmelding bij het naderen van een Routepunt * Print reisroute en routebeschrijving * Ondersteuning van voorsorteervakken * Ondersteuning van Android Wear * Veel gebruikersinterface-verbeteringen * Aparte zoomfunctie voor de tekstgrootte op de kaart * Speciale audio meldingen in het geval dat u afwijkt van de route * OsMo inlog functionaliteit * Oplossing van OsMo versie incompatibiliteit "</string>
     <string name="rendering_category_routes">Routes</string>
     <string name="rendering_category_details">Details</string>
-    <string name="rendering_attr_trainLightrailRoutes_name">Trein en lightrail lijnen</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Trein verbindingen</string>
     <string name="rendering_attr_tramRoutes_name">Tramlijnen</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Deeltaxi routes</string>
     <string name="rendering_attr_trolleybusRoutes_name">Trolleybus lijnen</string>
@@ -2006,6 +2006,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="impassable_road">Vermijd wegen…</string>
     <string name="rendering_category_hide">Verberg</string>
     <string name="wake_on_voice_never">Nooit</string>
-    <string name="lock_screen_request_explanation">%1$s heeft deze permissie nodig om het scherm uit te kunnen schakelen (stroombesparing).</string>
+    <string name="lock_screen_request_explanation">%1$s heeft toestemming nodig om het scherm uit te kunnen schakelen (als onderdeel van de stroombesparende functie).</string>
     <string name="advanced_settings">Geavanceerd</string>
 	</resources>

OsmAnd/res/values-ru/phrases.xml

@@ -341,7 +341,7 @@
 	<string name="poi_swimming">Плавание</string>
 	<string name="poi_table_tennis">Пинг-понг</string>
 	<string name="poi_tennis">Теннис</string>
-	<string name="poi_toboggan"/>
+	<string name="poi_toboggan">Санный спорт</string>
 	<string name="poi_volleyball">Воллейбол</string>
 
 	<string name="poi_museum">Музей</string>
@@ -553,7 +553,7 @@
 
 	<string name="poi_seamark_anchorage">Якорная стоянка</string>
 	<string name="poi_seamark_anchor_berth"/>
-	<string name="poi_seamark_beacon"/>
+	<string name="poi_seamark_beacon">Бакен</string>
 	<string name="poi_seamark_beacon_cardinal"/>
 	<string name="poi_seamark_beacon_lateral"/>
 	<string name="poi_seamark_beacon_safe_water"/>
@@ -574,14 +574,14 @@
 	<string name="poi_seamark_floating_dock"/>
 	<string name="poi_seamark_fog_signal">Сигнал при тумане</string>
 	<string name="poi_seamark_harbour_basin"/>
-	<string name="poi_seamark_harbour"/>
+	<string name="poi_seamark_harbour">Гавань</string>
 	<string name="poi_seamark_landmark"/>
 	<string name="poi_seamark_light"/>
 	<string name="poi_seamark_light_major"/>
 	<string name="poi_seamark_light_minor"/>
 	<string name="poi_seamark_light_float"/>
 	<string name="poi_seamark_light_vessel"/>
-	<string name="poi_seamark_mooring"/>
+	<string name="poi_seamark_mooring">Причал</string>
 	<string name="poi_seamark_notice"/>
 	<string name="poi_seamark_pile"/>
 	<string name="poi_seamark_radar_transponder"/>
@@ -600,4 +600,11 @@
 	<string name="poi_military_range">Военное стрельбище</string>
 	<string name="poi_military_naval_base">Военно-морская база</string>
 	<string name="poi_military_nuclear_explosion_site">Место ядерного взрыва</string>
-</resources>
+<string name="poi_city">Город</string>
+	<string name="poi_town">Город</string>
+	<string name="poi_village">Деревня</string>
+	<string name="poi_hamlet">Деревня</string>
+	<string name="poi_isolated_dwelling">Хутор</string>
+	<string name="poi_locality">Урочище</string>
+
+	</resources>

OsmAnd/res/values-sc/strings.xml

@@ -834,7 +834,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="osmand_accessibility_description">Ammustra sas impostaduras pro funtzionalidades ispetziales pro s\'atzessibilidade.</string>
 	<string name="extra_settings">Impostaduras avantzadas</string>
 	<string name="plugins_screen">Plugins</string>
-	<string name="select_plugin_to_activate">Issèbera unu plugin pro l\'ativare o lu deativare. (Diat pòdere serbire su reaviu de OsmAnd.)</string>
+	<string name="select_plugin_to_activate">Issèbera unu plugin pro l\'ativare o lu disativare. (Diat pòdere serbire su reaviu de OsmAnd.)</string>
 	<string name="prefs_plugins_descr">Sos plugins abìlitana funtzionalidades azuntivas e impostaduras avantzadas</string>
 	<string name="prefs_plugins">Plugins</string>
 	<string name="debugging_and_development">Isvilupu de OsmAnd</string>
@@ -1737,7 +1737,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="traffic_warning_calming">Moderatzione de su tràficu</string>
     <string name="traffic_warning_speed_camera">Autovelox</string>
     <string name="traffic_warning">Avisu de tràficu</string>
-	<string name="local_index_description">Ischerta unu elementu esistente pro bìere prus detallios, carca e mantène carcau pro lu deativare o burrare. Datos como in su dispositivu (%1$s lìberos):</string>
+	<string name="local_index_description">Ischerta unu elementu esistente pro bìere prus detallios, carca e mantène carcau pro lu disativare o burrare. Datos como in su dispositivu (%1$s lìberos):</string>
 	<string name="text_size_descr">Issèbera sa mannària de su testu in sa mapa.</string>
     <string name="text_size">Mannària de su testu</string>
     <string name="fav_point_dublicate_message">Amus cambiau su nùmene de su prefèrridu tuo a %1$s pro evitare nùmenes dòpios.</string>