Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix strings, refactor

Browse source
This commit is contained in:
Dima-1 2020-04-23 11:46:58 +03:00
parent 3d731717c4
commit e7430dcd5b
42 changed files with 48 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-ar/strings.xml
View file

@ -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>

2
OsmAnd/res/values-b+be+Latn/strings.xml
View file

@ -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>

2
OsmAnd/res/values-be/strings.xml
View file

@ -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>

2
OsmAnd/res/values-ca/strings.xml
View file

@ -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>

2
OsmAnd/res/values-cs/strings.xml
View file

@ -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>

2
OsmAnd/res/values-da/strings.xml
View file

@ -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>

2
OsmAnd/res/values-de/strings.xml
View file

@ -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>

2
OsmAnd/res/values-el/strings.xml
View file

@ -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>

2
OsmAnd/res/values-eo/strings.xml
View file

@ -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>

2
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -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>

2
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -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>

2
OsmAnd/res/values-es/strings.xml
View file

@ -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>

2
OsmAnd/res/values-et/strings.xml
View file

@ -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>

2
OsmAnd/res/values-gl/strings.xml
View file

@ -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>

2
OsmAnd/res/values-he/strings.xml
View file

@ -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>

2
OsmAnd/res/values-id/strings.xml
View file

@ -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>

2
OsmAnd/res/values-is/strings.xml
View file

@ -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>

2
OsmAnd/res/values-it/strings.xml
View file

@ -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>

2
OsmAnd/res/values-ka/strings.xml
View file

@ -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>

2
OsmAnd/res/values-lt/strings.xml
View file

@ -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>

2
OsmAnd/res/values-lv/strings.xml
View file

@ -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>

2
OsmAnd/res/values-ml/strings.xml
View file

@ -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>

2
OsmAnd/res/values-nb/strings.xml
View file

@ -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>

2
OsmAnd/res/values-nl/strings.xml
View file

@ -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>

2
OsmAnd/res/values-oc/strings.xml
View file

@ -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>

2
OsmAnd/res/values-pl/strings.xml
View file

@ -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>

2
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -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>

2
OsmAnd/res/values-pt/strings.xml
View file

@ -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>

2
OsmAnd/res/values-ro/strings.xml
View file

@ -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>

2
OsmAnd/res/values-ru/strings.xml
View file

@ -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>

2
OsmAnd/res/values-sc/strings.xml
View file

@ -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>

2
OsmAnd/res/values-sk/strings.xml
View file

@ -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>

2
OsmAnd/res/values-sl/strings.xml
View file

@ -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>

2
OsmAnd/res/values-sr/strings.xml
View file

@ -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>

2
OsmAnd/res/values-sv/strings.xml
View file

@ -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>

2
OsmAnd/res/values-ta/strings.xml
View file

@ -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>

2
OsmAnd/res/values-tr/strings.xml
View file

@ -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>

2
OsmAnd/res/values-uk/strings.xml
View file

@ -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>

2
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -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>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -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>

10
OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
View file

@ -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) {

16
OsmAnd/src/net/osmand/plus/inapp/InAppPurchases.java
View file

@ -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();