From 2b57f24bee7ffad29aa87ec190df028f34303d5b Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Sat, 7 Nov 2020 20:30:53 +0000 Subject: [PATCH 1/7] Translated using Weblate (Ukrainian) Currently translated at 100.0% (3530 of 3530 strings) --- OsmAnd/res/values-uk/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml index 5a9a051685..699889de13 100644 --- a/OsmAnd/res/values-uk/strings.xml +++ b/OsmAnd/res/values-uk/strings.xml @@ -3944,4 +3944,9 @@ MGRS OsmAnd використовує MGRS, який подібний формату UTM NATO. Додайте принаймні дві точки. + Керувати передплатою + Виникла проблема з передплатою. Натисніть кнопку, щоб перейти до налаштувань передплати у Google Play, щоб виправити спосіб оплати. + Термін дії передплати OsmAnd Live закінчився + Передплату OsmAnd Live зупинено + Передплата OsmAnd Live на утриманні \ No newline at end of file From cac06ac7d50d316c870b64b147e8fadb1edb3046 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sat, 7 Nov 2020 20:29:00 +0000 Subject: [PATCH 2/7] Translated using Weblate (Slovak) Currently translated at 100.0% (3530 of 3530 strings) --- OsmAnd/res/values-sk/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 4ff057ec8f..8d2372c2a8 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -3947,4 +3947,10 @@ MGRS MGRS OsmAnd používa MGSR, ktorý je podobný ako formát UTM NATO. + Musíte pridať aspoň dva body. + Spravovať predplatné + 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. + Predplatné OsmAnd Live skončilo + Predplatné OsmAnd Live je pozastavené + Predplatné OsmAnd Live je zablokované \ No newline at end of file From 3dbb84cd322944f81d802d17a86c10ebe98b97c2 Mon Sep 17 00:00:00 2001 From: Michal L Date: Sat, 7 Nov 2020 21:50:01 +0000 Subject: [PATCH 3/7] Translated using Weblate (Polish) Currently translated at 99.3% (3508 of 3530 strings) --- OsmAnd/res/values-pl/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 274f6b544a..9914cd72e6 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -3952,4 +3952,8 @@ Sport Służby ratunkowe Podróże + OsmAnd używa formatu MGRS, który jest podobny do UTM NATO. + Zarządzaj subskrypcją + Subskrypcja OsmAnd Live wygasła + Subskrypcja OsmAnd Live została wstrzymana \ No newline at end of file From 31c509a75e05b591b71e2a4e0ac63c1d94a6aaef Mon Sep 17 00:00:00 2001 From: Softmap Date: Sat, 7 Nov 2020 20:44:41 +0000 Subject: [PATCH 4/7] Translated using Weblate (Arabic) Currently translated at 100.0% (3530 of 3530 strings) --- OsmAnd/res/values-ar/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index 5a04090668..b0694fc934 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -3934,4 +3934,10 @@ النظام المرجعي للشبكة العسكرية النظام المرجعي للشبكة العسكرية OsmAnd يستخدم MGRS، وهو مشابه لتنسيق UTM NATO . + يجب عليك إضافة نقطتين على الأقل. + إدارة الاشتراك + هناك مشكلة في اشتراكك. انقر الزر للانتقال إلى إعدادات اشتراك Google Play لإصلاح طريقة الدفع الخاصة بك. + انتهت صلاحية اشتراك OsmAnd Live + تم إيقاف اشتراك OsmAnd Live مؤقتًا + اشتراك OsmAnd Live معلق \ No newline at end of file From 462f706844b56f268f5b39b935be8a9a88372fda Mon Sep 17 00:00:00 2001 From: Eduardo Addad de Oliveira Date: Sat, 7 Nov 2020 23:28:39 +0000 Subject: [PATCH 5/7] Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (3529 of 3530 strings) --- OsmAnd/res/values-pt-rBR/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 724b721b2b..ac13cb04f5 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -3942,4 +3942,9 @@ MGRS OsmAnd usa MGRS, que é semelhante ao formato UTM NATO. Você deve adicionar pelo menos dois pontos. + Gerenciar assinatura + 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. + A assinatura do OsmAnd Live expirou + A assinatura do OsmAnd Live foi pausada + A assinatura do OsmAnd Live está em espera \ No newline at end of file From fcc6450e8090cc124d66fe451e3fc65db38112a0 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2020 10:10:13 +0100 Subject: [PATCH 6/7] string for German (casual) --- OsmAnd/res/values-de/strings.xml | 1 + OsmAnd/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index ef1285f3f1..ae4edd0f73 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1252,6 +1252,7 @@ Walisisch Dänisch Deutsch + Deutsch (informell) Griechisch Englisch Spanisch diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index c0d8bb8721..68791492fc 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2426,6 +2426,7 @@ French Georgian German + German (casual) Greek Hebrew Hebrew From a35e49ca71d9b41c9a4f3932b9c588f7ca472702 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2020 10:20:27 +0100 Subject: [PATCH 7/7] fix small typos --- OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java | 2 +- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java index a9a0ba563e..f9fb061b10 100644 --- a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java +++ b/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) ); diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index b6e2cd103f..cc615af990 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/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)