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

OsmAnd/res/values-da/phrases.xml

@@ -3942,9 +3942,9 @@
 
 	<string name="poi_end_date">Slutdato</string>
 
-<string name="poi_appliance">Elektronik butik</string>
+<string name="poi_appliance">Butik for hårde hvidevarer</string>
 
-	<string name="poi_outcrop">Klippefremspring</string>
+	<string name="poi_outcrop">Blotlagt klippe</string>
 
 <string name="poi_payment_contactless_yes">Kontaktløs</string>
 	<string name="poi_payment_contactless_no">Kontaktløs ikke accepteret</string>
@@ -3953,7 +3953,7 @@
 	<string name="poi_hazard_erosion">Erosionsfare</string>
 	<string name="poi_hazard_avalanche">Lavinefare</string>
 	<string name="poi_hazard_slippery_road">Glat vejbane</string>
-	<string name="poi_hazard_flood">Oversvømmelse fare</string>
+	<string name="poi_hazard_flood">Oversvømmelsesfare</string>
 	<string name="poi_hazard_minefield">Minefelt</string>
 
 

OsmAnd/res/values-de/strings.xml

@@ -2955,7 +2955,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
 	<string name="north_abbreviation">N</string>
 	<string name="optional_point_name">Optionaler Punktname</string>
     <string name="transport_nearby_routes_within">Nahegelegene Routen innerhalb von</string>
-    <string name="transport_nearby_routes">Innerhalb von</string>
+    <string name="transport_nearby_routes">Innerhalb</string>
     <string name="group_deleted">Gruppe gelöscht</string>
     <string name="rendering_attr_whiteWaterSports_name">Wildwasser-Sportarten</string>
     <string name="clear_all_intermediates">Alle Zwischenpunkte löschen</string>

OsmAnd/res/values-sk/phrases.xml

@@ -3531,4 +3531,19 @@
 	<string name="poi_cable_number">Počet lán</string>
 	<string name="poi_via_ferrata_scale">Náročnosť</string>
 
+	<string name="poi_checkpoint_type">Typ kontrolného stanovišťa</string>
+
+<string name="poi_appliance">Obchod so spotrebičmi</string>
+
+	<string name="poi_payment_contactless_yes">Bezkontaktne</string>
+	<string name="poi_payment_contactless_no">Bezkontaktne nie je možné platiť</string>
+
+	<string name="poi_hazard_nuclear">Nebezpečenstvo rádioaktivity</string>
+	<string name="poi_hazard_erosion">Nebezpečenstvo erózie</string>
+	<string name="poi_hazard_avalanche">Nebezpečenstvo lavín</string>
+	<string name="poi_hazard_slippery_road">Klzká cesta</string>
+	<string name="poi_hazard_flood">Nebezpečenstvo záplav</string>
+	<string name="poi_hazard_minefield">Mínové pole</string>
+
+
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -1422,7 +1422,7 @@ Proporčná pamäť %4$s MB (Limit Androidu %5$s MB, Dalvik %6$s MB).</string>
     <string name="map_widget_right">Pravý panel</string>
     <string name="map_widget_left">Ľavý panel</string>
     <string name="configure_map">Nastaviť mapu</string>
-    <string name="search_radius_proximity">Vovnútri</string>
+    <string name="search_radius_proximity">Do vzdialenosti</string>
     <string name="rendering_category_routes">Trasy</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Vlakové linky</string>
     <string name="rendering_attr_tramRoutes_name">Električkové linky</string>

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

@@ -2715,4 +2715,7 @@
     <string name="download_wikipedia_label">下载维基百科数据</string>
     <string name="open_in_browser_wiki">在线打开文章</string>
     <string name="wiki_article_not_found">文章未找到</string>
+    <string name="increase_search_radius_to">增大搜索半径至 %1$s</string>
+    <string name="send_search_query_description">我们将会发送您的搜索请求：<b>\"%1$s\"</b>，以及您的位置。<br/><br/>我们不会搜集您的个人信息，我们只需要搜索数据以改进搜索算法。<br/></string>
+    <string name="send_search_query">发送搜索请求？</string>
     </resources>