From e7430dcd5b0f9a18db9537b2c492f5b002d9881b Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Thu, 23 Apr 2020 11:46:58 +0300
Subject: [PATCH] Fix strings, refactor

---
 OsmAnd/res/values-ar/strings.xml                 |  2 +-
 OsmAnd/res/values-b+be+Latn/strings.xml          |  2 +-
 OsmAnd/res/values-be/strings.xml                 |  2 +-
 OsmAnd/res/values-ca/strings.xml                 |  2 +-
 OsmAnd/res/values-cs/strings.xml                 |  2 +-
 OsmAnd/res/values-da/strings.xml                 |  2 +-
 OsmAnd/res/values-de/strings.xml                 |  2 +-
 OsmAnd/res/values-el/strings.xml                 |  2 +-
 OsmAnd/res/values-eo/strings.xml                 |  2 +-
 OsmAnd/res/values-es-rAR/strings.xml             |  2 +-
 OsmAnd/res/values-es-rUS/strings.xml             |  2 +-
 OsmAnd/res/values-es/strings.xml                 |  2 +-
 OsmAnd/res/values-et/strings.xml                 |  2 +-
 OsmAnd/res/values-gl/strings.xml                 |  2 +-
 OsmAnd/res/values-he/strings.xml                 |  2 +-
 OsmAnd/res/values-id/strings.xml                 |  2 +-
 OsmAnd/res/values-is/strings.xml                 |  2 +-
 OsmAnd/res/values-it/strings.xml                 |  2 +-
 OsmAnd/res/values-ka/strings.xml                 |  2 +-
 OsmAnd/res/values-lt/strings.xml                 |  2 +-
 OsmAnd/res/values-lv/strings.xml                 |  2 +-
 OsmAnd/res/values-ml/strings.xml                 |  2 +-
 OsmAnd/res/values-nb/strings.xml                 |  2 +-
 OsmAnd/res/values-nl/strings.xml                 |  2 +-
 OsmAnd/res/values-oc/strings.xml                 |  2 +-
 OsmAnd/res/values-pl/strings.xml                 |  2 +-
 OsmAnd/res/values-pt-rBR/strings.xml             |  2 +-
 OsmAnd/res/values-pt/strings.xml                 |  2 +-
 OsmAnd/res/values-ro/strings.xml                 |  2 +-
 OsmAnd/res/values-ru/strings.xml                 |  2 +-
 OsmAnd/res/values-sc/strings.xml                 |  2 +-
 OsmAnd/res/values-sk/strings.xml                 |  2 +-
 OsmAnd/res/values-sl/strings.xml                 |  2 +-
 OsmAnd/res/values-sr/strings.xml                 |  2 +-
 OsmAnd/res/values-sv/strings.xml                 |  2 +-
 OsmAnd/res/values-ta/strings.xml                 |  2 +-
 OsmAnd/res/values-tr/strings.xml                 |  2 +-
 OsmAnd/res/values-uk/strings.xml                 |  2 +-
 OsmAnd/res/values-zh-rCN/strings.xml             |  2 +-
 OsmAnd/res/values-zh-rTW/strings.xml             |  2 +-
 .../chooseplan/ChoosePlanDialogFragment.java     | 10 +++++++---
 .../net/osmand/plus/inapp/InAppPurchases.java    | 16 +---------------
 42 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 1473b93b73..8531f871fb 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -2699,7 +2699,7 @@
     <string name="osm_live_payment_annual_title">سنوي</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / شهر</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / شهر</string>
-    <string name="osm_live_payment_discount_descr">وفر %1$s.</string>
+    <string name="osm_live_payment_discount_descr">وفر %1$s</string>
     <string name="osm_live_payment_current_subscription">الاشتراك الحالي</string>
     <string name="osm_live_payment_renews_monthly">يجدد شهريا</string>
     <string name="osm_live_payment_renews_quarterly">تجديد فصلي</string>
diff --git a/OsmAnd/res/values-b+be+Latn/strings.xml b/OsmAnd/res/values-b+be+Latn/strings.xml
index 99a2c0c80e..a5a49915b4 100644
--- a/OsmAnd/res/values-b+be+Latn/strings.xml
+++ b/OsmAnd/res/values-b+be+Latn/strings.xml
@@ -2846,7 +2846,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="osm_live_payment_annual_title">Štohod</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / miesiac</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / miesiac</string>
-    <string name="osm_live_payment_discount_descr">Aščada %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Aščada %1$s</string>
     <string name="osm_live_payment_current_subscription">Dziejnaja padpiska</string>
     <string name="osm_live_payment_renews_monthly">Abnaŭliajecca štomiesiac</string>
     <string name="osm_live_payment_renews_quarterly">Abnaŭliajecca štokvartaĺna</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 1ac9a2a332..504fa380c9 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2919,7 +2919,7 @@
     <string name="osm_live_payment_annual_title">Штогод</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / месяц</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месяц</string>
-    <string name="osm_live_payment_discount_descr">Ашчада %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ашчада %1$s</string>
     <string name="osm_live_payment_current_subscription">Дзейная падпіска</string>
     <string name="osm_live_payment_renews_monthly">Абнаўляецца штомесяц</string>
     <string name="osm_live_payment_renews_quarterly">Абнаўляецца штоквартал</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 4a7b09c6c1..70af6407c1 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2874,7 +2874,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Anualment</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Desa %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Desa %1$s</string>
     <string name="osm_live_payment_current_subscription">Subscripció actual</string>
     <string name="osm_live_payment_renews_monthly">Renovació mensual</string>
     <string name="osm_live_payment_renews_quarterly">Renovació trimestral</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 74ccc1edef..962a29c222 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -2827,7 +2827,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Ročně</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / měsíc</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / měsíc</string>
-    <string name="osm_live_payment_discount_descr">Ušetříte %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ušetříte %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktuální předplatné</string>
     <string name="osm_live_payment_renews_monthly">Obnovuje se měsíčně</string>
     <string name="osm_live_payment_renews_quarterly">Obnovuje se čtvrtletně</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 42697f3221..2e7ae0cc0a 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2858,7 +2858,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Årligt</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / måned</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / måned</string>
-    <string name="osm_live_payment_discount_descr">Spar %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Spar %1$s</string>
     <string name="osm_live_payment_current_subscription">Nuværende abonnement</string>
     <string name="osm_live_payment_renews_monthly">Fornyes månedligt</string>
     <string name="osm_live_payment_renews_quarterly">Fornyes kvartalsvis</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index ea63260ab9..15d384d74c 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2864,7 +2864,7 @@ Lon %2$s</string>
     <string name="osm_live_payment_annual_title">Jährlich</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / Monat</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / Monat</string>
-    <string name="osm_live_payment_discount_descr">Sparen Sie %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Sparen Sie %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktuelles Abonnement</string>
     <string name="osm_live_payment_renews_monthly">Verlängert sich monatlich</string>
     <string name="osm_live_payment_renews_quarterly">Verlängert sich vierteljährlich</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index cceaa6d0e4..f18342af5d 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -2831,7 +2831,7 @@
     <string name="osm_live_payment_annual_title">Ετήσια</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / μήνα</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / μήνα</string>
-    <string name="osm_live_payment_discount_descr">Εξοικονομήστε %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Εξοικονομήστε %1$s</string>
     <string name="osm_live_payment_current_subscription">Η τρέχουσα εγγραφή</string>
     <string name="osm_live_payment_renews_monthly">Μηνιαίες ανανεώσεις</string>
     <string name="osm_live_payment_renews_quarterly">Τριμηνιαίες ανανεώσεις</string>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 59a6a36628..db33067366 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -2844,7 +2844,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="osm_live_payment_annual_title">Ĉiujare</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / monato</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$,2f %2$s / monato</string>
-    <string name="osm_live_payment_discount_descr">Ŝparu %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ŝparu %1$s</string>
     <string name="osm_live_payment_current_subscription">Nuna kotizo</string>
     <string name="osm_live_payment_renews_monthly">Reaboni ĉiumonate</string>
     <string name="osm_live_payment_renews_quarterly">Reaboni ĉiukvaronjare</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 3ec3bfc10b..5c9d9c236a 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2858,7 +2858,7 @@ Lon %2$s</string>
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Ahorra %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ahorra %1$s</string>
     <string name="osm_live_payment_current_subscription">Suscripción actual</string>
     <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
     <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 147cbbbad9..336f032e6d 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2858,7 +2858,7 @@ Lon %2$s</string>
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Ahorra %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ahorra %1$s</string>
     <string name="osm_live_payment_current_subscription">Suscripción actual</string>
     <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
     <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 80a140d695..448a1a4214 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2850,7 +2850,7 @@
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Ahorra %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ahorra %1$s</string>
     <string name="osm_live_payment_current_subscription">Suscripción actual</string>
     <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
     <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>
diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml
index 6791a51366..83b9a9ec24 100644
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@@ -558,7 +558,7 @@
     <string name="osm_live_payment_annual_title">Igal aastal</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / kuu</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / kuu</string>
-    <string name="osm_live_payment_discount_descr">Salvesta %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Salvesta %1$s</string>
     <string name="osm_live_payment_current_subscription">Praegune tellimus</string>
     <string name="osm_live_payment_renews_monthly">Uueneb igakuiselt</string>
     <string name="osm_live_payment_renews_quarterly">Uueneb kord kvartalis</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index f04476fd63..0e85997e43 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -2914,7 +2914,7 @@ Lon %2$s</string>
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Aforra un %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Aforra un %1$s</string>
     <string name="osm_live_payment_current_subscription">Subscrición actual</string>
     <string name="osm_live_payment_renews_monthly">Renovación mensual</string>
     <string name="osm_live_payment_renews_quarterly">Renovación trimestral</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 6b4ddab4f7..741d2b43b0 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -2850,7 +2850,7 @@
     <string name="osm_live_payment_annual_title">שנתית</string>
     <string name="osm_live_payment_month_cost_descr">%1$s לחודש</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s לחודש</string>
-    <string name="osm_live_payment_discount_descr">חיסכון של %1$s.</string>
+    <string name="osm_live_payment_discount_descr">חיסכון של %1$s</string>
     <string name="osm_live_payment_current_subscription">המינוי הנוכחי</string>
     <string name="osm_live_payment_renews_monthly">מתחדש חודשית</string>
     <string name="osm_live_payment_renews_quarterly">מתחדש רבעונית</string>
diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml
index 5dc6196eff..941b4b3137 100644
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@@ -708,7 +708,7 @@
     <string name="osm_live_payment_annual_title">Tahunan</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / bulan</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / bulan</string>
-    <string name="osm_live_payment_discount_descr">Hemat %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Hemat %1$s</string>
     <string name="osm_live_payment_current_subscription">Langganan saat ini</string>
     <string name="osm_live_payment_renews_monthly">Perpanjang tiap bulan</string>
     <string name="osm_live_payment_renews_quarterly">Perpanjang tiap 4 bulan</string>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 22116be1f8..80b0850a41 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -2864,7 +2864,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Árlega</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mánuði</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mánuði</string>
-    <string name="osm_live_payment_discount_descr">Sparaðu %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Sparaðu %1$s</string>
     <string name="osm_live_payment_current_subscription">Núverandi áskrift</string>
     <string name="osm_live_payment_renews_monthly">Endurnýjast mánaðarlega</string>
     <string name="osm_live_payment_renews_quarterly">Endurnýjast ársfjórðungslega</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 0daff2361b..7da19dd5a9 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2852,7 +2852,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Annualmente</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mese</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mese</string>
-    <string name="osm_live_payment_discount_descr">Risparmia %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Risparmia %1$s</string>
     <string name="osm_live_payment_current_subscription">Attuale sottoscrizione</string>
     <string name="osm_live_payment_renews_monthly">Abbonamento mensile</string>
     <string name="osm_live_payment_renews_quarterly">Rinnovo trimestrale</string>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 5c83ad4fb1..7458713fa9 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -1185,7 +1185,7 @@
     <string name="osm_live_payment_annual_title">წელიწადში ერთხელ გადახდა</string>
     <string name="osm_live_payment_month_cost_descr">%1$s თვეში</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s თვეში</string>
-    <string name="osm_live_payment_discount_descr">დაზოგეთ %1$s !</string>
+    <string name="osm_live_payment_discount_descr">დაზოგეთ %1$s</string>
     <string name="osm_live_payment_current_subscription">თქვენი მიმდინარე გამოწერა</string>
     <string name="osm_live_payment_renews_monthly">თვიური განახლება</string>
     <string name="osm_live_payment_renews_annually">წლიური განახლება</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 57dafaef09..a8f4eee382 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -2555,7 +2555,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="osm_live_payment_annual_title">Kartą per metus</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mėnuo</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mėnuo</string>
-    <string name="osm_live_payment_discount_descr">Sutaupyk %1$s!</string>
+    <string name="osm_live_payment_discount_descr">Sutaupyk %1$s</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
     <string name="start_search_from_city">Pirmiausiai parinkite miestą</string>
     <string name="routing_attr_avoid_tram_name">Vengti tramvajų</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 670dc847a9..2ee47646cc 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -2652,7 +2652,7 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="osm_live_payment_annual_title">Ikgadēja</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mēnesī</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mēnesī</string>
-    <string name="osm_live_payment_discount_descr">Ietaupiet %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ietaupiet %1$s</string>
     <string name="osm_live_payment_current_subscription">Patreizējais abonoments</string>
     <string name="osm_live_payment_renews_monthly">Atjaunojas katru mēnesi</string>
     <string name="osm_live_payment_renews_quarterly">Atjaunojas katru ceturksni</string>
diff --git a/OsmAnd/res/values-ml/strings.xml b/OsmAnd/res/values-ml/strings.xml
index 14e9ed86b3..5a7b728ea8 100644
--- a/OsmAnd/res/values-ml/strings.xml
+++ b/OsmAnd/res/values-ml/strings.xml
@@ -1797,7 +1797,7 @@
     <string name="osm_live_payment_annual_title">വര്ഷത്തിലൊരിക്കൽ</string>
     <string name="osm_live_payment_month_cost_descr">"പ്റതിമാസം  %1$s"</string>
     <string name="osm_live_payment_month_cost_descr_ex">"പ്റതിമാസം %1$.2f %2$s "</string>
-    <string name="osm_live_payment_discount_descr">%1$s ലാഭിക്കുക .</string>
+    <string name="osm_live_payment_discount_descr">%1$s ലാഭിക്കുക</string>
     <string name="osm_live_payment_current_subscription">നിലവിലെ സബ്സ്ക്രിപ്ഷൻ</string>
     <string name="osm_live_payment_renews_monthly">മാസത്തിലൊരിക്കൽ ആവര്‍ത്തിക്കുക</string>
     <string name="osm_live_payment_renews_quarterly">മൂന്നുമാസത്തിലൊരിക്കൽ ആവര്‍ത്തിക്കുക</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index fac215406e..13d0fbde8f 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -2846,7 +2846,7 @@
     <string name="osm_live_payment_annual_title">Årlig</string>
     <string name="osm_live_payment_month_cost_descr">%1$s per måned</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s per måned</string>
-    <string name="osm_live_payment_discount_descr">Lagre %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Lagre %1$s</string>
     <string name="osm_live_payment_current_subscription">Nåværende abonnement</string>
     <string name="osm_live_payment_renews_monthly">Fornyes månedlig</string>
     <string name="osm_live_payment_renews_quarterly">Fornyes kvartalsvis</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 4327f37146..e573b51e5b 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2739,7 +2739,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Jaarlijks</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / maand</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / maand</string>
-    <string name="osm_live_payment_discount_descr">Bespaar %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Bespaar %1$s</string>
     <string name="osm_live_payment_current_subscription">"Uw huidige abonnement "</string>
     <string name="osm_live_payment_renews_monthly">Wordt maandelijks verlengd</string>
     <string name="osm_live_payment_renews_quarterly">"Wordt per kwartaal verlengd "</string>
diff --git a/OsmAnd/res/values-oc/strings.xml b/OsmAnd/res/values-oc/strings.xml
index 6df44d7459..646da2f246 100644
--- a/OsmAnd/res/values-oc/strings.xml
+++ b/OsmAnd/res/values-oc/strings.xml
@@ -184,7 +184,7 @@
     <string name="osm_live_payment_annual_title">Cada an</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Esparnha %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Esparnha %1$s</string>
     <string name="osm_live_payment_current_subscription">Soscripcion actuala</string>
     <string name="osm_live_payment_renews_monthly">Abonament mesadier</string>
     <string name="osm_live_payment_renews_quarterly">Abonament trimestriau</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 4a034c7aa7..8c11f2145a 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -2854,7 +2854,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Raz w roku</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / miesiąc</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / miesiąc</string>
-    <string name="osm_live_payment_discount_descr">Oszczędź %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Oszczędź %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktualna subskrypcja</string>
     <string name="osm_live_payment_renews_monthly">Odnawia się co miesiąc</string>
     <string name="osm_live_payment_renews_quarterly">Odnawia się co kwartał</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index b2a5399e1e..da11e07acd 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2829,7 +2829,7 @@ Pôr do Sol: %2$s</string>
     <string name="osm_live_payment_annual_title">Anualmente</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mês</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mês</string>
-    <string name="osm_live_payment_discount_descr">Menos %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Menos %1$s</string>
     <string name="osm_live_payment_current_subscription">Assinatura atual</string>
     <string name="osm_live_payment_renews_monthly">Renova mensalmente</string>
     <string name="osm_live_payment_renews_annually">Renova anualmente</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 3ace6a28db..7b52230870 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -2182,7 +2182,7 @@
     <string name="osm_live_payment_annual_title">Anualmente</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mês</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mês</string>
-    <string name="osm_live_payment_discount_descr">Poupe %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Poupe %1$s</string>
     <string name="osm_live_payment_current_subscription">Assinatura atual</string>
     <string name="osm_live_payment_renews_monthly">Renova mensalmente</string>
     <string name="osm_live_payment_renews_quarterly">Renova trimestralmente</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 67c7894459..3e7d433de9 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -2238,7 +2238,7 @@
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / lună</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / lună</string>
-    <string name="osm_live_payment_discount_descr">Salvați %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Salvați %1$s</string>
     <string name="osm_live_payment_current_subscription">Abonament curent</string>
     <string name="osm_live_payment_renews_monthly">Reînnoire lunară</string>
     <string name="osm_live_payment_renews_quarterly">Se reînnoiește trimestrial</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 9dbf3b08ed..3732d2f46e 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2883,7 +2883,7 @@
     <string name="osm_live_payment_annual_title">Ежегодно</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / месяц</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месяц</string>
-    <string name="osm_live_payment_discount_descr">Экономия %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Экономия %1$s</string>
     <string name="osm_live_payment_current_subscription">Текущая подписка</string>
     <string name="osm_live_payment_renews_monthly">Продлевается ежемесячно</string>
     <string name="osm_live_payment_renews_quarterly">Продлевается ежеквартально</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 5120a4ecde..afbf848c77 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2856,7 +2856,7 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="osm_live_payment_annual_title">Una borta a s\'annu</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mese</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mese</string>
-    <string name="osm_live_payment_discount_descr">Rispàrmia %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Rispàrmia %1$s</string>
     <string name="osm_live_payment_current_subscription">Abbonamentu atuale</string>
     <string name="osm_live_payment_renews_monthly">Si rinnovat cada mese</string>
     <string name="osm_live_payment_renews_quarterly">Si rinnovat cada tres meses</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 42eac3f419..c7034a2a87 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2843,7 +2843,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Ročne</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mesiac</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mesiac</string>
-    <string name="osm_live_payment_discount_descr">Ušetríte %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ušetríte %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktuálne predplatné</string>
     <string name="osm_live_payment_renews_monthly">Obnovuje sa mesačne</string>
     <string name="osm_live_payment_renews_quarterly">Obnovuje sa štvrťročne</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index e06ef3099b..78db35b699 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -2763,7 +2763,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Letno</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mesec</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mesec</string>
-    <string name="osm_live_payment_discount_descr">Prihranite %1$s!</string>
+    <string name="osm_live_payment_discount_descr">Prihranite %1$s</string>
     <string name="osm_live_payment_current_subscription">Trenutno naročen paket</string>
     <string name="osm_live_payment_renews_monthly">Mesečna obnovitev</string>
     <string name="osm_live_payment_renews_quarterly">Četrtletna obnovitev</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 2f2a240c0e..1a3340e84b 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -2856,7 +2856,7 @@
     <string name="osm_live_payment_annual_title">годишње</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / месечно</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месечно</string>
-    <string name="osm_live_payment_discount_descr">Уштедите %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Уштедите %1$s</string>
     <string name="osm_live_payment_current_subscription">Тренутна претплата</string>
     <string name="osm_live_payment_renews_monthly">Месечно обнављање</string>
     <string name="osm_live_payment_renews_quarterly">Квартално обнављање</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index fc8bf50103..20b9ae5977 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2725,7 +2725,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="osm_live_payment_annual_title">Årligen</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / månad</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / månad</string>
-    <string name="osm_live_payment_discount_descr">Spara %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Spara %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktuell prenumeration</string>
     <string name="osm_live_payment_renews_monthly">Förnyas varje månad</string>
     <string name="osm_live_payment_renews_quarterly">Förnyas kvartalsvis</string>
diff --git a/OsmAnd/res/values-ta/strings.xml b/OsmAnd/res/values-ta/strings.xml
index 366c656a9f..3b4855713e 100644
--- a/OsmAnd/res/values-ta/strings.xml
+++ b/OsmAnd/res/values-ta/strings.xml
@@ -266,7 +266,7 @@
     <string name="record_plugin_name">பயண பதிவுகள்</string>
     <string name="srtm_paid_version_title">எல்லைகொடு வரிகளின் செருகி</string>
     <string name="srtm_plugin_name">"எல்லைகோடு  "</string>
-    <string name="osm_live_payment_discount_descr">சேமிக்க %1$s!</string>
+    <string name="osm_live_payment_discount_descr">சேமிக்க %1$s</string>
     <string name="markers_remove_dialog_msg">\'%s\' வரைப்படப் புள்ளியை அழிக்க\?</string>
     <string name="unirs_render_descr">பாதசாரி மற்றும் மிதிவண்டி சாலைகள் வேறுபடுவதை இயல்புநிலை பாணியின் மாற்றல். மரபுவழி Mapnik வண்ணங்களைப் பயன்படுத்துகிறது.</string>
     <string name="shared_string_bookmark">அடையாளக்குறி</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index ee1efe89ed..282e2d2a4a 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -2910,7 +2910,7 @@
     <string name="markers_remove_dialog_msg">\'%s\' harita işaretleyicisini sil\?</string>
     <string name="edit_map_marker">Harita işaretleyicisini düzenle</string>
     <string name="osm_live_plan_pricing">Plan ve Fiyatlandırma</string>
-    <string name="osm_live_payment_discount_descr">%1$s tasarruf edin.</string>
+    <string name="osm_live_payment_discount_descr">%1$s tasarruf edin</string>
     <string name="osm_live_payment_current_subscription">Mevcut abonelik</string>
     <string name="osm_live_payment_renews_quarterly">Üç ayda bir yeniler</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 1a4d5018e6..9a015f313c 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -2850,7 +2850,7 @@
     <string name="osm_live_payment_annual_title">Щорічно</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / місяць</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / місяць</string>
-    <string name="osm_live_payment_discount_descr">Заощадьте %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Заощадьте %1$s</string>
     <string name="osm_live_payment_current_subscription">Поточна підписка</string>
     <string name="osm_live_payment_renews_monthly">Оновлюється щомісяця</string>
     <string name="osm_live_payment_renews_quarterly">Оновлюється щокварталу</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 99f6bd51d0..7f0187f5d9 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -2528,7 +2528,7 @@
     <string name="osm_live_payment_annual_title">年度</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / 每月</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / 每月</string>
-    <string name="osm_live_payment_discount_descr">省下 %1$s。</string>
+    <string name="osm_live_payment_discount_descr">省下 %1$s</string>
     <string name="osm_live_payment_current_subscription">当前订阅</string>
     <string name="open_in_browser_wiki_description">在网页浏览器中查看条目。</string>
     <string name="osm_live_subscriptions">订阅</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 09886a6345..7a603f48fc 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2846,7 +2846,7 @@
     <string name="osm_live_payment_annual_title">每年</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / 月</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / 月</string>
-    <string name="osm_live_payment_discount_descr">節省 %1$s。</string>
+    <string name="osm_live_payment_discount_descr">節省 %1$s</string>
     <string name="osm_live_payment_current_subscription">目前的訂閱</string>
     <string name="osm_live_payment_renews_monthly">每月續訂</string>
     <string name="osm_live_payment_renews_quarterly">每季續訂</string>
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
index 2e220c7faf..ece8599f03 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
@@ -355,15 +355,19 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 			osmLiveCardButtonsContainer.removeAllViews();
 			View lastBtn = null;
 			List<InAppSubscription> visibleSubscriptions = purchaseHelper.getLiveUpdates().getVisibleSubscriptions();
+			InAppSubscription subscriptionMaxDiscount = null;
+			double maxDiscount = 0;
 			boolean anyPurchased = false;
 			for (final InAppSubscription s : visibleSubscriptions) {
 				if (s.isPurchased()) {
 					anyPurchased = true;
-					break;
+				}
+				double discount = s.getDiscountPercent(purchaseHelper.getMonthlyLiveUpdates());
+				if (discount > maxDiscount) {
+					subscriptionMaxDiscount = s;
+					maxDiscount = discount;
 				}
 			}
-			InAppSubscription subscriptionMaxDiscount = purchaseHelper.getLiveUpdates()
-					.getSubscriptionWithMaxDiscount(purchaseHelper.getMonthlyLiveUpdates());
 			boolean maxDiscountAction = subscriptionMaxDiscount != null
 					&& (subscriptionMaxDiscount.getIntroductoryInfo() != null || subscriptionMaxDiscount.isUpgrade());
 			for (final InAppSubscription s : visibleSubscriptions) {
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
index cbe1de7b92..5fb2e0baa3 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
@@ -258,20 +258,6 @@ public class InAppPurchases {
 			}
 			return null;
 		}
-
-		@Nullable
-		public InAppSubscription getSubscriptionWithMaxDiscount(@Nullable InAppSubscription monthlyLiveUpdates) {
-			double maxDiscount = 0;
-			InAppSubscription subscriptionWithMaxDiscount = null;
-			for (InAppSubscription s : getAllSubscriptions()) {
-				double discount = s.getDiscountPercent(monthlyLiveUpdates);
-				if (discount > maxDiscount) {
-					subscriptionWithMaxDiscount = s;
-					maxDiscount = discount;
-				}
-			}
-			return subscriptionWithMaxDiscount;
-		}
 	}
 
 	public static class LiveUpdatesInAppPurchasesFree extends InAppSubscriptionList {
@@ -773,7 +759,7 @@ public class InAppPurchases {
 			return discountPercent > 0 ? ctx.getString(R.string.osm_live_payment_discount_descr, discountPercent + "%") : "";
 		}
 
-		int getDiscountPercent(@Nullable InAppSubscription monthlyLiveUpdates) {
+		public int getDiscountPercent(@Nullable InAppSubscription monthlyLiveUpdates) {
 			double monthlyPriceValue = getMonthlyPriceValue();
 			if (monthlyLiveUpdates != null) {
 				double regularMonthlyPrice = monthlyLiveUpdates.getPriceValue();