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

OsmAnd/res/values-da/phrases.xml

@@ -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">Solafskærmning håndværk</string>
+        <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>
@@ -529,7 +529,7 @@
         <string name="poi_accountant">Revisor</string>
         <string name="poi_bitcoin_yes">Bitcoin betaling</string>
 
-        <string name="poi_cave_entrance">Hule indgang</string>
+        <string name="poi_cave_entrance">Huleindgang</string>
         <string name="poi_peak">Bjergtinde</string>
         <string name="poi_saddle">Bjergsadel</string>
         <string name="poi_volcano">Vulkan</string>
@@ -552,14 +552,14 @@
         <string name="poi_seamark_anchorage">Ankringsområde</string>
         <string name="poi_seamark_anchor_berth">Ankerplads</string>
         <string name="poi_seamark_beacon">Båke</string>
-        <string name="poi_seamark_beacon_cardinal">Cardinal båke</string>
+        <string name="poi_seamark_beacon_cardinal">Kardinal båke</string>
         <string name="poi_seamark_beacon_lateral">Lateral båke</string>
         <string name="poi_seamark_beacon_safe_water">Sikkervand båke</string>
         <string name="poi_seamark_beacon_special_purpose">Speciel formål båke</string>
         <string name="poi_seamark_berth">Kajplads</string>
         <string name="poi_seamark_building">Sømærke bygning</string>
         <string name="poi_seamark_bridge">Sømærke bro</string>
-        <string name="poi_seamark_buoy_cardinal">Cardinal tønde</string>
+        <string name="poi_seamark_buoy_cardinal">Kardinal tønde</string>
         <string name="poi_seamark_buoy_installation">Installation tønde</string>
         <string name="poi_seamark_buoy_isolated_danger">Tønde, isoleret fare</string>
         <string name="poi_seamark_buoy_lateral">Lateral tønde</string>
@@ -597,7 +597,7 @@
         <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_nuclear_explosion_site">Nuklear eksplosion område</string>
+        <string name="poi_military_nuclear_explosion_site">Nuklear eksplosionsområde</string>
 <string name="poi_city">Storby</string>
 	<string name="poi_town">By</string>
 	<string name="poi_village">Landsby</string>

OsmAnd/res/values-es/strings.xml

@@ -1861,7 +1861,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="distance">Distancia</string>
     <string name="record_plugin_name">Grabar tus viajes</string>
     <string name="record_plugin_description">Guardar tus trazas tocando un botón en la pantalla del mapa. Mostrar las opciones para grabar tus viajes a archivos GPX locales o usando un servicio web en línea.</string>
-    <string name="rendering_attr_publicTransportMode_name">Rutas de autobús, trolebús, transporte</string>
+    <string name="rendering_attr_publicTransportMode_name">Rutas de autobús, trolebús y lanzadera</string>
 	<string name="save_track_to_gpx_globally">Guardar traza en fichero GPX</string>
 	<string name="save_track_interval_globally">Intervalo de guardado</string>
 	<string name="save_track_to_gpx_globally_descr">El registro de la posición en un archivo GPX puede activarse o desactivarse usando el control de grabación GPX en la pantalla del mapa</string>
@@ -1915,7 +1915,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="rendering_attr_busRoutes_name">Rutas de autobús</string>
     <string name="rendering_category_hide">Ocultar</string>
     <string name="wake_on_voice">Encender pantalla</string>
-    <string name="wake_on_voice_descr">Encender pantalla al aproximarse a un giro</string>
+    <string name="wake_on_voice_descr">Encender la pantalla al aproximarse a un giro</string>
     <string name="lock_screen_request_explanation">%1$s necesita este permiso para apagar la pantalla para la característica de ahorro energético.</string>
     <string name="wake_on_voice_never">Nunca</string>
     <string name="advanced_settings">Avanzado</string>

OsmAnd/res/values-it/strings.xml

@@ -2027,4 +2027,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="wake_on_voice_never">Mai</string>
     <string name="lock_screen_request_explanation">%1$s necessita di questa autorizzazione per spegnere lo schermo per la funzionalità di risparmio energetico.</string>
     <string name="advanced_settings">Avanzato</string>
+	<string name="osmo_use_https">Usa https</string>
 	</resources>

OsmAnd/res/values-ko/strings.xml

@@ -2085,4 +2085,5 @@
     <string name="lock_screen_request_explanation">%1$의 절전 기능에 대한 화면을 해제 하려면 이 권한이 필요 합니다.</string>
     <string name="wake_on_voice_never">결코</string>
     <string name="advanced_settings">고급</string>
+	<string name="osmo_use_https">Https를 사용하기</string>
 	</resources>

OsmAnd/res/values-nl/strings.xml

@@ -2008,4 +2008,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="wake_on_voice_never">Nooit</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>
+	<string name="osmo_use_https_descr">Gebruik beveiligde verbinding met server</string>
+    <string name="osmo_use_https">Gebruik https</string>
 	</resources>

OsmAnd/res/values-sc/strings.xml

@@ -1781,4 +1781,6 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="wake_on_voice_never">Mai</string>
     <string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s\'ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>
     <string name="advanced_settings">Avantzadas</string>
+	<string name="osmo_use_https_descr">Imprea una cunnessione segura cun su server</string>
+    <string name="osmo_use_https">Imprea https</string>
 	</resources>

OsmAnd/res/values-sk/strings.xml

@@ -2034,4 +2034,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="lock_screen_request_explanation">%1$s potrebuje toto oprávnenie na vypnutie obrazovky pre šetrenie energiou.</string>
     <string name="wake_on_voice_never">Nikdy</string>
     <string name="advanced_settings">Pokročilé</string>
+	<string name="osmo_use_https_descr">Použiť zabezpečené spojenie so serverom</string>
+    <string name="osmo_use_https">Použiť HTTPS</string>
 	</resources>

OsmAnd/res/values-sv/strings.xml

@@ -1731,4 +1731,5 @@
     <string name="lock_screen_request_explanation">%1$s behöver denna tillåtelse för att stänga av skärmen för strömsparningsfunktionen.</string>
     <string name="wake_on_voice_never">Aldrig</string>
     <string name="advanced_settings">Avancerat</string>
+	<string name="osmo_use_https">Använd https</string>
 	</resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -1855,4 +1855,6 @@
     <string name="lock_screen_request_explanation">為了節電作用 %1$s 需要此許可權才能關閉螢幕。</string>
     <string name="wake_on_voice_never">永不</string>
     <string name="advanced_settings">進階</string>
+	<string name="osmo_use_https_descr">使用安全協定連線於伺服器</string>
+    <string name="osmo_use_https">使用 https</string>
 	</resources>