Merge branch 'master' of github.com:osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2020-05-01 15:25:08 +02:00
commit dde9cf2dbd
65 changed files with 881 additions and 407 deletions

View file

@ -69,4 +69,7 @@
<string name="timeline_no_data">Žádná data</string>
<string name="unit_of_length_descr">Zvolte, v čem se měří vzdálenost.</string>
<string name="units_and_formats">Jednotky a formáty</string>
<string name="shared_string_enabled">Povolen</string>
<string name="unit_of_length">Jednotky vzdálenosti</string>
<string name="shared_string_appearance">Vzhled</string>
</resources>

View file

@ -141,7 +141,7 @@
<string name="si_mi_meters">Millas/metros</string>
<string name="shared_string_hour_short">h</string>
<string name="shared_string_minute_short">min</string>
<string name="shared_string_second_short">seg</string>
<string name="shared_string_second_short">s</string>
<string name="welcome_descr">El <b>rastreador de OsmAnd</b> (en inglés como «OsmAnd Tracker»), permite compartir tu ubicación y ver la de otros en OsmAnd.<br/>
<br/>La aplicación utiliza la API de Telegram, por lo que necesita una cuenta de Telegram.</string>
<string name="my_location">Mi ubicación</string>

View file

@ -244,4 +244,8 @@
<string name="monitoring_is_disabled">La surveillance est désactivée</string>
<string name="osmand_connect_desc">Choisissez la version d\'OsmAnd qu\'OsmAnd Tracker utilise pour afficher les positions.</string>
<string name="disconnect_from_telegram_desc">Pour révoquer l\'accès au partage de localisation. Ouvrez Telegram, allez dans Paramètres → Vie privée et sécurité → Sessions, et terminez la session OsmAnd Tracker.</string>
<string name="no_location_permission">L\'application n\'a pas l\'autorisation d\'accéder aux données de localisation.</string>
<string name="start_location_sharing">Partager la position</string>
<string name="show_on_map">Afficher sur la carte</string>
<string name="already_registered_in_telegram">Vous avez besoin d\'un compte Telegram enregistré et d\'un numéro de téléphone</string>
</resources>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3.2929,1.2929C3.6834,0.9024 4.3166,0.9024 4.7071,1.2929L22.7071,19.2929C23.0976,19.6834 23.0976,20.3166 22.7071,20.7071C22.3166,21.0976 21.6834,21.0976 21.2929,20.7071L3.2929,2.7071C2.9024,2.3166 2.9024,1.6834 3.2929,1.2929Z"
android:fillColor="#1E1F20"
android:fillType="evenOdd"/>
<path
android:pathData="M2.2929,2.2929C2.6834,1.9024 3.3166,1.9024 3.7071,2.2929L21.7071,20.2929C22.0976,20.6834 22.0976,21.3166 21.7071,21.7071C21.3166,22.0976 20.6834,22.0976 20.2929,21.7071L2.2929,3.7071C1.9024,3.3166 1.9024,2.6834 2.2929,2.2929Z"
android:fillColor="#727272"
android:fillType="evenOdd"/>
</vector>

View file

@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3.2929,1.2929C3.6834,0.9024 4.3166,0.9024 4.7071,1.2929L22.7071,19.2929C23.0976,19.6834 23.0976,20.3166 22.7071,20.7071C22.3166,21.0976 21.6834,21.0976 21.2929,20.7071L3.2929,2.7071C2.9024,2.3166 2.9024,1.6834 3.2929,1.2929Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M2.2929,2.2929C2.6834,1.9024 3.3166,1.9024 3.7071,2.2929L21.7071,20.2929C22.0976,20.6834 22.0976,21.3166 21.7071,21.7071C21.3166,22.0976 20.6834,22.0976 20.2929,21.7071L2.2929,3.7071C1.9024,3.3166 1.9024,2.6834 2.2929,2.2929Z"
android:fillColor="#727272"
android:fillType="evenOdd"/>
</vector>

View file

@ -41,6 +41,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textColor="?android:textColorPrimary"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"

View file

@ -874,11 +874,11 @@
<string name="index_name_gb">أوروبا - بريطانيا العظمى</string>
<string name="route_preferences">تفضيلات الطريق</string>
<string name="route_info">معلومات الطريق</string>
<string name="routing_attr_avoid_toll_name">لا توجد طرق رسوم</string>
<string name="routing_attr_avoid_toll_name">طرق برسوم</string>
<string name="routing_attr_avoid_toll_description">تجنب الطرق برسوم</string>
<string name="routing_attr_avoid_unpaved_name">تجنب الطرق غير المعبّدة</string>
<string name="routing_attr_avoid_unpaved_description">اجتناب الطرق الترابية والوعرة</string>
<string name="routing_attr_avoid_ferries_name">لا العبارات</string>
<string name="routing_attr_avoid_ferries_name">تجنب العبارات</string>
<string name="routing_attr_weight_name">وزن المركبة</string>
<string name="android_19_location_disabled">منذ نسخة أندرويد كتكات 4.4، لا يمكنك تحميل أو تحديث الخرائط في مكان التخزين السابق (%s). هل تريد التغيير إلى مكان مسموح ونسخ كل الملفات إليه ؟ ملاحظات: 1-الملفات القديمة ستبقى كما هي (يمكن حذفها يدويا).
\n
@ -1241,7 +1241,7 @@
<string name="routing_attr_prefer_motorway_name">تفضيل طرق الدراجات النارية</string>
<string name="routing_attr_prefer_motorway_description">تفضيل طرق الدراجات النارية</string>
<string name="routing_attr_avoid_ferries_description">تجنب العبّارات</string>
<string name="routing_attr_avoid_motorway_name">لا طرق السريعة</string>
<string name="routing_attr_avoid_motorway_name">الطرق السريعة</string>
<string name="routing_attr_avoid_motorway_description">تجنب طرق الدراجات النارية</string>
<string name="routing_attr_weight_description">تحديد الوزن الأعلى المسموح به على الطرق.</string>
<string name="copying_osmand_files_descr">نسخ ملفات أوسماند إلى المسار الجديد (%s)…</string>
@ -1616,7 +1616,7 @@
<string name="search_near_map">البحث قرب مركز الخريطة الحالية</string>
<string name="active_markers">نشطة</string>
<string name="map_markers">علامات الخريطة</string>
<string name="routing_attr_avoid_borders_name">منع تخطي الحدود</string>
<string name="routing_attr_avoid_borders_name">تخطي الحدود</string>
<string name="impassable_road_desc">حدد الطرق التي تريد تجنبها أثناء التنقل.</string>
<string name="search_categories">الفئات</string>
<string name="shared_string_near">بالقرب من</string>
@ -1855,7 +1855,7 @@
<string name="nm">ميل بحري</string>
<string name="nm_h">ميل بحري/س</string>
<string name="simulate_your_location_descr">إجراء محاكاة تخيلية باستخدام توجيه نشط أو مسار مسجل.</string>
<string name="routing_attr_avoid_shuttle_train_name">لا خدمة نقل القطار</string>
<string name="routing_attr_avoid_shuttle_train_name">خدمة النقل بالقطار</string>
<string name="routing_attr_avoid_shuttle_train_description">يتجنب استخدام القطارات المكوكية</string>
<string name="traffic_warning_hazard">خطر</string>
<string name="rendering_value_boldOutline_name">مخطط واضح</string>
@ -3633,4 +3633,11 @@
<string name="lang_lmo">لومبارد</string>
<string name="custom_color">لون مخصص</string>
<string name="extra_maps_menu_group">خرائط إضافية</string>
<string name="download_unsupported_action">%1$s إجراء غير معتمد</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">سيتم احتساب الدفع لحساب Google Play الخاص بك في تأكيد الشراء.
\n
\nيتم تجديد الاشتراك تلقائيًا ما لم يتم إلغاؤه قبل تاريخ التجديد. سيتم تحميل حسابك لفترة التجديد (شهر / ثلاثة أشهر / سنة) فقط في تاريخ التجديد.
\n
\nيمكنك إدارة وإلغاء الاشتراكات الخاصة بك عن طريق الذهاب إلى إعدادات Google Play الخاصة بك.</string>
</resources>

View file

@ -80,4 +80,47 @@
<string name="poi_city_capital">রাজধানী</string>
<string name="poi_service_general">পরিসেবা</string>
<string name="poi_cash_withdrawal_bank_card">নগদ উত্তোলন</string>
<string name="poi_embassy_type">ধরণ</string>
<string name="poi_animal_training_type">ধরণ</string>
<string name="poi_telescope_type">ধরণ</string>
<string name="poi_vending_type">ভেন্ডিং টাইপ</string>
<string name="poi_fuel_avia_type">জ্বালানির ধরণ (এভিয়া)</string>
<string name="poi_washing_machine">ওয়াশিং মেশিন</string>
<string name="poi_tents">তাঁবু</string>
<string name="poi_massage_type">ম্যাসাজ টাইপ</string>
<string name="poi_health_specialty">স্বাস্থ্য বিশেষত্ব</string>
<string name="poi_diet">ডায়েট</string>
<string name="poi_nudism">নগ্নতাবাদ</string>
<string name="poi_beach_surface_type">পৃষ্ঠতল</string>
<string name="poi_water_characteristic">জলের বৈশিষ্ট্য</string>
<string name="poi_seasonal">মৌসুমী</string>
<string name="poi_fireplace">অগ্নিকুণ্ড</string>
<string name="poi_shelter_type">ধরণ</string>
<string name="poi_recycling_accepted_waste">গৃহীত বর্জ্য</string>
<string name="poi_recycling_type">ধরণ</string>
<string name="poi_beauty_salon_service">সেবা</string>
<string name="poi_microbrewery">মাইক্রোব্রিয়ারি</string>
<string name="poi_cocktails">ককটেল</string>
<string name="poi_takeaway">টেক আওয়ায়</string>
<string name="poi_drive_through">ড্রাইভ থ্রু</string>
<string name="poi_drive_in">ড্রাইভ ইন</string>
<string name="poi_delivery">ডেলিভারি</string>
<string name="poi_smoking">ধূমপান</string>
<string name="poi_fee">ফি</string>
<string name="poi_outdoor_seating">বাইরে বসার ব্যবস্থা</string>
<string name="poi_theatre_genre">জেনরে</string>
<string name="poi_piste_grooming">স্কি স্থান এর গ্রুমিং</string>
<string name="poi_piste_difficulty">স্কি স্থান এর কাঠিন্য</string>
<string name="poi_resort_type">ধরণ</string>
<string name="poi_backcountry">গ্রাম্য এলাকা</string>
<string name="poi_scout_camp">স্কাউট ক্যাম্প</string>
<string name="poi_clock_option">অতিরিক্ত</string>
<string name="poi_information_contents">বিষয়বস্তু</string>
<string name="poi_information_type">ধরণ</string>
<string name="poi_denomination">আখ্যা</string>
<string name="poi_religion_type">ধর্ম</string>
<string name="poi_star_rating">ষ্টার রেটিং</string>
<string name="poi_archaeological_site_type">ধরণ</string>
<string name="poi_free_flying_characteristics">বিশিষ্ট</string>
<string name="poi_healthcare_alternative_types">বিশিষ্টতা</string>
</resources>

View file

@ -1548,7 +1548,7 @@ Délka %2$s</string>
<string name="rendering_value_red_name">Červená</string>
<string name="rendering_value_default13_name">Výchozí (13)</string>
<string name="rendering_attr_currentTrackColor_name">GPX barva</string>
<string name="rendering_attr_currentTrackWidth_name">GPX šířka</string>
<string name="rendering_attr_currentTrackWidth_name">Šířka GPX</string>
<string name="rendering_value_yellow_name">Žlutá</string>
<string name="rendering_value_green_name">Zelená</string>
<string name="rendering_value_lightgreen_name">Světlezelená</string>
@ -3379,4 +3379,50 @@ Zobrazená oblast: %1$s x %2$s</string>
<string name="wikipedia_poi_languages_promo">Některé články Wikipedie nemusí být dostupné ve vašem jazyce. Zvolte jazyky, v nichž se články Wikipedie objeví na mapě.
\nBěhem čtení článku budete moci přepínat mezi všemi dostupnými jazyky.</string>
<string name="wiki_menu_download_descr">Pro zobrazení bodů zájmu Wikipedie jsou potřeba další mapy.</string>
<string name="main_actions_descr">Hlavní akce mohou obsahovat pouze 4 tlačítka.</string>
<string name="main_actions">Hlavní akce</string>
<string name="additional_actions_descr">Tyto akce jsou dostupné po stisknutí tlačítka “Akce”.</string>
<string name="move_inside_category">Položky můžete přesouvat pouze v rámci této kategorie.</string>
<string name="developer_plugin">Modul pro vývojáře</string>
<string name="shared_string_items">Položky</string>
<string name="select_wikipedia_article_langs">Zvolte jazyky, v nichž se články Wikipedie zobrazí na mapě. Při čtení článku můžete přepínat mezi všemi dostupnými jazyky.</string>
<string name="some_articles_may_not_available_in_lang">Některé články Wikipedie nemusí být dostupné ve vašem jazyce.</string>
<string name="lang_zhyue">Kantonština</string>
<string name="lang_zhminnan">Jižní min</string>
<string name="lang_yo">Jorubština</string>
<string name="lang_war">Warajština</string>
<string name="lang_uz">Uzbečtina</string>
<string name="lang_ur">Urdština</string>
<string name="lang_tt">Tatarština</string>
<string name="lang_tg">Tádžičtina</string>
<string name="lang_sco">Skotština</string>
<string name="lang_scn">Sicilština</string>
<string name="lang_pnb">Pandžábština</string>
<string name="lang_ne">Nepálština</string>
<string name="lang_nap">Neapolština</string>
<string name="lang_my">Barmština</string>
<string name="lang_mn">Mongolština</string>
<string name="lang_min">Minangkabauština</string>
<string name="lang_mg">Malgaština</string>
<string name="lang_ky">Kyrgyzština</string>
<string name="lang_kk">Kazaština</string>
<string name="lang_jv">Jávština</string>
<string name="lang_gu">Gudžarátština</string>
<string name="lang_cv">Čuvaština</string>
<string name="lang_ce">Čečenština</string>
<string name="lang_bar">Bavorština</string>
<string name="lang_ba">Baškirština</string>
<string name="lang_an">Aragonština</string>
<string name="lang_lmo">Lombardština</string>
<string name="custom_color">Vlastní barva</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Platba bude stržena z vašeho účtu Google Play po potvrzení nákupu.
\n
\nPředplatné se automaticky prodlužuje, pokud ho před termínem obnovení nezrušíte. Platba za předplatné (měsíc/tři měsíce/rok) bude stržena vždy jen v den obnovení.
\n
\nSvé předplatné můžete spravovat nebo zrušit v nastavení Google Play.</string>
<string name="search_poi_types">Hledat typy bodů zájmu</string>
<string name="search_poi_types_descr">Zkombinujte body zájmu různých kategorií. Klepnutím na přepínač vyberete všechny, klepnutím na levou stranu vyberete kategorie.</string>
<string name="extra_maps_menu_group">Další mapy</string>
<string name="download_unsupported_action">Nepodporovaná akce %1$s</string>
</resources>

View file

@ -3646,4 +3646,8 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="custom_color">Brugerdefineret farve</string>
<string name="some_articles_may_not_available_in_lang">Nogle Wikipedia-artikler er muligvis ikke tilgængelige på dit sprog.</string>
<string name="extra_maps_menu_group">Ekstra kort</string>
<string name="download_unsupported_action">Ikke understøttet handling %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types">Søg efter IP-typer</string>
<string name="search_poi_types_descr">Kombiner IP-typer fra forskellige kategorier. Tryk på knappen for at vælge alt, tryk på venstre side for valg af kategori.</string>
</resources>

View file

@ -1793,7 +1793,7 @@ Lon %2$s</string>
<string name="activate_srtm_plugin">Bitte die Erweiterung \'Höhenlinien\' aktivieren</string>
<string name="get_full_version">Vollversion</string>
<string name="confirm_download_roadmaps">Die reine Straßenkarte wird nicht benötigt, da Sie die Standardkarte haben. Trotzdem herunterladen?</string>
<string name="value_downloaded_of_max">%1$,1f von %2$,1fMB</string>
<string name="value_downloaded_of_max">%1$.1f von %2$.1fMB</string>
<string name="update_all">Alles aktualisieren (%1$s MB)</string>
<string name="free_downloads_used">Verbrauchte freie Downloads</string>
<string name="enter_country_name">Ländernamen eingeben</string>
@ -1806,7 +1806,7 @@ Lon %2$s</string>
<string name="access_from_map">Aufruf von der Karte aus</string>
<string name="favorite_category_add_new">Neue Katagorie erstellen</string>
<string name="next_proceed">Weiter</string>
<string name="file_size_in_mb">%,1fMB</string>
<string name="file_size_in_mb">%.1fMB</string>
<string name="please_specify_poi_type_only_from_list">Bitte einen gültigen POI-Typ angeben oder überspringen.</string>
<string name="share_osm_edits_subject">OSM-Bearbeitung mit OsmAnd geteilt</string>
<string name="av_locations_descr">GPX-Datei mit Standorten.</string>
@ -3665,7 +3665,17 @@ Lon %2$s</string>
<string name="lang_ce">Tschetschenisch</string>
<string name="lang_bar">Bairisch</string>
<string name="lang_ba">Baschkirisch</string>
<string name="main_actions_descr">Die Hauptaktionen enthalten nur 4 Schaltflächen.</string>
<string name="main_actions_descr">Hauptaktionen enthalten nur 4 Schaltflächen.</string>
<string name="additional_actions_descr">Sie können auf diese Aktionen zugreifen, indem Sie auf die Schaltfläche „Aktionen“ tippen.</string>
<string name="select_wikipedia_article_langs">Wählen Sie die Sprachen aus, in denen Wikipedia-Artikel auf der Karte erscheinen sollen. Sie können zwischen allen verfügbaren Sprachen wechseln, während Sie den Artikel lesen.</string>
<string name="hidden_items_descr">Diese Elemente werden aus dem Menü ausgeblendet, aber die dargestellten Optionen oder Plugins funktionieren weiterhin.</string>
<string name="reorder_or_hide_from">Ordnen Sie Elemente aus %1$s neu an oder blenden Sie sie aus.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Die Bezahlung wird nach der Bestätigung des Kaufs von ihrem Google Play Account abgebucht.
\n
\nDas Abonnement verlängert sich automatisch, sofern es nicht vor dem Verlängerungsdatum gekündigt wird. Erst nach dem Verlängerungsdatum wird die Bezahlung für die Verlängerungsperiode (1 Monat/ 3 Monate/ 1 Jahr) von ihrem Account abgebucht.
\n
\nSie können ihre Abonnements in ihrem Google Play Einstellungen verwalten oder kündigen.</string>
<string name="search_poi_types">Poi-Typen suchen</string>
<string name="search_poi_types_descr">Kombinieren Sie POI-Typen aus verschiedenen Kategorien. Tippen Sie auf den Schalter, um alle auszuwählen, tippen Sie auf die linke Seite, um die Kategorie auszuwählen.</string>
</resources>

View file

@ -892,7 +892,7 @@
<string name="poi_dock">Doko</string>
<string name="poi_cutline">Senarba strio</string>
<string name="poi_shower">Duŝejo</string>
<string name="poi_brothel">Putinejo</string>
<string name="poi_brothel">Bordelo</string>
<string name="poi_smoking_area">Fumejo</string>
<string name="poi_mortuary">Kadavrejo</string>
<string name="poi_crematorium">Kadavr-bruligejo</string>
@ -1993,7 +1993,7 @@
<string name="poi_summit_cross">Kruco sur la montopinto: jes</string>
<string name="poi_temperature">Temperaturo</string>
<string name="poi_fitness_station">Ekzerc-parko</string>
<string name="poi_hackerspace">Kodumulejo</string>
<string name="poi_hackerspace">Kodumulspaco</string>
<string name="poi_wiki_lang_af">Vikipedio Afrikansa</string>
<string name="poi_wiki_lang_eu">Vikipedio Eŭska</string>
<string name="poi_fireworks">Artfajraĵ-vendejo</string>

View file

@ -791,7 +791,7 @@ Lon: %2$s</string>
<string name="index_item_world_ski">Tutmondaj skivojoj</string>
<string name="calculate_osmand_route_without_internet">Loke kalkuli segmenton de kurso</string>
<string name="use_displayed_track_for_navigation">Ĉu uzi la montratan kurson por navigado?</string>
<string name="gpx_option_calculate_first_last_segment">Kalkuli OsmAnd-an kurson por unua kaj fina segmentoj de kurso</string>
<string name="gpx_option_calculate_first_last_segment">Kalkuli kurson inter la unua kaj la fina segmentoj de spuro</string>
<string name="keep_and_add_destination_point">Aldoni kiel sekvan celon</string>
<string name="select_gpx">Elekti GPX-on…</string>
<string name="route_descr_select_destination">Elekti celon</string>
@ -1070,8 +1070,8 @@ Lon: %2$s</string>
<string name="snap_to_road">Proksimumigi al vojo</string>
<string name="interrupt_music">Paŭzigi muzikon</string>
<string name="interrupt_music_descr">Voĉaj anoncoj paǔzigas ludadon de muziko.</string>
<string name="osmand_short_description_80_chars">Tuttera map-foliumilo kaj navigilo uzanta vektorajn aŭ enretajn mapojn OSM</string>
<string name="osmand_plus_short_description_80_chars">Tuttera mapfoliumilo kaj navigilo uzanta OSMmapojn (vektorajn aŭ enretajn)</string>
<string name="osmand_short_description_80_chars">Tuttera mapfoliumilo kaj navigilo uzanta OSMmapojn (vektorajn aŭ enretajn)</string>
<string name="osmand_plus_short_description_80_chars">Tuttera mapfoliumilo kaj navigilo uzanta OSMmapojn (vektorajn aŭ enretajn)</string>
<string name="osmand_long_description_1000_chars">OsmAnd (OSM Aŭtomata Navigado Direkte al la celo)
\n
\nOsmAnd estas malfermkoda navigada aplikaĵo kun aliro al diversaj mondaj datumoj de OSM. Ĉiuj mapoj (vektoraj kaj kahelaj) povas esti konservitaj en la poŝtelefona konservejo por malkonekta uzado. La aplikaĵo ankaŭ ebligas uzi lokan aŭ enretan navigadon kun voĉaj anoncoj turnopostturno.
@ -3656,4 +3656,12 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="custom_color">Propra koloro</string>
<string name="extra_maps_menu_group">Kromaj mapoj</string>
<string name="download_unsupported_action">Nesubtenata ago %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Pago estos prenita per via konto Google Play post konfirmi aĉeton.
\n
\nLa abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La abonpago estos prenita por la specifa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
\n
\nVi povas administri kaj rezigni la abonon en agordoj de Google Play.</string>
<string name="search_poi_types_descr">Miksi specojn de interesejoj el diversaj kategorioj. Frapetu “ŝaltilon” por elekti ĉiujn, frapetu ĉe maldekstre por elekti el la kategorio.</string>
<string name="search_poi_types">Serĉi specojn de interesejoj</string>
</resources>

View file

@ -3674,4 +3674,10 @@ Lon %2$s</string>
<string name="custom_color">Color personalizado</string>
<string name="extra_maps_menu_group">Mapas adicionales</string>
<string name="download_unsupported_action">Acción «%1$s» no admitida</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">El pago será cargado a la cuenta de Google Play al confirmar la compra.
\n
\nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. La cuenta será cargada por el período de renovación (mes/trimestre/año) sólo en la fecha de renovación.
\n
\nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de Google Play.</string>
</resources>

View file

@ -3629,4 +3629,7 @@ Area honi dagokio: %1$s x %2$s</string>
<string name="shared_string_language">Hizkuntza</string>
<string name="shared_string_all_languages">Hizkuntza guztiak</string>
<string name="wiki_menu_download_descr">Mapa osagarriak behar dira Wikipediaren POIak mapan ikusteko.</string>
<string name="custom_color">Kolore pertsonalizatua</string>
<string name="extra_maps_menu_group">Mapa gehigarriak</string>
<string name="download_unsupported_action">onartu gabeko ekintza %1$s</string>
</resources>

View file

@ -2879,7 +2879,7 @@
<string name="osm_live_payment_annual_title">سالانه</string>
<string name="osm_live_payment_month_cost_descr">%1$s در ماه</string>
<string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s در ماه</string>
<string name="osm_live_payment_discount_descr">%1$s ارزان‌تر.</string>
<string name="osm_live_payment_discount_descr">%1$s ارزان‌تر</string>
<string name="osm_live_payment_current_subscription">اشتراک کنونی</string>
<string name="osm_live_payment_renews_monthly">هر ماه تمدید می‌شود</string>
<string name="osm_live_payment_renews_quarterly">هر سه ماه تمدید می‌شود</string>
@ -3676,4 +3676,5 @@
<string name="lang_ur">اردو</string>
<string name="lang_tg">تاجیکی</string>
<string name="extra_maps_menu_group">نقشه‌های بیشتر</string>
<string name="download_unsupported_action">کنش پشتیبانی‌نشده %1$s</string>
</resources>

View file

@ -3399,7 +3399,7 @@
<string name="poi_water_place_durability_emergency">Durabilité des plans d\'eau : urgence</string>
<string name="poi_water_purification_chlorine">Chlore</string>
<string name="poi_water_supply_water_well">Puits deau</string>
<string name="poi_water_supply_pipeline">Pipeline</string>
<string name="poi_water_supply_pipeline">Oléoduc</string>
<string name="poi_water_supply_borehole">Trou de forage</string>
<string name="poi_socket_cee_blue">Prise de courant : Bleu CEE</string>
<string name="poi_socket_cee_blue_current">Prise de courant : Bleu CEE : courant</string>

View file

@ -99,7 +99,7 @@
<string name="select_search_position">Autour de :</string>
<string name="context_menu_item_search">Rechercher à proximité</string>
<string name="shared_string_save_as_gpx">Enregistrer comme nouveau fichier GPX</string>
<string name="route_successfully_saved_at">Itinéraire enregistré sous \'%1$s\'.</string>
<string name="route_successfully_saved_at">Itinéraire enregistré sous « %1$s».</string>
<string name="filename_input">Nom du fichier : </string>
<string name="file_with_name_already_exist">Le même nom existe déjà.</string>
<string name="shared_string_save">Enregistrer</string>
@ -109,7 +109,7 @@
<string name="show_more_map_detail">Afficher plus de détails</string>
<string name="show_more_map_detail_descr">Afficher certains détails des cartes vectorielles (routes, etc.) y compris aux niveaux de zooms inférieurs.</string>
<string name="favourites_delete_multiple_succesful">Favori(s) supprimé(s).</string>
<string name="favorite_delete_multiple">Êtes-vous certain de vouloir supprimer %1$d favoris et %2$d groupes de favoris \?</string>
<string name="favorite_delete_multiple">Êtes-vous certain(e) de vouloir supprimer %1$d favoris et %2$d groupes de favoris \?</string>
<string name="favorite_home_category">Domicile</string>
<string name="favorite_friends_category">Amis</string>
<string name="favorite_places_category">Lieux</string>
@ -583,8 +583,8 @@
<string name="filter_current_poiButton">Filtre</string>
<string name="edit_filter_save_as_menu_item">Enregistrer sous</string>
<string name="edit_filter_delete_dialog_title">Supprimer ce filtre \?</string>
<string name="edit_filter_delete_message">Le filtre \'%1$s\' a été supprimé</string>
<string name="edit_filter_create_message">Le filtre \'%1$s\' a été créé</string>
<string name="edit_filter_delete_message">Le filtre « %1$s» a été supprimé</string>
<string name="edit_filter_create_message">Le filtre « %1$s» a été créé</string>
<string name="offline_navigation_not_available">Navigation hors-ligne temporairement indisponible.</string>
<string name="left_side_navigation">Conduite à gauche</string>
<string name="left_side_navigation_descr">Pour les pays où la circulation s\'effectue sur la partie gauche de la route.</string>
@ -728,7 +728,7 @@
<string name="starting_point_too_far">Point de départ trop éloigné de la route la plus proche.</string>
<string name="shared_location">Lieu partagé</string>
<string name="select_animate_speedup">Vitesse de simulation de l\'itinéraire :</string>
<string name="global_app_allocated_memory_descr">Mémoire allouée %1$s Mo (limite Android %2$s MB, Dalvik %3$s Mo).</string>
<string name="global_app_allocated_memory_descr">Mémoire allouée %1$s Mo (limite Android %2$s Mo, Dalvik %3$s Mo).</string>
<string name="global_app_allocated_memory">Mémoire allouée</string>
<string name="native_app_allocated_memory_descr">Mémoire totale utilisée par l\'application %1$s Mo (Dalvik %2$s Mo, divers %3$s Mo).
\nMémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</string>
@ -1079,7 +1079,7 @@
<string name="animate_routing_route_not_calculated">Veuillez d\'abord calculer l\'itinéraire</string>
<string name="animate_routing_route">Simulation de l\'itinéraire calculé </string>
<string name="animate_routing_gpx">Simulation suivant une trace GPX</string>
<string name="local_osm_changes_delete_all_confirm">Êtes-vous certain de vouloir supprimer %1$d modifications OSM \?</string>
<string name="local_osm_changes_delete_all_confirm">Êtes-vous certain(e) de vouloir supprimer %1$d modifications OSM\?</string>
<string name="shared_string_delete_all">Tout supprimer</string>
<string name="app_mode_hiking">Randonnée</string>
<string name="app_mode_motorcycle">Moto</string>
@ -1333,7 +1333,7 @@
<string name="fav_point_dublicate_message">Favori renommé en %1$s pour éviter un doublon.</string>
<string name="text_size_descr">Sélectionnez la taille du texte sur la carte.</string>
<string name="print_route">Exporter l\'itinéraire</string>
<string name="fav_point_emoticons_message">Favori renommé en \'%1$s\' (les émoticônes ne sont pas autorisés).</string>
<string name="fav_point_emoticons_message">Favori renommé en « %1$s» (les émoticônes ne sont pas autorisés).</string>
<string name="speed_limit_exceed">Marge de tolérance aux limites de vitesse</string>
<string name="speed_limit_exceed_message">Indiquez la marge de tolérance à ajouter à la limitation de vitesse et au-dessus de laquelle vous recevrez une alerte vocale.</string>
<string name="anonymous_user_hint">Un utilisateur anonyme ne peut pas:
@ -1502,7 +1502,7 @@
<string name="delay_to_start_navigation_descr">Indiquez le délai d\'affichage de l\'itinéraire détaillé, avant de démarrer la navigation.</string>
<string name="shared_string_go">Aller</string>
<string name="confirmation_to_clear_history">Effacer l\'historique ?</string>
<string name="local_osm_changes_upload_all_confirm">Êtes-vous certain·e de vouloir téléverser %1$d modification(s) à OSM \?</string>
<string name="local_osm_changes_upload_all_confirm">Êtes-vous certain(e) de vouloir téléverser %1$d modification(s) à OSM \?</string>
<string name="delay_to_start_navigation">Lancer la navigation pas à pas après …</string>
<string name="osm_changes_added_to_local_edits">Modifications OSM mémorisées localement</string>
<string name="mark_to_delete">Marquer pour suppression</string>
@ -1556,7 +1556,7 @@
<string name="local_indexes_cat_wiki">Wikipédia</string>
<string name="download_wikipedia_maps">Wikipédia</string>
<string name="shared_string_import2osmand">Importer dans OsmAnd</string>
<string name="local_recordings_delete_all_confirm">Êtes-vous certain de vouloir supprimer %1$d notes \?</string>
<string name="local_recordings_delete_all_confirm">Êtes-vous certain(e) de vouloir supprimer %1$d notes \?</string>
<string name="gps_network_not_enabled">Le service de localisation est arrêté. Souhaitez-vous lactiver ?</string>
<string name="disable_recording_once_app_killed_descrp">Met en pause l\'enregistrement de la trace GPX lors de l\'arrêt d\'OsmAnd (via les applications récentes) et supprime l\'icône OsmAnd de la barre de notification Android.</string>
<string name="disable_recording_once_app_killed">Interdire la journalisation autonome</string>
@ -1706,8 +1706,8 @@
<string name="favorite_category_add_new_title">Ajouter une catégorie</string>
<string name="favorite_category_dublicate_message">Cette catégorie existe déjà. Merci d\'utiliser un autre nom.</string>
<string name="confirm_download_roadmaps">Êtes-vous certain de vouloir télécharger la carte des routes alors que vous disposez déjà d\'une carte complète ?</string>
<string name="value_downloaded_of_max">%1$,1f de %2$,1fMo</string>
<string name="file_size_in_mb">%,1fMo</string>
<string name="value_downloaded_of_max">%1$.1f de %2$.1fMo</string>
<string name="file_size_in_mb">%.1fMo</string>
<string name="update_all">Tout mettre à jour (%1$sMo)</string>
<string name="free_downloads_used">Téléchargements gratuits effectués</string>
<string name="free_downloads_used_description">Affiche le nombre de téléchargements gratuits restants.</string>
@ -2007,7 +2007,7 @@
<string name="no_update_info_desc">Ne pas vérifier les mises à jour ni les offres promotionnelles OsmAnd.</string>
<string name="no_update_info">Ne pas afficher les nouvelles versions</string>
<string name="skip_map_downloading">Ignorer le téléchargement des cartes</string>
<string name="skip_map_downloading_desc">Aucune carte hors-ligne n\'est installée. Vous pouvez sélectionner une carte dans la liste ou télécharger une carte plus tard depuis le menu \'%1$s\'.</string>
<string name="skip_map_downloading_desc">Aucune carte hors ligne n\'est installée. Vous pouvez sélectionner une carte dans la liste ou télécharger une carte plus tard depuis le menu « %1$s».</string>
<string name="search_another_country">Sélectionner une autre région</string>
<string name="search_map">Recherche des cartes …</string>
<string name="first_usage_wizard_desc">Autoriser OsmAnd à vous localiser et à vous suggérer le téléchargement des cartes de la région.</string>
@ -2131,7 +2131,7 @@
<string name="quick_action_favorites_hide">Masquer les favoris</string>
<string name="quick_action_showhide_poi_title">Afficher / Masquer les points d\'intérêt</string>
<string name="quick_action_poi_show">Afficher %1$s</string>
<string name="quick_action_poi_hide">"Masquer %1$s"</string>
<string name="quick_action_poi_hide">Masquer %1$s</string>
<string name="quick_action_add_category">Ajouter une catégorie</string>
<string name="quick_action_add_configure_map">Paramétrer la carte</string>
<string name="quick_action_add_navigation">Navigation</string>
@ -2208,7 +2208,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="shared_string_time_span">Amplitude horaire</string>
<string name="shared_string_gpx_track">Trace</string>
<string name="points_delete_multiple_succesful">Point(s) supprimé(s) avec succès.</string>
<string name="points_delete_multiple">Êtes-vous certain de vouloir supprimer %1$d point(s) \?</string>
<string name="points_delete_multiple">Êtes-vous certain(e) de vouloir supprimer %1$d point(s) \?</string>
<string name="add_new_folder">Créer un dossier</string>
<string name="route_points_category_name">Itinéraire pour emprunter cette route</string>
<string name="track_points_category_name">Points de passage, points dintérêt, points remarquables</string>
@ -2740,7 +2740,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="get_unlimited_access">Obtenir un accès illimité</string>
<string name="welcome_to_open_beta">Bienvenue dans cette bêta ouverte !</string>
<string name="contour_lines_hillshade_maps">Cartes avec courbes de niveaux et ombrage du relief</string>
<string name="download_wikipedia_description">Téléchargez les articles Wikipedia pour %1$s afin de pouvoir les lire hors-ligne.</string>
<string name="download_wikipedia_description">Téléchargez les articles Wikipédia pour %1$s afin de pouvoir les lire hors ligne.</string>
<string name="download_wikipedia_label">Télécharger les données Wikipedia</string>
<string name="open_in_browser_wiki">Ouvrir l\'article en ligne</string>
<string name="open_in_browser_wiki_description">Afficher l\'article dans un navigateur.</string>
@ -2844,7 +2844,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mois</string>
<string name="osm_live_payment_discount_descr">Économisez %1$s</string>
<string name="osm_live_payment_current_subscription">Abonnement en cours</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">Fréquence de règlement :</string>
<string name="osm_live_payment_contribute_descr">Les dons financent la cartographie OSM / OpenStreetMap.</string>
<string name="osm_live_plan_pricing">Abonnements &amp; tarifs</string>
@ -3412,7 +3412,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="import_profile">Importer un profil</string>
<string name="monitoring_prefs_descr">Navigation, fiabilité d\'enregistrement</string>
<string name="multimedia_notes_prefs_descr">Taille de l\'image, qualité audio et vidéo</string>
<string name="osm_editing_prefs_descr">Login, mot de passe, édition hors-ligne</string>
<string name="osm_editing_prefs_descr">Connexion, mot de passe, édition hors-ligne</string>
<string name="accessibility_prefs_descr">Choisissez l\'icône, la couleur et le nom</string>
<string name="live_monitoring_descr">Permet le partage de votre position grâce à l\'enregistrement du trajet.</string>
<string name="live_monitoring">Suivi en ligne</string>
@ -3649,4 +3649,12 @@ représentant la zone : %1$s x %2$s</string>
<string name="download_unsupported_action">Action %1$s non prise en charge</string>
<string name="lang_ky">Kirghize</string>
<string name="lang_gu">Gujarati</string>
<string name="osm_live_payment_subscription_management">Le paiement sera débité de votre compte Google Play dès confirmation de l\'achat.
\n
\nL\'abonnement sera reconduit automatiquement à moins qu\'il ne soit annulé avant sa date de renouvellement. Votre compte ne sera débité pour une nouvelle durée (mensuelle / trimestrielle / annuelle) qu\'à la date de renouvellement.
\n
\nVous pouvez gérer et annuler vos abonnements depuis vos paramètres Google Play.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types_descr">Combiner des types de PI de différentes catégories. Appuyez pour tout sélectionner, appuyez sur le côté gauche pour sélectionner la catégorie.</string>
<string name="search_poi_types">Rechercher des types de points d\'intérêt</string>
</resources>

View file

@ -247,7 +247,7 @@
<string name="app_mode_motorcycle">Moto</string>
<string name="app_mode_boat">Embarcación</string>
<string name="app_mode_aircraft">Aeronave</string>
<string name="local_osm_changes_delete_all_confirm">Eliminar %1$d mudanza(s) no OSM\?</string>
<string name="local_osm_changes_delete_all_confirm">Eliminar %1$d modificación(s) no OSM\?</string>
<string name="shared_string_delete_all">Eliminar todo</string>
<string name="animate_routing_route_not_calculated">Calcula-la rota primeiro</string>
<string name="animate_routing_route">"Simular empregando a rota calculada "</string>
@ -312,9 +312,9 @@
<string name="search_street_in_neighborhood_cities">Procura das rúas nas poboacións viciñas</string>
<string name="intermediate_items_sort_return">Orde optimizada dos destinos intermedios no itinerario cara o destino.</string>
<string name="intermediate_items_sort_by_distance">Ordenar porta a porta</string>
<string name="local_osm_changes_backup_successful">O ficheiro das mudanzas do OSM \"%1$s\" foi xerado</string>
<string name="local_osm_changes_backup_failed">Non foi posíbel facer copia de seguranza (backup) das mudanzas do OSM.</string>
<string name="local_osm_changes_backup">Copia de seguranza coma mudanza do OSM</string>
<string name="local_osm_changes_backup_successful">O ficheiro das modificacións do OSM \"%1$s\" foi xerado</string>
<string name="local_osm_changes_backup_failed">Non foi posíbel facer copia de seguranza (backup) das modificacións do OSM.</string>
<string name="local_osm_changes_backup">Copia de seguranza coma modificación do OSM</string>
<string name="delete_point">Eliminar o punto</string>
<string name="plugin_distance_point_time">hora</string>
<string name="plugin_distance_point_hdop">precisión</string>
@ -800,7 +800,7 @@
<string name="use_fluorescent_overlays_descr">Empregar cores fluorescentes para amosa-las pistas e rotas.</string>
<string name="offline_edition">Edición sen conexión</string>
<string name="offline_edition_descr">Empregar sempre a edición sen conexión.</string>
<string name="update_poi_does_not_change_indexes">As mudanzas nos puntos de interese (PDI) dentro da aplicación non afectan ós ficheiros dos mapas baixados, pois esas mudanzas gárdanse coma un ficheiro no teu dispositivo.</string>
<string name="update_poi_does_not_change_indexes">As modificacións nos puntos de interese (PDI) dentro da aplicación non afectan ós ficheiros dos mapas baixados, pois esas modificacións gárdanse coma un ficheiro no teu dispositivo.</string>
<string name="local_openstreetmap_uploading">Estase a subir…</string>
<string name="local_openstreetmap_were_uploaded">{0} PDI/notas subidos</string>
<string name="local_openstreetmap_uploadall">Actualizar todo</string>
@ -882,7 +882,7 @@
<string name="data_to_search_poi_not_available">Baixar datos sen conexión para procurar PDI.</string>
<string name="poi_filter_by_name">Procurar polo nome</string>
<string name="old_poi_file_should_be_deleted">O ficheiro de datos do PDI «%1$s» é redundante e pode ser eliminado.</string>
<string name="update_poi_file_not_found">Non foi posíbel atopar un ficheiro local para mante-las mudanzas nos PDI e tampouco foi posíbel crealo.</string>
<string name="update_poi_file_not_found">Non foi posíbel atopar un ficheiro local para manter as modificacións nos PDI e tampouco foi posíbel crealo.</string>
<string name="button_upgrade_osmandplus">Actualizar OsmAnd+</string>
<string name="map_version_changed_info">Baixa a nova versión da aplicación, para poder emprega-los novos ficheiros dos mapas.</string>
<string name="shared_string_rename">Mudar o nome</string>
@ -1356,7 +1356,7 @@
<string name="poi_error_info_not_loaded">A información sobre o nó non foi cargada</string>
<string name="poi_dialog_opening_hours">Aberto</string>
<string name="poi_dialog_comment">Comentario</string>
<string name="poi_dialog_comment_default">Mudanza do PDI</string>
<string name="poi_dialog_comment_default">Modificación do PDI</string>
<string name="poi_dialog_other_tags_message">O resto das etiquetas consérvase</string>
<string name="default_buttons_commit">Enviar</string>
<string name="shared_string_clear">Limpar</string>
@ -1463,7 +1463,7 @@
<string name="rendering_value_translucent_blue_name">Azul translúcido</string>
<string name="rendering_value_purple_name">Violeta</string>
<string name="rendering_value_translucent_purple_name">Violeta translúcido</string>
<string name="restart_is_required">Requírese un reinicio para aplicar as mudanzas.</string>
<string name="restart_is_required">Requírese un reinicio para aplicar as modificacións.</string>
<string name="light_theme">Claro</string>
<string name="dark_theme">Escuro</string>
<string name="lang_pms">Piamontés</string>
@ -1532,7 +1532,7 @@
<string name="current_route">Rota actual</string>
<string name="mark_to_delete">Marcar para eliminar</string>
<string name="local_recordings_delete_all_confirm">Eliminar %1$d notas\?</string>
<string name="local_osm_changes_upload_all_confirm">Subir %1$d mudanza(s) ó OSM\?</string>
<string name="local_osm_changes_upload_all_confirm">Subir %1$d modificación(s) ó OSM\?</string>
<string name="confirmation_to_clear_history">Limpa-lo historial\?</string>
<string name="shared_string_go">Ir</string>
<string name="osm_edits">Edicións do OSM</string>
@ -1546,7 +1546,7 @@
<string name="drawer">Listaxe sinxela</string>
<string name="short_location_on_map">Lat %1$s
Lon %2$s</string>
<string name="tips_and_tricks_descr">Cuestións frecuentes, mudanzas recentes e outros.</string>
<string name="tips_and_tricks_descr">Cuestións frecuentes, modificacións recentes e outros.</string>
<string name="routing_settings_2">Axustes da navegación</string>
<string name="general_settings_2">Axustes xerais</string>
<string name="shared_string_ellipsis"></string>
@ -1611,7 +1611,7 @@ Lon %2$s</string>
<string name="rate_this_app_long">Dálle unha valoración ó OsmAnd na Google Play</string>
<string name="user_hates_app_get_feedback">Díganos o porque.</string>
<string name="user_hates_app_get_feedback_long">Por favor, fáganos saber calquera suxestión.</string>
<string name="delete_change">Elimina-la mudanza</string>
<string name="delete_change">Eliminar modificación</string>
<string name="successfully_uploaded_pattern">Subido {0}/{1}</string>
<string name="try_again">Tentar de novo</string>
<string name="error_message_pattern">Erro: {0}</string>
@ -1630,7 +1630,7 @@ Lon %2$s</string>
<string name="shared_string_deselect_all">Desbota-la selección toda</string>
<string name="osm_edit_context_menu_delete">Eliminar edición do OSM</string>
<string name="rendering_attr_OSMMapperAssistant_name">Axudante cartográfico do OSM</string>
<string name="osm_changes_added_to_local_edits">As mudanzas no OSM foron engadidas ó conxunto das mudanzas locais</string>
<string name="osm_changes_added_to_local_edits">As modificacións no OSM foron engadidas ó conxunto de modificacións local</string>
<string name="osmand_parking_overdue">vencido</string>
<string name="action_create">Creacción de acción</string>
<string name="action_modify">Modificación de acción</string>
@ -1719,11 +1719,11 @@ Lon %2$s</string>
<string name="show_on_start">Amosar no inicio</string>
<string name="commit_poi">Enviar o PDI</string>
<string name="saved_at_time">Gardado agora coma: %1$s</string>
<string name="poi_deleted_localy">O punto de interese (PDI) será eliminado unha vez enviadas as mudanzas</string>
<string name="poi_deleted_localy">O punto de interese (PDI) será eliminado unha vez enviadas as modificacións</string>
<string name="show_gpx">Amosar datos GPX</string>
<string name="count_of_lines">Número de liñas</string>
<string name="are_you_sure">Tes a certeza de querer facelo\?</string>
<string name="unsaved_changes_will_be_lost">Vanse perde-las mudanzas non gardadas. Proseguer\?</string>
<string name="unsaved_changes_will_be_lost">Vanse perder as modificacións non gardadas. Proseguer\?</string>
<string name="downloads_left_template">Faltan %1$s baixadas</string>
<string name="roads">Estradas</string>
<string name="downloading_number_of_files">Estase a baixar - ficheiro %1$d</string>
@ -1855,7 +1855,7 @@ Lon %2$s</string>
<string name="last_update">Última actualización: %s</string>
<string name="update_time">Hora da actualización</string>
<string name="updates_size">Tamaño da actualización</string>
<string name="last_map_change">Última mudanza do mapa: %s</string>
<string name="last_map_change">Última modificación do mapa: %s</string>
<string name="hourly">Cada hora</string>
<string name="daily">Cada día</string>
<string name="weekly">Cada semana</string>
@ -1901,7 +1901,7 @@ Lon %2$s</string>
<string name="show_polygons">Amosar polígonos</string>
<string name="find_parking">Atopar aparcamento</string>
<string name="shared_string_status">Estado</string>
<string name="shared_string_save_changes">Garda-las mudanzas</string>
<string name="shared_string_save_changes">Gardar modificacións</string>
<string name="shared_string_email_address">Enderezo de correo</string>
<string name="rendering_attr_hideUnderground_name">Obxectos subterráneos</string>
<string name="data_is_not_available">Datos non dispoñíbeis</string>
@ -2042,7 +2042,7 @@ Lon %2$s</string>
<string name="get_started">Comezar</string>
<string name="route_stops_before">%1$s paraxes antes</string>
<string name="access_direction_haptic_feedback_descr">Inseri-lo enderezo do destino mediante vibración.</string>
<string name="use_osm_live_routing_description">Activa-la navegación por mudanzas do OsmAnd ao Vivo.</string>
<string name="use_osm_live_routing_description">Activar a navegación por modificacións do OsmAnd ao Vivo.</string>
<string name="access_disable_offroute_recalc">Non recalcular a ruta ó saírme da mesma</string>
<string name="access_disable_offroute_recalc_descr">Non recalcula a rota, ó afastarss da mesma.</string>
<string name="access_disable_wrong_direction_recalc">Non recalculares a rota cando se estea na dirección contraria</string>
@ -2083,7 +2083,7 @@ Lon %2$s</string>
<string name="osm_live_thanks">Grazas por apoiar ó OsmAnd!
\n
\nPara activares tódalas funcións novas, tes que reinicia-lo OsmAnd.</string>
<string name="osm_live_region_desc">Parte da súa doazón será enviada ós usuarios do OSM que fagan mudanzas do mapa desa rexión.</string>
<string name="osm_live_region_desc">Parte da túa doazón será enviada ós usuarios do OSM que fagan modificacións do mapa desa rexión.</string>
<string name="osm_live_ask_for_purchase">Merca primeiro unha subscrición ó OsmAnd ao Vivo</string>
<string name="osm_live_header">Esta subscrición permite actualizacións cada hora para tódolos mapas do mundo.
\n Un anaco dos ingresos voltan á comunidade do OSM e págase por cada contribución ó OSM.
@ -2114,7 +2114,7 @@ Lon %2$s</string>
<string name="show_free_version_banner_description">Amosa o anuncio da versión de balde, mesmo na versión de pago.</string>
<string name="activate_seamarks_plugin">Activa o plugin da \"Vista náutica\"</string>
<string name="other_menu_group">Outros</string>
<string name="poi_context_menu_modify_osm_change">Modificar mudanza do OSM</string>
<string name="poi_context_menu_modify_osm_change">Modificar modificación do OSM</string>
<string name="number_of_contributors">Número de colaboradores</string>
<string name="number_of_edits">Número de edicións</string>
<string name="reports_for">Informe para</string>
@ -2688,7 +2688,7 @@ Lon %2$s</string>
<string name="osm_save_offline">Gardar sen conexión</string>
<string name="context_menu_item_delete_waypoint">Eliminar punto de pasaxe do GPX\?</string>
<string name="context_menu_item_edit_waypoint">Editar punto de pasaxe GPX</string>
<string name="simulate_initial_startup_descr">Amosa a pantalla do primeiro arrinque e mantén os demais axustes sen mudanzas.</string>
<string name="simulate_initial_startup_descr">Amosa a pantalla do primeiro arrinque e mantén os demais axustes sen modificacións.</string>
<string name="rendering_value_darkyellow_name">Amarelo escuro</string>
<string name="rendering_value_translucent_pink_name">Rosa translúcido</string>
<string name="rendering_value_black_name">Negro</string>
@ -3054,7 +3054,7 @@ Lon %2$s</string>
\n • Eliminada a análise do Facebook e Firebase da versión de balde (o OsmAnd+ non o inclúe)
\n
\n</string>
<string name="use_osm_live_public_transport_description">Activar o transporte público para as mudanzas do OsmAnd Live.</string>
<string name="use_osm_live_public_transport_description">Activar o transporte público para as modificacións do OsmAnd Live.</string>
<string name="use_osm_live_public_transport">Transporte público no OsmAnd Live</string>
<string name="shared_string_walk">A pé</string>
<string name="save_poi_value_exceed_length">Acurta a lonxitude da etiqueta \"%s\" polo menos a 255 caracteres.</string>
@ -3149,8 +3149,8 @@ Lon %2$s</string>
<string name="profile_alert_duplicate_name_title">Nome duplicado</string>
<string name="profile_alert_duplicate_name_msg">Xa existe un perfil con ese nome</string>
<string name="profile_alert_cant_delete_base">Non se poden eliminar os perfís de base do OsmAnd</string>
<string name="profile_alert_need_save_title">Gardar mudanzas</string>
<string name="profile_alert_need_save_msg">Primeiro garda as mudanzas no perfil</string>
<string name="profile_alert_need_save_title">Gardar modificacións</string>
<string name="profile_alert_need_save_msg">Primeiro garda as modificacións no perfil</string>
<string name="profile_alert_delete_title">Eliminar perfil</string>
<string name="profile_alert_delete_msg">Tes a certeza de que desexas eliminar o perfil \"%s\"</string>
<string name="select_base_profile_dialog_title">Escoller o perfil para comezar</string>
@ -3310,7 +3310,7 @@ Lon %2$s</string>
<string name="coordinates_format_info">O formato escollido será aplicado en toda a aplicación.</string>
<string name="pref_selected_by_default_for_profiles">Esta opción está escollida por defecto para os perfís: %s</string>
<string name="change_default_settings">Mudar os axustes</string>
<string name="discard_changes">Rexeitar mudanza</string>
<string name="discard_changes">Rexeitar modificación</string>
<string name="apply_to_current_profile">Aplicar só a \"%1$s\"</string>
<string name="apply_to_all_profiles">Aplicar a tódolos perfís</string>
<string name="start_up_message_pref">Mensaxe de inicio</string>
@ -3427,7 +3427,7 @@ Lon %2$s</string>
\n • Outras correccións de erros
\n
\n</string>
<string name="apply_preference_to_all_profiles">Podes aplicar esta mudanza a todos ou só ós perfís seleccionados.</string>
<string name="apply_preference_to_all_profiles">Podes aplicar esta modificación a todos ou só ós perfís seleccionados.</string>
<string name="shared_preference">Compartillado</string>
<string name="routing_attr_driving_style_prefer_unpaved_name">Preferir estradas sen pavimentar</string>
<string name="routing_attr_driving_style_prefer_unpaved_description">Preferir as estradas sen pavimentar aos pavimentados para o trazado de rutas.</string>
@ -3494,7 +3494,7 @@ Lon %2$s</string>
<string name="choose_icon_color_name">Icona, cor e nome</string>
<string name="reorder_profiles">Editar a listaxe de perfís</string>
<string name="selected_profile">Perfil seleccionado</string>
<string name="reset_confirmation_descr">Ó premer en %1$s, serán desbotadas todas as túas mudanzas.</string>
<string name="reset_confirmation_descr">Ó premer en %1$s, serán desbotadas todas as túas modificacións.</string>
<string name="reset_all_profile_settings_descr">Restabelecer todos os axustes do perfil ós valores por defecto da instalación.</string>
<string name="reset_all_profile_settings">Restabelecer todos os axustes do perfil\?</string>
<string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
@ -3552,7 +3552,7 @@ Lon %2$s</string>
<string name="multimedia_photo_play_sound">Son do obturador da cámara</string>
<string name="osm_authorization_success">A autorización foi correcta</string>
<string name="rearrange_categories">Reorganizar categorías</string>
<string name="create_custom_categories_list_promo">Podes engadir categorías personalizadas, agochar as categorías que non semellen necesarias e mudar a orde de clasificación da listaxe. A listaxe pode ser importada e exportada con perfís.</string>
<string name="create_custom_categories_list_promo">Muda a orde de clasificación da listaxe ou agocha as categorías innecesarias. Podes importar ou exportar todos as modificacións cos perfís.</string>
<string name="add_new_custom_category_button_promo">Podes engadir unha nova categoría personalizada marcando unha ou varias categorías necesarias.</string>
<string name="reset_to_default_category_button_promo">Restabelecer ó valor por defecto, restabelecerá a orde de clasificación ó estado por defecto após a instalación.</string>
<string name="shared_string_available">Dispoñíbel</string>
@ -3692,4 +3692,55 @@ Lon %2$s</string>
<string name="lang_lmo">Lombardo</string>
<string name="custom_color">Cor personalizada</string>
<string name="extra_maps_menu_group">Mapas adicionais</string>
<string name="shared_string_terrain">Terreo</string>
<string name="hillshade_description">Mapa de asombreado empregando sombras escuras para amosar as pendentes, cumios e terras baixas.</string>
<string name="slope_description">A pendente visualízase en cores sobre o terreo.</string>
<string name="terrain_slider_description">Define os niveis de achegamento mínimo e máximo nos que se amosará a capa.</string>
<string name="hillshade_download_description">Precísanse mapas adicionais para ollar o asombreado no mapa.</string>
<string name="slope_download_description">Precísanse mapas adicionais para ollar as pendentes no mapa.</string>
<string name="slope_read_more">Podes ler máis sobre as pendentes en %1$s.</string>
<string name="shared_string_transparency">Transparencia</string>
<string name="shared_string_zoom_levels">Niveis de achegamento</string>
<string name="shared_string_legend">Lenda</string>
<string name="terrain_empty_state_text">Permite ollar o asombreado ou o mapa de pendentes. Podes ler máis sobre estes tipos de mapas no noso sitio</string>
<string name="shared_string_hillshade">Sombras do relevo</string>
<string name="import_complete_description">Todos os datos de %1$s son importados, podes empregar os botóns de abaixo para abrir a parte necesaria da aplicación para xestionala.</string>
<string name="shared_string_import_complete">Importación completada</string>
<string name="items_added">Elementos engadidos</string>
<string name="checking_for_duplicate_description">OsmAnd comproba %1$s para ver se hai duplicados cos elementos existentes na aplicación.
\n
\nPode levar algún tempo.</string>
<string name="shared_string_importing">Estase a importar</string>
<string name="importing_from">Estanse a importar datos de %1$s</string>
<string name="clear_recorded_data_warning">Eliminar os datos gravados\?</string>
<string name="recalculate_route_in_deviation">Recalcular ruta en caso de desvío</string>
<string name="select_distance_route_will_recalc">Escolle a distancia após a cal a ruta será recalculada.</string>
<string name="recalculate_route_distance_promo">A ruta será recalculada se a distancia á localización actual é maior que o valor escollido.</string>
<string name="n_items_of_z">%1$s de %2$s</string>
<string name="download_slope_maps">Pendentes</string>
<string name="quick_action_show_hide_terrain">Amosar/agochar terreo</string>
<string name="quick_action_terrain_hide">Agochar terreo</string>
<string name="quick_action_terrain_show">Amosar terreo</string>
<string name="quick_action_terrain_descr">Un botón que amosa ou agocha a capa do terreo no mapa.</string>
<string name="delete_description">Eliminar descrición</string>
<string name="add_description">Engadir descrición</string>
<string name="select_group">Escoller grupo</string>
<string name="select_shape">Escoller forma</string>
<string name="shared_string_circle">Círculo</string>
<string name="shared_string_octagon">Octógono</string>
<string name="shared_string_square">Cadrado</string>
<string name="shared_string_min">Mín</string>
<string name="ui_customization_description">Personaliza a morea de elementos na gabeta, na configuración do mapa e o menú contextual.
\n
\nPodes desactivar os plugins non enpregados, para agochar todos os seus controis da aplicación %1$s.</string>
<string name="ui_customization_short_descr">Elementos da gabeta, menú contextual</string>
<string name="ui_customization">Personalización da interface de usuario</string>
<string name="shared_string_drawer">Gabeta</string>
<string name="context_menu_actions">Accións do menú contextual</string>
<string name="reorder_or_hide_from">Reordenar ou agochar elementos de %1$s.</string>
<string name="shared_string_divider">Divisor</string>
<string name="divider_descr">Elementos abaixo deste punto separados por un divisor.</string>
<string name="shared_string_hidden">Agochado</string>
<string name="hidden_items_descr">Estes elementos non se amosan no menú, mais as opcións ou plugins que representan seguirán a funcionar.</string>
<string name="reset_items_descr">Os axustes restabeleceranse ó estado orixinal após agocharse.</string>
</resources>

View file

@ -3666,4 +3666,12 @@
<string name="extra_maps_menu_group">מפות נוספות</string>
<string name="lang_war">וראי</string>
<string name="download_unsupported_action">הפעולה %1$s אינה נתמכת</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">התשלום יחוייב דרך חשבון ה־Google Play שלך עם אישור הרכישה.
\n
\nהמינוי מתחדש אוטומטית אלמלא בוטל בטרם מועד החידוש. החשבון שלך יחוייב בתקופת החידוש (חודש/שלושה חודשים/שנה) רק במועד החידוש.
\n
\nניתן לנהל ולבטל את המינויים שלך על ידי מעבר להגדרות ה־Google Play שלך.</string>
<string name="search_poi_types">חיפוש סוגי נקודות עניין</string>
<string name="search_poi_types_descr">שילוב סוגי נקודות עניין מקטגוריות שונות. יש לגעת כדי לבחור את כולן, נגיעה בצד השמאלי לבחירת קטגוריה.</string>
</resources>

View file

@ -939,7 +939,7 @@ Ferill %2$s</string>
<string name="continuous_rendering">Samfelld myndgerð</string>
<string name="show_point_options">Nota staðsetningu …</string>
<string name="renderers_descr">Veldu útlit myndgerðar</string>
<string name="download_type_to_filter">skrifaðu að sía</string>
<string name="download_type_to_filter">skrifaðu til að sía</string>
<string name="use_high_res_maps">Skjár með háupplausn</string>
<string name="context_menu_item_search_transport">Leita að almenningssamgöngum</string>
<string name="voices">Talskilaboð</string>
@ -3655,7 +3655,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
<string name="select_wikipedia_article_langs">Veldu þau tungumál sem Wikipedia-greinarnar ættu að birtast á á kortinu. Þú munt geta skipt á milli allra tiltækra tungumála á meðan þú lest greinar.</string>
<string name="some_articles_may_not_available_in_lang">Sumar Wikipedia-greinar gætu verið ekki tiltækar á þínu tungumáli.</string>
<string name="lang_zhyue">Kantónska</string>
<string name="lang_zhminnan">Suður-mín</string>
<string name="lang_zhminnan">Suður-Mín</string>
<string name="lang_yo">Yórúba</string>
<string name="lang_war">Waray</string>
<string name="lang_uz">Úsbekíska</string>
@ -3682,4 +3682,13 @@ Stendur fyrir svæði: %1$s x %2$s</string>
<string name="lang_an">Aragónska</string>
<string name="lang_lmo">Lombardíska</string>
<string name="custom_color">Sérsniðinn litur</string>
<string name="osm_live_payment_subscription_management">Greiðsla verður gjaldfærð á Google Play reikninginn þinn við staðfestingu á kaupunum.
\n
\nÁskrift endurnýjast sjálfkrafa nema hún sé felld niður fyrir endurnýjunardag. Reikningur þinn verður einungis gjaldfærður fyrir endurnýjunartímabil (mánuður / þrír mánuðir / ár) á endurnýjunardegi.
\n
\nÞú getur stýrt og aflýst áskriftunum þínum með því að fara í Google Play stillingarnar þínar.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types">Leita í tegundum merkisstaða</string>
<string name="search_poi_types_descr">Sameina gerðir merkisstaða úr mismunandi flokkum. Ýttu á hnappinn til að velja allt, ýttu vinstra megin til að fara í val á flokkum.</string>
<string name="download_unsupported_action">Óstudd aðgerð %1$s</string>
</resources>

View file

@ -1704,8 +1704,8 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
<string name="favorite_category_name">Nome della categoria</string>
<string name="favorite_category_add_new_title">Aggiungi una nuova categoria</string>
<string name="confirm_download_roadmaps">Le mappe solo stradali non sono necessarie dato che disponi già delle mappe standard complete. Scaricare comunque\?</string>
<string name="value_downloaded_of_max">%1$,1f di %2$,1fMB</string>
<string name="file_size_in_mb">%,1fMB</string>
<string name="value_downloaded_of_max">%1$.1f di %2$.1fMB</string>
<string name="file_size_in_mb">%.1fMB</string>
<string name="update_all">Aggiorna tutto (%1$s MB)</string>
<string name="free_downloads_used">Scaricamenti gratuiti utilizzati</string>
<string name="free_downloads_used_description">Mostra il numero di download gratuiti rimasti.</string>

View file

@ -3531,4 +3531,8 @@
<string name="profile_prefs_reset_successful">Alle profilinnstillinger gjenopprettet til forvalg.</string>
<string name="shared_string_transparency">Gjennomsiktighet</string>
<string name="shared_string_legend">Tegnforklaring</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="reset_plugin_to_default">Tilbakestill programtilleggsinnstillinger til forvalg</string>
<string name="download_unsupported_action">Ustøttet handling %1$s</string>
<string name="extra_maps_menu_group">Ekstra kart</string>
</resources>

View file

@ -18,7 +18,7 @@
<string name="city_type_village">Wieś</string>
<string name="city_type_town">Miasteczko</string>
<string name="city_type_city">Miasto</string>
<string name="animate_route_off">Zatrzymaj symulację</string>
<string name="animate_route_off">Zakończ symulację</string>
<string name="animate_route">Rozpocznij symulację</string>
<string name="file_can_not_be_renamed">Nie można zmienić nazwy pliku.</string>
<string name="file_with_name_already_exists">Plik o takiej nazwie już istnieje.</string>
@ -303,7 +303,7 @@
<string name="search_poi_filter">Filtr</string>
<string name="menu_mute_off">Wyłącz dźwięk</string>
<string name="menu_mute_on">Włącz dźwięk</string>
<string name="voice_provider_descr">Wybiera głos komunikatów nawigatora.</string>
<string name="voice_provider_descr">Wybiera głos komunikatów nawigacji.</string>
<string name="voice_provider">Głos komunikatów</string>
<string name="voice_data_initializing">Inicjowanie danych głosowych…</string>
<string name="voice_data_not_supported">Niewspierana wersja danych głosowych</string>
@ -423,7 +423,7 @@
<string name="saving_gpx_tracks">Zapisywanie pliku GPX…</string>
<string name="finished_task">Zakończono</string>
<string name="use_online_routing_descr">Użyj Internetu do wyznaczenia trasy.</string>
<string name="use_online_routing">Użyj routingu online</string>
<string name="use_online_routing">Użyj nawigacji online</string>
<string name="user_password">Hasło konta OSM</string>
<string name="osm_settings_descr">Skonfiguruj ustawienia potrzebne do wysyłania danych do Openstreetmap.org (OSM).</string>
<string name="data_settings_descr">Ustaw język, pobierz/wczytaj ponownie dane.</string>
@ -437,9 +437,9 @@
<string name="shared_string_settings">Opcje</string>
<string name="save_current_track_descr">Zapisuje bieżący ślad jako plik GPX.</string>
<string name="save_current_track">Zapisz aktualny ślad</string>
<string name="save_track_interval_descr">Określ tempo rejestrowania śladów podczas nawigowania</string>
<string name="save_track_interval_descr">Określ tempo rejestrowania śladów podczas nawigacji</string>
<string name="save_track_interval">Częstość rejestrowania podczas nawigacji</string>
<string name="save_track_to_gpx_descrp">Zapisuje ślady do katalogu śladów podczas nawigowania.</string>
<string name="save_track_to_gpx_descrp">Zapisuje ślady do katalogu śladów podczas nawigacji.</string>
<string name="save_track_to_gpx">Automatyczne rejestrowanie śladu podczas nawigacji</string>
<string name="update_tile">Uaktualnij mapę</string>
<string name="reload_tile">Wczytaj ponownie kafelki</string>
@ -467,7 +467,7 @@
<string name="show_location">Wyświetl aktualne położenie</string>
<string name="show_gps_coordinates_text">Pokaż współrzędne GPS na mapie</string>
<string name="use_internet_to_download_tile">Pobiera brakujące kafelki map</string>
<string name="app_description">Aplikacja do nawigacji satelitarnej</string>
<string name="app_description">Aplikacja do nawigacji</string>
<string name="shared_string_exit">Zakończ</string>
<string name="search_button">Wyszukaj</string>
<string name="search_activity">Wyszukaj</string>
@ -739,7 +739,7 @@
<string name="use_compass_navigation_descr">Użyj kompasu, gdy nie zostanie wykryty kierunek.</string>
<string name="use_compass_navigation">Użyj kompasu</string>
<string name="route_updated_loc_found">Oczekiwanie na aktualne położenie w celu wyznaczenia trasy</string>
<string name="continue_follow_previous_route_auto">Poprzednia trasa nie została ukończona. Kontynuować ją? (%1$s sekund)</string>
<string name="continue_follow_previous_route_auto">Nawigacja nie została ukończona. Kontynuować ją\? (%1$s sekund)</string>
<string name="show_cameras">Fotoradary</string>
<string name="show_traffic_warnings">Ostrzeżenia drogowe</string>
<string name="avoid_toll_roads">Omijanie płatnych dróg</string>
@ -765,7 +765,8 @@
<string name="screen_is_locked">Naciśnij ikonę kłódki, aby odblokować</string>
<string name="bg_service_screen_unlock">Odblokuj ekran</string>
<string name="bg_service_sleep_mode_off">Uruchom\n aplikację w tle</string>
<string name="bg_service_sleep_mode_on">Zatrzymaj\n działanie aplikacji w tle</string>
<string name="bg_service_sleep_mode_on">Zakończ
\n działanie aplikacji w tle</string>
<string name="filterpoi_activity">Utwórz filtr użytecznych miejsc</string>
<string name="day_night_info_description">Wschód: %1$s
\nZachód: %2$s</string>
@ -777,7 +778,7 @@
<string name="show_warnings_title">Wyświetlanie ostrzeżeń…</string>
<string name="show_warnings_descr">Konfiguruje ostrzeżenia ruchu drogowego (ograniczenia prędkości, znaki \"stop\", progi zwalniające, tunele), ostrzeżenia o fotoradarach i informacje o pasach ruchu.</string>
<string name="osmand_short_description_80_chars">Mapy dla całego świata i nawigacja działająca w oparciu o stacjonarne jak i sieciowe mapy OSM</string>
<string name="osmand_long_description_1000_chars">OsmAnd (OSM Automatyczne Nawigowanie Do celu)
<string name="osmand_long_description_1000_chars">OsmAnd (OSM Automatyczna nawigacja do celu)
\n
\nOsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej gamy globalnych map (OSM). Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu do użytku offline. OsmAnd oferuje również nawigację w trybie offline i online zawierającą zapowiedzi głosowe.
\n
@ -796,12 +797,12 @@
\n
\n Ograniczenia w tej bezpłatnej wersji OsmAnd:
\n - Limitowana liczba pobrań mapy
\n - Brak dostępu do Użytecznych Miejsc z Wikipedii w trybie offline
\n - Brak dostępu do Użytecznych miejsc z Wikipedii w trybie offline
\n
\nOsmAnd jest aktywnie rozwijany i dalszy rozwój jest uzależniony od wkładu pieniężnego na finansowanie rozwoju i testowania nowych funkcjonalności. Proszę rozważyć zakup OsmAnd+, lub finansowanie konkretnych nowych funkcji lub dokonania ogólnej darowizny na https://osmand.net.</string>
<string name="osmand_plus_short_description_80_chars">OsmAnd to aplikacja open source do nawigacji obsługująca mapy offline i online</string>
<string name="avoid_motorway">Unikaj autostrad</string>
<string name="snap_to_road_descr">Przyciąga położenie do dróg podczas nawigowania.</string>
<string name="snap_to_road_descr">Przyciąga położenie do dróg podczas nawigacji.</string>
<string name="snap_to_road">Przyciąganie do drogi</string>
<string name="day_night_info">Informacja o dniu/nocy</string>
<string name="map_widget_vector_attributes">Atrybuty renderowania</string>
@ -835,7 +836,7 @@
<string name="poi_filter_sightseeing">Zwiedzanie</string>
<string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions)
\n
\nOsmAnd+ jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej gamy globalnych map OSM. Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu do użycia bez połączenia z siecią. OsmAnd umożliwia również wyznaczanie tras oraz nawigowanie zarówno w trybie stacjonarnym jak i sieciowym z komunikatami głosowymi.
\nOsmAnd+ jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej gamy globalnych map OSM. Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu do użycia bez połączenia z siecią. OsmAnd umożliwia również wyznaczanie tras oraz nawigacja zarówno w trybie stacjonarnym jak i sieciowym z komunikatami głosowymi.
\n
\nOsmAnd + to płatna wersja aplikacji, kupując ją wspierasz projekt, finansujesz rozwój nowych funkcji i otrzymujesz najnowsze aktualizacje.
\n
@ -920,7 +921,7 @@
<string name="recording_context_menu_play">Odtwórz</string>
<string name="recording_description">Nagranie %1$s %3$s %2$s</string>
<string name="recording_default_name">Nagranie</string>
<string name="shared_string_control_stop">Zatrzymaj</string>
<string name="shared_string_control_stop">Zakończ</string>
<string name="shared_string_control_start">Start</string>
<string name="map_widget_av_notes">Notatki audio/video</string>
<string name="osmand_srtm_short_description_80_chars">Wtyczka OsmAnd do rysowania poziomic offline</string>
@ -939,7 +940,7 @@
<string name="recording_photo_description">Zdjęcie %1$s %2$s</string>
<string name="av_def_action_picture">Zrobienie zdjęcia</string>
<string name="recording_context_menu_precord">Zrób zdjęcie</string>
<string name="stop_routing_confirm">Zatrzymać nawigowanie?</string>
<string name="stop_routing_confirm">Na pewno zatrzymać nawigację\?</string>
<string name="clear_dest_confirm">Usunąć cel trasy i jej cele pośrednie?</string>
<string name="precise_routing_mode">Precyzyjne trasy (alpha)</string>
<string name="precise_routing_mode_descr">Obliczanie precyzyjnych tras w nawigacji. Funkcja nadal jest dość powolna i ograniczona odległością.</string>
@ -975,7 +976,7 @@
<string name="favourites_list_activity">Wybierz Ulubione miejsca</string>
<string name="download_using_mobile_internet">Brak połączenia z Wi-Fi. Użyć do pobierania obecnego połączenia z Internetem?</string>
<string name="clear_destination">Usuń cel trasy</string>
<string name="cancel_navigation">Zatrzymaj nawigację</string>
<string name="cancel_navigation">Zakończ nawigację</string>
<string name="cancel_route">Odrzucenie trasy</string>
<string name="install_paid">Pełna wersja</string>
<string name="other_location">Inna</string>
@ -1126,9 +1127,9 @@
<string name="route_info">Informacje o trasie</string>
<string name="calculate_osmand_route_gpx">Wyznacz trasę offline w OsmAnd</string>
<string name="keep_and_add_destination_point">Dodaj kolejny cel</string>
<string name="use_displayed_track_for_navigation">Wykorzystać wyświetlany ślad do nawigacji?</string>
<string name="use_displayed_track_for_navigation">Użyć wyświetlanego śladu do nawigacji\?</string>
<string name="calculate_osmand_route_without_internet">Wyznaczanie segmentów trasy offline</string>
<string name="gpx_option_calculate_first_last_segment">Wyznacza trasę usługi OsmAnd dla pierwszego i ostatniego segmentu</string>
<string name="gpx_option_calculate_first_last_segment">Niech OsmAnd ułoży trasę od pierwszego do ostatniego segmentu</string>
<string name="lang_en">Angielski</string>
<string name="lang_af">Afrykański</string>
<string name="lang_hy">Armeński</string>
@ -1260,9 +1261,9 @@
<string name="live_monitoring_m_descr">Wysyła dane śledzenia do określonej usługi internetowej jeżeli rejestrowanie śladów jest włączone.</string>
<string name="live_monitoring_m">Śledzenie online (wymagane GPX)</string>
<string name="live_monitoring_start">Rozpocznij śledzenie online</string>
<string name="live_monitoring_stop">Zatrzymaj śledzenie online</string>
<string name="live_monitoring_stop">Zakończ śledzenie online</string>
<string name="gpx_monitoring_start">Rozpocznij rejestrowanie śladu</string>
<string name="gpx_monitoring_stop">Zatrzymaj rejestrowanie śladu</string>
<string name="gpx_monitoring_stop">Zakończ rejestrowanie śladu</string>
<string name="gpx_start_new_segment">Rozpocznij nowy segment</string>
<string name="rendering_attr_hideBuildings_name">Budynki</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Trasy niedostępne dla aut</string>
@ -1488,7 +1489,7 @@ Długość %2$s</string>
<string name="remove_the_tag">Usuń znacznik</string>
<string name="version_settings">Kompilacje</string>
<string name="shared_string_gpx_points">Punkty</string>
<string name="navigation_over_track">Rozpocząć nawigowanie wzdłuż śladu?</string>
<string name="navigation_over_track">Rozpocząć nawigację wzdłuż śladu\?</string>
<string name="save_track_to_gpx_globally_headline">Zapis śladu na żądanie</string>
<string name="enable_proxy_descr">Konfiguruje proxy HTTP dla wszystkich zapytań sieciowych.</string>
<string name="proxy_host_descr">Określ nazwę hosta serwera proxy (np. 127.0.0.1).</string>
@ -1820,7 +1821,7 @@ Długość %2$s</string>
<string name="missing_write_external_storage_permission">OsmAnd nie posiada uprawnień do użycia karty pamięci</string>
<string name="select_voice_provider">Wybór komunikatów głosowych</string>
<string name="select_voice_provider_descr">Proszę wybrać lub pobrać komunikaty głosowe właściwe dla danego języka.</string>
<string name="impassable_road_desc">Wskazuje drogi, których należy unikać podczas nawigowania.</string>
<string name="impassable_road_desc">Wskazuje drogi, których należy unikać podczas nawigacji.</string>
<string name="shared_string_sound">Dźwięk</string>
<string name="no_location_permission">Przyznaj dostęp do danych o lokalizacji.</string>
<string name="no_camera_permission">Przyznaj dostęp do aparatu.</string>
@ -1959,7 +1960,7 @@ Długość %2$s</string>
<string name="map_widget_magnetic_bearing">Orientacja magnetyczna</string>
<string name="map_widget_bearing">Orientacja względna</string>
<string name="access_disable_wrong_direction_recalc">Utrzymywanie trasy po obraniu niewłaściwego kierunku</string>
<string name="use_osm_live_routing_description">Włącza nawigację dla bieżących aktualizacji mapy.</string>
<string name="use_osm_live_routing_description">Włącza nawigację dla zmian z OsmAnd Live.</string>
<string name="access_disable_wrong_direction_recalc_descr">Brak ponownego wyznaczania nowej trasy podczas poruszania się w niewłaściwym kierunku.</string>
<string name="map_widget_battery">Stan akumulatora</string>
<string name="access_direction_audio_feedback_descr">Wskazuje kierunek do celu używając dźwięku.</string>
@ -2008,7 +2009,7 @@ Długość %2$s</string>
<string name="shared_string_change">Zmień</string>
<string name="get_started">Rozpocznij</string>
<string name="routing_attr_short_way_name">Ekonomiczna trasa</string>
<string name="routing_attr_short_way_description">Wyznacza ekonomiczną trasę (zwykle najkrótszą).</string>
<string name="routing_attr_short_way_description">Użyj trasy oszczędzającej paliwo (zwykle najkrótszej).</string>
<string name="replace_favorite_confirmation">Zastąpić ulubiony punkt %1$s?</string>
<string name="skip_map_downloading">Pomiń pobieranie map</string>
<string name="first_usage_greeting">Otrzymuj wskazówki dojazdu i odkrywaj nowe miejsca bez połączenia z Internetem</string>
@ -2275,7 +2276,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="shared_string_in_name">w %1$s</string>
<string name="shared_string_overview">Podsumowanie</string>
<string name="animate_my_location">Animowanie położenia</string>
<string name="animate_my_location_desc">Animuje aktualne położenie na mapie podczas nawigowania.</string>
<string name="animate_my_location_desc">Animuje aktualne położenie na mapie podczas nawigacji.</string>
<string name="osmand_extended_description_part2">Nawigacja GPS
\n • Możesz wybrać pomiędzy trybem offline (brak kosztów roamingu za granicą) lub online (szybciej)
\n • Podpowiedzi głosowe zakręt-za-zakrętem poprowadzą cię do celu (nagrane lub syntetyzowane głosy)
@ -2366,11 +2367,11 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="ascent_descent">Podjazd/zjazd</string>
<string name="moving_time">Czas w ruchu</string>
<string name="max_min">Maks./min.</string>
<string name="quick_action_resume_pause_navigation">Wstrzymaj/wznów nawigowanie</string>
<string name="quick_action_resume_pause_navigation">Wstrzymaj/wznów nawigację</string>
<string name="quick_action_resume_pause_navigation_descr">Przycisk do wstrzymania lub wznowienia nawigacji.</string>
<string name="quick_action_start_stop_navigation">Rozpocznij/zatrzymaj nawigowanie</string>
<string name="quick_action_start_stop_navigation">Rozpocznij/zakończ nawigację</string>
<string name="quick_action_start_stop_navigation_descr">Przycisk rozpoczęcia lub zakończenia nawigacji.</string>
<string name="quick_action_show_navigation_finish_dialog">Wyświetl ekran końca nawigowania</string>
<string name="quick_action_show_navigation_finish_dialog">Wyświetl ekran końca nawigacji</string>
<string name="measurement_tool_action_bar">Przeglądanie mapy i dodawanie punktów</string>
<string name="measurement_tool">Mierzenie odległości</string>
<string name="enter_gpx_name">Nazwa pliku GPX:</string>
@ -2886,7 +2887,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="app_mode_public_transport">Transport publiczny</string>
<string name="avoid_roads_descr">Proszę wybrać na mapie lub z poniższej listy, drogę omijaną podczas nawigacji:</string>
<string name="show_along_the_route">Wyświetlanie wzdłuż trasy</string>
<string name="simulate_navigation">Symulacja nawigowania</string>
<string name="simulate_navigation">Symulacja nawigacji</string>
<string name="choose_track_file_to_follow">Wybierz plik śladu do podążania</string>
<string name="voice_announcements">Komunikaty głosowe</string>
<string name="intermediate_destinations">Pośrednie cele podróży</string>
@ -2917,7 +2918,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="quick_action_gpx_tracks_show">Wyświetl ślady GPX</string>
<string name="add_destination_query">Proszę najpierw ustalić cel</string>
<string name="previous_route">Poprzednia trasa</string>
<string name="public_transport_warning_descr_blog">Dowiedz się więcej z wpisu na naszym blogu jak OsmAnd wyznacza trasy.</string>
<string name="public_transport_warning_descr_blog">Dowiedz się więcej na naszym blogu, jak OsmAnd wyznacza trasy.</string>
<string name="route_add_start_point">Dodawanie punktu początkowego</string>
<string name="route_descr_select_start_point">Wybierz punkt początkowy</string>
<string name="rendering_attr_surface_unpaved_name">Nieutwardzona</string>
@ -3250,7 +3251,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="copy_from_other_profile">Skopiuj z innego profilu</string>
<string name="vehicle_parameters_descr">Ciężar, wysokość, prędkość</string>
<string name="vehicle_parameters">Parametry pojazdu</string>
<string name="voice_announces_info">Komunikaty głosowe są odtwarzane tylko podczas nawigowania.</string>
<string name="voice_announces_info">Komunikaty głosowe są odtwarzane tylko podczas nawigacji.</string>
<string name="voice_announces">Komunikaty głosowe</string>
<string name="screen_alerts">Ostrzeżenia ekranowe</string>
<string name="route_parameters">Parametry trasy</string>
@ -3262,11 +3263,11 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="get_discount_second_part">następnie %1$s</string>
<string name="navigate_point_format_olc">Otwórz kod lokalizacji</string>
<string name="analytics_pref_title">Analityka</string>
<string name="turn_screen_on_info">Wyświetla mapę na ekranie blokady podczas nawigowania.</string>
<string name="turn_screen_on_info">Wyświetla mapę na ekranie blokady podczas nawigacji.</string>
<string name="route_parameters_info">Ustawienia wyznaczania trasy w wybranym profilu „%1$s”.</string>
<string name="wake_time">Czas wybudzenia</string>
<string name="configure_navigation">Konfiguruje nawigację</string>
<string name="screen_alerts_descr">Alerty będą wyświetlane w lewym dolnym rogu podczas nawigowania.</string>
<string name="screen_alerts_descr">Alerty będą wyświetlane w lewym dolnym rogu podczas nawigacji.</string>
<string name="reset_to_default">Przywróć ustawienia domyślne</string>
<string name="osmand_settings_descr">Konfiguruje opcje działające w całej aplikacji</string>
<string name="turn_screen_on">Włącz ekran</string>
@ -3391,7 +3392,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="download_map_dialog">Dialog pobierania map</string>
<string name="dialogs_and_notifications_title">Dialogi i powiadomienia</string>
<string name="suggested_maps">Sugerowane mapy</string>
<string name="suggested_maps_descr">Te mapy są wymagane do użycia z wtyczką.</string>
<string name="suggested_maps_descr">Wtyczka wymaga wymienionych map.</string>
<string name="added_profiles">Dodano profile</string>
<string name="added_profiles_descr">Profile dodane przez wtyczkę</string>
<string name="shared_string_turn_off">Wyłącz</string>
@ -3407,7 +3408,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="personal_category_name">Osobiste</string>
<string name="shared_string_downloading_formatted">Pobieranie %s</string>
<string name="desert_render_descr">Dla pustyń i innych słabo zaludnionych obszarów. Bardziej szczegółowa.</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">Pokaż punkty sieci tras rowerowych</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">Pokaż trasy rowerowe z sieci węzłów</string>
<string name="rendering_value_thick_name">Gruby</string>
<string name="select_navigation_icon">Ikona położenia podczas ruchu</string>
<string name="select_map_icon">Ikona położenia podczas spoczynku</string>
@ -3547,7 +3548,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="recalc_angle_dialog_descr">Dodatkowy prosty odcinek pomiędzy moją pozycją a obliczoną trasą zostanie wyświetlony do czasu ponownego obliczenia trasy</string>
<string name="recalc_angle_dialog_title">Minimalny kąt między moją lokalizacją a trasą</string>
<string name="shared_string_preparing">Przygotowanie</string>
<string name="shared_string_poi_types">Rodzaje POI</string>
<string name="shared_string_poi_types">Rodzaje użytecznych miejsc</string>
<string name="shared_string_nothing_selected">Nic nie zaznaczono</string>
<string name="shared_string_profiles">Profile</string>
<string name="listed_exist">Wymienione %1$s, już istnieją w OsmAnd.</string>
@ -3617,9 +3618,9 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="settings_item_read_error">Nie udało się odczytać %1$s.</string>
<string name="settings_item_write_error">Nie udało się napisać %1$s.</string>
<string name="settings_item_import_error">Nie udało się zaimportować %1$s.</string>
<string name="ui_customization_short_descr">Elementy szuflady, menu podręczne</string>
<string name="ui_customization_short_descr">Elementy menu bocznego, menu podręczne</string>
<string name="ui_customization">Ustawienia interfejsu użytkownika</string>
<string name="shared_string_drawer">Szuflada</string>
<string name="shared_string_drawer">Menu boczne</string>
<string name="context_menu_actions">Menu kontekstowe działań</string>
<string name="reorder_or_hide_from">Przeorganizuj lub ukryj elementy z %1$s.</string>
<string name="shared_string_divider">Dzielnik</string>
@ -3658,4 +3659,24 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="lang_bar">Bawarski</string>
<string name="lang_lmo">Lombard</string>
<string name="extra_maps_menu_group">Dodatkowe mapy</string>
<string name="lang_scn">Sycylijski</string>
<string name="lang_cv">Czuwaski</string>
<string name="lang_my">Birmański</string>
<string name="lang_zhminnan">Południowy min</string>
<string name="lang_min">Minangkabau</string>
<string name="lang_mg">Malgaski</string>
<string name="lang_pnb">Pendżabski</string>
<string name="download_unsupported_action">Nieobsługiwana czynność %1$s</string>
<string name="lang_ba">Baszkirski</string>
<string name="lang_war">Waray</string>
<string name="lang_sco">Scots</string>
<string name="lang_an">Aragoński</string>
<string name="lang_gu">Gudźarati</string>
<string name="lang_yo">Joruba</string>
<string name="ui_customization_description">Dostosuj liczbę elementów w menu bocznym, wyglądzie mapy i menu kontekstowym.
\n
\nMożesz wyłączyć nieużywane wtyczki, aby ukryć ich elementy z aplikacji %1$s.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types">Szukaj typów użytecznych miejsc</string>
<string name="search_poi_types_descr">Łącz typy użytecznych zmian z różnych kategorii. Stuknij przełącznik, aby zaznaczyć wszystko, stuknij lewą stronę, aby wybrać kategorię.</string>
</resources>

View file

@ -3658,4 +3658,12 @@ Pôr do Sol: %2$s</string>
<string name="custom_color">Cor customizada</string>
<string name="extra_maps_menu_group">Mapas extras</string>
<string name="download_unsupported_action">Ação não suportada %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">O pagamento será cobrado na sua conta do Google Play na confirmação da compra.
\n
\nA assinatura é renovada automaticamente, a menos que seja cancelada antes da data de renovação. Sua conta será cobrada pelo período de renovação (mês/três meses/ano) somente na data de renovação.
\n
\nVocê pode gerenciar e cancelar suas assinaturas acessando as configurações do Google Play.</string>
<string name="search_poi_types">Pesquisar tipos de poi</string>
<string name="search_poi_types_descr">Combine tipos de PIs de diferentes categorias. Toque em para selecionar tudo, toque em lado esquerdo para selecionar a categoria.</string>
</resources>

View file

@ -3663,4 +3663,12 @@
<string name="lang_lmo">Ломбардский</string>
<string name="extra_maps_menu_group">Дополнительные карты</string>
<string name="download_unsupported_action">Неподдерживаемое действие %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Оплата будет списана со счета, привязанного к вашему аккаунту Google Play при подтверждении покупки.
\n
\nПодписка продлевается автоматически, если вы не отмените ее до даты продления. С вашего счета будет взиматься плата за период продления (месяц/три месяца/год) разово в день продления.
\n
\nВы можете управлять подписками и отменять их в настройках Google Play.</string>
<string name="search_poi_types_descr">Можно объединить типы POI из разных категорий. Нажмите переключатель, чтобы выбрать все; нажмите слева, чтобы выбрать категорию.</string>
<string name="search_poi_types">Типы POI для поиска</string>
</resources>

View file

@ -3670,4 +3670,12 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="custom_color">Colore personalizadu</string>
<string name="extra_maps_menu_group">Mapas additzionales</string>
<string name="download_unsupported_action">Atzione %1$s non suportada</string>
<string name="osm_live_payment_subscription_management">Su pagamentu at a èssere addebitadu a su contu tuo de Google Play cando sa còmpora at a èssere cunfirmada.
\n
\nS\'abbonamentu si rinnovat a sa sola automaticamente, francu chi siat istadu annulladu in antis de sa die de su rinnovu. Su contu tuo at a bènnere addebitadu pro su perìodu de rinnovu (mese/tres meses/annu) in sa die de rinnovu ebbia.
\n
\nPodes amministrare e annullare sos abbonamentos tuos intrende in sas impostatziones de Google Play tuas.</string>
<string name="search_poi_types">Chirca castas de PDI</string>
<string name="search_poi_types_descr">Cumbina castas de PDI de catogorias diferentes. Incarca su buone pro ischertare totu, incarca s\'ala a manca pro sa seletzione de sas categorias.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
</resources>

View file

@ -102,7 +102,7 @@
<string name="poi_video">Videotéka</string>
<string name="poi_window_blind">Žalúzie</string>
<string name="poi_department_store">Obchodný dom</string>
<string name="poi_electronics">Elektro</string>
<string name="poi_electronics">Elektrospotrebiče/Elektronika</string>
<string name="poi_car">Automobily</string>
<string name="poi_car_parts">Autodiely</string>
<string name="poi_atv">Terénne štvorkolky</string>
@ -3554,4 +3554,5 @@
<string name="poi_dive_centre">Potápačské centrum</string>
<string name="poi_video_telephone">Video</string>
<string name="poi_sms">SMS</string>
<string name="poi_climbing_crag_filter">Lezecká stena</string>
</resources>

View file

@ -1231,7 +1231,7 @@
<string name="lang_sc">Sardínsky</string>
<string name="lang_sr">Srbsky (Cyrilika)</string>
<string name="lang_zh_cn">Čínština (Zjednodušená)</string>
<string name="lang_zh_tw">Čínština (Tradičná)</string>
<string name="lang_zh_tw">Čínsky (Tradičná)</string>
<string name="continue_navigation">Pokračovať v navigácii</string>
<string name="pause_navigation">Pozastaviť navigáciu</string>
<string name="rendering_attr_alpineHiking_name">Alpinistická stupnica (SAC)</string>
@ -3633,4 +3633,41 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="custom_color">Vlastná farba</string>
<string name="extra_maps_menu_group">Ďalšie mapy</string>
<string name="download_unsupported_action">Nepodporovaná akcia %1$s</string>
<string name="select_wikipedia_article_langs">Zvoľte jazyky, v ktorých sa zobrazia články Wikipedia na mape. Počas čítania článku môžete prepnúť medzi všetkými dostupnými jazykmi.</string>
<string name="some_articles_may_not_available_in_lang">Niektoré články Wikipedia nemusia byť dostupné vo vašom jazyku.</string>
<string name="lang_zhyue">Kantonsky</string>
<string name="lang_zhminnan">Južnominsky</string>
<string name="lang_yo">Jorubsky</string>
<string name="lang_war">Warajsky</string>
<string name="lang_uz">Uzbecky</string>
<string name="lang_ur">Urdsky</string>
<string name="lang_tt">Tatársky</string>
<string name="lang_tg">Tadžicky</string>
<string name="lang_sco">Škótsky</string>
<string name="lang_scn">Sicílsky</string>
<string name="lang_pnb">Pandžábsky</string>
<string name="lang_ne">Nepálsky</string>
<string name="lang_nap">Neapolsky</string>
<string name="lang_my">Barmsky</string>
<string name="lang_mn">Mongolsky</string>
<string name="lang_min">Minangkabausky</string>
<string name="lang_mg">Malagašsky</string>
<string name="lang_ky">Kirgizsky</string>
<string name="lang_kk">Kazašsky</string>
<string name="lang_jv">Jávsky</string>
<string name="lang_gu">Gudžarátsky</string>
<string name="lang_cv">Baškir</string>
<string name="lang_ce">Čečensky</string>
<string name="lang_bar">Bavorsky</string>
<string name="lang_ba">Baškirsky</string>
<string name="lang_an">Aragonsky</string>
<string name="lang_lmo">Lombardsky</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Platba bude stiahnutá z vášho účtu Google Play po potvrdení nákupu.
\n
\nPredplatné sa automaticky obnovuje, ak ho pred jeho termínom obnovenia nezrušíte. Platba za obdobie predplatného (mesiac/štvrťrok/rok) bude stiahnutý z vášho účtu len v deň obnovenia.
\n
\nSpravovať a zrušiť vaše predplatné môžete v nastaveniach Google Play.</string>
<string name="search_poi_types">Hľadať typy bodov záujmu</string>
<string name="search_poi_types_descr">Skombinovať typy bodov záujmov z rôznych kategórií. Stlačte prepínač pre zvolenie všetkých, stlačte ľavú stranu pre výber kategórií.</string>
</resources>

View file

@ -3588,10 +3588,50 @@
<string name="shared_string_divider">Bölücü</string>
<string name="divider_descr">Bu noktanın altındaki ögeler bir bölücü ile ayrılır.</string>
<string name="shared_string_hidden">Gizli</string>
<string name="hidden_items_descr">Bu ögeler menüden gizlenir, ancak temsil edilen seçenekler veya eklentiler hala çalışır.</string>
<string name="hidden_items_descr">Bu ögeler menüden gizlenir, ancak temsil edilen seçenekler veya eklentiler çalışmaya devam eder.</string>
<string name="main_actions_descr">Ana eylemler sadece 4 düğme içerir.</string>
<string name="main_actions">Ana eylemler</string>
<string name="additional_actions_descr">Bu eylemlere “Eylemler” düğmesine dokunarak erişebilirsiniz.</string>
<string name="move_inside_category">Ögeleri yalnızca bu kategorinin içine taşıyabilirsiniz.</string>
<string name="developer_plugin">Geliştirici Eklentisi</string>
<string name="select_wikipedia_article_langs">Wikipedia makalelerinin haritada görüneceği dilleri seçin. Makaleyi okurken kullanılabilir bütün diller arasında geçiş yapabilirsiniz.</string>
<string name="some_articles_may_not_available_in_lang">Bazı Wikipedia makaleleri sizin dilinizde mevcut olmayabilir.</string>
<string name="lang_zhyue">Kantonca</string>
<string name="lang_zhminnan">Güney Min</string>
<string name="lang_yo">Yorubaca</string>
<string name="lang_war">Varayca</string>
<string name="lang_uz">Özbekçe</string>
<string name="lang_ur">Urduca</string>
<string name="lang_tt">Tatarca</string>
<string name="lang_tg">Tacikçe</string>
<string name="lang_sco">İskoçça</string>
<string name="lang_scn">Sicilyaca</string>
<string name="lang_pnb">Pencapça</string>
<string name="lang_ne">Nepalce</string>
<string name="lang_nap">Napolice</string>
<string name="lang_my">Birmanca</string>
<string name="lang_min">Minangkabau dili</string>
<string name="lang_mg">Malgaşça</string>
<string name="lang_ky">Kırgızca</string>
<string name="lang_kk">Kazakça</string>
<string name="lang_jv">Cava dili</string>
<string name="lang_gu">Guceratça</string>
<string name="lang_cv">Çuvaşça</string>
<string name="lang_ce">Çeçence</string>
<string name="lang_bar">Bavyeraca</string>
<string name="lang_ba">Başkurtça</string>
<string name="lang_an">Aragonca</string>
<string name="lang_lmo">Lombardca</string>
<string name="lang_mn">Moğolca</string>
<string name="custom_color">Özel renk</string>
<string name="extra_maps_menu_group">Ekstra haritalar</string>
<string name="download_unsupported_action">Desteklenmeyen eylem %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">Ödeme, satın almayı onayladıktan sonra Google Play hesabınıza yansıtılacaktır.
\n
\nYenileme tarihinden önce iptal edilmediği sürece abonelik otomatik olarak yenilenir. Hesabınızdan yenileme süresi (ay/üç ay/yıl) için sadece yenileme tarihinde ücret alınacaktır.
\n
\nGoogle Play ayarlarınıza giderek aboneliklerinizi yönetebilir ve iptal edebilirsiniz.</string>
<string name="search_poi_types">POI türleri ara</string>
<string name="search_poi_types_descr">Farklı kategorilerdeki POI türlerini birleştirin. Tümünü seçmek için düğmeye dokunun, kategori seçimi için sol tarafa dokunun.</string>
</resources>

View file

@ -3662,4 +3662,12 @@
<string name="custom_color">自訂顏色</string>
<string name="extra_maps_menu_group">額外地圖</string>
<string name="download_unsupported_action">不支援的動作 %1$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">確認購賣時,款項將會從您的 Google Play 帳號中扣除。
\n
\n除非您在續訂日期前取消否則將會自動續訂。您的帳號將僅會在續訂日期前收取續訂週期的費用。
\n
\n您可以到您的 Google Play 設定管理與取消您的訂閱。</string>
<string name="search_poi_types">搜尋 POI 類型</string>
<string name="search_poi_types_descr">組合來自不同分類的 POI 類型。點擊開關以全選,點擊左側選取分類。</string>
</resources>

View file

@ -11,6 +11,18 @@
Thx - Hardy
-->
<string name="navigation_profiles_item">Navigation profiles</string>
<string name="legend_item_description">The guide to a map\'s symbology</string>
<string name="osmand_purchases_item">OsmAnd purchases</string>
<string name="subscription_osmandlive_item">Subscription - OsmAnd Live</string>
<string name="favorites_item">Favorites</string>
<string name="map_markers_item">Map markers</string>
<string name="travel_item">Travel (Wikivoyage and Wikipedia)</string>
<string name="measure_distance_item">Measure distance</string>
<string name="radius_ruler_item">Radius ruler</string>
<string name="quick_action_item">Quick action</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="tracker_item">OsmAnd tracker</string>
<string name="download_unsupported_action">Unsupported action %1$s</string>
<string name="extra_maps_menu_group">Extra maps</string>
<string name="search_poi_types_descr">Combine POI types from different categories. Tap switch to select all, tap left side to category selection.</string>
@ -3521,7 +3533,7 @@
<string name="faq_item">FAQ</string>
<string name="faq_item_description">Frequently asked questions</string>
<string name="map_viewing_item">Map viewing</string>
<string name="search_on_the_map_item">Searching the map</string>
<string name="search_on_the_map_item">Searching on the map</string>
<string name="instalation_troubleshooting_item">Installation and troubleshooting</string>
<string name="techical_articles_item">Technical articles</string>
<string name="versions_item">Versions</string>

View file

@ -14,6 +14,8 @@ import android.content.res.Resources;
import android.os.AsyncTask;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import net.osmand.AndroidUtils;
@ -617,7 +619,7 @@ public class AppInitializer implements IProgress {
});
}
public static void loadRoutingFiles(final OsmandApplication app, final LoadRoutingFilesCallback callback) {
public static void loadRoutingFiles(@NonNull final OsmandApplication app, @Nullable final LoadRoutingFilesCallback callback) {
new AsyncTask<Void, Void, Map<String, RoutingConfiguration.Builder>>() {
@Override
@ -653,7 +655,9 @@ public class AppInitializer implements IProgress {
app.getCustomRoutingConfigs().putAll(customConfigs);
}
app.avoidSpecificRoads.initRouteObjects(false);
callback.onRoutingFilesLoaded();
if (callback != null) {
callback.onRoutingFilesLoaded();
}
}
private Map<String, String> getDefaultAttributes() {

View file

@ -45,6 +45,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@ -368,7 +369,7 @@ public class CustomOsmandPlugin extends OsmandPlugin {
public static List<CustomRegion> collectRegionsFromJson(@NonNull Context ctx, JSONArray jsonArray) throws JSONException {
List<CustomRegion> customRegions = new ArrayList<>();
Map<String, CustomRegion> flatRegions = new HashMap<>();
Map<String, CustomRegion> flatRegions = new LinkedHashMap<>();
for (int i = 0; i < jsonArray.length(); i++) {
JSONObject regionJson = jsonArray.getJSONObject(i);
CustomRegion region = CustomRegion.fromJson(ctx, regionJson);

View file

@ -32,6 +32,8 @@ import java.util.Map;
public class CustomRegion extends WorldRegion {
public static final int INVALID_ID = -1;
private static final Log LOG = PlatformUtil.getLog(CustomRegion.class);
private String scopeId;
@ -51,7 +53,7 @@ public class CustomRegion extends WorldRegion {
private Map<String, String> icons = new HashMap<>();
private Map<String, String> headers = new HashMap<>();
private int headerColor = -1;
private int headerColor = INVALID_ID;
private CustomRegion(String scopeId, String path, String type) {
@ -75,6 +77,11 @@ public class CustomRegion extends WorldRegion {
@ColorInt
public int getHeaderColor() {
if (headerColor != INVALID_ID) {
return headerColor;
} else if (superregion instanceof CustomRegion) {
return ((CustomRegion) superregion).getHeaderColor();
}
return headerColor;
}
@ -83,6 +90,10 @@ public class CustomRegion extends WorldRegion {
return descriptionInfo;
}
public String getIconName(Context ctx) {
return JsonUtils.getLocalizedResFromMap(ctx, icons, null);
}
public static CustomRegion fromJson(@NonNull Context ctx, JSONObject object) throws JSONException {
String scopeId = object.optString("scope-id", null);
String path = object.optString("path", null);
@ -117,9 +128,9 @@ public class CustomRegion extends WorldRegion {
String headerColor = object.optString("header-color", null);
try {
region.headerColor = Algorithms.isEmpty(headerColor) ? 0 : Algorithms.parseColor(headerColor);
region.headerColor = Algorithms.isEmpty(headerColor) ? INVALID_ID : Algorithms.parseColor(headerColor);
} catch (IllegalArgumentException e) {
region.headerColor = 0;
region.headerColor = INVALID_ID;
}
region.descriptionInfo = DownloadDescriptionInfo.fromJson(object.optJSONObject("description"));
@ -138,6 +149,9 @@ public class CustomRegion extends WorldRegion {
JsonUtils.writeLocalizedMapToJson("icon", jsonObject, icons);
JsonUtils.writeLocalizedMapToJson("header", jsonObject, headers);
if (headerColor != INVALID_ID) {
jsonObject.putOpt("header-color", Algorithms.colorToString(headerColor));
}
if (descriptionInfo != null) {
jsonObject.putOpt("description", descriptionInfo.toJson());
}
@ -216,6 +230,7 @@ public class CustomRegion extends WorldRegion {
if ("json".equalsIgnoreCase(dynamicDownloadItems.format)) {
dynamicItemsJson = mapJsonItems(result);
}
app.getDownloadThread().runReloadIndexFilesSilent();
}
}
};
@ -259,7 +274,7 @@ public class CustomRegion extends WorldRegion {
if (value instanceof String) {
String key = (String) value;
int index = key.indexOf("@");
if (index != -1) {
if (index != INVALID_ID) {
key = key.substring(index + 1);
}
return json.opt(key);

View file

@ -377,7 +377,8 @@ public class UiUtilities {
TextView tvMessage = (TextView) view.findViewById(com.google.android.material.R.id.snackbar_text);
TextView tvAction = (TextView) view.findViewById(com.google.android.material.R.id.snackbar_action);
if (messageColor == null) {
messageColor = nightMode ? R.color.text_color_primary_dark : R.color.text_color_primary_light;
messageColor = nightMode ? R.color.active_buttons_and_links_text_dark
: R.color.active_buttons_and_links_text_light;
}
tvMessage.setTextColor(ContextCompat.getColor(ctx, messageColor));
if (actionColor == null) {
@ -388,7 +389,7 @@ public class UiUtilities {
tvMessage.setMaxLines(maxLines);
}
if (backgroundColor == null) {
backgroundColor = nightMode ? R.color.list_background_color_dark : R.color.list_background_color_light;
backgroundColor = nightMode ? R.color.list_background_color_dark : R.color.color_black;
}
view.setBackgroundColor(ContextCompat.getColor(ctx, backgroundColor));
}

View file

@ -99,6 +99,8 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
R.string.navigation_item_description, "feature_articles/navigation.html"));
contextMenuAdapter.addItem(createItem(R.string.faq_item,
R.string.faq_item_description, "feature_articles/faq.html"));
contextMenuAdapter.addItem(createItem(R.string.map_legend,
R.string.legend_item_description, "feature_articles/map-legend.html"));
}
private void createSocialNetworksItems(ContextMenuAdapter contextMenuAdapter) {
@ -127,8 +129,28 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
"feature_articles/find-something-on-map.html"));
contextMenuAdapter.addItem(createItem(R.string.planning_trip_item, NULL_ID,
"feature_articles/trip-planning.html"));
contextMenuAdapter.addItem(createItem(R.string.map_legend, NULL_ID,
"feature_articles/map-legend.html"));
contextMenuAdapter.addItem(createItem(R.string.navigation_profiles_item, NULL_ID,
"feature_articles/navigation-profiles.html"));
contextMenuAdapter.addItem(createItem(R.string.osmand_purchases_item, NULL_ID,
"feature_articles/osmand_purchases.html"));
contextMenuAdapter.addItem(createItem(R.string.subscription_osmandlive_item, NULL_ID,
"feature_articles/subscription.html"));
contextMenuAdapter.addItem(createItem(R.string.favorites_item, NULL_ID,
"feature_articles/favourites.html"));
contextMenuAdapter.addItem(createItem(R.string.map_markers_item, NULL_ID,
"feature_articles/map-markers.html"));
contextMenuAdapter.addItem(createItem(R.string.travel_item, NULL_ID,
"feature_articles/travel.html"));
contextMenuAdapter.addItem(createItem(R.string.measure_distance_item, NULL_ID,
"feature_articles/measure-distance.html"));
contextMenuAdapter.addItem(createItem(R.string.radius_ruler_item, NULL_ID,
"feature_articles/ruler.html"));
contextMenuAdapter.addItem(createItem(R.string.quick_action_item, NULL_ID,
"feature_articles/quick-action.html"));
contextMenuAdapter.addItem(createItem(R.string.mapillary_item, NULL_ID,
"feature_articles/mapillary.html"));
contextMenuAdapter.addItem(createItem(R.string.tracker_item, NULL_ID,
"feature_articles/tracker.html"));
}
private void createPluginsItems(ContextMenuAdapter contextMenuAdapter) {

View file

@ -1,6 +1,7 @@
package net.osmand.plus.activities.actions;
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Build.VERSION_CODES;
@ -22,6 +23,7 @@ import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import org.apache.commons.logging.Log;
@ -110,6 +112,7 @@ public class AppModeDialog {
public static void updateButtonState(final OsmandApplication ctx, final List<ApplicationMode> visible,
final Set<ApplicationMode> selected, final View.OnClickListener onClickListener, final View[] buttons,
int i, final boolean singleChoice, final boolean useMapTheme, final boolean nightMode) {
Context themedCtx = UiUtilities.getThemedContext(ctx, nightMode);
if (buttons[i] != null) {
View tb = buttons[i];
final ApplicationMode mode = visible.get(i);
@ -124,7 +127,7 @@ public class AppModeDialog {
} else {
if (useMapTheme) {
iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)));
iv.setBackgroundResource(AndroidUtils.resolveAttribute(ctx, android.R.attr.selectableItemBackground));
iv.setBackgroundResource(AndroidUtils.resolveAttribute(themedCtx, android.R.attr.selectableItemBackground));
} else {
iv.setImageDrawable(ctx.getUIUtilities().getThemedIcon(mode.getIconRes()));
}

View file

@ -240,10 +240,11 @@ public class PluginInstalledBottomSheetDialog extends MenuBottomSheetDialogFragm
private void createSuggestedMapsItems(List<IndexItem> suggestedMaps) {
final OsmandApplication app = requiredMyApplication();
Context themedCtx = UiUtilities.getThemedContext(app, nightMode);
items.add(new DividerItem(getContext()));
items.add(new DividerItem(themedCtx));
View categoryView = UiUtilities.getInflater(getContext(), nightMode).inflate(R.layout.bottom_sheet_item_with_descr_56dp, null);
View categoryView = UiUtilities.getInflater(themedCtx, nightMode).inflate(R.layout.bottom_sheet_item_with_descr_56dp, null);
categoryView.findViewById(R.id.icon).setVisibility(View.GONE);
BaseBottomSheetItem addedAppProfiles = new BottomSheetItemWithDescription.Builder()
@ -256,8 +257,8 @@ public class PluginInstalledBottomSheetDialog extends MenuBottomSheetDialogFragm
final DownloadIndexesThread downloadThread = app.getDownloadThread();
for (final IndexItem indexItem : suggestedMaps) {
View view = UiUtilities.getInflater(app, nightMode).inflate(R.layout.list_item_icon_and_download, null);
AndroidUtils.setBackground(view, UiUtilities.getSelectableDrawable(app));
View view = UiUtilities.getInflater(themedCtx, nightMode).inflate(R.layout.list_item_icon_and_download, null);
AndroidUtils.setBackground(view, UiUtilities.getSelectableDrawable(themedCtx));
final ImageView secondaryIcon = view.findViewById(R.id.secondary_icon);
final ProgressBar progressBar = view.findViewById(R.id.ProgressBar);
@ -302,6 +303,7 @@ public class PluginInstalledBottomSheetDialog extends MenuBottomSheetDialogFragm
private void updateItems() {
Activity activity = getActivity();
Context themedCtx = UiUtilities.getThemedContext(activity, nightMode);
View mainView = getView();
if (activity != null && mainView != null) {
LinearLayout itemsContainer = (LinearLayout) mainView.findViewById(useScrollableItemsContainer()
@ -312,7 +314,7 @@ public class PluginInstalledBottomSheetDialog extends MenuBottomSheetDialogFragm
items.clear();
createMenuItems(null);
for (BaseBottomSheetItem item : items) {
item.inflate(activity, itemsContainer, nightMode);
item.inflate(themedCtx, itemsContainer, nightMode);
}
setupHeightAndBackground(mainView);
}

View file

@ -4,18 +4,25 @@ import android.graphics.drawable.Drawable;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.DrawableRes;
import net.osmand.AndroidUtils;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.CustomRegion;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.DownloadResourceGroup.DownloadResourceGroupType;
import net.osmand.plus.download.IndexItem;
public class DownloadGroupViewHolder {
TextView textView;
private DownloadActivity ctx;
private TextView textView;
public DownloadGroupViewHolder(DownloadActivity ctx, View v) {
this.ctx = ctx;
textView = (TextView) v.findViewById(R.id.title);
@ -23,52 +30,64 @@ public class DownloadGroupViewHolder {
private boolean isParentWorld(DownloadResourceGroup group) {
return group.getParentGroup() == null
|| group.getParentGroup().getType() == DownloadResourceGroup.DownloadResourceGroupType.WORLD;
|| group.getParentGroup().getType() == DownloadResourceGroupType.WORLD;
}
private Drawable getIconForGroup(DownloadResourceGroup group) {
Drawable iconStart;
if (group.getType() == DownloadResourceGroup.DownloadResourceGroupType.VOICE_REC
|| group.getType() == DownloadResourceGroup.DownloadResourceGroupType.VOICE_TTS) {
iconStart = ctx.getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_volume_up);
} else if (group.getType() == DownloadResourceGroup.DownloadResourceGroupType.FONTS) {
iconStart = ctx.getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_map_language);
OsmandApplication app = ctx.getMyApplication();
UiUtilities cache = app.getUIUtilities();
if (group.getType() == DownloadResourceGroupType.VOICE_REC
|| group.getType() == DownloadResourceGroupType.VOICE_TTS) {
iconStart = cache.getThemedIcon(R.drawable.ic_action_volume_up);
} else if (group.getType() == DownloadResourceGroupType.FONTS) {
iconStart = cache.getThemedIcon(R.drawable.ic_action_map_language);
} else {
UiUtilities cache = ctx.getMyApplication().getUIUtilities();
if (group.getRegion() instanceof CustomRegion) {
String iconName = ((CustomRegion) group.getRegion()).getIconName(ctx);
int iconId = AndroidUtils.getDrawableId(app, iconName);
if (iconId != 0) {
iconStart = getIconForDownloadedItems(group, iconId);
return iconStart != null ? iconStart : cache.getThemedIcon(iconId);
}
}
if (isParentWorld(group) || isParentWorld(group.getParentGroup())) {
iconStart = cache.getThemedIcon(R.drawable.ic_world_globe_dark);
} else {
DownloadResourceGroup ggr = group
.getSubGroupById(DownloadResourceGroup.DownloadResourceGroupType.REGION_MAPS.getDefaultId());
iconStart = cache.getThemedIcon(R.drawable.ic_map);
if (ggr != null && ggr.getIndividualResources() != null) {
IndexItem item = null;
for (IndexItem ii : ggr.getIndividualResources()) {
if (ii.getType() == DownloadActivityType.NORMAL_FILE
|| ii.getType() == DownloadActivityType.ROADS_FILE) {
if (ii.isDownloaded() || ii.isOutdated()) {
item = ii;
break;
}
}
}
if (item != null) {
if (item.isOutdated()) {
iconStart = cache.getIcon(R.drawable.ic_map, R.color.color_distance);
} else {
iconStart = cache.getIcon(R.drawable.ic_map, R.color.color_ok);
}
}
iconStart = getIconForDownloadedItems(group, R.drawable.ic_map);
if (iconStart == null) {
iconStart = cache.getThemedIcon(R.drawable.ic_map);
}
}
}
return iconStart;
}
private Drawable getIconForDownloadedItems(DownloadResourceGroup group, @DrawableRes int iconId) {
DownloadResourceGroup ggr = group.getSubGroupById(DownloadResourceGroupType.REGION_MAPS.getDefaultId());
if (ggr != null && ggr.getIndividualResources() != null) {
IndexItem item = null;
for (IndexItem ii : ggr.getIndividualResources()) {
if (ii.getType() == DownloadActivityType.NORMAL_FILE
|| ii.getType() == DownloadActivityType.ROADS_FILE) {
if (ii.isDownloaded() || ii.isOutdated()) {
item = ii;
break;
}
}
}
if (item != null) {
int color = item.isOutdated() ? R.color.color_distance : R.color.color_ok;
return ctx.getMyApplication().getUIUtilities().getIcon(iconId, color);
}
}
return null;
}
public void bindItem(DownloadResourceGroup group) {
String name = group.getName(ctx);
textView.setText(name);
Drawable iconStart = getIconForGroup(group);
AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(textView, iconStart, null, null, null);
}
}
}

View file

@ -19,6 +19,8 @@ import androidx.fragment.app.DialogFragment;
import androidx.viewpager.widget.ViewPager;
import net.osmand.AndroidUtils;
import net.osmand.map.WorldRegion;
import net.osmand.plus.CustomRegion;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
@ -161,6 +163,13 @@ public class DownloadItemFragment extends DialogFragment implements DownloadEven
updateActionButtons(activity, descriptionInfo, indexItem, buttonsContainer, R.layout.bottom_buttons, nightMode);
}
}
WorldRegion region = group.getParentGroup().getRegion();
if (region instanceof CustomRegion) {
int headerColor = ((CustomRegion) region).getHeaderColor();
if (headerColor != CustomRegion.INVALID_ID) {
toolbar.setBackgroundColor(headerColor);
}
}
}
static void updateActionButtons(final DownloadActivity ctx, DownloadDescriptionInfo descriptionInfo,

View file

@ -0,0 +1,157 @@
package net.osmand.plus.download.ui;
import android.content.res.Resources;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import net.osmand.plus.R;
import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
import net.osmand.plus.download.CustomIndexItem;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.IndexItem;
import java.util.ArrayList;
import java.util.List;
public class DownloadResourceGroupAdapter extends OsmandBaseExpandableListAdapter {
private List<DownloadResourceGroup> data = new ArrayList<DownloadResourceGroup>();
private DownloadActivity ctx;
private DownloadResourceGroup mainGroup;
public DownloadResourceGroupAdapter(DownloadActivity ctx) {
this.ctx = ctx;
}
public void update(DownloadResourceGroup mainGroup) {
this.mainGroup = mainGroup;
data = mainGroup.getGroups();
notifyDataSetChanged();
}
@Override
public Object getChild(int groupPosition, int childPosition) {
DownloadResourceGroup drg = data.get(groupPosition);
if (drg.getType().containsIndexItem()) {
return drg.getItemByIndex(childPosition);
}
return drg.getGroupByIndex(childPosition);
}
@Override
public long getChildId(int groupPosition, int childPosition) {
return groupPosition * 10000 + childPosition;
}
@Override
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
final Object child = getChild(groupPosition, childPosition);
if (child instanceof IndexItem) {
IndexItem item = (IndexItem) child;
DownloadResourceGroup group = getGroupObj(groupPosition);
ItemViewHolder viewHolder;
if (convertView != null && convertView.getTag() instanceof ItemViewHolder) {
viewHolder = (ItemViewHolder) convertView.getTag();
} else {
convertView = LayoutInflater.from(parent.getContext()).inflate(
R.layout.two_line_with_images_list_item, parent, false);
viewHolder = new ItemViewHolder(convertView, ctx);
viewHolder.setShowRemoteDate(true);
convertView.setTag(viewHolder);
}
if (mainGroup.getType() == DownloadResourceGroup.DownloadResourceGroupType.REGION &&
group != null && group.getType() == DownloadResourceGroup.DownloadResourceGroupType.REGION_MAPS
&& !(item instanceof CustomIndexItem)) {
viewHolder.setShowTypeInName(true);
viewHolder.setShowTypeInDesc(false);
} else if (group != null && (group.getType() == DownloadResourceGroup.DownloadResourceGroupType.SRTM_HEADER
|| group.getType() == DownloadResourceGroup.DownloadResourceGroupType.HILLSHADE_HEADER)) {
viewHolder.setShowTypeInName(false);
viewHolder.setShowTypeInDesc(false);
} else {
viewHolder.setShowTypeInDesc(true);
}
viewHolder.bindIndexItem(item);
} else {
DownloadResourceGroup group = (DownloadResourceGroup) child;
DownloadGroupViewHolder viewHolder;
if (convertView != null && convertView.getTag() instanceof DownloadGroupViewHolder) {
viewHolder = (DownloadGroupViewHolder) convertView.getTag();
} else {
convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.simple_list_menu_item,
parent, false);
viewHolder = new DownloadGroupViewHolder(ctx, convertView);
convertView.setTag(viewHolder);
}
viewHolder.bindItem(group);
}
return convertView;
}
@Override
public View getGroupView(int groupPosition, boolean isExpanded, final View convertView, final ViewGroup parent) {
View v = convertView;
String section = getGroup(groupPosition);
if (v == null) {
LayoutInflater inflater = LayoutInflater.from(ctx);
v = inflater.inflate(R.layout.download_item_list_section, parent, false);
}
TextView nameView = ((TextView) v.findViewById(R.id.title));
nameView.setText(section);
v.setOnClickListener(null);
TypedValue typedValue = new TypedValue();
Resources.Theme theme = ctx.getTheme();
theme.resolveAttribute(R.attr.activity_background_color, typedValue, true);
v.setBackgroundColor(typedValue.data);
return v;
}
@Override
public int getChildrenCount(int groupPosition) {
return data.get(groupPosition).size();
}
public DownloadResourceGroup getGroupObj(int groupPosition) {
return data.get(groupPosition);
}
@Override
public String getGroup(int groupPosition) {
DownloadResourceGroup drg = data.get(groupPosition);
int rid = drg.getType().getResourceId();
if (rid != -1) {
return ctx.getString(rid);
}
return "";
}
@Override
public int getGroupCount() {
return data.size();
}
@Override
public long getGroupId(int groupPosition) {
return groupPosition;
}
@Override
public boolean hasStableIds() {
return false;
}
@Override
public boolean isChildSelectable(int groupPosition, int childPosition) {
return true;
}
}

View file

@ -3,11 +3,9 @@ package net.osmand.plus.download.ui;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -28,19 +26,17 @@ import androidx.fragment.app.DialogFragment;
import net.osmand.AndroidNetworkUtils;
import net.osmand.AndroidUtils;
import net.osmand.map.WorldRegion;
import net.osmand.plus.CustomRegion;
import net.osmand.plus.LockableViewPager;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
import net.osmand.plus.download.CustomIndexItem;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadActivity.BannerAndDownloadFreeVersion;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.DownloadResourceGroup.DownloadResourceGroupType;
import net.osmand.plus.download.DownloadResources;
import net.osmand.plus.download.DownloadValidationManager;
import net.osmand.plus.download.IndexItem;
@ -53,9 +49,7 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static net.osmand.plus.download.ui.DownloadItemFragment.updateActionButtons;
@ -438,6 +432,13 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
if (group != null) {
listAdapter.update(group);
toolbar.setTitle(group.getName(activity));
WorldRegion region = group.getRegion();
if (region instanceof CustomRegion) {
int headerColor = ((CustomRegion) region).getHeaderColor();
if (headerColor != CustomRegion.INVALID_ID) {
toolbar.setBackgroundColor(headerColor);
}
}
}
expandAllGroups();
}
@ -565,208 +566,4 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
fragment.setArguments(bundle);
return fragment;
}
private static class DownloadGroupViewHolder {
TextView textView;
private DownloadActivity ctx;
public DownloadGroupViewHolder(DownloadActivity ctx, View v) {
this.ctx = ctx;
textView = (TextView) v.findViewById(R.id.title);
}
private boolean isParentWorld(DownloadResourceGroup group) {
return group.getParentGroup() == null
|| group.getParentGroup().getType() == DownloadResourceGroupType.WORLD;
}
private Drawable getIconForGroup(DownloadResourceGroup group) {
Drawable iconStart;
if (group.getType() == DownloadResourceGroupType.VOICE_REC
|| group.getType() == DownloadResourceGroupType.VOICE_TTS) {
iconStart = ctx.getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_volume_up);
} else if (group.getType() == DownloadResourceGroupType.FONTS) {
iconStart = ctx.getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_map_language);
} else {
UiUtilities cache = ctx.getMyApplication().getUIUtilities();
if (isParentWorld(group) || isParentWorld(group.getParentGroup())) {
iconStart = cache.getThemedIcon(R.drawable.ic_world_globe_dark);
} else {
DownloadResourceGroup ggr = group
.getSubGroupById(DownloadResourceGroupType.REGION_MAPS.getDefaultId());
iconStart = cache.getThemedIcon(R.drawable.ic_map);
if (ggr != null && ggr.getIndividualResources() != null) {
IndexItem item = null;
for (IndexItem ii : ggr.getIndividualResources()) {
if (ii.getType() == DownloadActivityType.NORMAL_FILE
|| ii.getType() == DownloadActivityType.ROADS_FILE) {
if (ii.isDownloaded() || ii.isOutdated()) {
item = ii;
break;
}
}
}
if (item != null) {
if (item.isOutdated()) {
iconStart = cache.getIcon(R.drawable.ic_map, R.color.color_distance);
} else {
iconStart = cache.getIcon(R.drawable.ic_map, R.color.color_ok);
}
}
}
}
}
return iconStart;
}
public void bindItem(DownloadResourceGroup group) {
String name = group.getName(ctx);
textView.setText(name);
Drawable iconStart = getIconForGroup(group);
AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(textView, iconStart, null, null, null);
}
}
public static class DownloadResourceGroupAdapter extends OsmandBaseExpandableListAdapter {
private List<DownloadResourceGroup> data = new ArrayList<DownloadResourceGroup>();
private DownloadActivity ctx;
private DownloadResourceGroup mainGroup;
public DownloadResourceGroupAdapter(DownloadActivity ctx) {
this.ctx = ctx;
}
public void update(DownloadResourceGroup mainGroup) {
this.mainGroup = mainGroup;
data = mainGroup.getGroups();
notifyDataSetChanged();
}
@Override
public Object getChild(int groupPosition, int childPosition) {
DownloadResourceGroup drg = data.get(groupPosition);
if (drg.getType().containsIndexItem()) {
return drg.getItemByIndex(childPosition);
}
return drg.getGroupByIndex(childPosition);
}
@Override
public long getChildId(int groupPosition, int childPosition) {
return groupPosition * 10000 + childPosition;
}
@Override
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
final Object child = getChild(groupPosition, childPosition);
if (child instanceof IndexItem) {
IndexItem item = (IndexItem) child;
DownloadResourceGroup group = getGroupObj(groupPosition);
ItemViewHolder viewHolder;
if (convertView != null && convertView.getTag() instanceof ItemViewHolder) {
viewHolder = (ItemViewHolder) convertView.getTag();
} else {
convertView = LayoutInflater.from(parent.getContext()).inflate(
R.layout.two_line_with_images_list_item, parent, false);
viewHolder = new ItemViewHolder(convertView, ctx);
viewHolder.setShowRemoteDate(true);
convertView.setTag(viewHolder);
}
if (mainGroup.getType() == DownloadResourceGroupType.REGION &&
group != null && group.getType() == DownloadResourceGroupType.REGION_MAPS
&& !(item instanceof CustomIndexItem)) {
viewHolder.setShowTypeInName(true);
viewHolder.setShowTypeInDesc(false);
} else if (group != null && (group.getType() == DownloadResourceGroupType.SRTM_HEADER
|| group.getType() == DownloadResourceGroupType.HILLSHADE_HEADER)) {
viewHolder.setShowTypeInName(false);
viewHolder.setShowTypeInDesc(false);
} else {
viewHolder.setShowTypeInDesc(true);
}
viewHolder.bindIndexItem(item);
} else {
DownloadResourceGroup group = (DownloadResourceGroup) child;
DownloadGroupViewHolder viewHolder;
if (convertView != null && convertView.getTag() instanceof DownloadGroupViewHolder) {
viewHolder = (DownloadGroupViewHolder) convertView.getTag();
} else {
convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.simple_list_menu_item,
parent, false);
viewHolder = new DownloadGroupViewHolder(ctx, convertView);
convertView.setTag(viewHolder);
}
viewHolder.bindItem(group);
}
return convertView;
}
@Override
public View getGroupView(int groupPosition, boolean isExpanded, final View convertView, final ViewGroup parent) {
View v = convertView;
String section = getGroup(groupPosition);
if (v == null) {
LayoutInflater inflater = LayoutInflater.from(ctx);
v = inflater.inflate(R.layout.download_item_list_section, parent, false);
}
TextView nameView = ((TextView) v.findViewById(R.id.title));
nameView.setText(section);
v.setOnClickListener(null);
TypedValue typedValue = new TypedValue();
Resources.Theme theme = ctx.getTheme();
theme.resolveAttribute(R.attr.activity_background_color, typedValue, true);
v.setBackgroundColor(typedValue.data);
return v;
}
@Override
public int getChildrenCount(int groupPosition) {
return data.get(groupPosition).size();
}
public DownloadResourceGroup getGroupObj(int groupPosition) {
return data.get(groupPosition);
}
@Override
public String getGroup(int groupPosition) {
DownloadResourceGroup drg = data.get(groupPosition);
int rid = drg.getType().getResourceId();
if (rid != -1) {
return ctx.getString(rid);
}
return "";
}
@Override
public int getGroupCount() {
return data.size();
}
@Override
public long getGroupId(int groupPosition) {
return groupPosition;
}
@Override
public boolean hasStableIds() {
return false;
}
@Override
public boolean isChildSelectable(int groupPosition, int childPosition) {
return true;
}
}
}

View file

@ -854,6 +854,12 @@ public class ImportHelper {
if (!Algorithms.isEmpty(plugin.getDownloadMaps())) {
app.getDownloadThread().runReloadIndexFilesSilent();
}
if (!Algorithms.isEmpty(plugin.getRendererNames())) {
app.getRendererRegistry().updateExternalRenderers();
}
if (!Algorithms.isEmpty(plugin.getRouterNames())) {
loadRoutingFiles(app, null);
}
if (activity != null) {
plugin.onInstall(app, activity);
}

View file

@ -13,6 +13,7 @@ import net.osmand.osm.PoiCategory;
import net.osmand.osm.PoiFilter;
import net.osmand.osm.PoiType;
import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.mapcontextmenu.MenuBuilder;
@ -21,6 +22,7 @@ import net.osmand.plus.mapcontextmenu.builders.AmenityMenuBuilder;
import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.transport.TransportStopRoute;
import net.osmand.plus.wikipedia.WikipediaDialogFragment;
import net.osmand.plus.wikipedia.WikipediaPoiMenu;
import net.osmand.util.Algorithms;
import net.osmand.util.OpeningHoursParser;
@ -156,9 +158,16 @@ public class AmenityMenuController extends MenuController {
@NonNull
@Override
public String getNameStr() {
String name = amenity.getName(
amenity.getType().isWiki() ? getPreferredMapAppLang() : getPreferredMapLang(),
isTransliterateNames());
String preferredLang = getPreferredMapLang();
if (amenity.getType().isWiki()) {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
OsmandApplication app = mapActivity.getMyApplication();
preferredLang = WikipediaPoiMenu.getWikiArticleLanguage(app,
amenity.getSupportedContentLocales(), getPreferredMapAppLang());
}
}
String name = amenity.getName(preferredLang, isTransliterateNames());
Map<String, String> additionalInfo = amenity.getAdditionalInfo();
if (additionalInfo != null) {
String ref = additionalInfo.get("ref");

View file

@ -1,6 +1,7 @@
package net.osmand.plus.profiles;
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.View;
@ -17,6 +18,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import net.osmand.AndroidUtils;
import net.osmand.CallbackWithObject;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
@ -225,10 +227,11 @@ public class SelectProfileBottomSheetDialogFragment extends BasePreferenceBottom
private void addButtonItem(int titleId, int iconId, OnClickListener listener) {
OsmandApplication app = requiredMyApplication();
Context themedCtx = UiUtilities.getThemedContext(app, nightMode);
int activeColorResId = isNightMode(app) ? R.color.active_color_primary_dark : R.color.active_color_primary_light;
int activeColorResId = AndroidUtils.resolveAttribute(themedCtx, R.attr.active_color_basic);
View buttonView = View.inflate(app, R.layout.bottom_sheet_item_preference_btn, null);
View buttonView = View.inflate(themedCtx, R.layout.bottom_sheet_item_preference_btn, null);
TextView tvTitle = buttonView.findViewById(R.id.title);
tvTitle.setText(app.getString(titleId));

View file

@ -30,6 +30,7 @@ public class RenderingIcons {
private static Map<String, Integer> smallIcons = new LinkedHashMap<String, Integer>();
private static Map<String, Integer> bigIcons = new LinkedHashMap<String, Integer>();
private static Map<String, Bitmap> iconsBmp = new LinkedHashMap<String, Bitmap>();
private static Map<String, Drawable> iconsDrawable = new LinkedHashMap<String, Drawable>();
// private static DisplayMetrics dm;
private static Bitmap cacheBmp = null;
@ -147,7 +148,29 @@ public class RenderingIcons {
}
return iconsBmp.get(s);
}
public static Drawable getDrawableIcon(Context ctx, String s, boolean includeShader) {
if (s == null) {
return null;
}
if (includeShader && shaderIcons.containsKey(s)) {
s = "h_" + s;
}
Drawable d = iconsDrawable.get(s);
if (d == null) {
Integer drawableId = s.startsWith("h_") ? shaderIcons.get(s.substring(2)) : smallIcons.get(s);
if (drawableId != null) {
d = ContextCompat.getDrawable(ctx, drawableId);
if (d != null) {
d = DrawableCompat.wrap(d);
d.mutate();
iconsDrawable.put(s, d);
}
}
}
return d;
}
public static Integer getResId(String id) {
return id.startsWith("h_") ? shaderIcons.get(id.substring(2)) : smallIcons.get(id);
}

View file

@ -1207,6 +1207,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
if (SearchUICore.isDebugMode()) {
LOG.info("UI >> Start loading categories");
}
final boolean nightMode = !app.getSettings().isLightContent();
SearchResultCollection res = searchUICore.shallowSearch(SearchAmenityTypesAPI.class, "", null);
if (res != null) {
List<QuickSearchListItem> rows = new ArrayList<>();
@ -1274,6 +1275,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
}
});
UiUtilities.setupSnackbarVerticalLayout(snackbar);
UiUtilities.setupSnackbar(snackbar, nightMode);
snackbar.show();
}
}

View file

@ -99,7 +99,7 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
showResult(sr);
} else {
if (sr.objectType == ObjectType.CITY || sr.objectType == ObjectType.VILLAGE) {
if (sr.objectType == ObjectType.CITY || sr.objectType == ObjectType.VILLAGE || sr.objectType == ObjectType.STREET) {
showResult = true;
}
dialogFragment.completeQueryWithObject(sr);

View file

@ -940,6 +940,7 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
}
});
UiUtilities.setupSnackbarVerticalLayout(snackbar);
UiUtilities.setupSnackbar(snackbar, nightMode);
snackbar.show();
}
}

View file

@ -271,11 +271,7 @@ public class ImportDuplicatesFragment extends BaseOsmAndFragment implements View
public void onSettingsImportFinished(boolean succeed, @NonNull List<SettingsItem> items) {
if (succeed) {
app.getRendererRegistry().updateExternalRenderers();
AppInitializer.loadRoutingFiles(app, new AppInitializer.LoadRoutingFilesCallback() {
@Override
public void onRoutingFilesLoaded() {
}
});
AppInitializer.loadRoutingFiles(app, null);
FragmentManager fm = getFragmentManager();
if (fm != null && file != null) {
ImportCompleteFragment.showInstance(fm, items, file.getName());

View file

@ -1,5 +1,6 @@
package net.osmand.plus.settings.bottomsheets;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.os.Build;
@ -51,6 +52,7 @@ public class BooleanPreferenceBottomSheet extends BasePreferenceBottomSheet {
if (!(preference instanceof BooleanPreference)) {
return;
}
Context themedCtx = UiUtilities.getThemedContext(app, nightMode);
String title = switchPreference.getTitle().toString();
items.add(new TitleItem(title));
@ -62,8 +64,8 @@ public class BooleanPreferenceBottomSheet extends BasePreferenceBottomSheet {
? getString(R.string.shared_string_enabled) : summaryOn.toString();
final String off = summaryOff == null || summaryOff.toString().equals("")
? getString(R.string.shared_string_disabled) : summaryOff.toString();
final int activeColor = AndroidUtils.resolveAttribute(app, R.attr.active_color_basic);
final int disabledColor = AndroidUtils.resolveAttribute(app, android.R.attr.textColorSecondary);
final int activeColor = AndroidUtils.resolveAttribute(themedCtx, R.attr.active_color_basic);
final int disabledColor = AndroidUtils.resolveAttribute(themedCtx, android.R.attr.textColorSecondary);
boolean checked = pref.getModeValue(getAppMode());
final BottomSheetItemWithCompoundButton[] preferenceBtn = new BottomSheetItemWithCompoundButton[1];
@ -129,10 +131,11 @@ public class BooleanPreferenceBottomSheet extends BasePreferenceBottomSheet {
protected void updateCustomButtonView(View customView, boolean checked) {
OsmandApplication app = requiredMyApplication();
Context themedCtx = UiUtilities.getThemedContext(app, nightMode);
View buttonView = customView.findViewById(R.id.button_container);
int colorRes = getAppMode().getIconColorInfo().getColor(nightMode);
int color = checked ? getResolvedColor(colorRes) : AndroidUtils.getColorFromAttr(app, R.attr.divider_color_basic);
int color = checked ? getResolvedColor(colorRes) : AndroidUtils.getColorFromAttr(themedCtx, R.attr.divider_color_basic);
int bgColor = UiUtilities.getColorWithAlpha(color, checked ? 0.1f : 0.5f);
int selectedColor = UiUtilities.getColorWithAlpha(color, checked ? 0.3f : 0.5f);

View file

@ -170,6 +170,7 @@ public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet {
fragment.setNewDirectory(newDirectory);
fragment.setTargetFragment(target, 0);
fragment.setUsedOnMap(usedOnMap);
fragment.setArguments(args);
fragment.show(fm, TAG);
return true;
}

View file

@ -1,5 +1,6 @@
package net.osmand.plus.settings.bottomsheets;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
@ -59,6 +60,7 @@ public class RecalculateRouteInDeviationBottomSheet extends BooleanPreferenceBot
settings = app.getSettings();
appMode = getAppMode();
preference = settings.ROUTE_RECALCULATION_DISTANCE;
Context themedCtx = UiUtilities.getThemedContext(app, nightMode);
getPreferenceStateAndValue();
final SwitchPreferenceEx switchPref = (SwitchPreferenceEx) getPreference();
@ -81,9 +83,9 @@ public class RecalculateRouteInDeviationBottomSheet extends BooleanPreferenceBot
}
final int appModeColorId = appMode.getIconColorInfo().getColor(nightMode);
final int appModeColor = ContextCompat.getColor(app, appModeColorId);
final int activeColor = AndroidUtils.resolveAttribute(app, R.attr.active_color_basic);
final int disabledColor = AndroidUtils.resolveAttribute(app, android.R.attr.textColorSecondary);
final int appModeColor = ContextCompat.getColor(themedCtx, appModeColorId);
final int activeColor = AndroidUtils.resolveAttribute(themedCtx, R.attr.active_color_basic);
final int disabledColor = AndroidUtils.resolveAttribute(themedCtx, android.R.attr.textColorSecondary);
String title = getString(R.string.recalculate_route_in_deviation);
items.add(new TitleItem(title));
@ -176,11 +178,12 @@ public class RecalculateRouteInDeviationBottomSheet extends BooleanPreferenceBot
}
private void updateSliderView() {
int activeColor = AndroidUtils.resolveAttribute(app, R.attr.active_color_basic);
int disabledColor = AndroidUtils.resolveAttribute(app, android.R.attr.textColorSecondary);
int textColorPrimary = AndroidUtils.resolveAttribute(app, android.R.attr.textColorPrimary);
tvSliderTitle.setTextColor(ContextCompat.getColor(app, enabled ? textColorPrimary : disabledColor));
tvSliderSummary.setTextColor(ContextCompat.getColor(app, enabled ? activeColor : disabledColor));
Context themedCtx = UiUtilities.getThemedContext(app, nightMode);
int activeColor = AndroidUtils.resolveAttribute(themedCtx, R.attr.active_color_basic);
int disabledColor = AndroidUtils.resolveAttribute(themedCtx, android.R.attr.textColorSecondary);
int textColorPrimary = AndroidUtils.resolveAttribute(themedCtx, android.R.attr.textColorPrimary);
tvSliderTitle.setTextColor(ContextCompat.getColor(themedCtx, enabled ? textColorPrimary : disabledColor));
tvSliderSummary.setTextColor(ContextCompat.getColor(themedCtx, enabled ? activeColor : disabledColor));
tvSliderSummary.setText(getFormattedDistance(app, currentValue));
slider.setValue(findIndexOfValue(currentValue));
slider.setEnabled(enabled);

View file

@ -12,6 +12,7 @@ import androidx.fragment.app.FragmentManager;
import net.osmand.AndroidUtils;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTitleWithDescrAndButton;
import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
@ -42,6 +43,7 @@ public class SingleSelectPreferenceBottomSheet extends BasePreferenceBottomSheet
if (ctx == null || listPreference == null || listPreference.getEntries() == null || listPreference.getEntryValues() == null) {
return;
}
ctx = UiUtilities.getThemedContext(ctx, nightMode);
Bundle args = getArguments();
if (args != null && args.containsKey(USE_COLLAPSIBLE_DESCRIPTION)) {
collapsibleDescription = args.getBoolean(USE_COLLAPSIBLE_DESCRIPTION);

View file

@ -816,7 +816,9 @@ public class MapControlsLayer extends OsmandMapLayer {
compassHud.forceHideCompass = forceHideCompass;
compassHud.updateVisibility(!forceHideCompass && shouldShowCompass());
if (layersHud.setIconResId(settings.getApplicationMode().getMapIconRes())) {
ApplicationMode appMode = settings.getApplicationMode();
layersHud.setIconColorId(appMode.getIconColorInfo().getColor(isNight));
if (layersHud.setIconResId(appMode.getMapIconRes())) {
layersHud.update(app, isNight);
}
layersHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && !isInMeasurementToolMode() && !isInPlanRouteMode()

View file

@ -43,6 +43,7 @@ import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.routing.IRouteInformationListener;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.MapTextLayer.MapTextProvider;
import net.osmand.plus.wikipedia.WikipediaPoiMenu;
import net.osmand.util.Algorithms;
import java.util.ArrayList;
@ -60,11 +61,11 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
public static final org.apache.commons.logging.Log log = PlatformUtil.getLog(POIMapLayer.class);
private Paint paintIcon;
private Paint paintIconBackground;
private Bitmap poiBackground;
private Bitmap poiBackgroundSmall;
private PorterDuffColorFilter poiColorFilter;
private int poiSize;
private OsmandMapTileView view;
@ -175,11 +176,8 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
public void initLayer(OsmandMapTileView view) {
this.view = view;
paintIcon = new Paint();
//paintIcon.setStrokeWidth(1);
//paintIcon.setStyle(Style.STROKE);
//paintIcon.setColor(Color.BLUE);
paintIcon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN));
poiSize = dpToPx(view.getContext(), 16f);
poiColorFilter = new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN);
paintIconBackground = new Paint();
poiBackground = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_white_orange_poi_shield);
poiBackgroundSmall = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_white_orange_poi_shield_small);
@ -262,9 +260,14 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
}
}
if (id != null) {
Bitmap bmp = RenderingIcons.getIcon(view.getContext(), id, false);
if (bmp != null) {
canvas.drawBitmap(bmp, x - bmp.getWidth() / 2, y - bmp.getHeight() / 2, paintIcon);
Drawable img = RenderingIcons.getDrawableIcon(view.getContext(), id, false);
if (img != null) {
canvas.save();
canvas.translate(x - poiSize / 2f, y - poiSize / 2f);
img.setBounds(0, 0, poiSize, poiSize);
img.setColorFilter(poiColorFilter);
img.draw(canvas);
canvas.restore();
}
}
}
@ -354,16 +357,19 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
public PointDescription getObjectName(Object o) {
if (o instanceof Amenity) {
Amenity a = (Amenity) o;
String preferredMapLang = app.getSettings().MAP_PREFERRED_LOCALE.get();
String preferredMapAppLang = preferredMapLang;
if (Algorithms.isEmpty(preferredMapAppLang)) {
preferredMapAppLang = app.getLanguage();
}
String preferredLang = app.getSettings().MAP_PREFERRED_LOCALE.get();
boolean transliterateNames = app.getSettings().MAP_TRANSLITERATE_NAMES.get();
return new PointDescription(PointDescription.POINT_TYPE_POI, a.getName(
a.getType().isWiki() ? preferredMapAppLang : preferredMapLang,
transliterateNames));
if (a.getType().isWiki()) {
if (Algorithms.isEmpty(preferredLang)) {
preferredLang = app.getLanguage();
}
preferredLang = WikipediaPoiMenu.getWikiArticleLanguage(app,
a.getSupportedContentLocales(), preferredLang);
}
return new PointDescription(PointDescription.POINT_TYPE_POI,
a.getName(preferredLang, transliterateNames));
}
return null;
}