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

OsmAnd-java/src/net/osmand/map/OsmandRegions.java

@@ -97,19 +97,35 @@ public class OsmandRegions {
 	}
 
 	private String getLang(BinaryMapDataObject o) {
-		return o.getNameByType(langType);
+		if (langType != null) {
+			return o.getNameByType(langType);
+		} else {
+			return null;
+		}
 	}
 
 	private String getMetric(BinaryMapDataObject o) {
-		return o.getNameByType(metricType);
+		if (metricType != null) {
+			return o.getNameByType(metricType);
+		} else {
+			return null;
+		}
 	}
 
 	private String getLeftHandDriving(BinaryMapDataObject o) {
-		return  o.getNameByType(leftHandDrivingType);
+		if (leftHandDrivingType != null) {
+			return o.getNameByType(leftHandDrivingType);
+		} else {
+			return null;
+		}
 	}
 
 	private String getRoadSigns(BinaryMapDataObject o) {
-		return o.getNameByType(roadSignsType);
+		if (roadSignsType != null) {
+			return o.getNameByType(roadSignsType);
+		} else {
+			return null;
+		}
 	}
 
 	public String getDownloadName(BinaryMapDataObject o) {

OsmAnd/res/values-da/phrases.xml

@@ -2183,7 +2183,7 @@
 
 	<string name="poi_social_facility_group_home">Socialfacilitet: bosted</string>
 	<string name="poi_social_facility_assisted_living">Socialfacilitet: plejehjem</string>
-	<string name="poi_social_facility_outreach">Socialfacilitet: opsøgende</string>
+	<string name="poi_social_facility_outreach">Socialfacilitet: privat humanitær organisation</string>
 	<string name="poi_social_facility_food_bank">Socialfacilitet: madcentral</string>
 	<string name="poi_social_facility_shelter">Socialfacilitet: herberg</string>
 	<string name="poi_social_facility_ambulatory_care">Socialfacilitet: ambulant behandling</string>
@@ -2198,7 +2198,7 @@
 	<string name="poi_social_facility_for_juvenile">Socialmålgruppe: unge</string>
 	<string name="poi_social_facility_for_homeless">Socialmålgruppe: hjemløse</string>
 	<string name="poi_social_facility_for_migrant">Socialmålgruppe: indvandrere</string>
-	<string name="poi_social_facility_for_underprivileged">Socialmålgruppe: underprivilegerede</string>
+	<string name="poi_social_facility_for_underprivileged">Socialmålgruppe: dårligt stillede</string>
 	<string name="poi_social_facility_for_drug_addicted">Socialmålgruppe: stofmisbrugere</string>
 	<string name="poi_social_facility_for_unemployed">Socialmålgruppe: arbejdsløse</string>
 	<string name="poi_social_facility_for_diseased">Socialmålgruppe: syge</string>

OsmAnd/res/values-ru/strings.xml

@@ -2148,4 +2148,7 @@
 <string name="update_all">Обновить все (%1$s Мб)</string>
 <string name="free_downloads_used">Использовано бесплатных загрузок</string>
     <string name="free_downloads_used_description">Вы можете посмотреть сколько бесплатных загрузок вы использовали</string>
-</resources>
+<string name="share_clipboard">Буфер обмена</string>
+    <string name="share_qr_code">QR-код</string>
+    <string name="share_geo">гео:</string>
+    </resources>

OsmAnd/res/values-sv/strings.xml

@@ -332,7 +332,7 @@
 <string name="index_name_europe">Europa</string>
 <string name="index_name_france">Europa - Frankrike</string>
 <string name="index_name_germany">Europa - Tyskland</string>
-<string name="index_name_russia">Europa/Asien - Ryssland</string>
+<string name="index_name_russia">Ryssland</string>
 <string name="index_name_africa">Afrika</string>
 <string name="index_name_asia">Asien</string>
 <string name="index_name_oceania">Oceanien</string>
@@ -2049,4 +2049,6 @@
 <string name="free_downloads_used">Gratis nedladdningar hämtade</string>
     <string name="free_downloads_used_description">Du kan ange hur många gratis nedladdningar som du har gjort</string>
 <string name="downloading_number_of_files">Hämtar - %1$d fil(er)</string>
+    <string name="share_clipboard">Urklipp</string>
+    <string name="share_geo">geo:</string>
     </resources>