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

OsmAnd/res/values-eo/phrases.xml

@@ -3831,4 +3831,8 @@
 
 	<string name="poi_climbing_adventure">Grimpada parko</string>
 
+<string name="poi_via_ferrata">Via ferrata (fera grimp-vojo)</string>
+	<string name="poi_cable_number">Nombro da ŝnuregoj</string>
+	<string name="poi_via_ferrata_scale">Malfacileco</string>
+
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -2938,4 +2938,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="shared_string_explore">Esplori</string>
     <string name="shared_string_contents">Enhavo</string>
     <string name="article_removed">Forigis artikolon</string>
+    <string name="download_maps_travel">Vojaĝaj mapoj</string>
+    <string name="shared_string_wikivoyage">Vikivojaĝo</string>
+    <string name="index_item_world_wikivoyage">Tutmondaj artikoloj de Vikivojaĝo</string>
     </resources>

OsmAnd/res/values-nb/strings.xml

@@ -2837,11 +2837,14 @@
 \n
 \n</string>
     <string name="share_geo">geo:</string>
-    <string name="nm">sm</string>
-    <string name="nm_h">sm/t</string>
-    <string name="min_mile">min/engelsk mil</string>
+    <string name="nm">nmi</string>
+    <string name="nm_h">nmi/t</string>
+    <string name="min_mile">min/m</string>
     <string name="poi_filter_nominatim">Nettbasert Nominatim</string>
     <string name="osmand_routing_experimental">Frakoblet OsmAnd-navigasjon er en eksperimentell funksjon, og fungerer ikke for distanser lenger enn omtrent 20 km.
 \n
 \nNavigasjon midlertidig byttet til nettbasert CloudMade-tjeneste.</string>
+    <string name="download_maps_travel">Reisekart</string>
+    <string name="shared_string_wikivoyage">Wikivoyage</string>
+    <string name="article_removed">Artikkel fjernet</string>
     </resources>