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

Merge pull request #11321 from osmandapp/master

Browse source 
Update test branch
This commit is contained in:
Hardy 2021-04-02 08:18:59 +02:00 committed by GitHub
commit ea5e932139
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 439 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@
<string name="no_location_permission">Der App fehlt die Berechtigung, auf Standortdaten zuzugreifen.</string> <string name="no_location_permission">Der App fehlt die Berechtigung, auf Standortdaten zuzugreifen.</string>
<string name="gps_not_available">Bitte schalten Sie \"Standort\" in den Systemeinstellungen ein</string> <string name="gps_not_available">Bitte schalten Sie \"Standort\" in den Systemeinstellungen ein</string>
<string name="osmand_service">Hintergrundmodus</string> <string name="osmand_service">Hintergrundmodus</string>
<string name="osmand_service_descr">OsmAnd Tracker läuft im Hintergrund bei ausgeschaltetem Bildschirm.</string> <string name="osmand_service_descr">OsmAnd Tracker läuft bei ausgeschaltetem Bildschirm im Hintergrund.</string>
<string name="shared_string_distance">Distanz</string> <string name="shared_string_distance">Distanz</string>
<string name="share_location">Standort teilen</string> <string name="share_location">Standort teilen</string>
<string name="process_service">OsmAnd Tracker-Service</string> <string name="process_service">OsmAnd Tracker-Service</string>

6
OsmAnd/res/values-ar/phrases.xml
View file

@ -3711,4 +3711,10 @@
<string name="poi_training_sport">التدريب: رياضة</string> <string name="poi_training_sport">التدريب: رياضة</string>
<string name="poi_memorial_stupa">نصب تذكاري بوذي</string> <string name="poi_memorial_stupa">نصب تذكاري بوذي</string>
<string name="poi_piste_nordic">ممر زحلقة الشمالي</string> <string name="poi_piste_nordic">ممر زحلقة الشمالي</string>
<string name="poi_biergarten">مقهى بيرة</string>
<string name="poi_hunting_stand">شرفة صيد</string>
<string name="poi_piste_sled">مضمار خاص بالمنزلقة</string>
<string name="poi_piste_sleigh">مضمار خاص بالمنزلقة</string>
<string name="poi_piste_hike">طريق تنزه</string>
<string name="poi_piste_skitour">مضمار جولة تزلج</string>
</resources> </resources>

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

@ -2971,7 +2971,7 @@
\n• عرض السمت في قياس المسافة \n• عرض السمت في قياس المسافة
\n \n
\n</string--> \n</string-->
<string name="day">يوم</string> <string name="day">نهار</string>
<string name="days_2_4">أيام</string> <string name="days_2_4">أيام</string>
<string name="days_5">أيام</string> <string name="days_5">أيام</string>
<string name="week">أسبوع</string> <string name="week">أسبوع</string>
@ -4132,4 +4132,22 @@
\n • تحديث مربع حوار \"تسجيل الرحلة\" \n • تحديث مربع حوار \"تسجيل الرحلة\"
\n \n
\n</string> \n</string>
<string name="osmand_live">OsmAnd لايف</string>
<string name="next_billing_date">تاريخ الفاتورة التالية: %1$s</string>
<string name="in_grace_period">في فترة السماح</string>
<string name="no_purchases">ليس لديك أي مشتريات</string>
<string name="new_device_account">جهاز جديد / حساب جديد</string>
<string name="contact_support_description">إذا كان لديك أي أسئلة ، يرجى الاتصال بنا على %1$s.</string>
<string name="empty_purchases_description">إذا لم تظهر مشترياتك هنا ، فانقر على \"%1$s\" ، أو اتصل بفريق الدعم الخاص بنا.</string>
<string name="contact_support">الاتصال بالدعم</string>
<string name="troubleshooting">استكشاف الاخطاء</string>
<string name="troubleshooting_description">يرجى اتباع هذا الرابط إذا كان لديك أي مشاكل مع المشتريات.</string>
<string name="annual_subscription">اشتراك سنوي</string>
<string name="monthly_subscription">اشتراك شهري</string>
<string name="three_months_subscription">اشتراك ثلاثة اشهر</string>
<string name="osmand_live_cancelled">ملغاة</string>
<string name="renew_subscription">جدد الاشتراك</string>
<string name="on_hold">في الانتظار</string>
<string name="expired">منتهي الصلاحية</string>
<string name="update_all_maps_added">تحديث كافة الخرائط المضافة إلى %1$s؟</string>
</resources> </resources>

3
OsmAnd/res/values-de/phrases.xml
View file

@ -209,7 +209,7 @@
<string name="poi_food_court">Markthalle</string> <string name="poi_food_court">Markthalle</string>
<string name="poi_ford">Furt</string> <string name="poi_ford">Furt</string>
<string name="poi_fort">Festung</string> <string name="poi_fort">Festung</string>
<string name="poi_fountain">Zierbrunnen</string> <string name="poi_fountain">Springbrunnen</string>
<string name="poi_frame">Bilderrahmengeschäft</string> <string name="poi_frame">Bilderrahmengeschäft</string>
<string name="poi_fuel">Tankstelle;Tankanlage;Tankstation</string> <string name="poi_fuel">Tankstelle;Tankanlage;Tankstation</string>
<string name="poi_funeral_directors">Bestatter</string> <string name="poi_funeral_directors">Bestatter</string>
@ -3894,4 +3894,5 @@
<string name="poi_local_ref">Lokale Referenz</string> <string name="poi_local_ref">Lokale Referenz</string>
<string name="poi_geodesist">Geodät</string> <string name="poi_geodesist">Geodät</string>
<string name="poi_conference_centre">Konferenzzentrum</string> <string name="poi_conference_centre">Konferenzzentrum</string>
<string name="poi_camp_pitch">Lagerplatz</string>
</resources> </resources>

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

@ -1664,7 +1664,7 @@
<string name="si_m_s">Meter pro Sekunde</string> <string name="si_m_s">Meter pro Sekunde</string>
<string name="si_min_km">Minuten pro Kilometer</string> <string name="si_min_km">Minuten pro Kilometer</string>
<string name="si_min_m">Minuten pro Meile</string> <string name="si_min_m">Minuten pro Meile</string>
<string name="si_nm_h">Nautische Meilen pro Stunde (Knoten)</string> <string name="si_nm_h">Seemeilen pro Stunde (Knoten)</string>
<string name="shared_string_navigation">Navigation</string> <string name="shared_string_navigation">Navigation</string>
<string name="looking_up_address">Adresse wird gesucht</string> <string name="looking_up_address">Adresse wird gesucht</string>
<string name="favourites_context_menu_add">Favorit hinzufügen</string> <string name="favourites_context_menu_add">Favorit hinzufügen</string>
@ -4006,7 +4006,7 @@
<string name="activity_type_motorbike_name">Motorrad</string> <string name="activity_type_motorbike_name">Motorrad</string>
<string name="activity_type_car_name">Auto</string> <string name="activity_type_car_name">Auto</string>
<string name="announcement_time_prepare">Zweite Ankündigung (mittlere Distanz)</string> <string name="announcement_time_prepare">Zweite Ankündigung (mittlere Distanz)</string>
<string name="shared_string_sec">sek</string> <string name="shared_string_sec">Sek</string>
<string name="activity_type_racing_name">Rennsport</string> <string name="activity_type_racing_name">Rennsport</string>
<string name="announcement_time_prepare_long">Erste Ankündigung (größere Distanz)</string> <string name="announcement_time_prepare_long">Erste Ankündigung (größere Distanz)</string>
<string name="restart">Neustart</string> <string name="restart">Neustart</string>
@ -4066,4 +4066,22 @@
\n• Dialog \"Streckenaufzeichnung\" aktualisiert \n• Dialog \"Streckenaufzeichnung\" aktualisiert
\n \n
\n</string> \n</string>
<string name="route_line_use_map_style_appearance">Die Routenlinie würde %1$s verwenden, die für den ausgewählten Kartenstil angegeben ist: %2$s.</string>
<string name="no_purchases">Du hast keine Einkäufe</string>
<string name="new_device_account">Neues Gerät / neues Konto</string>
<string name="contact_support_description">Wenn du Fragen hast, kontaktiere uns bitte unter %1$s.</string>
<string name="empty_purchases_description">Wenn deine Einkäufe hier nicht angezeigt werden, tippe auf \"%1$s\", oder wende dich an unser Support-Team.</string>
<string name="contact_support">Support kontaktieren</string>
<string name="troubleshooting">Problemlösung</string>
<string name="troubleshooting_description">Bitte folge diesem Link, wenn du Probleme beim Kauf hast.</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Jährliches Abonnement</string>
<string name="monthly_subscription">Monatliches Abo</string>
<string name="three_months_subscription">Drei-Monats-Abonnement</string>
<string name="next_billing_date">Nächstes Abrechnungsdatum: %1$s</string>
<string name="osmand_live_cancelled">Abgebrochen</string>
<string name="renew_subscription">Abonnement erneuern</string>
<string name="on_hold">In der Warteschleife</string>
<string name="expired">Abgelaufen</string>
<string name="update_all_maps_added">Alle zu %1$s hinzugefügten Maps aktualisieren\?</string>
</resources> </resources>

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

@ -4063,4 +4063,22 @@
\n• plibonigita ekrano “registri spuron” \n• plibonigita ekrano “registri spuron”
\n \n
\n</string> \n</string>
<string name="empty_purchases_description">Se viaj aĉetoj ne aperas ĉi tie, frapetu “%1$s”, aŭ kontaktu nian subtenan teamon.</string>
<string name="troubleshooting">Problemsolvado</string>
<string name="troubleshooting_description">Bonvolu sekvi ĉi tiun ligilon, se vi spertas problemojn pri aĉetoj.</string>
<string name="three_months_subscription">Trimonata abono</string>
<string name="next_billing_date">Sekva faktura dato: %1$s</string>
<string name="osmand_live_cancelled">Nuligita</string>
<string name="renew_subscription">Renovigi abonon</string>
<string name="in_grace_period">En prokrastoperiodo</string>
<string name="on_hold">En atendo</string>
<string name="expired">Eksvalidiĝita</string>
<string name="contact_support_description">Se vi havas demandojn, bonvolu kontakti nin ĉe %1$s.</string>
<string name="contact_support">Kontakti subtenon</string>
<string name="no_purchases">Vi ne havas aĉetojn</string>
<string name="new_device_account">Nova aparato / nova konto</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Jara abono</string>
<string name="monthly_subscription">Monata abono</string>
<string name="update_all_maps_added">Ĉu ĝisdatigi ĉiujn mapojn aldonitajn al %1$s\?</string>
</resources> </resources>

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

@ -4065,4 +4065,22 @@
\n • Se actualiza el cuadro de diálogo «Grabación de viaje» \n • Se actualiza el cuadro de diálogo «Grabación de viaje»
\n \n
\n</string> \n</string>
<string name="no_purchases">No tienes compras</string>
<string name="new_device_account">Nuevo dispositivo / nueva cuenta</string>
<string name="contact_support_description">Si tienes alguna duda, ponte en contacto con nosotros en %1$s.</string>
<string name="empty_purchases_description">Si tus compras no aparecen aquí, pulsa sobre «%1$s», o ponte en contacto con nuestro equipo de asistencia.</string>
<string name="contact_support">Soporte de contacto</string>
<string name="troubleshooting">Solución de problemas</string>
<string name="troubleshooting_description">Sigue este enlace si tienes algún problema con las compras.</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Suscripción anual</string>
<string name="monthly_subscription">Suscripción mensual</string>
<string name="three_months_subscription">Suscripción trimestral</string>
<string name="next_billing_date">Próxima fecha de facturación: %1$s</string>
<string name="osmand_live_cancelled">Cancelado</string>
<string name="renew_subscription">Renovar suscripción</string>
<string name="in_grace_period">En período de gracia</string>
<string name="on_hold">En espera</string>
<string name="expired">Expirado</string>
<string name="update_all_maps_added">¿Actualizar todos los mapas añadidos a %1$s\?</string>
</resources> </resources>

1
OsmAnd/res/values-et/phrases.xml
View file

@ -3894,4 +3894,5 @@
<string name="poi_gladed_yes">Lagendikega: jah</string> <string name="poi_gladed_yes">Lagendikega: jah</string>
<string name="poi_piste_name">Nõlva nimi</string> <string name="poi_piste_name">Nõlva nimi</string>
<string name="poi_piste_ski_jump">Suusahüpped</string> <string name="poi_piste_ski_jump">Suusahüpped</string>
<string name="poi_camp_pitch">Telkimisplats</string>
</resources> </resources>

20
OsmAnd/res/values-fa/strings.xml
View file

@ -4038,7 +4038,7 @@
\nبرای مدیریت یا لغو اشتراک خود، به تنظیمات AppGallery بروید.</string> \nبرای مدیریت یا لغو اشتراک خود، به تنظیمات AppGallery بروید.</string>
<string name="subscription_expired_title">اشتراک OsmAnd Live لغو شده است (expired)</string> <string name="subscription_expired_title">اشتراک OsmAnd Live لغو شده است (expired)</string>
<string name="subscription_paused_title">اشتراک OsmAnd Live موقتاً متوقف شده است (paused)</string> <string name="subscription_paused_title">اشتراک OsmAnd Live موقتاً متوقف شده است (paused)</string>
<string name="subscription_on_hold_title">اشتراک OsmAnd Live در انتظار است (on hold)</string> <string name="subscription_on_hold_title">اشتراک OsmAnd Live در وضعیت تعلیق است (on hold)</string>
<string name="app_mode_kayak">کایاک</string> <string name="app_mode_kayak">کایاک</string>
<string name="shared_string_server_url">Server URL</string> <string name="shared_string_server_url">Server URL</string>
<string name="keep_it_empty_if_not">اگر نیاز ندارد خالی بگذارید</string> <string name="keep_it_empty_if_not">اگر نیاز ندارد خالی بگذارید</string>
@ -4087,4 +4087,22 @@
\n• کادر «ضبط سفر» روزآمد شد. \n• کادر «ضبط سفر» روزآمد شد.
\n \n
\n</string> \n</string>
<string name="on_hold">در تعلیق</string>
<string name="no_purchases">شما هیچ خریدی نکرده‌اید</string>
<string name="new_device_account">دستگاه جدید / حساب جدید</string>
<string name="contact_support_description">اگر هر گونه پرسشی دارید، لطفاً از طریق %1$s با ما تماس بگیرید.</string>
<string name="empty_purchases_description">اگر خریدهای شما اینجا نمایش داده نمی‌شود، روی «%1$s» بزنید یا با تیم پشتیبانی ما تماس بگیرید.</string>
<string name="contact_support">تماس با پشتیبانی</string>
<string name="troubleshooting">عیب‌یابی</string>
<string name="troubleshooting_description">اگر با مسئله‌ای در خرید مواجه شدید این پیوند را دنبال کنید.</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">اشتراک سالانه</string>
<string name="monthly_subscription">اشتراک ماهانه</string>
<string name="three_months_subscription">اشتراک سه‌ماهه</string>
<string name="next_billing_date">تاریخ صورت‌حساب بعدی: %1$s</string>
<string name="osmand_live_cancelled">لغو شده</string>
<string name="renew_subscription">تمدید اشتراک</string>
<string name="in_grace_period">در مهلت اضافه</string>
<string name="expired">منقضی شده</string>
<string name="update_all_maps_added">همهٔ نقشه‌های اضافه‌شده به %1$s روزآمد شود؟</string>
</resources> </resources>

18
OsmAnd/res/values-fr/strings.xml
View file

@ -4053,4 +4053,22 @@
<string name="customize_route_line">Personnaliser la ligne d\'itinéraire</string> <string name="customize_route_line">Personnaliser la ligne d\'itinéraire</string>
<string name="shared_string_route_line">Ligne d\'itinéraire</string> <string name="shared_string_route_line">Ligne d\'itinéraire</string>
<string name="specify_color_for_map_mode">Définissez une couleur pour le mode de carte : %1$s.</string> <string name="specify_color_for_map_mode">Définissez une couleur pour le mode de carte : %1$s.</string>
<string name="contact_support_description">Si vous avez des questions, veuillez nous contacter sur %1$s.</string>
<string name="empty_purchases_description">Si vos achats n\'apparaissent pas ici, appuyez sur \"%1$s\" ou contactez notre équipe d\'assistance.</string>
<string name="troubleshooting">Résolution de problèmes</string>
<string name="troubleshooting_description">Veuillez suivre ce lien si vous rencontrez des problèmes avec vos achats.</string>
<string name="in_grace_period">En période de grâce</string>
<string name="update_all_maps_added">Mettre à jour toutes les cartes ajoutées à %1$s \?</string>
<string name="no_purchases">Vous n\'avez fait aucun achat</string>
<string name="new_device_account">Nouvel appareil / nouveau compte</string>
<string name="contact_support">Contacter le support</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Abonnement annuel</string>
<string name="monthly_subscription">Abonnement mensuel</string>
<string name="three_months_subscription">Abonnement pour 3 mois</string>
<string name="next_billing_date">Prochaine facture le : %1$s</string>
<string name="osmand_live_cancelled">Annulé</string>
<string name="renew_subscription">Renouveler l’abonnement</string>
<string name="on_hold">En attente</string>
<string name="expired">Expiré</string>
</resources> </resources>

10
OsmAnd/res/values-hu/phrases.xml
View file

@ -365,7 +365,7 @@
<string name="poi_meadow">Rét</string> <string name="poi_meadow">Rét</string>
<string name="poi_landuse_railway">Vasúti terület</string> <string name="poi_landuse_railway">Vasúti terület</string>
<string name="poi_canal">Csatorna</string> <string name="poi_canal">Csatorna</string>
<string name="poi_surveillance">Térfigyelő kamera</string> <string name="poi_surveillance">Térfigyelő berendezés</string>
<string name="poi_observatory">Obszervatórium</string> <string name="poi_observatory">Obszervatórium</string>
<string name="poi_astronomical_observatory">Csillagvizsgáló</string> <string name="poi_astronomical_observatory">Csillagvizsgáló</string>
<string name="poi_tower">Torony</string> <string name="poi_tower">Torony</string>
@ -1069,7 +1069,7 @@
<string name="poi_water_characteristic_mineral">Ásványi</string> <string name="poi_water_characteristic_mineral">Ásványi</string>
<string name="poi_water_characteristic_mud">Iszapos</string> <string name="poi_water_characteristic_mud">Iszapos</string>
<string name="poi_water_characteristic_sulfuric">Kénes</string> <string name="poi_water_characteristic_sulfuric">Kénes</string>
<string name="poi_water_point">Vízcsatlakozás lakókocsinak</string> <string name="poi_water_point">Vízcsatlakozás (pl. lakókocsinak)</string>
<string name="poi_information_guidepost">Útirányjelző tábla</string> <string name="poi_information_guidepost">Útirányjelző tábla</string>
<string name="poi_information_board">Tábla</string> <string name="poi_information_board">Tábla</string>
<string name="poi_information_map">Térkép</string> <string name="poi_information_map">Térkép</string>
@ -1963,7 +1963,7 @@
<string name="poi_memorial_prasat">Praszat</string> <string name="poi_memorial_prasat">Praszat</string>
<string name="poi_memorial_fassade_decoration">Homlokzatdíszítés</string> <string name="poi_memorial_fassade_decoration">Homlokzatdíszítés</string>
<string name="poi_route_share_taxi_ref">Iránytaxi</string> <string name="poi_route_share_taxi_ref">Iránytaxi</string>
<string name="poi_surveillance_yes">Térfigyelő kamera</string> <string name="poi_surveillance_yes">Térfigyelő berendezés</string>
<string name="poi_shop_additional_yes">Üzlet van</string> <string name="poi_shop_additional_yes">Üzlet van</string>
<string name="poi_service_bicycle_retail_yes">Kereskedés</string> <string name="poi_service_bicycle_retail_yes">Kereskedés</string>
<string name="poi_service_bicycle_retail_no">Kerékpár-kereskedés nincs</string> <string name="poi_service_bicycle_retail_no">Kerékpár-kereskedés nincs</string>
@ -2904,7 +2904,7 @@
<string name="poi_netball">Netball</string> <string name="poi_netball">Netball</string>
<string name="poi_judo">Cselgáncs</string> <string name="poi_judo">Cselgáncs</string>
<string name="poi_shuffleboard">Shuffleboard</string> <string name="poi_shuffleboard">Shuffleboard</string>
<string name="poi_dyke">Árvízvédelmi gát</string> <string name="poi_dyke">Árvízvédelmi töltés</string>
<string name="poi_medical_system_kampo_yes">Hagyományos japán (kampo)</string> <string name="poi_medical_system_kampo_yes">Hagyományos japán (kampo)</string>
<string name="poi_medical_system_sidda_yes">Hagyományos dél-indiai tamil (sidda)</string> <string name="poi_medical_system_sidda_yes">Hagyományos dél-indiai tamil (sidda)</string>
<string name="poi_medical_system_unani_yes">Hagyományos görög-iszlám (unani)</string> <string name="poi_medical_system_unani_yes">Hagyományos görög-iszlám (unani)</string>
@ -3420,7 +3420,7 @@
<string name="poi_socket_schuko_output_low">kicsi</string> <string name="poi_socket_schuko_output_low">kicsi</string>
<string name="poi_flooring">Parkettabolt</string> <string name="poi_flooring">Parkettabolt</string>
<string name="poi_pottery">Kerámiatermék-bolt</string> <string name="poi_pottery">Kerámiatermék-bolt</string>
<string name="poi_whitewater_rapid_name">Sellő neve</string> <string name="poi_whitewater_rapid_name">Zúgó (sellő) neve</string>
<string name="poi_service_car">Autós szolgáltatás</string> <string name="poi_service_car">Autós szolgáltatás</string>
<string name="poi_barbecue_grill">Barbecue, grill</string> <string name="poi_barbecue_grill">Barbecue, grill</string>
<string name="poi_water_utility">Vízmű irodája</string> <string name="poi_water_utility">Vízmű irodája</string>

18
OsmAnd/res/values-hu/strings.xml
View file

@ -4056,4 +4056,22 @@
<string name="shared_string_route_line">Útvonal</string> <string name="shared_string_route_line">Útvonal</string>
<string name="customize_route_line">Útvonal testreszabása</string> <string name="customize_route_line">Útvonal testreszabása</string>
<string name="specify_color_for_map_mode">Szín meghatározása a következő térképmódhoz: %1$s.</string> <string name="specify_color_for_map_mode">Szín meghatározása a következő térképmódhoz: %1$s.</string>
<string name="no_purchases">Ön nem vásárolt semmit</string>
<string name="new_device_account">Új készülék / új fiók</string>
<string name="contact_support_description">Ha kérdése van, lépjen kapcsolatba velünk: %1$s.</string>
<string name="empty_purchases_description">Ha a vásárlásai nem jelennek meg itt, lépjen kapcsolatba az ügyfélszolgálatunkkal, vagy koppintson ide: „%1$s”.</string>
<string name="contact_support">Kapcsolatfelvétel az ügyfélszolgálattal</string>
<string name="troubleshooting">Hibaelhárítás</string>
<string name="troubleshooting_description">Ha problémája akadt a vásrlással, kattintson erre a linkre.</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Éves előfizetés</string>
<string name="monthly_subscription">Havi előfizetés</string>
<string name="three_months_subscription">Három hónapos előfizetés</string>
<string name="next_billing_date">Következő számla dátuma: %1$s</string>
<string name="osmand_live_cancelled">Törölve</string>
<string name="renew_subscription">Előfizetés megújítása</string>
<string name="in_grace_period">Türelmi időszakban</string>
<string name="on_hold">Várakoztatva</string>
<string name="expired">Lejárt</string>
<string name="update_all_maps_added">Frissüljön minden térkép, amely hozzá lett adva ehhez: %1$s\?</string>
</resources> </resources>

1
OsmAnd/res/values-is/phrases.xml
View file

@ -3894,4 +3894,5 @@
<string name="poi_local_ref">Staðvær tilvísun</string> <string name="poi_local_ref">Staðvær tilvísun</string>
<string name="poi_conference_centre">Ráðstefnumiðstöð</string> <string name="poi_conference_centre">Ráðstefnumiðstöð</string>
<string name="poi_geodesist">Landmælingar</string> <string name="poi_geodesist">Landmælingar</string>
<string name="poi_camp_pitch">Tjaldstæði</string>
</resources> </resources>

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

@ -4050,4 +4050,40 @@
<string name="select_another_colorization">Veldu aðra tegund litunar.</string> <string name="select_another_colorization">Veldu aðra tegund litunar.</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Fela mörk friðlanda, verndaðra svæða og þjóðgarða</string> <string name="rendering_attr_noNatureReserveBoundaries_description">Fela mörk friðlanda, verndaðra svæða og þjóðgarða</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Mörk náttúru</string> <string name="rendering_attr_noNatureReserveBoundaries_name">Mörk náttúru</string>
<string name="trip_recording_logging_interval_info">Millibil skráninga stillir tímabilið milli þess sem OsmAnd biður um staðsetningargögn.</string>
<string name="trip_recording_show_start_dialog_setting">Ef þetta er óvirkt, mun upptaka hefjast strax eftir að ýtt er á hnappinn eða valmyndarfærsluna og staðfestingarglugga er þá sleppt.</string>
<string name="release_4_0_beta">• Uppfærslur OsmAnd Live færðar í \"Sótt gögn &gt; Uppfærslur\"
\n
\n • Ferla er nú hægt að lita eftir hæð, hraða eða halla.
\n
\n • Bætt við valkosti á að breyta útliti leiðarlínu leiðsagnar
\n
\n • Uppfærður gluggi fyrir \"Skráning ferðar\"
\n
\n</string>
<string name="trip_recording_save_and_continue">Vista og halda áfram</string>
<string name="lost_data_warning">Öll óvistuð gögn munu tapast.</string>
<string name="show_start_dialog">Birta upphafsglugga</string>
<string name="customize_route_line">Sérsníða leiðarlínu</string>
<string name="shared_string_route_line">Leiðarlína</string>
<string name="route_line_use_map_style_appearance">Leiðarlína myndi nota %1$s sem tilgreint er í völdum kortastíl: %2$s.</string>
<string name="specify_color_for_map_mode">Tilgreindu lit fyrir kortaham: %1$s.</string>
<string name="no_purchases">Þú ert ekki með nein innkaup</string>
<string name="new_device_account">Nýtt tæki / nýr aðgangur</string>
<string name="contact_support_description">Ef þú ert með spurningar skaltu hafa samband við okkur á %1$s.</string>
<string name="empty_purchases_description">Ef innkaupin þín birtast ekki hér, ýttu þá á “%1$s” eða hafðu samband við hjálparteymið okkar.</string>
<string name="contact_support">Hafa samband við aðstoðarteymi</string>
<string name="troubleshooting">Lausn á vandamálum</string>
<string name="troubleshooting_description">Fylgdu þessum tengli ef þú átt í vandræðum með innkaup.</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Árs áskrift</string>
<string name="monthly_subscription">Mánaðarleg áskrift</string>
<string name="three_months_subscription">Þriggja mánaða áskrift</string>
<string name="next_billing_date">Næsta greiðsludagsetning: %1$s</string>
<string name="osmand_live_cancelled">Hætt við</string>
<string name="renew_subscription">Endurnýja áskrift</string>
<string name="in_grace_period">Í umþóttunarfresti</string>
<string name="on_hold">Í bið</string>
<string name="expired">Útrunnið</string>
<string name="update_all_maps_added">Uppfæra öll kort sem bætt hefur verið við %1$s\?</string>
</resources> </resources>

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

@ -2356,7 +2356,7 @@
<string name="mappilary_no_internet_desc">Hai bisogno di essere connesso a Internet per vedere le foto da Mapillary.</string> <string name="mappilary_no_internet_desc">Hai bisogno di essere connesso a Internet per vedere le foto da Mapillary.</string>
<string name="add_waypoint">Aggiungi punto intermedio</string> <string name="add_waypoint">Aggiungi punto intermedio</string>
<string name="save_gpx_waypoint">Salva Waypoint GPX</string> <string name="save_gpx_waypoint">Salva Waypoint GPX</string>
<string name="waypoint_one">Waypoint 1</string> <string name="waypoint_one">Punto intermedio 1</string>
<string name="line">Linea</string> <string name="line">Linea</string>
<string name="save_as_route_point">Salva come punti di un percorso</string> <string name="save_as_route_point">Salva come punti di un percorso</string>
<string name="save_as_line">Salva come linea</string> <string name="save_as_line">Salva come linea</string>
@ -3885,7 +3885,7 @@
<string name="app_mode_light_aircraft">Ultraleggeri</string> <string name="app_mode_light_aircraft">Ultraleggeri</string>
<string name="plan_route_split_after">Spezza dopo</string> <string name="plan_route_split_after">Spezza dopo</string>
<string name="plan_route_add_new_segment">Aggiungi un nuovo segmento</string> <string name="plan_route_add_new_segment">Aggiungi un nuovo segmento</string>
<string name="release_3_9">"• Aggiunta l\'opzione per esportare e importare tutti i dati incluse le impostazioni, le risorse e i preferiti <string name="release_3_9">• Aggiunta l\'opzione per esportare e importare tutti i dati incluse le impostazioni, le risorse e i preferiti
\n \n
\n • Creazione del percorso: grafici per parti del percorso, aggiunta anche la possibilità di creare e modificare tracce composte da più segmenti \n • Creazione del percorso: grafici per parti del percorso, aggiunta anche la possibilità di creare e modificare tracce composte da più segmenti
\n \n
@ -3893,7 +3893,7 @@
\n \n
\n • Supporto alla personalizzazione dei colori per i preferiti e i punti intermedi delle tracce \n • Supporto alla personalizzazione dei colori per i preferiti e i punti intermedi delle tracce
\n \n
\n"</string> \n</string>
<string name="plan_route_join_segments">Unisci segmenti</string> <string name="plan_route_join_segments">Unisci segmenti</string>
<string name="plan_route_split_before">Spezza</string> <string name="plan_route_split_before">Spezza</string>
<string name="announcement_time_arrive">Arrivo a destinazione</string> <string name="announcement_time_arrive">Arrivo a destinazione</string>
@ -3944,7 +3944,7 @@
<string name="shared_string_api_key">Chiave API</string> <string name="shared_string_api_key">Chiave API</string>
<string name="shared_string_server_url">URL del server</string> <string name="shared_string_server_url">URL del server</string>
<string name="shared_string_enter_param">Immetti un parametro</string> <string name="shared_string_enter_param">Immetti un parametro</string>
<string name="keep_it_empty_if_not">"Mantienilo vuoto se non lo fosse"</string> <string name="keep_it_empty_if_not">Mantienilo vuoto se non lo fosse</string>
<string name="online_routing_example_hint">URL con tutti i parametri saranno come questo:</string> <string name="online_routing_example_hint">URL con tutti i parametri saranno come questo:</string>
<string name="test_route_calculation">Prova il calcolo del percorso</string> <string name="test_route_calculation">Prova il calcolo del percorso</string>
<string name="routing_engine_vehicle_type_driving">Driving</string> <string name="routing_engine_vehicle_type_driving">Driving</string>
@ -3994,11 +3994,11 @@
<string name="activity_type_offroad_name">Fuoristrada</string> <string name="activity_type_offroad_name">Fuoristrada</string>
<string name="activity_type_motorbike_name">Moto</string> <string name="activity_type_motorbike_name">Moto</string>
<string name="activity_type_car_name">Auto</string> <string name="activity_type_car_name">Auto</string>
<string name="temporary_conditional_routing_descr">Utilizza le restrizioni stradali che sono attive attualmente sulla mappa</string> <string name="temporary_conditional_routing_descr">Utilizza le restrizioni stradali attualmente attive sulla mappa</string>
<string name="routing_attr_short_way_description">Percorso più breve ottimizzato (risparmio energia)</string> <string name="routing_attr_short_way_description">Percorso ottimizzato per brevità (risparmio energia)</string>
<string name="routing_attr_driving_style_description">Scegli il tipo di guida per ottenere percorsi più brevi, veloci e sicuri</string> <string name="routing_attr_driving_style_description">Scegli il tipo di guida per ottenere percorsi più brevi, veloci e sicuri</string>
<string name="snap_to_road_descr">L\'icona della localizzazione attuale sarà incollata al percorso corrente</string> <string name="snap_to_road_descr">L\'icona della localizzazione attuale sarà incollata al percorso corrente</string>
<string name="map_orientation_threshold_descr">Non ruotare la visualizzazione della mappa se la velocità è inferiore a un valore</string> <string name="map_orientation_threshold_descr">Non ruotare la visualizzazione della mappa se la velocità è inferiore a una soglia</string>
<string name="restart">Riavvia</string> <string name="restart">Riavvia</string>
<string name="shared_strings_all_regions">Tutte le regioni</string> <string name="shared_strings_all_regions">Tutte le regioni</string>
<string name="delete_number_files_question">Cancellare %1$d file\?</string> <string name="delete_number_files_question">Cancellare %1$d file\?</string>
@ -4013,28 +4013,62 @@
<string name="quick_action_coordinates_widget_descr">Un interruttore per mostrare o nascondere il widget delle coordinate sulla mappa.</string> <string name="quick_action_coordinates_widget_descr">Un interruttore per mostrare o nascondere il widget delle coordinate sulla mappa.</string>
<string name="map_widget_distance_by_tap">Distanza dal tocco</string> <string name="map_widget_distance_by_tap">Distanza dal tocco</string>
<string name="latest_openstreetmap_update">Ultimo aggiornamento OpenStreetMap disponibile:</string> <string name="latest_openstreetmap_update">Ultimo aggiornamento OpenStreetMap disponibile:</string>
<string name="updated">Aggiornamento: %s</string> <string name="updated">Aggiornata: %s</string>
<string name="last_time_checked">Ultimo controllo: %s</string> <string name="last_time_checked">Ultimo controllo: %s</string>
<string name="update_frequency">Frequenza di aggiornamento</string> <string name="update_frequency">Frequenza di aggiornamento</string>
<string name="live_update_frequency_week_variant">Gli aggiornamenti della mappa saranno controllati ogni settimana. Il prossimo %1$s in %2$s.</string> <string name="live_update_frequency_week_variant">Gli aggiornamenti della mappa saranno controllati ogni settimana. La prossima alle %2$s %1$s.</string>
<string name="live_update_frequency_day_variant">Gli aggiornamenti della mappa saranno controllati ogni giorno. La prossima volta %1$s in %2$s.</string> <string name="live_update_frequency_day_variant">Gli aggiornamenti della mappa saranno controllati ogni giorno. La prossima alle %2$s %1$s.</string>
<string name="live_update_frequency_hour_variant">Gli aggiornamenti alla mappa saranno controllati ogni ora. Il prossimo alle %1$s in %2$s.</string> <string name="live_update_frequency_hour_variant">Gli aggiornamenti alla mappa saranno controllati ogni ora. Il prossimo alle %2$s %1$s.</string>
<string name="delete_updates">Elimina aggiornamenti</string> <string name="delete_updates">Elimina aggiornamenti</string>
<string name="live_update_delete_updates_msg">Confermi di voler eliminare tutti %s gli aggiornamenti live\?</string> <string name="live_update_delete_updates_msg">Confermi di voler eliminare tutti i %s aggiornamenti live\?</string>
<string name="purchases">Acquisti</string> <string name="purchases">Acquisti</string>
<string name="select_category_descr">Seleziona la categoria o aggiungine una nuova</string> <string name="select_category_descr">Seleziona la categoria o aggiungine una nuova</string>
<string name="track_recording_will_be_continued">La registrazione sarà continuata.</string> <string name="track_recording_will_be_continued">La registrazione proseguirà.</string>
<string name="copy_poi_name">Copia il nome del PDI</string> <string name="copy_poi_name">Copia il nome del PDI</string>
<string name="quick_action_show_hide_title">Mostra/nascondi</string> <string name="quick_action_show_hide_title">Mostra/nascondi</string>
<string name="shared_string_interval">Intervallo</string> <string name="shared_string_interval">Intervallo</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Nascondi i confini delle riserve naturali, delle aree protette e dei parchi naturali.</string> <string name="rendering_attr_noNatureReserveBoundaries_description">Nascondi i confini delle riserve naturali, delle aree protette e dei parchi naturali</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Confini naturali</string> <string name="rendering_attr_noNatureReserveBoundaries_name">Confini naturali</string>
<string name="track_has_no_altitude">La traccia non contiene i dati di altitudine.</string> <string name="track_has_no_altitude">La traccia non contiene i dati di altitudine.</string>
<string name="track_has_no_speed">La traccia non contiene i dati di velocità.</string> <string name="track_has_no_speed">La traccia non contiene i dati di velocità.</string>
<string name="select_another_colorization">Prego selezionare un altro tipo di colorazione.</string> <string name="select_another_colorization">Prego selezionare un altro tipo di colorazione.</string>
<string name="trip_recording_logging_interval_info">"L\'intervallo di registrazione imposta la frequenza con cui OsmAnd chiederà i dati della posizione attuale."</string> <string name="trip_recording_logging_interval_info">L\'intervallo di registrazione imposta la frequenza con cui OsmAnd chiederà i dati della posizione attuale.</string>
<string name="trip_recording_save_and_continue">Salva e continua</string> <string name="trip_recording_save_and_continue">Salva e continua</string>
<string name="lost_data_warning">Tutti i dati non salvati andranno persi.</string> <string name="lost_data_warning">Tutti i dati non salvati andranno persi.</string>
<string name="show_start_dialog">Mostra la finestra di avvio</string> <string name="show_start_dialog">Mostra la finestra di avvio</string>
<string name="trip_recording_show_start_dialog_setting">Se disabilitato, la registrazione inizierà appena tappato sul widget o sul menu, saltando la finestra di configurazione.</string> <string name="trip_recording_show_start_dialog_setting">Se disabilitato, la registrazione inizierà appena tappato sul widget o sul menu, saltando la finestra di configurazione.</string>
<string name="specify_color_for_map_mode">Specifica il colore per il tipo di mappa: %1$s.</string>
<string name="new_device_account">Nuovo dispositivo / nuovo account</string>
<string name="contact_support_description">Se hai delle domande, per favore contattaci al %1$s.</string>
<string name="next_billing_date">Nuova data di addebito: %1$s</string>
<string name="routing_attr_allow_streams_name">Permetti ruscelli e scoli</string>
<string name="release_4_0_beta">• Aggiornamenti OsmAnd Live spostati in \"Scarica mappe&gt; Aggiornabili\"
\n
\n • Le tracce adesso possono essere colorate in base all\'altitudine, velocità o pendenza.
\n
\n • Aggiunta l\'opzione per cambiare l\'aspetto della line del percorso di navigazione
\n
\n • Aggiornato la finestra di dialogo \"Registra il percorso\"
\n
\n</string>
<string name="routing_attr_allow_streams_description">Permetti ruscelli e scoli</string>
<string name="routing_attr_allow_intermittent_description">Permetti le vie d\'acqua intermittenti</string>
<string name="routing_attr_allow_intermittent_name">Permetti le vie d\'acqua intermittenti</string>
<string name="customize_route_line">Personalizza la linea del percorso</string>
<string name="shared_string_route_line">Linea del percorso</string>
<string name="route_line_use_map_style_appearance">Per la linea del percorso sarà utilizzato %1$s specificato nello stile della mappa selezionato %2$s.</string>
<string name="no_purchases">Non hai alcun acquisto</string>
<string name="empty_purchases_description">Se l\'acquisto non viene visualizzato qui, tappa su “%1$s”, o contatta il supporto.</string>
<string name="contact_support">Contatta il supporto</string>
<string name="troubleshooting">Risoluzione dei problemi</string>
<string name="troubleshooting_description">Per problemi con gli acquisti per favore segui il link.</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Sottoscrizione annuale</string>
<string name="monthly_subscription">Sottoscrizione mensile</string>
<string name="three_months_subscription">Sottoscrizione trimestrale</string>
<string name="osmand_live_cancelled">Cancellato</string>
<string name="renew_subscription">Rinnova la sottoscrizione</string>
<string name="on_hold">In attesa</string>
<string name="expired">Scaduto</string>
<string name="update_all_maps_added">Aggiornare tutte le mappe aggiunte a %1$s\?</string>
</resources> </resources>

18
OsmAnd/res/values-iw/strings.xml
View file

@ -4065,4 +4065,22 @@
\n • החלונית „הקלטת מסלול” עודכנה \n • החלונית „הקלטת מסלול” עודכנה
\n \n
\n</string> \n</string>
<string name="osmand_live">OsmAnd חי</string>
<string name="osmand_live_cancelled">בוטל</string>
<string name="renew_subscription">חידוש מינוי</string>
<string name="in_grace_period">בתקופת חסד</string>
<string name="on_hold">מוקפא</string>
<string name="expired">פג</string>
<string name="annual_subscription">מינוי שנתי</string>
<string name="monthly_subscription">מינוי חודשי</string>
<string name="three_months_subscription">מינוי לשלושה חודשים</string>
<string name="next_billing_date">מועד החיוב הבא: %1$s</string>
<string name="new_device_account">מכשיר חדש / חשבון חדש</string>
<string name="contact_support_description">אם יש לך שאלות, נא ליצור אתנו קשר דרך %1$s.</string>
<string name="empty_purchases_description">אם הרכישות לא מופיעות כאן, יש לגעת ב־„%1$s” או ליצור קשר עם צוות התמיכה שלנו.</string>
<string name="contact_support">יצירת קשר עם התמיכה</string>
<string name="troubleshooting">פתרון בעיות</string>
<string name="troubleshooting_description">נא לעקוב אחר הקישור אם נתקלת בבעיות ברכישות.</string>
<string name="no_purchases">אין לך רכישות</string>
<string name="update_all_maps_added">לעדכן את כל המפות שנוספו אל %1$s\?</string>
</resources> </resources>

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

@ -2165,7 +2165,6 @@
<string name="rendering_attr_depthContours_description">Wyświetla kontury i punkty głębi.</string> <string name="rendering_attr_depthContours_description">Wyświetla kontury i punkty głębi.</string>
<string name="rendering_attr_depthContours_name">Morskie kontury głębokości</string> <string name="rendering_attr_depthContours_name">Morskie kontury głębokości</string>
<string name="routing_attr_height_obstacles_name">Używanie danych wysokościowych</string> <string name="routing_attr_height_obstacles_name">Używanie danych wysokościowych</string>
<string name="route_altitude">Wysokość trasy</string> <string name="route_altitude">Wysokość trasy</string>
<string name="altitude_descent">W dół</string> <string name="altitude_descent">W dół</string>
<string name="altitude_ascent">W górę</string> <string name="altitude_ascent">W górę</string>
@ -2336,7 +2335,7 @@
<string name="average">Średnia</string> <string name="average">Średnia</string>
<string name="of">%1$d z %2$d</string> <string name="of">%1$d z %2$d</string>
<string name="ascent_descent">Podjazd/zjazd</string> <string name="ascent_descent">Podjazd/zjazd</string>
<string name="moving_time">Czas poruszania</string> <string name="moving_time">Czas w ruchu</string>
<string name="max_min">Maks./min.</string> <string name="max_min">Maks./min.</string>
<string name="quick_action_resume_pause_navigation">Zatrzymaj/wznów nawigację</string> <string name="quick_action_resume_pause_navigation">Zatrzymaj/wznów nawigację</string>
<string name="quick_action_resume_pause_navigation_descr">Przycisk do wstrzymania lub wznowienia nawigacji.</string> <string name="quick_action_resume_pause_navigation_descr">Przycisk do wstrzymania lub wznowienia nawigacji.</string>
@ -3917,7 +3916,7 @@
<string name="routing_attr_allow_streams_name">Zezwalaj na strumienie i dreny</string> <string name="routing_attr_allow_streams_name">Zezwalaj na strumienie i dreny</string>
<string name="routing_attr_allow_intermittent_description">Zezwalaj na przerywane drogi wodne</string> <string name="routing_attr_allow_intermittent_description">Zezwalaj na przerywane drogi wodne</string>
<string name="routing_attr_allow_intermittent_name">Zezwalaj na przerywane drogi wodne</string> <string name="routing_attr_allow_intermittent_name">Zezwalaj na przerywane drogi wodne</string>
<string name="voice_prompts_timetable">Czas monitów głosowych</string> <string name="voice_prompts_timetable">Czas komunikatów głosowych</string>
<string name="shared_string_subtype">Podtyp</string> <string name="shared_string_subtype">Podtyp</string>
<string name="shared_string_vehicle">Pojazd</string> <string name="shared_string_vehicle">Pojazd</string>
<string name="shared_string_api_key">Klucz API</string> <string name="shared_string_api_key">Klucz API</string>
@ -3935,7 +3934,7 @@
<string name="select_folder">Wybierz folder</string> <string name="select_folder">Wybierz folder</string>
<string name="select_folder_descr">Wybierz folder lub dodaj nowy</string> <string name="select_folder_descr">Wybierz folder lub dodaj nowy</string>
<string name="shared_string_empty">Opróżnij</string> <string name="shared_string_empty">Opróżnij</string>
<string name="analyze_by_intervals">Analiza według przedziałów (przedział podziału)</string> <string name="analyze_by_intervals">Analizuj przedziały czasowe</string>
<string name="upload_to_openstreetmap">Prześlij do OpenStreetMap</string> <string name="upload_to_openstreetmap">Prześlij do OpenStreetMap</string>
<string name="edit_track">Edytuj trasę</string> <string name="edit_track">Edytuj trasę</string>
<string name="rename_track">Zmień nazwę trasy</string> <string name="rename_track">Zmień nazwę trasy</string>
@ -4001,4 +4000,48 @@
<string name="activity_type_motorbike_name">Motocykl</string> <string name="activity_type_motorbike_name">Motocykl</string>
<string name="activity_type_offroad_name">Poza drogą</string> <string name="activity_type_offroad_name">Poza drogą</string>
<string name="activity_type_car_name">Samochód</string> <string name="activity_type_car_name">Samochód</string>
<string name="select_segments">Wybierz segmenty</string>
<string name="temporary_conditional_routing_descr">Użyj ograniczeń drogowych, które są aktywne w danej chwili na mapie</string>
<string name="routing_attr_short_way_description">Zoptymalizowana krótsza trasa (oszczędność energii)</string>
<string name="routing_attr_driving_style_description">Wybierz cel jazdy, aby wyznaczyć krótszą, szybszą lub bezpieczniejszą trasę</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Ukryj rezerwat przyrody, obszary chronione i granice parku narodowego</string>
<string name="contact_support_description">W razie jakichkolwiek pytań prosimy o kontakt pod adresem %1$s.</string>
<string name="empty_purchases_description">Jeśli Twoje zakupy nie są tutaj widoczne, dotknij \"%1$s\" lub skontaktuj się z naszym zespołem wsparcia.</string>
<string name="snap_to_road_descr">Ikona bieżącej lokalizacji zostanie przyciągnięta do bieżącej trasy nawigacji</string>
<string name="map_orientation_threshold_descr">Nie obracaj widoku mapy, jeśli prędkość jest mniejsza niż próg</string>
<string name="restart">Uruchom ponownie</string>
<string name="shared_strings_all_regions">Wszystkie regiony</string>
<string name="delete_number_files_question">Usunąć pliki %1$d\?</string>
<string name="track_recording_stop_without_saving">Zatrzymaj bez zapisywania</string>
<string name="app_restart_required">Wymagane ponowne uruchomienie aplikacji w celu zastosowania niektórych ustawień.</string>
<string name="quick_action_coordinates_widget_descr">Przełącznik służący do pokazywania lub ukrywania widżetu Współrzędne na mapie.</string>
<string name="latest_openstreetmap_update">Dostępna najnowsza aktualizacja OpenStreetMap:</string>
<string name="updated">Zaktualizowano: %s</string>
<string name="last_time_checked">Ostatnio sprawdzono: %s</string>
<string name="update_frequency">Częstotliwość aktualizacji</string>
<string name="live_update_frequency_week_variant">Aktualizacje map będą sprawdzane co tydzień. Następnym razem %1$s w %2$s.</string>
<string name="live_update_frequency_day_variant">Aktualizacje map będą sprawdzane codziennie. Następnym razem %1$s w %2$s.</string>
<string name="live_update_frequency_hour_variant">Aktualizacje map będą sprawdzane co godzinę. Następnym razem %1$s w %2$s.</string>
<string name="delete_updates">Usuń aktualizacje</string>
<string name="live_update_delete_updates_msg">Czy na pewno chcesz usunąć wszystkie %s aktualizacje na żywo\?</string>
<string name="purchases">Zakupy</string>
<string name="select_category_descr">Wybierz kategorię lub dodaj nową</string>
<string name="copy_poi_name">Skopiuj nazwę punktu POI</string>
<string name="quick_action_show_hide_title">Pokaż/ukryj</string>
<string name="trip_recording_save_and_continue">Zapisz i kontynuuj</string>
<string name="lost_data_warning">Wszystkie niezapisane dane zostaną utracone.</string>
<string name="specify_color_for_map_mode">Określ kolor dla trybu mapy: %1$s.</string>
<string name="no_purchases">Nie masz żadnych zakupów</string>
<string name="new_device_account">Nowe urządzenie / nowe konto</string>
<string name="contact_support">Kontakt z pomocą techniczną</string>
<string name="troubleshooting">Rozwiązywanie problemów</string>
<string name="troubleshooting_description">Jeśli masz jakiekolwiek problemy z zakupami, skorzystaj z tego linku.</string>
<string name="osmand_live">OsmAnd na żywo</string>
<string name="annual_subscription">Roczna subskrypcja</string>
<string name="monthly_subscription">Subskrypcja miesięczna</string>
<string name="three_months_subscription">Subskrypcja trzymiesięczna</string>
<string name="next_billing_date">Następna data rozliczenia: %1$s</string>
<string name="osmand_live_cancelled">Anulowano</string>
<string name="renew_subscription">Odnów subskrypcję</string>
<string name="update_all_maps_added">Zaktualizować wszystkie mapy dodane do %1$s\?</string>
</resources> </resources>

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

@ -4058,4 +4058,22 @@
\n • Caixa de diálogo \"Gravação de viagem\" atualizada \n • Caixa de diálogo \"Gravação de viagem\" atualizada
\n \n
\n"</string> \n"</string>
<string name="no_purchases">Você não tem nenhuma compra</string>
<string name="new_device_account">Novo dispositivo / nova conta</string>
<string name="contact_support_description">Se você tiver alguma dúvida, entre em contato conosco em %1$s.</string>
<string name="empty_purchases_description">Se suas compras não aparecerem aqui, toque em \"%1$s\", ou entre em contato com nossa equipe de suporte.</string>
<string name="contact_support">Contato com o suporte</string>
<string name="troubleshooting">Solução de problemas</string>
<string name="troubleshooting_description">Por favor, siga este link se você tiver algum problema com compras.</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Assinatura anual</string>
<string name="monthly_subscription">Assinatura mensal</string>
<string name="three_months_subscription">Três meses de assinatura</string>
<string name="next_billing_date">Próxima data de faturamento: %1$s</string>
<string name="osmand_live_cancelled">Cancelado</string>
<string name="renew_subscription">Renovar assinatura</string>
<string name="in_grace_period">No período de carência</string>
<string name="on_hold">Em espera</string>
<string name="expired">Expirado</string>
<string name="update_all_maps_added">Atualizar todos os mapas adicionados a %1$s\?</string>
</resources> </resources>

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

@ -4051,4 +4051,18 @@
<string name="show_start_dialog">Показывать начальный диалог</string> <string name="show_start_dialog">Показывать начальный диалог</string>
<string name="trip_recording_show_start_dialog_setting">Если выключено, запись начнётся сразу после нажатия на виджет или пункт меню, пропуская диалоговое окно подтверждения.</string> <string name="trip_recording_show_start_dialog_setting">Если выключено, запись начнётся сразу после нажатия на виджет или пункт меню, пропуская диалоговое окно подтверждения.</string>
<string name="trip_recording_logging_interval_info">Интервал записи трека указывает период времени, через который OsmAnd будет запрашивать данные о текущем местоположении.</string> <string name="trip_recording_logging_interval_info">Интервал записи трека указывает период времени, через который OsmAnd будет запрашивать данные о текущем местоположении.</string>
<string name="three_months_subscription">Подписка на три месяца</string>
<string name="monthly_subscription">Подписка на месяц</string>
<string name="next_billing_date">Следующая дата оплаты: %1$s</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Годовая подписка</string>
<string name="release_4_0_beta">• Обновления OsmAnd Live перемещены в «Загрузка карт» → «Обновления».
\n
\n• Теперь треки можно раскрашивать по высоте, скорости или уклону.
\n
\n• Добавлена возможность изменить внешний вид линии маршрута.
\n
\n• Обновлен диалог «Запись поездки».
\n
\n</string>
</resources> </resources>

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

@ -2218,7 +2218,7 @@
<string name="shared_string_paused">Pausad</string> <string name="shared_string_paused">Pausad</string>
<string name="retry">Försök igen</string> <string name="retry">Försök igen</string>
<string name="plan_route_no_markers_toast">Du måste lägga till åtminstone en markör för att använda denna funktion.</string> <string name="plan_route_no_markers_toast">Du måste lägga till åtminstone en markör för att använda denna funktion.</string>
<string name="osn_modify_dialog_error">Kunde ej ändra anteckning</string> <string name="osn_modify_dialog_error">Kunde ej ändra anteckning.</string>
<string name="osn_modify_dialog_title">Ändra anteckning</string> <string name="osn_modify_dialog_title">Ändra anteckning</string>
<string name="context_menu_item_modify_note">Ändra OSM-anteckning</string> <string name="context_menu_item_modify_note">Ändra OSM-anteckning</string>
<string name="coordinates_format">Koordinatformat</string> <string name="coordinates_format">Koordinatformat</string>
@ -2274,13 +2274,13 @@
<string name="coordinate_input">Koordinatinmatning</string> <string name="coordinate_input">Koordinatinmatning</string>
<string name="modify_the_search_query">Ändra sökningen.</string> <string name="modify_the_search_query">Ändra sökningen.</string>
<string name="empty_state_osm_edits">Skapa eller ändra OSM-objekt</string> <string name="empty_state_osm_edits">Skapa eller ändra OSM-objekt</string>
<string name="empty_state_osm_edits_descr">Skapa eller ändra OSM-POI, öppna eller kommentera OSM-anteckningar och bidraga med inspelade GPX-filer.</string> <string name="empty_state_osm_edits_descr">Skapa eller ändra OSM-POI:er, öppna eller kommentera OSM-anteckningar och bidraga med inspelade GPX-filer.</string>
<string name="shared_string_deleted">Raderad</string> <string name="shared_string_deleted">Raderad</string>
<string name="shared_string_edited">Redigerad</string> <string name="shared_string_edited">Redigerad</string>
<string name="shared_string_added">Tillagd</string> <string name="shared_string_added">Tillagd</string>
<string name="marker_activated">Markör %s aktiverad.</string> <string name="marker_activated">Markör %s aktiverad.</string>
<string name="empty_state_av_notes">Gör anteckningar!</string> <string name="empty_state_av_notes">Gör anteckningar!</string>
<string name="notes_by_date">Anteckningar efter datum</string> <string name="notes_by_date">A/V-anteckningar efter datum</string>
<string name="by_date">Efter datum</string> <string name="by_date">Efter datum</string>
<string name="by_type">Efter typ</string> <string name="by_type">Efter typ</string>
<string name="looking_for_tracks_with_waypoints">Söker efter spår med waypoints</string> <string name="looking_for_tracks_with_waypoints">Söker efter spår med waypoints</string>
@ -2292,8 +2292,8 @@
<string name="context_menu_read_full_article">Läs hela artikeln</string> <string name="context_menu_read_full_article">Läs hela artikeln</string>
<string name="context_menu_read_article">Läs artikel</string> <string name="context_menu_read_article">Läs artikel</string>
<string name="group_deleted">Grupp borttagen</string> <string name="group_deleted">Grupp borttagen</string>
<string name="distance_farthest">Avstånd: längst bort först</string> <string name="distance_farthest">Längst bort först</string>
<string name="distance_nearest">Avstånd: närmast först</string> <string name="distance_nearest">Närmast först</string>
<string name="enter_lon">Ange longitud</string> <string name="enter_lon">Ange longitud</string>
<string name="enter_lat">Ange latitud</string> <string name="enter_lat">Ange latitud</string>
<string name="enter_lat_and_lon">Ange latitud och longitud</string> <string name="enter_lat_and_lon">Ange latitud och longitud</string>
@ -2312,19 +2312,19 @@
<string name="enter_the_file_name">Ange filnamnet.</string> <string name="enter_the_file_name">Ange filnamnet.</string>
<string name="map_import_error">Kartimportfel</string> <string name="map_import_error">Kartimportfel</string>
<string name="map_imported_successfully">Karta importerad</string> <string name="map_imported_successfully">Karta importerad</string>
<string name="make_as_start_point">Gör som startpunkt</string> <string name="make_as_start_point">Gör som utgångspunkt</string>
<string name="shared_string_current">Nuvarande</string> <string name="shared_string_current">Nuvarande</string>
<string name="last_intermediate_dest_description">Lägger till mellanliggande stopp</string> <string name="last_intermediate_dest_description">Lägger till mellanliggande stopp</string>
<string name="first_intermediate_dest_description">Lägger till första stoppet</string> <string name="first_intermediate_dest_description">Lägger till första stoppet</string>
<string name="subsequent_dest_description">Flytta upp destination och skapa</string> <string name="subsequent_dest_description">Flytta upp destination och skapa</string>
<string name="show_closed_notes">Visa stängda anteckningar</string> <string name="show_closed_notes">Visa stängda anteckningar</string>
<string name="switch_osm_notes_visibility_desc">Visa/Dölj OSM-anteckningar på kartan.</string> <string name="switch_osm_notes_visibility_desc">Visa eller dölj OSM-anteckningar på kartan.</string>
<string name="gpx_file_desc">GPX - lämplig för export till JOSM eller andra OSM-redigerare.</string> <string name="gpx_file_desc">GPX - lämplig för export till JOSM eller andra OSM-redigerare.</string>
<string name="osc_file_desc">OSC - lämplig för export till OpenStreetMap.</string> <string name="osc_file_desc">OSC - lämplig för export till OSM.</string>
<string name="shared_string_gpx_file">GPX-fil</string> <string name="shared_string_gpx_file">GPX-fil</string>
<string name="osc_file">OSC-fil</string> <string name="osc_file">OSC-fil</string>
<string name="choose_file_type">Välj filtyp</string> <string name="choose_file_type">Välj filtyp</string>
<string name="osm_edits_export_desc">Välj typ av export: OSM-anteckningar, POI, eller båda.</string> <string name="osm_edits_export_desc">Exportera som OSM-anteckningar, POI:er, eller båda.</string>
<string name="all_data">Alla data</string> <string name="all_data">Alla data</string>
<string name="osm_notes">OSM-anteckningar</string> <string name="osm_notes">OSM-anteckningar</string>
<string name="will_open_tomorrow_at">Öppnar imorgon vid</string> <string name="will_open_tomorrow_at">Öppnar imorgon vid</string>
@ -2344,9 +2344,9 @@
<string name="shared_string_marker">Markör</string> <string name="shared_string_marker">Markör</string>
<string name="one_tap_active_descr">Tryck på en markör på kartan för att flytta den till toppen av de aktiva markörerna utan att öppna sammanhangsmenyn.</string> <string name="one_tap_active_descr">Tryck på en markör på kartan för att flytta den till toppen av de aktiva markörerna utan att öppna sammanhangsmenyn.</string>
<string name="one_tap_active">\'Ett tryck\' aktiv</string> <string name="one_tap_active">\'Ett tryck\' aktiv</string>
<string name="empty_state_av_notes_desc">Lägg till ljud-, video- eller fotonotering för varje punkt på kartan, med hjälp av widgeten eller menyn.</string> <string name="empty_state_av_notes_desc">Lägg till ljud-, video- eller foto-notering för varje punkt på kartan med hjälp av widgeten eller menyn.</string>
<string name="add_track_to_markers_descr">Välj ett spår för att lägga till dess waypoints till markörer.</string> <string name="add_track_to_markers_descr">Välj ett spår för att lägga till dess waypoints till markörer.</string>
<string name="add_favourites_group_to_markers_descr">Välj en favoritkategori att lägga till markörerna.</string> <string name="add_favourites_group_to_markers_descr">Välj en favoritkategori att lägga till i markörerna.</string>
<string name="shared_string_gpx_waypoints">Spåra waypoints</string> <string name="shared_string_gpx_waypoints">Spåra waypoints</string>
<string name="favourites_group">Kategorin Favoriter</string> <string name="favourites_group">Kategorin Favoriter</string>
<string name="add_group">Lägg till en grupp</string> <string name="add_group">Lägg till en grupp</string>
@ -2361,7 +2361,7 @@
<string name="show_guide_line_descr">Visa styrlinjer från din position till de aktiva markörlägena.</string> <string name="show_guide_line_descr">Visa styrlinjer från din position till de aktiva markörlägena.</string>
<string name="show_arrows_descr">Visa en eller två pilar som anger riktningen till de aktiva markörerna.</string> <string name="show_arrows_descr">Visa en eller två pilar som anger riktningen till de aktiva markörerna.</string>
<string name="distance_indication_descr">Välj hur avståndet till aktiva markörer ska visas.</string> <string name="distance_indication_descr">Välj hur avståndet till aktiva markörer ska visas.</string>
<string name="active_markers_descr">Välj hur många riktningsindikatorer som ska visas.</string> <string name="active_markers_descr">Ange antalet riktningsindikatorer.</string>
<string name="digits_quantity">Antal decimaler</string> <string name="digits_quantity">Antal decimaler</string>
<string name="shared_string_right">Höger</string> <string name="shared_string_right">Höger</string>
<string name="shared_string_left">Vänster</string> <string name="shared_string_left">Vänster</string>
@ -2567,7 +2567,7 @@
<string name="quick_action_showhide_poi_descr">Knackning på åtgärdsknappen visar eller döljer Intressepunkter på kartan.</string> <string name="quick_action_showhide_poi_descr">Knackning på åtgärdsknappen visar eller döljer Intressepunkter på kartan.</string>
<string name="quick_action_fav_name_descr">Lämna tomt för att automatiskt använda adressen eller platsens namn.</string> <string name="quick_action_fav_name_descr">Lämna tomt för att automatiskt använda adressen eller platsens namn.</string>
<string name="show_tunnels">Tunnlar</string> <string name="show_tunnels">Tunnlar</string>
<string name="wikivoyage_search_hint">Sök: land, stad, region</string> <string name="wikivoyage_search_hint">Sök efter land, stad, eller region</string>
<string name="shared_string_read">Läs</string> <string name="shared_string_read">Läs</string>
<string name="saved_articles">Bokmärkta artiklar</string> <string name="saved_articles">Bokmärkta artiklar</string>
<string name="shared_string_explore">Utforska</string> <string name="shared_string_explore">Utforska</string>
@ -2579,14 +2579,14 @@
<string name="shared_string_bookmark">Bokmärke</string> <string name="shared_string_bookmark">Bokmärke</string>
<string name="hide_full_description">Dölj fullständig beskrivning</string> <string name="hide_full_description">Dölj fullständig beskrivning</string>
<string name="show_full_description">Visa fullständig beskrivning</string> <string name="show_full_description">Visa fullständig beskrivning</string>
<string name="off_road_render_descr">Lämplig för användning vid off-road körning. Lämplig för användning med gröna satellitbilder som ett underlagskarta. Viktiga egenskaper: minskad tjocklek på stora vägar, ökad tjocklek av spår, stigar, cykelvägar och andra stigar. Baserat på \'Topo\' stil.</string> <string name="off_road_render_descr">För terrängkörning baserad på Topo-stilen och för användning med gröna satellitbilder som underlag. Minskad tjocklek på huvudvägar, ökad tjocklek på spår, stigar, cykelvägar och andra vägar.</string>
<string name="nautical_render_descr">Nautisk navigeringsstil. Viktiga funktioner: bojar, fyrar, vattendrag, farleder och märken, hamnar, sjömärken, djupkonturer.</string> <string name="nautical_render_descr">För nautisk navigering. Innehåller bojar, fyrar, vattendrag, farleder och märken, hamnar, sjömärken, och djupkonturer.</string>
<string name="ski_map_render_descr">Skidåkningsstil. Viktiga funktioner: Renderar pister, skidliftar och andra skidanläggningar på ett bekvämt sätt. Mindre distraherande sekundära kartobjekt.</string> <string name="ski_map_render_descr">För skidåkning. Innehåller pister, skidliftar, längdspår osv. Dämpar sekundära kartobjekt.</string>
<string name="light_rs_render_descr">Enkel och kontrastrik stil för navigering med bil. Skonsam mot ögonen under natten. Viktiga funktioner: höjdkurvor, kontrastrik orange stil på vägar, mindre störande sekundära kartobjekt.</string> <string name="light_rs_render_descr">Enkel körstil. Mjukt nattläge, konturlinjer, kontrasterande orangefärgade vägar, och dämpar sekundära kartobjekt.</string>
<string name="topo_render_descr">Kontraststil utformad främst för vandring, trekking och cykling i naturen. Bra läsbarhet vid komplex extern belysning. Viktiga funktioner: kontrastrika vägar och naturliga objekt, olika typer av rutter, höjdkurvor med avancerade inställningar för mer detaljer på motsvarande zoomnivåer än standard. Ytläge-alternativet kan skilja vägens ytkvalitet. Inget nattläge.</string> <string name="topo_render_descr">För vandring, trekking och cykling i naturen. Läsbar utomhus. Kontrasterande vägar och naturobjekt, olika rutttyper, avancerade alternativ för konturlinjer, extra detaljer. Justering av ytintegritet skiljer vägkvalitet åt. Inget nattläge.</string>
<string name="mapnik_render_descr">Gamla \"Mapnik\'-stil standardrendering. Viktiga funktioner: Färger som liknar \"Mapnik\" stil.</string> <string name="mapnik_render_descr">Gammal standard \"Mapnik\"-stil. Använder liknande färger som \"Mapnik\".</string>
<string name="touring_view_render_descr">Högsdetaljsstil för turiständamål. Innehåller alla konfigurationsinställningar av standardstilen, dessutom: Visar så mycket detaljer som möjligt, i synnerhet alla vägar, stigar och andra sätt att resa. Tydliga visuella skillnader mellan olika vägtyper som påminner om många turistatlaser. Högkontrastfärger för utomhusbruk, dag- och nattläge.</string> <string name="touring_view_render_descr">Turiststil med hög kontrast och maximal detaljrikedom. Innehåller alla alternativ i OsmAnd:s standardstil, samtidigt som den visar så mycket detaljer som möjligt, särskilt vägar, stigar, och andra sätt att resa. Tydlig distinktion mellan olika vägtyper som i en turistatlas. Lämplig för användning på dag, natt, och utomhus.</string>
<string name="default_render_descr">Stil för allmänna ändamål. Förenklad återgivning i tätbefolkade städer. Viktiga funktioner: höjdkurvor, rutter, ytkvalitet, tillträdeskontroll, farthinder, stigrendering enligt SAC-skala, vattensporter.</string> <string name="default_render_descr">Allmän stil. Täta städer visas rent. Funktioner konturlinjer, vägar, ytkvalitet, tillträdesbegränsningar, vägsköldar, vägar som återges enligt SAC-skalan, vitvattensportartiklar.</string>
<string name="open_wikipedia_link_online">Öppna Wikipedia-länk på internet</string> <string name="open_wikipedia_link_online">Öppna Wikipedia-länk på internet</string>
<string name="open_wikipedia_link_online_description">Länken kommer att öppnas i en webbläsare.</string> <string name="open_wikipedia_link_online_description">Länken kommer att öppnas i en webbläsare.</string>
<string name="read_wikipedia_offline_description">Skaffa OsmAnd Live-prenumeration för att läsa Wikipedia och Wikivoyage-artiklar frånkopplad.</string> <string name="read_wikipedia_offline_description">Skaffa OsmAnd Live-prenumeration för att läsa Wikipedia och Wikivoyage-artiklar frånkopplad.</string>
@ -2609,14 +2609,14 @@
<string name="download_file">Hämta fil</string> <string name="download_file">Hämta fil</string>
<string name="start_editing_card_image_text">Den fria, världsomspännande reseguiden som alla kan redigera.</string> <string name="start_editing_card_image_text">Den fria, världsomspännande reseguiden som alla kan redigera.</string>
<string name="welcome_to_open_beta_description">Reseguider är baserade på Wikivoyage. Testa alla funktioner under öppnen beta-testning gratis.</string> <string name="welcome_to_open_beta_description">Reseguider är baserade på Wikivoyage. Testa alla funktioner under öppnen beta-testning gratis.</string>
<string name="start_editing_card_description">Du kan och bör redigera en artikel på Wikivoyage. Dela med dig av kunskap, erfarenhet, talang och din kännedom</string> <string name="start_editing_card_description">Du kan och bör redigera en artikel på Wikivoyage. Dela med dig av kunskap, erfarenhet, talang, och din kännedom.</string>
<string name="start_editing">Börja redigera</string> <string name="start_editing">Börja redigera</string>
<string name="get_unlimited_access">Få obegränsad tillgång</string> <string name="get_unlimited_access">Få obegränsad tillgång</string>
<string name="welcome_to_open_beta">Välkommen till öppen beta</string> <string name="welcome_to_open_beta">Välkommen till öppen beta</string>
<string name="wikivoyage_travel_guide">Reseguider</string> <string name="wikivoyage_travel_guide">Reseguider</string>
<string name="wikivoyage_travel_guide_descr">Guider till de mest intressanta platserna i världen, inuti OsmAnd, utan en internetanslutning.</string> <string name="wikivoyage_travel_guide_descr">Guider till de mest intressanta platserna i världen, inuti OsmAnd, utan en internetanslutning.</string>
<string name="monthly_map_updates">Kartuppdateringar: varje månad</string> <string name="monthly_map_updates">Månatliga kartuppdateringar</string>
<string name="daily_map_updates">Kartuppdateringar: varje timme</string> <string name="daily_map_updates">Uppdatering av kartan varje timme</string>
<string name="in_app_purchase">Köp i app</string> <string name="in_app_purchase">Köp i app</string>
<string name="in_app_purchase_desc">Engångsbetalning</string> <string name="in_app_purchase_desc">Engångsbetalning</string>
<string name="in_app_purchase_desc_ex">När det väl är köpt, blir det permanent tillgängligt för dig.</string> <string name="in_app_purchase_desc_ex">När det väl är köpt, blir det permanent tillgängligt för dig.</string>
@ -2628,7 +2628,7 @@
<string name="unlock_all_features">Låsa upp alla OsmAnd-funktioner</string> <string name="unlock_all_features">Låsa upp alla OsmAnd-funktioner</string>
<string name="purchase_dialog_title">Välj abonnemang</string> <string name="purchase_dialog_title">Välj abonnemang</string>
<string name="purchase_dialog_travel_description">Köp något av följande för att läsa researtiklar frånkopplad:</string> <string name="purchase_dialog_travel_description">Köp något av följande för att läsa researtiklar frånkopplad:</string>
<string name="purchase_dialog_subtitle">Välj lämpligt val:</string> <string name="purchase_dialog_subtitle">Välj lämpligt val</string>
<string name="shared_string_dont">Gör inte</string> <string name="shared_string_dont">Gör inte</string>
<string name="shared_string_do">Gör</string> <string name="shared_string_do">Gör</string>
<string name="shared_string_only_with_wifi">Endast på Wi-Fi</string> <string name="shared_string_only_with_wifi">Endast på Wi-Fi</string>
@ -2768,7 +2768,7 @@
<string name="osm_live_payment_renews_annually">Förnyas årligen</string> <string name="osm_live_payment_renews_annually">Förnyas årligen</string>
<string name="default_price_currency_format">%1$.2f %2$s</string> <string name="default_price_currency_format">%1$.2f %2$s</string>
<string name="osm_live_payment_header">Betalningsintervall:</string> <string name="osm_live_payment_header">Betalningsintervall:</string>
<string name="osm_live_payment_contribute_descr">Donationer hjälper till att finansiera OpenStreetMap-kartografi.</string> <string name="osm_live_payment_contribute_descr">Donationer hjälper till att finansiera OSM-kartografi.</string>
<string name="markers_remove_dialog_msg">Ta bort kartmarkör \'%s\'\?</string> <string name="markers_remove_dialog_msg">Ta bort kartmarkör \'%s\'\?</string>
<string name="edit_map_marker">Redigera kartmarkör</string> <string name="edit_map_marker">Redigera kartmarkör</string>
<string name="osm_live_subscriptions">Abonnemang</string> <string name="osm_live_subscriptions">Abonnemang</string>
@ -2845,7 +2845,7 @@
<string name="profile_alert_need_save_msg">Spara ändringar i profilen först</string> <string name="profile_alert_need_save_msg">Spara ändringar i profilen först</string>
<string name="profile_alert_delete_title">Ta bort profil</string> <string name="profile_alert_delete_title">Ta bort profil</string>
<string name="profile_alert_delete_msg">Är du säker på att du vill ta bort profilen \"%s\"</string> <string name="profile_alert_delete_msg">Är du säker på att du vill ta bort profilen \"%s\"</string>
<string name="select_base_profile_dialog_title">Välj en basprofil</string> <string name="select_base_profile_dialog_title">Välj en basprofil att starta med</string>
<string name="process_downloading_service">OsmAnd-hämtningstjänst</string> <string name="process_downloading_service">OsmAnd-hämtningstjänst</string>
<string name="shared_string_icon">Ikon</string> <string name="shared_string_icon">Ikon</string>
<string name="collected_data">Insamlade data</string> <string name="collected_data">Insamlade data</string>
@ -2886,7 +2886,7 @@
<string name="turn_screen_on_router">Vakna vid kurva</string> <string name="turn_screen_on_router">Vakna vid kurva</string>
<string name="turn_screen_on_time_descr">Justera hur länge skärmen ska vara på.</string> <string name="turn_screen_on_time_descr">Justera hur länge skärmen ska vara på.</string>
<string name="turn_screen_on_sensor">Använd närhetssensor</string> <string name="turn_screen_on_sensor">Använd närhetssensor</string>
<string name="turn_screen_on_sensor_descr">Rör handen över den övre delen av skärmen för att slå på den när du navigerar.</string> <string name="turn_screen_on_sensor_descr">Rör handen över skärmen för att slå på den.</string>
<string name="turn_on_profile_desc">Aktivera minst en approfil om du vill använda den här inställningen.</string> <string name="turn_on_profile_desc">Aktivera minst en approfil om du vill använda den här inställningen.</string>
<string name="rendering_attr_winter_road_name">Vinterväg</string> <string name="rendering_attr_winter_road_name">Vinterväg</string>
<string name="rendering_attr_ice_road_name">Isväg</string> <string name="rendering_attr_ice_road_name">Isväg</string>
@ -2920,7 +2920,7 @@
<string name="analytics_pref_title">Analytics</string> <string name="analytics_pref_title">Analytics</string>
<string name="turn_screen_on_info">Visa karta på låsskärmen vid navigering.</string> <string name="turn_screen_on_info">Visa karta på låsskärmen vid navigering.</string>
<string name="route_parameters_info">Inställningar för routing i den valda profilen \"%1$s\".</string> <string name="route_parameters_info">Inställningar för routing i den valda profilen \"%1$s\".</string>
<string name="wake_time">Vakentid</string> <string name="wake_time">Timeout efter väckning</string>
<string name="units_and_formats">Enheter &amp; format</string> <string name="units_and_formats">Enheter &amp; format</string>
<string name="map_look_descr">Kartans utseende</string> <string name="map_look_descr">Kartans utseende</string>
<string name="map_look">Kartans utseende</string> <string name="map_look">Kartans utseende</string>
@ -2928,7 +2928,7 @@
<string name="configure_navigation">Konfigurera navigation</string> <string name="configure_navigation">Konfigurera navigation</string>
<string name="general_settings_profile_descr">Tema, enheter, region</string> <string name="general_settings_profile_descr">Tema, enheter, region</string>
<string name="configure_profile">Konfigurera profil</string> <string name="configure_profile">Konfigurera profil</string>
<string name="screen_alerts_descr">Varningar visas i vänstra nedre hörnet av skärmen under navigeringen.</string> <string name="screen_alerts_descr">Varningar visas i nedre vänstra hörnet av skärmen under navigeringen.</string>
<string name="switch_profile">Byt profil</string> <string name="switch_profile">Byt profil</string>
<string name="language_and_output">Språk och utmatning</string> <string name="language_and_output">Språk och utmatning</string>
<string name="reset_to_default">Återställ till standard</string> <string name="reset_to_default">Återställ till standard</string>
@ -2941,7 +2941,7 @@
<string name="map_during_navigation_info">Karta under navigering</string> <string name="map_during_navigation_info">Karta under navigering</string>
<string name="map_during_navigation">Karta under navigering</string> <string name="map_during_navigation">Karta under navigering</string>
<string name="shared_string_other">Övrigt</string> <string name="shared_string_other">Övrigt</string>
<string name="vehicle_parameters_descr">Vikt, höjd, hastighet</string> <string name="vehicle_parameters_descr">Vikt, höjd, längd, hastighet</string>
<string name="vehicle_parameters">Fordonsparametrar</string> <string name="vehicle_parameters">Fordonsparametrar</string>
<string name="voice_announces_info">Röstmeddelanden sker bara under navigering.</string> <string name="voice_announces_info">Röstmeddelanden sker bara under navigering.</string>
<string name="voice_announces_descr">Navigeringsinstruktioner och meddelanden</string> <string name="voice_announces_descr">Navigeringsinstruktioner och meddelanden</string>
@ -2956,13 +2956,13 @@
<string name="files_copied">%1$d filer kopierades (%2$s).</string> <string name="files_copied">%1$d filer kopierades (%2$s).</string>
<string name="move_inside_category">Du kan bara flytta objekt inom den här kategorin.</string> <string name="move_inside_category">Du kan bara flytta objekt inom den här kategorin.</string>
<string name="developer_plugin">Utvecklar-plugin</string> <string name="developer_plugin">Utvecklar-plugin</string>
<string name="replace_point_descr">Ersätt en annan punkt med den här</string> <string name="replace_point_descr">Ersätt en annan punkt med den här.</string>
<string name="app_mode_ski_touring">Skid-touring</string> <string name="app_mode_ski_touring">Skid-touring</string>
<string name="app_mode_ski_snowmobile">Snöskoter</string> <string name="app_mode_ski_snowmobile">Snöskoter</string>
<string name="custom_osmand_plugin">Anpassad OsmAnd-plugin</string> <string name="custom_osmand_plugin">Anpassad OsmAnd-plugin</string>
<string name="shared_string_items">Objekt</string> <string name="shared_string_items">Objekt</string>
<string name="changes_applied_to_profile">Ändringar tillämpas på %1$s profil.</string> <string name="changes_applied_to_profile">Ändringar tillämpas på %1$s profilen.</string>
<string name="settings_item_read_error">Kunde inte läsa %1$s.</string> <string name="settings_item_read_error">Kunde inte läsa från %1$s.</string>
<string name="settings_item_write_error">Kunde inte skriva till %1$s.</string> <string name="settings_item_write_error">Kunde inte skriva till %1$s.</string>
<string name="settings_item_import_error">Kunde inte importera %1$s.</string> <string name="settings_item_import_error">Kunde inte importera %1$s.</string>
<string name="select_track_file">Välj spårfil</string> <string name="select_track_file">Välj spårfil</string>

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

@ -4062,4 +4062,22 @@
\n• Оновлено діалогове вікно «Запис поїздки» \n• Оновлено діалогове вікно «Запис поїздки»
\n \n
\n</string> \n</string>
<string name="no_purchases">У вас немає покупок</string>
<string name="new_device_account">Новий пристрій / новий обліковий запис</string>
<string name="contact_support_description">Якщо маєте будь-які питання, зв\'яжіться з нами за адресою %1$s.</string>
<string name="empty_purchases_description">Якщо ваші покупки не з\'явилися тут, натисніть «%1$s», або зв\'яжіться з нашою службою підтримки.</string>
<string name="contact_support">Звернутися до служби підтримки</string>
<string name="troubleshooting">Розв\'язання проблем</string>
<string name="troubleshooting_description">Перейдіть за цим посиланням, якщо у вас виникли проблеми з покупками.</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">Річна передплата</string>
<string name="monthly_subscription">Щомісячна передплата</string>
<string name="three_months_subscription">Тримісячна передплата</string>
<string name="next_billing_date">Наступна дата оплати: %1$s</string>
<string name="osmand_live_cancelled">Скасовано</string>
<string name="renew_subscription">Поновити передплату</string>
<string name="in_grace_period">У пільговий період</string>
<string name="on_hold">Утримується</string>
<string name="expired">Термін дії закінчився</string>
<string name="update_all_maps_added">Оновити всі мапи, додані до %1$s\?</string>
</resources> </resources>

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

@ -4056,4 +4056,22 @@
\n • 更新「旅程錄製」對話框 \n • 更新「旅程錄製」對話框
\n \n
\n</string> \n</string>
<string name="no_purchases">您沒有任何購買</string>
<string name="new_device_account">新裝置／新帳號</string>
<string name="contact_support_description">如果您有任何問題，請於 %1$s 聯絡我們。</string>
<string name="empty_purchases_description">如果您的購買未在此顯示，請點擊「%1$s」，或聯絡我們的支援團隊。</string>
<string name="contact_support">聯絡支援</string>
<string name="troubleshooting">故障排除</string>
<string name="troubleshooting_description">如果您有任何購買問題，請點擊此連結。</string>
<string name="osmand_live">OsmAnd Live</string>
<string name="annual_subscription">年度訂閱</string>
<string name="monthly_subscription">每月訂閱</string>
<string name="three_months_subscription">訂閱三個月</string>
<string name="next_billing_date">下一個結算日：%1$s</string>
<string name="osmand_live_cancelled">已取消</string>
<string name="renew_subscription">續訂</string>
<string name="in_grace_period">在寬限期內</string>
<string name="on_hold">保留</string>
<string name="expired">過期</string>
<string name="update_all_maps_added">更新所有新增至 %1$s 的地圖？</string>
</resources> </resources>

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

@ -29,7 +29,7 @@
<string name="monthly_subscription">Monthly subscription</string> <string name="monthly_subscription">Monthly subscription</string>
<string name="annual_subscription">Annual subscription</string> <string name="annual_subscription">Annual subscription</string>
<string name="osmand_live">OsmAnd Live</string> <string name="osmand_live">OsmAnd Live</string>
<string name="troubleshooting_description">Please follow this link if you any issues with purchases.</string> <string name="troubleshooting_description">Please follow this link if you have any issues with purchases.</string>
<string name="troubleshooting">Troubleshooting</string> <string name="troubleshooting">Troubleshooting</string>
<string name="contact_support">Contact support</string> <string name="contact_support">Contact support</string>
<string name="empty_purchases_description">If your purchases don\'t show up here, tap on “%1$s”, or contact our support team.</string> <string name="empty_purchases_description">If your purchases don\'t show up here, tap on “%1$s”, or contact our support team.</string>

29
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -611,7 +611,7 @@ public class GpxUiHelper {
} }
} }
dialog.dismiss(); dialog.dismiss();
updateSelectedTracksAppearance(app, fileNames); updateSelectedTracksAppearance(app, fileNames, gpxAppearanceParams);
loadGPXFileInDifferentThread(activity, callbackWithObject, dir, currentGPX, loadGPXFileInDifferentThread(activity, callbackWithObject, dir, currentGPX,
fileNames.toArray(new String[0])); fileNames.toArray(new String[0]));
} }
@ -718,13 +718,7 @@ public class GpxUiHelper {
return dlg; return dlg;
} }
private static void updateSelectedTracksAppearance(OsmandApplication app, List<String> fileNames) { private static void updateSelectedTracksAppearance(final OsmandApplication app, List<String> fileNames, final Map<String, String> params) {
final GpxDbHelper gpxDbHelper = app.getGpxDbHelper();
final boolean showStartFinish = app.getSettings().SHOW_START_FINISH_ICONS.get();
final String savedWidth = app.getSettings().getCustomRenderProperty(CURRENT_TRACK_WIDTH_ATTR).get();
String savedColor = app.getSettings().getCustomRenderProperty(CURRENT_TRACK_COLOR_ATTR).get();
final int color = GpxAppearanceAdapter.parseTrackColor(app.getRendererRegistry().getCurrentSelectedRenderer(), savedColor);
GpxDataItemCallback callback = new GpxDataItemCallback() { GpxDataItemCallback callback = new GpxDataItemCallback() {
@Override @Override
public boolean isCancelled() { public boolean isCancelled() {
@ -733,22 +727,35 @@ public class GpxUiHelper {
@Override @Override
public void onGpxDataItemReady(GpxDataItem item) { public void onGpxDataItemReady(GpxDataItem item) {
updateTrackAppearance(gpxDbHelper, item, savedWidth, color, showStartFinish); updateTrackAppearance(app, item, params);
} }
}; };
GpxDbHelper gpxDbHelper = app.getGpxDbHelper();
for (String name : fileNames) { for (String name : fileNames) {
GpxDataItem item = gpxDbHelper.getItem(new File(app.getAppPath(IndexConstants.GPX_INDEX_DIR), name), callback); GpxDataItem item = gpxDbHelper.getItem(new File(app.getAppPath(IndexConstants.GPX_INDEX_DIR), name), callback);
if (item != null) { if (item != null) {
updateTrackAppearance(gpxDbHelper, item, savedWidth, color, showStartFinish); updateTrackAppearance(app, item, params);
} }
} }
} }
private static void updateTrackAppearance(GpxDbHelper gpxDbHelper, GpxDataItem item, String width, int color, boolean showStartFinish) { private static void updateTrackAppearance(OsmandApplication app, GpxDataItem item, Map<String, String> params) {
OsmandSettings settings = app.getSettings();
GpxDbHelper gpxDbHelper = app.getGpxDbHelper();
if (params.containsKey(CURRENT_TRACK_COLOR_ATTR)) {
String savedColor = settings.getCustomRenderProperty(CURRENT_TRACK_COLOR_ATTR).get();
int color = GpxAppearanceAdapter.parseTrackColor(app.getRendererRegistry().getCurrentSelectedRenderer(), savedColor);
gpxDbHelper.updateColor(item, color); gpxDbHelper.updateColor(item, color);
}
if (params.containsKey(CURRENT_TRACK_WIDTH_ATTR)) {
String width = settings.getCustomRenderProperty(CURRENT_TRACK_WIDTH_ATTR).get();
gpxDbHelper.updateWidth(item, width); gpxDbHelper.updateWidth(item, width);
}
if (params.containsKey(SHOW_START_FINISH_ATTR)) {
boolean showStartFinish = settings.SHOW_START_FINISH_ICONS.get();
gpxDbHelper.updateShowStartFinish(item, showStartFinish); gpxDbHelper.updateShowStartFinish(item, showStartFinish);
} }
}
public static void updateGpxInfoView(final @NonNull OsmandApplication app, public static void updateGpxInfoView(final @NonNull OsmandApplication app,
final @NonNull View v, final @NonNull View v,

6
OsmAnd/src/net/osmand/plus/settings/backend/OsmAndPreferencesDataStore.java
View file

@ -43,7 +43,8 @@ public class OsmAndPreferencesDataStore extends PreferenceDataStore {
@Override @Override
public void putBoolean(String key, boolean value) { public void putBoolean(String key, boolean value) {
if (osmandSettings.DISABLE_COMPLEX_ROUTING.getId().equals(key)) { if (osmandSettings.DISABLE_COMPLEX_ROUTING.getId().equals(key)
|| osmandSettings.DISABLE_WRONG_DIRECTION_RECALC.getId().equals(key)) {
osmandSettings.setPreference(key, !value, appMode); osmandSettings.setPreference(key, !value, appMode);
} else { } else {
osmandSettings.setPreference(key, value, appMode); osmandSettings.setPreference(key, value, appMode);
@ -107,7 +108,8 @@ public class OsmAndPreferencesDataStore extends PreferenceDataStore {
OsmandPreference<?> preference = osmandSettings.getPreference(key); OsmandPreference<?> preference = osmandSettings.getPreference(key);
if (preference instanceof BooleanPreference) { if (preference instanceof BooleanPreference) {
BooleanPreference booleanPreference = (BooleanPreference) preference; BooleanPreference booleanPreference = (BooleanPreference) preference;
if (osmandSettings.DISABLE_COMPLEX_ROUTING.getId().equals(booleanPreference.getId())) { if (osmandSettings.DISABLE_COMPLEX_ROUTING.getId().equals(booleanPreference.getId())
|| osmandSettings.DISABLE_WRONG_DIRECTION_RECALC.getId().equals(booleanPreference.getId())) {
return !booleanPreference.getModeValue(appMode); return !booleanPreference.getModeValue(appMode);
} }
return booleanPreference.getModeValue(appMode); return booleanPreference.getModeValue(appMode);

4
OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
View file

@ -853,7 +853,7 @@ public class OsmandSettings {
public boolean setValue(Object prefs, DrivingRegion val) { public boolean setValue(Object prefs, DrivingRegion val) {
boolean overrideMetricSystem = !DRIVING_REGION_AUTOMATIC.getValue(prefs, DRIVING_REGION_AUTOMATIC.getDefaultValue()); boolean overrideMetricSystem = !DRIVING_REGION_AUTOMATIC.getValue(prefs, DRIVING_REGION_AUTOMATIC.getDefaultValue());
if (overrideMetricSystem && val != null) { if (overrideMetricSystem && val != null) {
METRIC_SYSTEM.set(val.defMetrics); METRIC_SYSTEM.setValue(prefs, val.defMetrics);
} }
return super.setValue(prefs, val); return super.setValue(prefs, val);
} }
@ -866,7 +866,7 @@ public class OsmandSettings {
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
// cache of metrics constants as they are used very often // cache of metrics constants as they are used very often
public final OsmandPreference<MetricsConstants> METRIC_SYSTEM = new EnumStringPreference<MetricsConstants>(this, public final EnumStringPreference<MetricsConstants> METRIC_SYSTEM = (EnumStringPreference<MetricsConstants>) new EnumStringPreference<MetricsConstants>(this,
"default_metric_system", MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.values()) { "default_metric_system", MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.values()) {
protected MetricsConstants getDefaultValue() { protected MetricsConstants getDefaultValue() {
return DRIVING_REGION.get().defMetrics; return DRIVING_REGION.get().defMetrics;

22
OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
View file

@ -31,9 +31,8 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.routing.RouteService;
import net.osmand.plus.development.OsmandDevelopmentPlugin; import net.osmand.plus.development.OsmandDevelopmentPlugin;
import net.osmand.plus.routing.RouteProvider; import net.osmand.plus.routing.RouteService;
import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.BooleanPreference; import net.osmand.plus.settings.backend.BooleanPreference;
@ -357,15 +356,14 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
} }
private void setupReverseDirectionRecalculation(PreferenceScreen screen) { private void setupReverseDirectionRecalculation(PreferenceScreen screen) {
SwitchPreferenceEx recalcRouteReverseDirectionPreference = OsmandPreference<Boolean> preference = settings.DISABLE_WRONG_DIRECTION_RECALC;
createSwitchPreferenceEx(settings.DISABLE_WRONG_DIRECTION_RECALC.getId(), SwitchPreferenceEx switchPreference = createSwitchPreferenceEx(preference.getId(),
R.string.in_case_of_reverse_direction, R.string.in_case_of_reverse_direction,
R.layout.preference_with_descr_dialog_and_switch); R.layout.preference_with_descr_dialog_and_switch);
recalcRouteReverseDirectionPreference.setIcon( switchPreference.setIcon(getRoutingPrefIcon(preference.getId()));
getRoutingPrefIcon(settings.DISABLE_WRONG_DIRECTION_RECALC.getId())); switchPreference.setSummaryOn(R.string.shared_string_enabled);
recalcRouteReverseDirectionPreference.setSummaryOn(R.string.shared_string_enabled); switchPreference.setSummaryOff(R.string.shared_string_disabled);
recalcRouteReverseDirectionPreference.setSummaryOff(R.string.shared_string_disabled); screen.addPreference(switchPreference);
screen.addPreference(recalcRouteReverseDirectionPreference);
} }
private void setupRouteRecalcHeader(PreferenceScreen screen) { private void setupRouteRecalcHeader(PreferenceScreen screen) {
@ -546,7 +544,9 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
if (settings.DISABLE_COMPLEX_ROUTING.getId().equals(preference.getKey()) && newValue instanceof Boolean) { if ((settings.DISABLE_COMPLEX_ROUTING.getId().equals(preference.getKey()) ||
settings.DISABLE_WRONG_DIRECTION_RECALC.getId().equals(preference.getKey())) &&
newValue instanceof Boolean) {
return onConfirmPreferenceChange(preference.getKey(), !(Boolean) newValue, getApplyQueryType()); // pref ui was inverted return onConfirmPreferenceChange(preference.getKey(), !(Boolean) newValue, getApplyQueryType()); // pref ui was inverted
} }
return onConfirmPreferenceChange(preference.getKey(), newValue, getApplyQueryType()); return onConfirmPreferenceChange(preference.getKey(), newValue, getApplyQueryType());
@ -573,8 +573,6 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
applyPreference(ROUTING_RECALC_DISTANCE, applyToAllProfiles, valueToSave); applyPreference(ROUTING_RECALC_DISTANCE, applyToAllProfiles, valueToSave);
applyPreference(settings.DISABLE_OFFROUTE_RECALC.getId(), applyToAllProfiles, !enabled); applyPreference(settings.DISABLE_OFFROUTE_RECALC.getId(), applyToAllProfiles, !enabled);
updateRouteRecalcDistancePref(); updateRouteRecalcDistancePref();
} else if (settings.DISABLE_WRONG_DIRECTION_RECALC.getId().equals(prefId)) {
applyPreference(settings.DISABLE_WRONG_DIRECTION_RECALC.getId(), applyToAllProfiles, newValue);
} else { } else {
super.onApplyPreferenceChange(prefId, applyToAllProfiles, newValue); super.onApplyPreferenceChange(prefId, applyToAllProfiles, newValue);
} }