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

OsmAnd/build.gradle

@@ -212,6 +212,7 @@ task collectHelpContentsAssets(type: Copy) {
 		include "changes.html"
 		include "faq.html"
 		include "technical-articles.html"
+		include "map-legend.html"
 	}
 	from("../../help/website/feature_articles"){
 		include "*.html"

OsmAnd/res/values-da/strings.xml

@@ -2011,5 +2011,5 @@
     <string name="rendering_attr_hideProposed_name">Skjul foreslåede objekter</string>
     <string name="read_more">Læs mere</string>
     <string name="whats_new">Hvad er nyt i</string>
-    <string name="map_legend_item_description">Signaturforklaring til OsmAnd standard kortformat, internetforbindelse er nødvendig</string>
+    <!-- string name="map_legend_item_description">Signaturforklaring til OsmAnd standard kortformat, internetforbindelse er nødvendig</string -->
 </resources>

OsmAnd/res/values-lt/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?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>
@@ -1970,7 +1971,7 @@
     <string name="activate_srtm_plugin">Prašom aktyvuoti SRTM įskiepį</string>
     <string name="begin_with_osmand_menu_group">Pirmi žngsniai su OsmAnd</string>
     <string name="features_menu_group">Galimybės</string>
-    <string name="faq_item_description">Kaip naudotis įskiepiais</string>
+    <string name="faq_item_description">Dažnai užduodami klausimai</string>
     <string name="map_viewing_item">Žemėlapio peržiūra</string>
 
     
@@ -2001,4 +2002,7 @@
     <string name="feedback">Atsiliepimai</string>
     <string name="map_legend">Legenda</string>
 <string name="first_usage_item">Pirmasis paleidimas</string>
+    <string name="read_more">Skaityti toliau</string>
+    <string name="whats_new">Kas naujo</string>
+    <string name="rendering_attr_hideProposed_name">Paslėpti siūlomus objektus</string>
     </resources>

OsmAnd/res/values-sk/strings.xml

@@ -1957,5 +1957,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 
 <string name="read_more">Prečítať viac</string>
     <string name="whats_new">Čo je nové v</string>
-    <string name="map_legend_item_description">Vysvetlivky k základnému mapovému štýlu v OsmAnd. Pre ich zobrazenie je potrebné pripojenie na Internet</string>
+    <!-- string name="map_legend_item_description">Vysvetlivky k základnému mapovému štýlu v OsmAnd. Pre ich zobrazenie je potrebné pripojenie na Internet</string -->
 </resources>

OsmAnd/res/values-sv/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?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>
@@ -1947,7 +1948,7 @@
     <string name="first_usage_item_description">Hur man hämtar kartor och gör grundinställningar</string>
     <string name="navigation_item_description">Ställa in navigering</string>
     <string name="faq_item">Frågor och svar</string>
-    <string name="faq_item_description">Hur man använder insticksmoduler</string>
+    <string name="faq_item_description">Frågor och svar</string>
     <string name="map_viewing_item">Kartvisning</string>
     <string name="search_on_the_map_item">Söka på kartan</string>
     <string name="planning_trip_item">Att planera en resa</string>
@@ -1968,4 +1969,6 @@
     
     
     <string name="feedback">Återkoppling</string>
+    <string name="read_more">Läs mer</string>
+    <string name="whats_new">Nyheter</string>
     </resources>

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

@@ -1969,5 +1969,5 @@
     <string name="rendering_attr_hideProposed_name">隱藏已提出的物件</string>
 <string name="read_more">讀取更多</string>
     <string name="whats_new">有什麼新的在</string>
-    <string name="map_legend_item_description">圖例為 OsmAnd 預設的地圖樣式，網路需連接以去顯示</string>
+    <!-- string name="map_legend_item_description">圖例為 OsmAnd 預設的地圖樣式，網路需連接以去顯示</string -->
 </resources>