Merge branch 'master' into route_merge

OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java

@@ -180,9 +180,11 @@ public class TransportRoute extends MapObject {
 					if(reverseSecond) {
 						second.reverseNodes();
 					}
+					if (first != second && (first.getId() < 0 || first.getId() != second.getId())) {
 						for (int i = 1; i < second.getNodes().size(); i++) {
 							first.addNode(second.getNodes().get(i));
 						}
+					}
 					changed = true;
 				} else {
 					k++;

OsmAnd-telegram/res/values-fi/strings.xml

@@ -3,4 +3,42 @@
     <string name="shared_string_disable">Pois käytöstä</string>
     <string name="shared_string_save">Tallenna</string>
     <string name="add_device">Lisää laite</string>
+    <string name="si_mi_feet">Mailia/jalkaa</string>
+    <string name="si_min_m">Minuutteja mailille</string>
+    <string name="si_min_km">Minuutteja kilometrille</string>
+    <string name="si_m_s">Metriä sekunnissa</string>
+    <string name="si_mph">Mailia tunnissa</string>
+    <string name="si_kmh">Kilometriä tunnissa</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="km_h">km/h</string>
+    <string name="m_s">m/s</string>
+    <string name="min_km">min/km</string>
+    <string name="min_mile">min/m</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="shared_string_settings">Asetukset</string>
+    <string name="shared_string_cancel">Peruuta</string>
+    <string name="shared_string_continue">Jatka</string>
+    <string name="shared_string_back">Takaisin</string>
+    <string name="shared_string_share">Jaa</string>
+    <string name="shared_string_install">Asenna</string>
+    <string name="shared_string_off">Pois päältä</string>
+    <string name="shared_string_all">Kaikki</string>
+    <string name="shared_string_close">Sulje</string>
+    <string name="shared_string_exit">Poistu</string>
+    <string name="shared_string_name">Nimi</string>
+    <string name="shared_string_status">Tila</string>
+    <string name="shared_string_enabled">Käytössä</string>
+    <string name="shared_string_hide">Piilota</string>
+    <string name="shared_string_add">Lisää</string>
+    <string name="shared_string_map">Kartta</string>
+    <string name="average_speed">Keskinopeus</string>
+    <string name="average_altitude">Keskimääräinen korkeus</string>
+    <string name="shared_string_appearance">Ulkoasu</string>
+    <string name="shared_string_ok">OK</string>
+    <string name="shared_string_search">Etsi</string>
+    <string name="altitude">Korkeus</string>
+    <string name="shared_string_enable">Ota käyttöön</string>
+    <string name="shared_string_select">Valitse</string>
+    <string name="shared_string_apply">Käytä</string>
 </resources>

OsmAnd-telegram/res/values-gl/strings.xml

@@ -56,7 +56,7 @@
     <string name="minutes_format">%1$d min</string>
     <string name="hours_format">%1$d h</string>
     <string name="shared_string_install">Instalar</string>
-    <string name="shared_string_share">Compartillar</string>
+    <string name="shared_string_share">Compartir</string>
     <string name="shared_string_back">Voltar</string>
     <string name="shared_string_add">Engadir</string>
     <string name="enter_another_device_name">Escolle un nome que aínda non está a ser empregado</string>

OsmAnd/build.gradle

@@ -523,7 +523,7 @@ dependencies {
 	implementation 'androidx.gridlayout:gridlayout:1.0.0'
 	implementation 'androidx.cardview:cardview:1.0.0'
 	implementation 'androidx.appcompat:appcompat:1.1.0'
-	implementation 'com.google.android.material:material:1.2.0-alpha05'
+	implementation 'com.google.android.material:material:1.2.0-alpha06'
 	implementation 'androidx.browser:browser:1.0.0'
 	implementation 'androidx.preference:preference:1.1.0'
 	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')