Merge pull request #10151 from osmandapp/master

update test branch

OsmAnd/res/values-ar/strings.xml

@@ -3934,4 +3934,10 @@
     <string name="navigate_point_mgrs">النظام المرجعي للشبكة العسكرية</string>
     <string name="navigate_point_format_mgrs">النظام المرجعي للشبكة العسكرية</string>
     <string name="mgrs_format_descr">OsmAnd يستخدم MGRS، وهو مشابه لتنسيق UTM NATO .</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">يجب عليك إضافة نقطتين على الأقل.</string>
+    <string name="manage_subscription">إدارة الاشتراك</string>
+    <string name="subscription_payment_issue_title">هناك مشكلة في اشتراكك. انقر الزر للانتقال إلى إعدادات اشتراك Google Play لإصلاح طريقة الدفع الخاصة بك.</string>
+    <string name="subscription_expired_title">انتهت صلاحية اشتراك OsmAnd Live</string>
+    <string name="subscription_paused_title">تم إيقاف اشتراك OsmAnd Live مؤقتًا</string>
+    <string name="subscription_on_hold_title">اشتراك OsmAnd Live معلق</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -1252,6 +1252,7 @@
     <string name="lang_cy">Walisisch</string>
     <string name="lang_da">Dänisch</string>
     <string name="lang_de">Deutsch</string>
+    <string name="lang_de_casual">Deutsch (informell)</string>
     <string name="lang_el">Griechisch</string>
     <string name="lang_en">Englisch</string>
     <string name="lang_es">Spanisch</string>

OsmAnd/res/values-pl/strings.xml

@@ -3952,4 +3952,8 @@
     <string name="icon_group_sport">Sport</string>
     <string name="icon_group_emergency">Służby ratunkowe</string>
     <string name="icon_group_travel">Podróże</string>
+    <string name="mgrs_format_descr">OsmAnd używa formatu MGRS, który jest podobny do UTM NATO.</string>
+    <string name="manage_subscription">Zarządzaj subskrypcją</string>
+    <string name="subscription_expired_title">Subskrypcja OsmAnd Live wygasła</string>
+    <string name="subscription_paused_title">Subskrypcja OsmAnd Live została wstrzymana</string>
 </resources>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -3942,4 +3942,9 @@
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">OsmAnd usa MGRS, que é semelhante ao formato UTM NATO.</string>
     <string name="message_you_need_add_two_points_to_show_graphs">Você deve adicionar pelo menos dois pontos.</string>
+    <string name="manage_subscription">Gerenciar assinatura</string>
+    <string name="subscription_payment_issue_title">Há um problema com sua assinatura. Clique no botão para ir para as configurações de assinatura do Google Play para corrigir sua forma de pagamento.</string>
+    <string name="subscription_expired_title">A assinatura do OsmAnd Live expirou</string>
+    <string name="subscription_paused_title">A assinatura do OsmAnd Live foi pausada</string>
+    <string name="subscription_on_hold_title">A assinatura do OsmAnd Live está em espera</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -3947,4 +3947,10 @@
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">OsmAnd používa MGSR, ktorý je podobný ako formát UTM NATO.</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Musíte pridať aspoň dva body.</string>
+    <string name="manage_subscription">Spravovať predplatné</string>
+    <string name="subscription_payment_issue_title">S vaším predplatným je problém. Stlačte tlačidlo pre prechod do nastavení predplatného v Google Play a opravte váš spôsob platby.</string>
+    <string name="subscription_expired_title">Predplatné OsmAnd Live skončilo</string>
+    <string name="subscription_paused_title">Predplatné OsmAnd Live je pozastavené</string>
+    <string name="subscription_on_hold_title">Predplatné OsmAnd Live je zablokované</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -3944,4 +3944,9 @@
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">OsmAnd використовує MGRS, який подібний формату UTM NATO.</string>
     <string name="message_you_need_add_two_points_to_show_graphs">Додайте принаймні дві точки.</string>
+    <string name="manage_subscription">Керувати передплатою</string>
+    <string name="subscription_payment_issue_title">Виникла проблема з передплатою. Натисніть кнопку, щоб перейти до налаштувань передплати у Google Play, щоб виправити спосіб оплати.</string>
+    <string name="subscription_expired_title">Термін дії передплати OsmAnd Live закінчився</string>
+    <string name="subscription_paused_title">Передплату OsmAnd Live зупинено</string>
+    <string name="subscription_on_hold_title">Передплата OsmAnd Live на утриманні</string>
 </resources>

OsmAnd/res/values/strings.xml

@@ -2426,6 +2426,7 @@
     <string name="lang_fr">French</string>
     <string name="lang_ka">Georgian</string>
     <string name="lang_de">German</string>
+    <string name="lang_de_casual">German (casual)</string>
     <string name="lang_el">Greek</string>
     <string name="lang_he">Hebrew</string>
     <string name="lang_iw">Hebrew</string>

OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java

@@ -164,7 +164,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
 		addButton(ll, "\u25BA (1.2)  New route calculated, 1350m, 3680sec (01:01:20)", builder(p).newRouteCalculated(1350, 3680));
 		addButton(ll, "\u25BA (1.3)  New route calculated 3700m, 7320sec (02:02)", builder(p).newRouteCalculated(3700, 7320));
 		addButton(ll, "\u25BA (1.4)  New route calculated 9100m, 10980sec (03:03)", builder(p).newRouteCalculated(9100, 10980));
-		addButton(ll, "\u25BA (1.5)  New route calculated, 1500m, 4280sec (01:20:20)", builder(p).newRouteCalculated(1500, 4820));
+		addButton(ll, "\u25BA (1.5)  New route calculated, 1500m, 4820sec (01:20:20)", builder(p).newRouteCalculated(1500, 4820));
 		addButton(ll, "\u25BA (2.1)  Route recalculated 11500m, 18600sec (05:10)", builder(p).routeRecalculated(11500, 18600));
 		addButton(ll, "\u25BA (2.2)  Route recalculated 19633m, 26700sec (07:25)", builder(p).routeRecalculated(19633, 26700) );
 		addButton(ll, "\u25BA (2.3)  Route recalculated 89750m, 55800sec (15:30)", builder(p).routeRecalculated(89750, 55800) );

OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java

@@ -204,7 +204,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 						lregion = lsplit[i];
 				}
 			}
-			// Locale constructor supports 'language, region, variant'.
+			// Locale constructor supports 'language, region, variant'
 			//Locale newLocale0 = new Locale(lsplit[0], lregion, lvariant); (Setting variant here seems to cause errors on some systems)
 			Locale newLocale0 = new Locale(lsplit[0], lregion);
 			// #3344: Try Locale builder instead (only available from API 21), also supports script (we support as 4 letters)