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

Merge branch 'r3.7' into Tablet_sizes

Browse source
This commit is contained in:
Victor Shcherb 2020-05-19 16:09:02 +02:00
commit 3f62311456
317 changed files with 1269 additions and 886 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java
View file

@ -11,6 +11,7 @@ import net.osmand.binary.RouteDataBundle;
import net.osmand.binary.StringBundle;
import net.osmand.binary.StringBundleWriter;
import net.osmand.binary.StringBundleXmlWriter;
import net.osmand.util.Algorithms;
import org.xmlpull.v1.XmlSerializer;
@ -38,20 +39,22 @@ public class RouteExporter {
RouteDataResources resources = new RouteDataResources(locations);
final RouteDataBundle bundle = new RouteDataBundle(resources);
for (RouteSegmentResult sr : route) {
sr.collectTypes(resources);
}
for (RouteSegmentResult sr : route) {
sr.collectNames(resources);
}
if (!Algorithms.isEmpty(route)) {
for (RouteSegmentResult sr : route) {
sr.collectTypes(resources);
}
for (RouteSegmentResult sr : route) {
sr.collectNames(resources);
}
List<StringBundle> routeItems = new ArrayList<>();
for (RouteSegmentResult sr : route) {
RouteDataBundle itemBundle = new RouteDataBundle(resources);
sr.writeToBundle(itemBundle);
routeItems.add(itemBundle);
List<StringBundle> routeItems = new ArrayList<>();
for (RouteSegmentResult sr : route) {
RouteDataBundle itemBundle = new RouteDataBundle(resources);
sr.writeToBundle(itemBundle);
routeItems.add(itemBundle);
}
bundle.putBundleList("route", "segment", routeItems);
}
bundle.putBundleList("route", "segment", routeItems);
List<StringBundle> typeList = new ArrayList<>();
Map<RouteTypeRule, Integer> rules = resources.getRules();

1
OsmAnd/res/layout/download_tiles.xml
View file

@ -25,6 +25,7 @@
android:id="@+id/ZoomToDownload"
style="@style/Widget.Styled.Slider"
android:layout_width="fill_parent"
android:stepSize="1"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"

6
OsmAnd/res/layout/fragment_edit_poi.xml
View file

@ -95,12 +95,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:completionThreshold="1"
android:drawableRight="@drawable/ic_action_arrow_drop_down"
app:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
android:importantForAutofill="noExcludeDescendants"
android:imeOptions="actionSend"
android:inputType="text"
tools:text="@string/lorem_ipsum"
android:drawableEnd="@drawable/ic_action_arrow_drop_down" />
tools:text="@string/lorem_ipsum" />
</com.google.android.material.textfield.TextInputLayout>

4
OsmAnd/res/layout/point_editor_fragment.xml
View file

@ -169,9 +169,9 @@
android:layout_marginLeft="@dimen/content_padding_half"
android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="@dimen/content_padding_half"
android:drawableRight="@drawable/ic_action_arrow_drop_down"
app:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
android:editable="false"
android:drawableEnd="@drawable/ic_action_arrow_drop_down"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding_half" />

6
OsmAnd/res/layout/quick_action_add_favorite.xml
View file

@ -195,11 +195,11 @@
android:layout_marginTop="@dimen/content_padding_half"
android:focusable="false"
android:text="@string/shared_string_favorites"
android:drawableRight="@drawable/ic_action_arrow_drop_down"
osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
android:editable="false"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding_half"
android:drawableEnd="@drawable/ic_action_arrow_drop_down" />
android:layout_marginStart="@dimen/content_padding_half" />
</LinearLayout>

6
OsmAnd/res/layout/quick_action_add_gpx.xml
View file

@ -194,12 +194,12 @@
android:layout_marginRight="@dimen/content_padding"
android:layout_marginTop="@dimen/content_padding_half"
android:focusable="false"
osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
android:text="@string/shared_string_favorites"
android:drawableRight="@drawable/ic_action_arrow_drop_down"
android:editable="false"
android:layout_marginStart="@dimen/content_padding_half"
android:layout_marginEnd="@dimen/content_padding"
android:drawableEnd="@drawable/ic_action_arrow_drop_down" />
android:layout_marginEnd="@dimen/content_padding" />
</LinearLayout>

6
OsmAnd/res/layout/quick_action_add_poi_layout.xml
View file

@ -89,14 +89,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:completionThreshold="1"
android:drawableTint="@color/osmand_orange"
android:drawableRight="@drawable/ic_action_arrow_drop_down"
osmand:drawableTint="@color/osmand_orange"
osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
android:hint="@string/poi_dialog_poi_type"
android:imeOptions="actionSend"
android:inputType="text"
android:layout_marginLeft="-4dp"
tools:text="@string/lorem_ipsum"
android:drawableEnd="@drawable/ic_action_arrow_drop_down"
android:layout_marginStart="-4dp" />
</com.google.android.material.textfield.TextInputLayout>

6
OsmAnd/res/layout/subscription_fragment.xml
View file

@ -179,14 +179,14 @@
android:id="@+id/selectCountryEdit"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:drawableRight="@drawable/ic_action_arrow_drop_down"
app:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
android:editable="false"
android:paddingLeft="2dp"
android:paddingRight="0dp"
android:text="Ukraine"
android:paddingStart="2dp"
android:paddingEnd="0dp"
android:drawableEnd="@drawable/ic_action_arrow_drop_down" />
android:paddingEnd="0dp" />
<TextView
android:layout_width="match_parent"

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

@ -3538,4 +3538,7 @@
<string name="add_edit_favorite">Дадаць / рэдагаваць улюбёнае</string>
<string name="reset_deafult_order">Аднавіць прадвызначаны парадак элементаў</string>
<string name="back_to_editing">Вярнуцца да рэдагавання</string>
<string name="quick_action_transport_show">Паказаць грамадскі транспарт</string>
<string name="quick_action_transport_descr">Кнопка, каб паказаць ці схаваць грамадскі транспарт на карце.</string>
<string name="shared_string_add_profile">Дадаць профіль</string>
</resources>

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

@ -2339,13 +2339,13 @@ Repræsenterer område: %1$s x %2$s</string>
\n • Valgfri visning af hastighedsgrænse med påmindelse ved overskridelse
\n • Valgfri hastighedsafhængig zoom  
\n • Del placering, så dine venner kan finde dig</string>
<string name="osmand_plus_extended_description_part6">Cykel og fodgænger-funktioner
\n  • Visning af gang-, vandre- og cykelstier, fantastisk til udendørsaktiviteter
\n  • Særlige navigations- og visningstilstande for cyklister og fodgængere
\n  • Valgfrie stoppesteder for offentlig transport (bus, sporvogn, tog), herunder også linjenavne
\n  • Valgfri ruteoptagelse til lokal GPX-fil eller online tjeneste
\n  • Valgfri hastigheds og højdevisning
\n  • Visning af højdekurver og relieflag (med ekstra udvidelse)</string>
<string name="osmand_plus_extended_description_part6">Cykel og fodgænger-funktioner
\n • Visning af gang-, vandre- og cykelstier, fantastisk til udendørsaktiviteter
\n • Særlige navigations- og visningstilstande for cyklister og fodgængere
\n • Valgfrie stoppesteder for offentlig transport (bus, sporvogn, tog), herunder også linjenavne
\n • Valgfri ruteoptagelse til lokal GPX-fil eller online tjeneste
\n • Valgfri hastigheds og højdevisning
\n • Visning af højdekurver og relieflag (med ekstra udvidelse)</string>
<string name="osmand_plus_extended_description_part8">Anslået kortdækning og kvalitet:
\n • Vesteuropa: ****
\n • Østeuropa: ***

7
OsmAnd/res/values-eo/phrases.xml
View file

@ -2508,9 +2508,9 @@
<string name="poi_pump_type_gravity">Pumpila speco: gravita (sifona)</string>
<string name="poi_pump_style_historic">Pumpila aspekto: historia</string>
<string name="poi_pump_type_india_mk_2_3">Pumpila speco: India Mk II aŭ III</string>
<string name="poi_pump_status_ok">Pumpila stato: laboranta</string>
<string name="poi_pump_status_broken">Pumpila stato: difektita</string>
<string name="poi_pump_status_locked">Pumpila ŝtato: blokita</string>
<string name="poi_pump_status_ok">Stato de pumpilo: funkcianta</string>
<string name="poi_pump_status_broken">Stato de pumpilo: difektita</string>
<string name="poi_pump_status_locked">Stato de pumpilo: ŝlosita</string>
<string name="poi_payment_troika_yes">Troika (Тройка)</string>
<string name="poi_payment_troika_no">Troika (Тройка) kartoj malakceptataj</string>
<string name="poi_telescope_type_optical">optika</string>
@ -3816,4 +3816,5 @@
<string name="poi_fire_hydrant_style_water_source_groundwater">grundakvo</string>
<string name="poi_fire_hydrant_type_pipe">tubo</string>
<string name="poi_fire_hydrant_pressure_filter">Premo de hidranto</string>
<string name="poi_pump_status_missing_beam">Stato de pumpilo: levilo mankas</string>
</resources>

1
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -3830,4 +3830,5 @@
<string name="poi_fire_hydrant_style_water_source_groundwater">Agua subterránea</string>
<string name="poi_fire_hydrant_type_pipe">Tubería</string>
<string name="poi_fire_hydrant_pressure_filter">Presión</string>
<string name="poi_pump_status_missing_beam">Estado de la bomba: sin palanca</string>
</resources>

60
OsmAnd/res/values-fi/phrases.xml
View file

@ -133,7 +133,7 @@
<string name="poi_cheese">Juustokauppa</string>
<string name="poi_chocolate">Suklaakauppa</string>
<string name="poi_coffee">Kahvikauppa</string>
<string name="poi_mall">Posti</string>
<string name="poi_mall">ostoskeskus</string>
<string name="poi_beverages">Virvoitusjuomakauppa</string>
<string name="poi_butcher">Lihakauppa</string>
<string name="poi_deli">Herkkukauppa</string>
@ -1390,4 +1390,62 @@
<string name="poi_post_housenumber">Talon numero</string>
<string name="poi_post_flats">Asunto</string>
<string name="poi_video_telephone">Video</string>
<string name="poi_aerialway_chair_lift">Tuolihissi</string>
<string name="poi_vehicle_ramp">Ajoneuvoramppi</string>
<string name="poi_fire_water_pond">Palolampi</string>
<string name="poi_historic_civilization_roman">Sivilisaatio: roomalainen</string>
<string name="poi_historic_civilization_ancient_greek">Sivilisaatio: antiikin kreikkalainen</string>
<string name="poi_historic_civilization_prehistoric">Sivilisaatio: esihistoriallinen</string>
<string name="poi_tomb_pyramid">Tyyppi: pyramidi</string>
<string name="poi_tomb_sarcophagus">Tyyppi: sarkofagi</string>
<string name="poi_tomb_mausoleum">Tyyppi: mausoleumi</string>
<string name="poi_tomb_war_grave">Tyyppi: sotahauta</string>
<string name="poi_ramp_luggage_no">Ramppi matkatavaroille: ei</string>
<string name="poi_ramp_bicycle_no">Ramppi polkupyörille: ei</string>
<string name="poi_ramp_stroller_no">Ramppi (rattaat): ei</string>
<string name="poi_ramp_stroller_yes">Ramppi (rattaat): kyllä</string>
<string name="poi_ramp_wheelchair_no">Ramppi pyörätuoleille: ei</string>
<string name="poi_ramp_no">Ramppi: ei</string>
<string name="poi_handrail_no">Kaide: ei</string>
<string name="poi_highway_steps">Portaat</string>
<string name="poi_product_meat">Tuote: liha</string>
<string name="poi_product_charcoal">Tuote: puuhiili</string>
<string name="poi_product_beer">Tuote: olut</string>
<string name="poi_product_leather">Tuote: nahka</string>
<string name="poi_kiln">polttouuni</string>
<string name="poi_product_brick">Tuote: tiili</string>
<string name="poi_theatre_genre_shadow_play">Varjoleikki</string>
<string name="poi_theatre_genre_ballet">Baletti</string>
<string name="poi_theatre_genre_marionette">Marionetti</string>
<string name="poi_theatre_genre_chamber_music">Kamarimusiikki</string>
<string name="poi_theatre_genre_comedy">Komedia</string>
<string name="poi_theatre_genre_opera">Ooppera</string>
<string name="poi_theatre_genre_drama">Draama</string>
<string name="poi_theatre_genre_musical">Musikaali</string>
<string name="poi_theatre_genre_philharmonic">Filharmoninen</string>
<string name="poi_social_facility_for_unemployed">työtön</string>
<string name="poi_social_facility_for_underprivileged">Vähäosaisten</string>
<string name="poi_social_facility_for_migrant">Maahanmuuttajat</string>
<string name="poi_social_facility_for_homeless">Koditon</string>
<string name="poi_social_facility_for_juvenile">Nuorten</string>
<string name="poi_social_facility_for_mental_health">Mielenterveysongelmista kärsivät potilaat</string>
<string name="poi_social_facility_for_orphan">Orvot</string>
<string name="poi_social_facility_for_child">Lapset</string>
<string name="poi_social_facility_for_senior">Seniorit</string>
<string name="poi_social_facility_day_care">Päivähoito</string>
<string name="poi_social_facility_workshop">Työpaja</string>
<string name="poi_social_facility_food_bank">Ruokapankki</string>
<string name="poi_social_facility_assisted_living">Avustettu asuminen</string>
<string name="poi_social_facility_group_home">Ryhmäkoti</string>
<string name="poi_refugee_yes">Palvelut pakolaisille</string>
<string name="poi_power_supply_nema_5_15">Virtalähde (pistorasia): NEMA 5-15</string>
<string name="poi_power_supply_cee_7_5">Virtalähde (pistorasia): CEE 7/5</string>
<string name="poi_power_supply_cee_7_4">Virtalähde (pistorasia): CEE 7/4</string>
<string name="poi_power_supply_cee_17_blue">Virtalähde (pistorasia): CEE 17 sininen</string>
<string name="poi_power_supply_no">Virtalähde: ei</string>
<string name="poi_sanitary_dump_station_no">Septitankin tyhjennys asema: ei</string>
<string name="poi_sanitary_dump_station_yes">Septitankin tyhjennys asema: kyllä</string>
<string name="poi_caravans_no">Asuntovaunut: ei</string>
<string name="poi_group_only_no">Vain ryhmä: ei</string>
<string name="poi_group_only_yes">Ainoastaan ryhmä: kyllä</string>
</resources>

211
OsmAnd/res/values-nb/phrases.xml
View file

@ -1358,4 +1358,215 @@
<string name="poi_vending_animal_food">Dyrefor</string>
<string name="poi_vending_drinks_food">Drikkevarer og mat</string>
<string name="poi_vending_food">Mat</string>
<string name="poi_ventilation_shaft">Ventilasjonssjakt</string>
<string name="poi_pumping_station">Pumpestasjon</string>
<string name="poi_generator_output_electricity">Utgangseffekt</string>
<string name="poi_voltage">Spenning</string>
<string name="poi_aquaculture_mussels">Akvakultur: Muslinger</string>
<string name="poi_aquaculture_fish">Akvakultur: Fisk</string>
<string name="poi_aquaculture_shrimp">Akvakultur: Reker</string>
<string name="poi_aquaculture">Akvakultur</string>
<string name="poi_public_bookcase_type_phone_box">Type: Telefonkiosk</string>
<string name="poi_tanning_salon">Solarium</string>
<string name="poi_cuisine_donut">Smultring</string>
<string name="poi_cuisine_sushi">Sushi</string>
<string name="poi_cuisine_burger">Hamburger</string>
<string name="poi_cuisine_pizza">Pizza</string>
<string name="poi_cuisine_dessert">Dessert</string>
<string name="poi_cuisine_deli">Delikatesser</string>
<string name="poi_cuisine_hotdog">Pølsevogn</string>
<string name="poi_gambling_bingo">Bingo</string>
<string name="poi_gambling_slot_machines">Spilleautomater</string>
<string name="poi_gambling_lottery">Lotteri</string>
<string name="poi_gambling_type">Type</string>
<string name="poi_electronics_repair_tv">Elektronikkreparasjon: TV</string>
<string name="poi_music_school">Musikkskole</string>
<string name="poi_electronics_repair_phone">Elektronikkreparasjon: Telefon</string>
<string name="poi_electronics_repair_appliance">Elektronikkreparasjon: Apparater</string>
<string name="poi_electronics_repair_computer">Elektronikkreparasjon: Datamaskiner</string>
<string name="poi_drink_wine_served">Vin: Serveres</string>
<string name="poi_drink_wine_retail">Vin: Detaljhandel</string>
<string name="poi_drink_wine_yes">Vin: Ja</string>
<string name="poi_fast_food_cafeteria">Ja</string>
<string name="poi_railway_yard">Fraktstasjon</string>
<string name="poi_animal_keeping">Dyrehold</string>
<string name="poi_motorcycle_clothes_no">Motorsykkelbekledning: Nei</string>
<string name="poi_motorcycle_clothes_yes">Motorsykkelbekledning</string>
<string name="poi_motorcycle_tyres_no">Dekk: Nei</string>
<string name="poi_motorcycle_tyres_yes">Dekk</string>
<string name="poi_motorcycle_parts_no">Deler: Nei</string>
<string name="poi_motorcycle_parts_yes">Deler</string>
<string name="poi_motorcycle_sales_used">Salg: Brukt</string>
<string name="poi_motorcycle_sales_yes_used">Salg: Ja, brukt</string>
<string name="poi_motorcycle_sales_no">Salg: Nei</string>
<string name="poi_beds">Senger</string>
<string name="poi_reservation_members_only">Reservasjon: Kun medlemmer</string>
<string name="poi_reservation_no">Reservasjon: Nei</string>
<string name="poi_direction_all">Retning: Alle</string>
<string name="poi_direction_exit">Retning: Utgang</string>
<string name="poi_direction_entrance">Retning: Inngang</string>
<string name="poi_direction_down">Retning: Nedover</string>
<string name="poi_direction_w">Retning: Vest</string>
<string name="poi_direction_wsw">Retning: Vestlig sørvest</string>
<string name="poi_direction_sw">Retning: Sørvest</string>
<string name="poi_direction_ssw">Retning: Sørlig sørvest</string>
<string name="poi_direction_s">Retning: Sør</string>
<string name="poi_direction_sse">Retning: Sørlig sørøst</string>
<string name="poi_direction_se">Retning: Sørøst</string>
<string name="poi_direction_ese">Retning: Østlig sørøst</string>
<string name="poi_direction_e">Retning: Øst</string>
<string name="poi_direction_ene">Retning: Østlig nordøst</string>
<string name="poi_direction_ne">Retning: Nordøst</string>
<string name="poi_government_treasury">Finansdepartementet</string>
<string name="poi_network">Nettverk</string>
<string name="poi_boat_canoe_rental_rental_no">Kano: Nei</string>
<string name="poi_boat_canoe_rental_rental_yes">Kano: Ja</string>
<string name="poi_boat_kayak_rental_rental_no">Kajakker: Nei</string>
<string name="poi_boat_kayak_rental_rental_yes">Kajakker: Ja</string>
<string name="poi_boat_sailboat_rental_no">Seilbåter: Nei</string>
<string name="poi_boat_sailboat_rental_yes">Seilbåter: Ja</string>
<string name="poi_boat_houseboat_rental_no">Husbåter: Nei</string>
<string name="poi_boat_houseboat_rental_yes">Husbåter: Ja</string>
<string name="poi_boat_motorboat_rental_no">Motorbåt: Nei</string>
<string name="poi_surface_clay">Leire</string>
<string name="poi_mountain_area">Fjellheim</string>
<string name="poi_vhf">VHF-kanal</string>
<string name="poi_water_place_access_family">Familie</string>
<string name="poi_water_place_access_community">Gemenskap</string>
<string name="poi_water_supply_bottled_water">Flaskevann</string>
<string name="poi_operational_status_needs_maintenance">Trenger vedlikehold</string>
<string name="poi_operational_status_broken">Ødelagt</string>
<string name="poi_operational_status_closed">Lukket</string>
<string name="poi_operational_status_open">Åpen</string>
<string name="poi_amperage">Ampere</string>
<string name="poi_bicycle_no">Sykkel: Nei</string>
<string name="poi_bicycle_yes">Sykkel: Ja</string>
<string name="poi_car_no">Bil: Nei</string>
<string name="poi_car_yes">Bil: Ja</string>
<string name="poi_post_flats">Leilighet</string>
<string name="poi_post_housenumber">Husnummer</string>
<string name="poi_post_street">Gate</string>
<string name="poi_map_size_region">Kartstørrelse: Region</string>
<string name="poi_map_size_city">Kartstørrelse: By</string>
<string name="poi_map_size_site">Kartstørrelse: Sted</string>
<string name="poi_climbing_length">Klatrelengde</string>
<string name="poi_climbing_mixed_no">Blandet: Nei</string>
<string name="poi_climbing_ice_yes">Is: Ja</string>
<string name="poi_climbing_boulder_no">Buldring: Nei</string>
<string name="poi_climbing_boulder_yes">Buldring: Ja</string>
<string name="poi_climbing_sport_no">Sport: Nei</string>
<string name="poi_climbing_sport_yes">Sport: Ja</string>
<string name="poi_ref_post">Postnummer</string>
<string name="poi_socket_cee_blue_output_medium">Middels</string>
<string name="poi_socket_cee_blue_output_high">Høy</string>
<string name="poi_socket_type3_output_low">Lav</string>
<string name="poi_socket_type3_output_medium">Middels</string>
<string name="poi_socket_type3_output_high">Høy</string>
<string name="poi_socket_type2_combo_output_low">Lav</string>
<string name="poi_socket_type2_combo_output_medium">Middels</string>
<string name="poi_socket_type2_combo_output_high">Høy</string>
<string name="poi_socket_type2_output_low">Lav</string>
<string name="poi_socket_type2_output_medium">Middels</string>
<string name="poi_socket_type2_output_high">Høy</string>
<string name="poi_socket_chademo_output_low">Lav</string>
<string name="poi_socket_chademo_output_medium">Middels</string>
<string name="poi_socket_chademo_yes">CHAdeMO</string>
<string name="poi_socket_tesla_standard_yes">Tesla standard</string>
<string name="poi_socket_tesla_supercharger_yes">Tesla superlader</string>
<string name="poi_service_vehicle_new_car_sales_yes">Nybilsalg</string>
<string name="poi_service_vehicle_brakes_yes">Bremser</string>
<string name="poi_pottery">Keramikk</string>
<string name="poi_service_vehicle_tyres_yes">Dekk</string>
<string name="poi_service_vehicle_batteries_yes">Batterier</string>
<string name="poi_service_vehicle_car_parts_yes">Bildeler</string>
<string name="poi_service_vehicle_diagnostics_yes">Diagnostikk</string>
<string name="poi_service_vehicle_oil_change_yes">Oljeskift</string>
<string name="poi_flooring">Gulvbutikk</string>
<string name="poi_glacier_slope">Gjennomsnittlig helling</string>
<string name="poi_glacier_ele_bottom">Laveste punkt</string>
<string name="poi_glacier_ele_top">Topp-punkt</string>
<string name="poi_glacier_type_tidewater">Tidevann</string>
<string name="poi_via_ferrata_scale">Vanskelighetsgrad</string>
<string name="poi_ruins">Ruiner</string>
<string name="poi_hazard_minefield">Minefelt</string>
<string name="poi_end_date">Sluttdato</string>
<string name="poi_books_children">Barn</string>
<string name="poi_books_academic">Akademisk</string>
<string name="poi_substation_valve_group">Ventilgruppe</string>
<string name="poi_substation_valve">Ventil</string>
<string name="poi_substation_measurement">Måling</string>
<string name="poi_substation_industrial">Industriell</string>
<string name="poi_bulk_purchase_only">Kun</string>
<string name="poi_bulk_purchase_yes">Ja</string>
<string name="poi_park_ride_bus">Buss</string>
<string name="poi_park_ride_train">Tog</string>
<string name="poi_park_ride_yes">Ja</string>
<string name="poi_denotation_landmark">Landemerke</string>
<string name="poi_hazard">Fare</string>
<string name="poi_defibrillator_location">Plassering</string>
<string name="poi_hazard_additional_contamination">Fare: Forgiftelse</string>
<string name="poi_hazard_additional_minefield">Fare: Minefelt</string>
<string name="poi_hazard_additional_avalanche">Fare: Snøskred</string>
<string name="poi_hazard_additional_flood">Fare: Oversvømmelse</string>
<string name="poi_source_biomass">Energikilde: Biomasse</string>
<string name="poi_motorhome_yes">Ja</string>
<string name="poi_bus_yes">Ja</string>
<string name="poi_snowmobile_yes">Ja</string>
<string name="poi_taxi_no">Drosjetilgang: Nei</string>
<string name="poi_taxi_designated">Drosjetilgang: Anvist plass</string>
<string name="poi_taxi_office">Drosjekontor</string>
<string name="poi_vehicle_no">Kjøretøytilgang: Nei</string>
<string name="poi_vehicle_private">Kjøretøytilgang: Privat</string>
<string name="poi_vehicle_yes">Kjøretøytilgang: Ja</string>
<string name="poi_foot_yes">Fotjengertilgang: Ja</string>
<string name="poi_horse_destination">Hestetilgang: Mål</string>
<string name="poi_bicycle_customers">Sykkeltilgang: Kunder</string>
<string name="poi_bicycle_destination">Sykkeltilgang: Mål</string>
<string name="poi_bicycle_dismount">Sykkeltilgang: Tre av</string>
<string name="poi_bicycle_private">Sykkeltilgang: Privat</string>
<string name="poi_moped_no">Mopedtilgang: Nei</string>
<string name="poi_motorcycle_no">Motorsykkeltilgang: Nei</string>
<string name="poi_craft_bakery">Bakeri</string>
<string name="poi_hgv_yes">Ja</string>
<string name="poi_mofa_yes">Ja</string>
<string name="poi_moped_yes">Ja</string>
<string name="poi_motorcycle_destination">Mål</string>
<string name="poi_atm_yes">Minibank: Ja</string>
<string name="poi_cash_withdrawal_bank_card">Kontantuttak</string>
<string name="poi_bath_open_air_no">Nei</string>
<string name="poi_bath_open_air_yes">Ja</string>
<string name="poi_bath_type_foot_bath">Fotbad</string>
<string name="poi_bath_type_thermal">Jordvarme</string>
<string name="poi_bath_type_hot_spring">Varm kilde</string>
<string name="poi_cash_withdrawal_limit">Kontantuttaksgrense</string>
<string name="poi_bath_open_air">Utendørs</string>
<string name="poi_bath_type">Type</string>
<string name="poi_bowling_alley">Bowlinghall</string>
<string name="poi_shop_security">Sikkerhetsforretning</string>
<string name="poi_mountain_rescue">Fjellberging</string>
<string name="poi_memorial_ghost_bike">Spøkelsessykkel</string>
<string name="poi_volcano_number_of_eruptions">Antall utbrudd</string>
<string name="poi_volcano_status_inactive">Inaktiv</string>
<string name="poi_volcano_last_eruption">Siste utbrudd</string>
<string name="poi_volcano_type_shield">Skjold</string>
<string name="poi_sms">SMS</string>
<string name="poi_osmand_fire_hydrant_pressure_suction">Undertrykk</string>
<string name="poi_osmand_fire_hydrant_pressure_pressurized">Under trykk</string>
<string name="poi_fire_hydrant_style_water_source_groundwater">Grunnvann</string>
<string name="poi_fire_hydrant_type_pipe">Rør</string>
<string name="poi_drinking_water_refill_network">Nettverk for påfyll av drikkevann</string>
<string name="poi_drinking_water_refill_no">Drikkevannspåfylling: Nei</string>
<string name="poi_drinking_water_refill_yes">Drikkevannspåfylling: Ja</string>
<string name="poi_seamark_water_level_submerged">Vann-nivå: Nedsenket</string>
<string name="poi_seamark_obstruction">Hindring</string>
<string name="poi_seamark_water_level_below_mwl">Vann-nivå: Under vanlig vann-nivå</string>
<string name="poi_seamark_water_level_above_mwl">Vann-nivå: Over vanlig vann-nivå</string>
<string name="poi_seamark_water_level_floating">Vann-nivå: Flyter</string>
<string name="poi_seamark_water_level_floods">Vann-nivå: Oversvømmelse</string>
<string name="poi_seamark_water_level_awash">Vann-nivå: Overskylt</string>
<string name="poi_seamark_water_level_covers">Vann-nivå: Dekker</string>
<string name="poi_seamark_water_level_dry">Vann-nivå: Tørt</string>
<string name="poi_seamark_water_level_part_submerged">Vann-nivå: Delvis nedsenket</string>
<string name="poi_tactile_paving_incorrect">Uriktig</string>
<string name="poi_fire_hydrant_pressure_filter">Trykk</string>
</resources>

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

@ -101,8 +101,8 @@
<string name="offline_navigation_not_available">OsmAnd offline navigering er midlertidig ikke tilgjengelig.</string>
<string name="left_side_navigation">Venstrekjøring</string>
<string name="left_side_navigation_descr">For land hvor det kjøres på venstre side av veien.</string>
<string name="unknown_from_location">Startpunkt ikke bestemt enda</string>
<string name="unknown_location">Posisjon ennå ikke kjent</string>
<string name="unknown_from_location">Startpunkt ikke bestemt enda.</string>
<string name="unknown_location">Posisjon enda ikke kjent.</string>
<string name="local_indexes_cat_tile">Nettbaserte kart og hurtigbufrede fliskart</string>
<string name="local_indexes_cat_map">Standardkart (vektor)</string>
<string name="index_settings_descr">Last ned og håndter offline-kart lagret på enheten.</string>
@ -244,8 +244,8 @@
<string name="favourites_edit_dialog_category">Kategori</string>
<string name="shared_string_no_thanks">Nei takk</string>
<string name="basemap_missing">Last ned basiskartet for verden for å få en oversikt som dekker hele verden ved lave zoomnivåer.</string>
<string name="local_index_gpx_info_show">"
\n
<string name="local_index_gpx_info_show">"
\n
\nTrykk lenge for alternativer"</string>
<string name="local_index_descr_title">Karthåndtering.</string>
<string name="local_index_mi_restore">Aktiver</string>
@ -265,7 +265,7 @@
<string name="map_text_size">Skriftstørrelse for kart</string>
<string name="internet_connection_required_for_online_route">Nettbasert navigering fungerer ikke frakoblet.</string>
<string name="tts_language_not_supported_title">Språk ikke støttet</string>
<string name="tts_language_not_supported">Det valgte språket støttes ikke av den installerte motoren for Android TTS (tekst-til-tale). Vil du se etter en annen TTS-motor i markedet? Ellers vil det forhåndsinnstilte TTS-språket brukes.</string>
<string name="tts_language_not_supported">Det valgte språket støttes ikke av Android TTS-motoren (tekst-til-tale). Det forhåndsinnstilte TTS-språket vil brukes. Vil du se etter en annen TTS-motor i markedet\?</string>
<string name="tts_missing_language_data_title">Manglende data</string>
<string name="switch_to_vector_map_to_see">Offline-vektorkart foreligger for dette stedet.
\n\t
@ -428,7 +428,7 @@
<string name="save_current_track_descr">Lagre nåværende spor som GPX-fil nå.</string>
<string name="save_current_track">Lagre gjeldende spor</string>
<string name="save_track_interval">Loggeintervall under navigering</string>
<string name="save_track_interval_descr">Velg loggingsintervall for opptak av spor under navigering.</string>
<string name="save_track_interval_descr">Angi loggingsintervall for opptak av spor under navigering</string>
<string name="save_track_to_gpx_descrp">Et GPX-spor lagres automatisk i spor-mappen under navigering.</string>
<string name="save_track_to_gpx">Auto-opptak av spor under navigering</string>
<string name="update_tile">Oppdater kart</string>
@ -447,7 +447,7 @@
<string name="map_view_3d">3D-kartvisning</string>
<string name="show_poi_over_map_description">Vis sist valgte interessepunktsoverlegg.</string>
<string name="show_poi_over_map">Vis interessepunktoverlegg</string>
<string name="map_tile_source_descr">Velg kilde for nettbaserte eller hurtigbufrede kart</string>
<string name="map_tile_source_descr">Velg kilde for nettbaserte eller hurtiglagrede kart.</string>
<string name="map_tile_source">Fliskartkilde</string>
<string name="map_source">Kartkilde</string>
<string name="use_internet">Bruk Internett</string>
@ -752,7 +752,7 @@
<string name="safe_mode_description">Kjør programmet i sikker modus (med tregere Android i stedet for egen kode).</string>
<string name="safe_mode">Sikker modus</string>
<string name="native_library_not_running">Programmet kjører i sikker modus (skru det av i \'Innstillinger\').</string>
<string name="interrupt_music_descr">Avbryt musikk ved talemeldinger (ikke bare senk volumet).</string>
<string name="interrupt_music_descr">Talemeldinger stopper midlertidig musikkavspilling.</string>
<string name="interrupt_music">Avbryt musikk</string>
<string name="gpxup_public">Offentlig</string>
<string name="rendering_attr_appMode_description">Optimaliser kart for</string>
@ -792,9 +792,9 @@
<string name="rendering_attr_lessDetailed_name">Færre detaljer</string>
<string name="sort_by_distance">Sorter etter avstand</string>
<string name="sort_by_name">Sorter etter navn</string>
<string name="selected_gpx_info_show">"
\n
\nLangt trykk for å vise på kartet"</string>
<string name="selected_gpx_info_show">"
\n
\nTrykk lenge for å vise på kartet"</string>
<string name="gpx_info_waypoints">Rutepunkter: %1$s</string>
<string name="loading_streets">Laster gater…</string>
<string name="loading_cities">Laster byer…</string>
@ -1006,7 +1006,7 @@
<string name="map_underlay_descr">Velg underlagskart</string>
<string name="layer_overlay">Overleggskart…</string>
<string name="map_overlay">Overleggskart</string>
<string name="map_overlay_descr">Velg overleggskartet.</string>
<string name="map_overlay_descr">Velg overleggskartet</string>
<string name="audionotes_plugin_name">Audio/video-notater</string>
<string name="osm_settings">OSM-redigering</string>
<string name="osmand_srtm_long_description_1000_chars">Dette programtillegget gir både et lag med koter og et lag med relieffskygger som kan vises oppå standardkartene til OsmAnd. Denne funksjonen vil bli satt stor pris på av idrettsutøvere, turgåere og enhver som er interessert i relieff-strukturen til et landskap.
@ -1551,7 +1551,7 @@
<string name="dist_away_from_my_location">Søk %1$s unna</string>
<string name="share_history_subject">delt via OsmAnd</string>
<string name="rendering_attr_horseRoutes_name">Hesteruter</string>
<string name="world_ski_missing">For å vise skikart må det spesielle offline-kartet lastes ned</string>
<string name="world_ski_missing">For å vise skikart må det spesielle frakoblede kartet lastes ned.</string>
<string name="route_stops_before">%1$s stopp før</string>
<string name="coords_search">Koordinatsøk</string>
<string name="advanced_coords_search">Avansert koordinatsøk</string>
@ -1667,7 +1667,7 @@
<string name="proxy_host_title">Mellomtjenervert</string>
<string name="proxy_host_descr">Angi din mellomtjeners vertsnavn (f.eks. 127.0.0.1).</string>
<string name="proxy_port_title">Mellomtjener-port</string>
<string name="gpx_monitoring_stop">Stopp GPX-logging</string>
<string name="gpx_monitoring_stop">Ta en pause i GPX-logging</string>
<string name="gpx_start_new_segment">Start nytt segment</string>
<string name="no_index_file_to_download">Ingen nedlastinger funnet, sjekk din internettforbindelse.</string>
<string name="gpx_info_subtracks">Underspor: %1$s</string>
@ -1700,7 +1700,7 @@
\n - Ingen nettfrakoblet tilgang til interessepunkter fra Wikipedia
\n
\n OsmAnd utvikles aktivt, og prosjektet vårt og dets videre framdrift avhenger av finansielle bidrag for å drive utviklingen og testingen av nye funksjoner. Overvei å kjøpe OsmAnd+ eller støtte spesifikke nye funksjoner eller bidra med en generell donasjon på https://osmand.net.</string>
<string name="upload_osm_note_description">Last opp ditt OSM-notat anonymt eller ved å bruke din profil hos OpenStreetMap.org</string>
<string name="upload_osm_note_description">Last opp ditt OSM-notat anonymt eller ved å bruke din profil hos OpenStreetMap.org.</string>
<string name="gpx_no_tracks_title">Du har ingen GPX-filer enda</string>
<string name="gpx_no_tracks_title_folder">Du kan også legge til GPX-filer i mappen</string>
<string name="gpx_add_track">Legg til mer…</string>
@ -1780,7 +1780,7 @@
<string name="track_points">Sporpunkter</string>
<string name="share_note">Del notat</string>
<string name="notes">Notater</string>
<string name="nautical_maps_missing">For å vise sjøkart, må det spesielle offline-kartet lastes ned</string>
<string name="nautical_maps_missing">For å vise sjøkart, må det spesielle frakoblede kartet lastes ned.</string>
<string name="navigation_over_track">Starte navigering langs spor\?</string>
<string name="avoid_roads_msg">Utløs en alternativ rute ved å velge veier å unngå</string>
<string name="routing_attr_no_new_routing_name">Ingen v1.9-regler for ruteplanlegging</string>
@ -1802,7 +1802,7 @@
<string name="live_monitoring_m">Nettbasert sporing (GPX kreves)</string>
<string name="live_monitoring_start">Start nettbasert sporing</string>
<string name="live_monitoring_stop">Stopp nettbasert sporing</string>
<string name="gpx_monitoring_start">Start GPX-logging</string>
<string name="gpx_monitoring_start">Fortsett GPX-logging</string>
<string name="select_index_file_to_download">Fant ikke noe. Hvis du ikke finner din region, kan du lage den selv (se https://osmand.net).</string>
<string name="none_selected_gpx">Ingen GPX-filer valgt. Velg en ved lang-trykking.</string>
<string name="gpx_split_interval">Oppdelingsintervall</string>
@ -1872,7 +1872,7 @@
<string name="lang_kab">Kabylsk</string>
<string name="lang_zh_hk">Kinesisk (Hongkong)</string>
<string name="use_displayed_track_for_navigation">Bruk vist spor for navigering\?</string>
<string name="local_osm_changes_backup_failed">Kunne ikke sikkerhetskopiere OSM-endringer</string>
<string name="local_osm_changes_backup_failed">Kunne ikke sikkerhetskopiere OSM-endringer.</string>
<string name="use_distance_measurement_help">* Trykk for å markere et punkt.
\n * Langt trykk på kartet for å slette forrige punkt.
\n * Langt trykk på et punkt for å vise og legge til beskrivelse.
@ -1882,7 +1882,7 @@
<string name="global_app_allocated_memory_descr">Tildelt minne %1$s MB (Android-grense %2$s MB, Dalvik %3$s MB).</string>
<string name="global_app_allocated_memory">Tildelt minne</string>
<string name="osmand_parking_event">Finn bilen der den er parkert</string>
<string name="osmand_parking_warning_text">En merknad om å hente bilen har blitt lagt til i kalenderen din. Den vil finnes der til du sletter den manuelt.</string>
<string name="osmand_parking_warning_text">Et varsel om å hente bilen er lagt til i kalenderen din og kan redigeres eller fjernes der.</string>
<string name="osmand_parking_time_limit_title">Angi tidsgrense for parkering</string>
<string name="osmand_parking_delete_confirm">Slett parkeringsmarkøren\?</string>
<string name="osmand_parking_choose_type">Velg parkeringstype</string>
@ -2063,7 +2063,7 @@
<string name="none_point_error">Legg til minst et punkt.</string>
<string name="enter_gpx_name">GPX-filnavn:</string>
<string name="quick_action_resume_pause_navigation">Navigering: sett på pause/gjenoppta</string>
<string name="quick_action_resume_pause_navigation_descr">Trykk på denne knappen for å sette på pause eller gjenoppta navigeringen.</string>
<string name="quick_action_resume_pause_navigation_descr">Knapp for å ta en pause i eller gjenoppta navigeringen.</string>
<string name="right_side_navigation">Høyrekjøring</string>
<string name="quick_action_start_stop_navigation_descr">Trykk på denne knappen for å starte eller avslutte navigeringen.</string>
<string name="store_tracks_in_monthly_directories">Lagre spor som er tatt opp i månedlige mapper</string>
@ -2210,7 +2210,7 @@
<string name="live_monitoring_interval">Nettbasert sporingsintervall</string>
<string name="live_monitoring_url">Nettadresse for nettbasert sporing</string>
<string name="live_monitoring_max_interval_to_send">Tidsbuffer for nettbasert sporing</string>
<string name="live_monitoring_max_interval_to_send_desrc">"Angi tidsbuffer for å beholde posisjoner som skal sendes når internettforbindelse mangler"</string>
<string name="live_monitoring_max_interval_to_send_desrc">Angi tidsbuffer for å beholde posisjoner som skal sendes når internettforbindelse mangler</string>
<string name="shared_string_others">Andre</string>
<string name="trace_rendering">Opptegningfeilsøkingsinfo</string>
<string name="trace_rendering_descr">Vis opptegningsytelsen.</string>
@ -2245,7 +2245,7 @@
<string name="saving_gpx_tracks">Lagrer GPX-fil…</string>
<string name="data_settings_descr">Angi språk, last ned/gjeninnlast data.</string>
<string name="av_camera_focus">Kameraets fokusmetode</string>
<string name="av_camera_focus_descr">Velg fokusmodus for kameraet.</string>
<string name="av_camera_focus_descr">Kamerafokusmodus:</string>
<string name="av_camera_focus_infinity">Uendelig fokus</string>
<string name="av_camera_focus_macro">Makrofokus (nærbilde)</string>
<string name="av_camera_focus_continuous">Kameraet prøver kontinuerlig å fokusere</string>
@ -2616,13 +2616,13 @@
\n • Valgfri fartsavhengig zoom
\n • Del din posisjon slik at dine venner kan finne deg
\n</string>
<string name="osmand_plus_extended_description_part6">"Sykkel- og fotgjengerfunksjoner
\n • Visning av gang-, vandring- og sykkelstier, flott for utendørsaktiviteter
\n • Spesielle ruteplanleggings- og visningsmoduser for syklister og fotgjengere
\n • Visning av stoppesteder for offentlig transport (buss, trikk, tog) inkludert linjenavn (alternativ)
\n • Turopptak til lokal GPX-fil eller nettbasert tjeneste (alternativ)
\n • Hastighet- og høydevisning (alternativ)
\n • Visning av koter og relieffskygger (via programtillegg)"</string>
<string name="osmand_plus_extended_description_part6">Sykkel- og fotgjengerfunksjoner
\n • Visning av gang-, vandring- og sykkelstier, flott for utendørsaktiviteter
\n • Spesielle ruteplanleggings- og visningsmoduser for syklister og fotgjengere
\n • Visning av stoppesteder for offentlig transport (buss, trikk, tog) inkludert linjenavn (alternativ)
\n • Turopptak til lokal GPX-fil eller nettbasert tjeneste (alternativ)
\n • Hastighet- og høydevisning (alternativ)
\n • Visning av koter og relieffskygger (via programtillegg)</string>
<string name="live_monitoring_url_descr">Angi nettadressen med parametersyntaks: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
<string name="wikivoyage_download_pics_descr">Bilder fra artikler kan lastes ned for frakoblet bruk.
\nKan alltid endres i \'Utforsk\' → \'Alternativer\'.</string>
@ -2684,7 +2684,8 @@
\n • Wikipedia på ditt foretrukne språk kan fortelle deg mye under en bytur
\n • Stoppesteder for offentlig transport (buss, trikk, tog), inkludert linjenavn, hjelper til med å navigere i en ny by
\n • GPS-navigering i fotgjengermodus lager ruten ved hjelp av gangstier
\n • Last opp og følg en GPX-rute eller ta opp og del din egen</string>
\n • Last opp og følg en GPX-rute eller ta opp og del din egen
\n</string>
<string name="osmand_extended_description_part8">OsmAnd blir aktivt utviklet og er programvare med åpen kildekode. Alle kan komme med bidrag til programmet ved å rapportere feil, forbedre oversettelser eller ved koding av nye funksjoner. I tillegg er prosjektet avhengig av økonomiske bidrag til å finansiere koding og testing av nye funksjoner.
\nOmtrentlig kartdekning og kvalitet:
\n • Vest-Europa: ****
@ -2758,7 +2759,7 @@
<string name="nautical_render_descr">Nautisk navigasjonsstil. Har bøyer, fyr, vannveier, skipsleder og merker, havner, sjømerketjenester, dybdekonturer.</string>
<string name="ski_map_render_descr">Skistil. Har bakker, heiser og andre skifunksjoner osv. Demper sekundære kartobjekter.</string>
<string name="light_rs_render_descr">Enkel kjørestil. Skånsomt nattmodus. Koter, kontrasterende oransje veier, dempede sekundære kartobjekter.</string>
<string name="topo_render_descr">For turgåing, vandring og sykling i naturen. Lesbar utendørs. Kontrasterende veier og naturlige objekter, forskjellige rutetyper, koter med avanserte innstillinger, flere detaljer. Overflatevalg muliggjør skjelning av veikvalitet. Inget nattmodus.</string>
<string name="topo_render_descr">For turgåing, vandring og sykling i naturen. Lesbar utendørs. Kontrasterende veier og naturlige objekter, forskjellige rutetyper, avanserte kotealternativer, flere detaljer. Justering av overflate gjør det mulig å skjelne veikvalitet. Inget nattmodus.</string>
<string name="mapnik_render_descr">Gammel forvalgt \'Mapnik\'-stil. Lignende farger som \"Mapnik\".</string>
<string name="touring_view_render_descr">Høydetaljert kontraststil for turformål. Alle innstillingsmulighetene til forvalgsstilen med så høy detaljvisning som mulig, i særdeleshet veier, stier og andre måter å reise på. Klar \"reiseatlas\"-forskjell mellom alle ulike typer veier. Egnet for utendørs bruk, dag- og nattmodus.</string>
<string name="default_render_descr">Stil for generell bruk. Renere opptegning i tett befolkede byer. Har koter, ruter, overflatekvalitet, tilgangsbegrensninger, veinummer, stiopptegning i henhold til SAC-skala, raftingsfunksjoner.</string>
@ -2871,7 +2872,7 @@
<string name="run_full_osmand_msg">Du bruker {0}-kart, muliggjort av OsmAnd. Ønsker du å ta i bruk fullversjonen av OsmAnd\?</string>
<string name="run_full_osmand_header">Kjør OsmAnd\?</string>
<string name="lang_gn_py">Guaraní</string>
<string name="quick_action_switch_day_night_descr">Trykk på denne knappen for å veksle mellom dag- og nattmodus i OsmAnd</string>
<string name="quick_action_switch_day_night_descr">Vekselvender mellom dag- og nattmodus i OsmAnd</string>
<string name="quick_action_switch_day_mode">Dagmodus</string>
<string name="quick_action_switch_night_mode">Nattmodus</string>
<string name="quick_action_day_night_switch_mode">Veksle dag-/nattmodus</string>
@ -2916,7 +2917,7 @@
<string name="exit_at">Gå av på</string>
<string name="sit_on_the_stop">Sitt på stoppet</string>
<string name="quick_action_show_hide_gpx_tracks">Vis/skjul GPX-spor</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Å trykke på denne knappen viser eller skjuler valgte GPX-spor på kartet</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Knapp som viser eller skjuler valgte GPX-spor på kartet.</string>
<string name="quick_action_gpx_tracks_hide">Skjul GPX-spor</string>
<string name="quick_action_gpx_tracks_show">Vis GPX-spor</string>
<string name="release_3_3">• Ny \'Anvisninger\'-skjerm: Viser hjem og arbeid som målknapper, snarvei til \"tidligere rute\", liste over aktive GPX-spor og markører, søkehistorikk
@ -3038,7 +3039,7 @@
<string name="coordinates_widget">Koordinat-miniprogram</string>
<string name="rate_dialog_descr">Del din tilbakemelding og legg til en vurdering på Google Play.</string>
<string name="shared_string_privacy_policy">Personvernspraksis</string>
<string name="help_us_make_osmand_better">Hjelp oss å forbedre OsmAnd.</string>
<string name="help_us_make_osmand_better">Hjelp oss å forbedre OsmAnd</string>
<string name="make_osmand_better_descr">Tillat OsmAnd å samle inn og behandle anonym programbruksdata. Vi samler ikke inn eller lagrer data om din plassering, eller om plasseringer ser på på kartet.
\n
\nDu kan alltid endre ditt valg i Innstillinger &gt; Personvern og sikkerhet.</string>
@ -3263,10 +3264,10 @@
<string name="quick_action_hillshade_show">Vis relieffskygge</string>
<string name="quick_action_hillshade_hide">Skjul relieffskygge</string>
<string name="quick_action_show_hide_hillshade">Vis/skjul relieffskygge</string>
<string name="tts_initialization_error">Kan ikke starte tekst-til-tale-motor</string>
<string name="tts_initialization_error">Kan ikke starte tekst-til-tale-motor.</string>
<string name="simulate_your_location_gpx_descr">Simuler posisjonen din ved bruk av et innspilt GPX-spor.</string>
<string name="exported_osmand_profile">OsmAnd-profil: %1$s</string>
<string name="profile_import">Profil-import:</string>
<string name="profile_import">Profil-import</string>
<string name="rendering_value_white_name">Hvit</string>
<string name="default_speed_dialog_msg">Brukes til å estimere ankomsttid for ukjente veityper, og for å begrense farten på alle veier (kan endre rute)</string>
<string name="track_storage_directory">Spor-lagringsmappe</string>
@ -3311,7 +3312,7 @@
<string name="routeInfo_winter_ice_road_name">Vinter- og isveier</string>
<string name="enter_path_to_folder">Skriv inn sti til mappen</string>
<string name="paste_Osmand_data_folder_path">Lim inn sti til mappen inneholdende OsmAnd-data</string>
<string name="internal_app_storage_description">Internlagring, skjult fra bruker og andre programmer, kun tilgjengelig for OsmAnd</string>
<string name="internal_app_storage_description">Internlagring for OsmAnd, (skjult fra bruker og andre programmer).</string>
<string name="change_data_storage_folder">Endre datalagringsmappe</string>
<string name="rendering_attr_piste_type_snow_park_name">Snøpark</string>
<string name="rendering_attr_piste_type_nordic_name">Langrenn</string>
@ -3322,7 +3323,7 @@
<string name="empty_filename">Filnavnet er tomt</string>
<string name="turn_screen_on_router">Vekk for sving</string>
<string name="turn_screen_on_time_descr">Juster hvor lenge skjermen skal forbli påslått.</string>
<string name="turn_screen_on_sensor">Bruk nærhetssensor.</string>
<string name="turn_screen_on_sensor">Bruk nærhetssensor</string>
<string name="turn_screen_on_sensor_descr">Vift hånden din over toppen av skjermen for å skru den på under navigasjon.</string>
<string name="rendering_attr_highway_class_track_grade1_name">Klasse 1</string>
<string name="rendering_attr_highway_class_track_grade2_name">Klasse 2</string>
@ -3398,9 +3399,9 @@
<string name="clear_confirmation_msg">Tøm %1$s\?</string>
<string name="download_map_dialog">Kartnedlastingsdialog</string>
<string name="dialogs_and_notifications_title">Dialogvinduer og merknader</string>
<string name="dialogs_and_notifications_descr">Kontroller oppsprettsvinduer, dialogvinduer og merknader som OsmAnd viser under bruk.</string>
<string name="dialogs_and_notifications_descr">Kontroller oppsprettsvinduer, dialogvinduer og merknader.</string>
<string name="suggested_maps">Foreslåtte kart</string>
<string name="suggested_maps_descr">Disse kartene må brukes med programtillegg</string>
<string name="suggested_maps_descr">Disse kartene kreves av programtillegget.</string>
<string name="added_profiles">Tillagte profiler</string>
<string name="added_profiles_descr">Programtillegg legger til ny profil i OsmAnd</string>
<string name="shared_string_turn_off">Skru av</string>
@ -3442,7 +3443,7 @@
<string name="live_monitoring">Nettbasert sporing</string>
<string name="save_track_logging_accuracy">Loggingsnøyaktighet</string>
<string name="tracks_view_descr">Du kan finne alle dine innspilte spor i %1$s, eller i OsmAnd-mappen.</string>
<string name="multimedia_notes_view_descr">Du finner alle dine notater i %1$sr</string>
<string name="multimedia_notes_view_descr">Du finner alle dine OSM-notater i %1$s.</string>
<string name="video_notes">Videonotater</string>
<string name="photo_notes">Bildenotater</string>
<string name="route_recalculation">Ruteomberegning</string>
@ -3551,5 +3552,42 @@
<string name="create_edit_poi">Legg til/rediger interessepunkt</string>
<string name="quick_action_show_hide_transport">Vis/skjul offentlig transport</string>
<string name="shared_string_add_profile">Legg til profil</string>
<string name="quick_action_transport_descr"></string>
<string name="quick_action_transport_descr">En knapp for å vise eller skjule offentlig transport på kartet.</string>
<string name="routing_profile_direct_to">Direkte-til-punkt</string>
<string name="clear_recorded_data">Tøm lagret data</string>
<string name="shared_string_include_data">Inkluder ytterligere data</string>
<string name="live_monitoring_tracking_interval">Sporingsintervall</string>
<string name="live_monitoring_time_buffer">Tidsmellomlager</string>
<string name="multimedia_photo_play_sound">Kameralukker-lyd</string>
<string name="shared_string_resume">Fortsett</string>
<string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
<string name="lang_zhyue">Standard kantonesisk</string>
<string name="lang_zhminnan">Sørlig min</string>
<string name="lang_yo">Joruba</string>
<string name="lang_war">Waray-waray</string>
<string name="lang_uz">Usbekisk</string>
<string name="lang_ur">Lashkari</string>
<string name="lang_tt">Tatarisk</string>
<string name="lang_tg">Tadsjikisk</string>
<string name="lang_sco">Skotsk</string>
<string name="lang_scn">Siciliansk</string>
<string name="lang_pnb">Panjabi</string>
<string name="lang_ne">Gurkhali</string>
<string name="lang_nap">Napolitansk-kalabresisk</string>
<string name="lang_my">Burmesisk</string>
<string name="lang_mn">Mongolsk</string>
<string name="lang_min">Minangkabau</string>
<string name="lang_mg">Madagassisk</string>
<string name="lang_ky">Kirgisisk</string>
<string name="lang_kk">Kasakhisk</string>
<string name="lang_jv">Javanesisk</string>
<string name="lang_gu">Gujarati</string>
<string name="lang_cv">Tsjuvasjisk</string>
<string name="lang_ce">Tsjetsjensk</string>
<string name="lang_bar">Bairisk</string>
<string name="lang_ba">Basjkirsk</string>
<string name="lang_an">Aragonesisk</string>
<string name="lang_lmo">Langobardisk</string>
<string name="parking_positions">Parkeringsposisjoner</string>
<string name="add_edit_favorite">Legg til / rediger profil</string>
</resources>

1
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -3823,4 +3823,5 @@
<string name="poi_fire_hydrant_style_water_source_groundwater">Água subterrânea</string>
<string name="poi_fire_hydrant_type_pipe">Tubo</string>
<string name="poi_fire_hydrant_pressure_filter">Pressão</string>
<string name="poi_pump_status_missing_beam">Status da bomba: falta de feixe</string>
</resources>

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

@ -409,7 +409,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="menu_mute_off">Zvok je vključen</string>
<string name="menu_mute_on">Zvok je izključen</string>
<string name="tts_language_not_supported_title">Izbrani jezik ni podprt</string>
<string name="tts_language_not_supported">Vgrajeni sintetizator govora za Android zapisa izbranega jezika ne podpira (programnik pretvarjanja besedila v govor TTS). Ali želite v trgovini Market poiskati drug program\? Če drug jezik ne bo izbran, bo uporabljen sistemski.</string>
<string name="tts_language_not_supported">Nameščeni sintetizator govora za Android (pretvarjanje besedila v govor TTS) ne podpira izbranega jezika. Uporabljen bo privzeti jezik. Ali želite v trgovini Market poiskati drug sintetizator govora\?</string>
<string name="tts_missing_language_data">Ali želite odpreti okno trgovine Market in namestiti jezikovni paket\?</string>
<string name="system_locale">Sistemski</string>
<string name="support_new_features">Podpora nadaljnjemu razvoju</string>
@ -525,7 +525,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="osb_comment_dialog_message">Sporočilo</string>
<string name="osb_comment_dialog_author">Ime avtorja</string>
<string name="osb_comment_dialog_success">Opomba je dodana</string>
<string name="osb_comment_dialog_error">Opombe ni mogoče dodati</string>
<string name="osb_comment_dialog_error">Opombe ni mogoče dodati.</string>
<string name="route_descr_lat_lon">ZD (λ) %1$.3f; ZŠ (β) %2$.3f</string>
<string name="first_time_msg">Zahvaljujemo se vam za uporabo programa OsmAnd. Za pregled zemljevidov, iskanje naslovov in krajev, javnih prevozov in drugih podatkov prejmite krajevne datoteke z izbiro možnosti med \'Nastavitvami\' → \'Upravljanje s podatki\'.</string>
<string name="local_indexes_cat_tile">Spletni in shranjeni zemljevidi</string>
@ -567,9 +567,8 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="daynight">Možnosti izrisa</string>
<string name="daynight_descr">Izbor nastavitev preklapljanja med dnevnim in nočnim načinom prikazovanja.</string>
<string name="download_files_not_enough_space">Ni dovolj razpoložljivega prostora za prejem %1$s MB (prosto: %2$s).</string>
<string name="download_files_question_space">Ali res želite prejeti datoteke ({0})?
Datoteke zahtevajo {1} MB pomnilnika.
(Na voljo je le {2} MB.)</string>
<string name="download_files_question_space">Ali želite prejeti datoteke ({0})\?
\n Porabljeno bo {1} MB (od {2} MB) pomnilnika.</string>
<string name="native_library_not_supported">Izvorna knjižnica na tej napravi ni podprta.</string>
<string name="init_native_library">Nalaganje izvornih knjižnic …</string>
<string name="auto_follow_route_navigation">Samodejno središči le med navigacijo</string>
@ -651,7 +650,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="save_current_track">Shrani trenutno sled</string>
<string name="save_current_track_descr">Shrani trenutno sled v datoteko GPX.</string>
<string name="save_track_interval">Interval beleženja med navigacijo</string>
<string name="save_track_interval_descr">Izberite časovni razmik beleženja za shranjevanje sledi med navigacijo.</string>
<string name="save_track_interval_descr">Določite časovni razmik beleženja za shranjevanje sledi med navigacijo</string>
<string name="save_track_to_gpx">Samodejno beleži sled med navigacijo</string>
<string name="save_track_to_gpx_descrp">Sledi GPX se med navigacijo samodejno shranjujejo v mapo za sledi.</string>
<string name="mark_point">Cilj</string>
@ -913,7 +912,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="shared_string_control_start">Začni ↦</string>
<string name="av_def_action_video">Snemanje videa</string>
<string name="av_def_action_audio">Snemanje zvoka</string>
<string name="av_widget_action_descr">Izberite privzeto dejanje gradnika.</string>
<string name="av_widget_action_descr">Privzeto dejanje gradnika:</string>
<string name="av_widget_action">Privzeto dejanje gradnika</string>
<string name="av_video_format_descr">Izberite zapis za video.</string>
<string name="av_video_format">Zapis za video</string>
@ -992,7 +991,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="search_street_in_neighborhood_cities">Iskanje ulice v sosednjih krajih ali mestih</string>
<string name="intermediate_items_sort_return">Vmesni cilji so razvrščeni po vrsti na poti od trenutnega mesta do končnega cilja.</string>
<string name="local_osm_changes_backup_successful">Datoteka sprememb je ustvarjena %1$s</string>
<string name="local_osm_changes_backup_failed">Ni mogoče ustvariti varnostne kopije sprememb za OSM</string>
<string name="local_osm_changes_backup_failed">Ni mogoče ustvariti varnostne kopije sprememb za OSM.</string>
<string name="local_osm_changes_backup">Varnostna kopija sprememb za OSM</string>
<string name="destination_point">Cilj %1$s</string>
<string name="intermediate_items_sort_by_distance">Razvrsti od vrat do vrat</string>
@ -1141,13 +1140,13 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="routing_attr_prefer_motorway_name">Prednostno vodi po avtocestah</string>
<string name="routing_attr_prefer_motorway_description">Prednostno bodo izbrane hitre ceste in avtoceste.</string>
<string name="routing_attr_avoid_toll_name">Izogni se cestninam</string>
<string name="routing_attr_avoid_toll_description">Izbrane so poti, ki vodijo mimo cest s plačilom cestnine.</string>
<string name="routing_attr_avoid_toll_description">Izogne se cestam s plačljivo cestnino</string>
<string name="routing_attr_avoid_unpaved_name">Izogni se neasfaltiranim cestam</string>
<string name="routing_attr_avoid_unpaved_description">Poti, ki vodijo po neasfaltiranih cestah, ne bodo izbrane.</string>
<string name="routing_attr_avoid_unpaved_description">Izogne se netlakovanim cestam</string>
<string name="routing_attr_avoid_ferries_name">Izogni se trajektom</string>
<string name="routing_attr_avoid_ferries_description">Izbor poti ne bo upošteval možnosti prevoza s trajektom.</string>
<string name="routing_attr_avoid_ferries_description">Izogne se trajektom</string>
<string name="routing_attr_avoid_motorway_name">Izogni se avtocestam</string>
<string name="routing_attr_avoid_motorway_description">Izbor poti ne bo upošteval avtocest.</string>
<string name="routing_attr_avoid_motorway_description">Izogne se avtocestam</string>
<string name="routing_attr_weight_name">Omejitev teže vozila</string>
<string name="routing_attr_weight_description">Vodenje po poteh z omejitvijo dovoljene teže vozila.</string>
<string name="app_mode_truck">Tovorno vozilo</string>
@ -1424,7 +1423,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="shared_string_enabled">Omogočeno</string>
<string name="plugin_ski_name">Zemljevidi smučišč</string>
<string name="plugin_nautical_name">Pomorski zemljevid</string>
<string name="world_ski_missing">Za prikaz zemljevidov smučišč je treba prejeti posebne datoteke za delovanje brez povezave</string>
<string name="world_ski_missing">Za prikaz zemljevidov smučišč je potrebno prejeti poseben zemljevid.</string>
<string name="nautical_maps_missing">Za izris pomorskih zemljevidov je treba najprej prejeti datoteke za delovanje brez povezave.</string>
<string name="edit_group">Urejanje skupine</string>
<string name="shared_string_enable">Omogoči</string>
@ -1761,7 +1760,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="shared_string_location">Mesto</string>
<string name="poi_context_menu_modify_osm_change">Popravi spremembo OSM</string>
<string name="please_specify_poi_type_only_from_list">Določiti je treba ustrezno vrsto točke POI ali pa podatek preskočiti.</string>
<string name="access_from_map_description">Menijski gumb zažene nadzorno ploščo in ne menija.</string>
<string name="access_from_map_description">Menijski gumb zažene nadzorno ploščo in ne menija</string>
<string name="access_from_map">Dostop prek zemljevida</string>
<string name="copied_to_clipboard">Vsebina je kopirana v odložišče</string>
<string name="osm_save_offline">Shrani v pomnilnik</string>
@ -1777,9 +1776,9 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="osn_reopen_dialog_title">Ponovno odpri opombo</string>
<string name="osn_close_dialog_title">Zapri opombo</string>
<string name="osn_add_dialog_success">Opomba je ustvarjena</string>
<string name="osn_add_dialog_error">Opombe ni mogoče ustvariti</string>
<string name="osn_add_dialog_error">Opombe ni mogoče ustvariti.</string>
<string name="osn_close_dialog_success">Opomba je zaprta</string>
<string name="osn_close_dialog_error">Opombe ni mogoče zapreti</string>
<string name="osn_close_dialog_error">Opombe ni mogoče zapreti.</string>
<string name="shared_string_commit">Uveljavi</string>
<string name="rendering_attr_currentTrackColor_description">Barva GPX</string>
<string name="rendering_attr_currentTrackWidth_description">Širina GPX</string>
@ -1791,7 +1790,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="dashboard_or_drawer_description">Ob meniju je na voljo možnost upravljanja programa prek prilagodljive nadzorne plošče. Možnost je mogoče izbrati med nastavitvami.</string>
<string name="osm_edit_commented_note">Opomba OSM z dodatnimi zapisi</string>
<string name="routing_attr_avoid_stairs_name">Izogni se stopnicam</string>
<string name="routing_attr_avoid_stairs_description">Izogni se stopnicam.</string>
<string name="routing_attr_avoid_stairs_description">Izogne se stopnicam</string>
<string name="routing_attr_avoid_borders_name">Izogni se mejnim prehodom</string>
<string name="shared_string_near">V bližini</string>
<string name="shared_string_hide">Skrij</string>
@ -1882,9 +1881,10 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="select_map_marker">Izbor označbe na zemljevidu</string>
<string name="map_markers_other">Druge označbe</string>
<string name="download_files_error_not_enough_space">Ni dovolj prostora!
Možnost zahteva {3} MB začasnega in {1} MB trajnega pomnilnika.
Na voljo je le {2} MB prostora.</string>
<string name="download_files_question_space_with_temp">Ali res želite prejeti datoteke ({0})\? Prejem zahteva {3} MB začasnega in {1} MB stalnega prostora (na napravi je na voljo {2} MB).</string>
\n Možnost začasno zahteva {3} MB in trajno {1} MB pomnilnika.
\n (Na voljo je le {2} MB prostora.)</string>
<string name="download_files_question_space_with_temp">Ali želite prejeti datoteke ({0})\?
\n Prejem začasno zahteva {3} MB in trajno {1} MB prostora (na voljo jw {2} MB.)</string>
<string name="upload_osm_note_description">Opombo OSM je mogoče poslati brezimno, ali pa prek profila OpenStreetMap.org.</string>
<string name="upload_osm_note">Pošlji Opombo OSM</string>
<string name="upload_anonymously">Pošlji anonimno</string>
@ -1925,7 +1925,9 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
<string name="file_name_containes_illegal_char">V imenu datoteke je nedovoljen znak</string>
<string name="no_map_markers_found">Ni nobene določene označbe</string>
<string name="no_waypoints_found">Ni vmesnih točk</string>
<string name="osm_live_header">Prijava omogoča dostop do urnih posodobitev vseh zemljevidov sveta. Del prihodka se vrne v skupnost OSM in se izplačuje za vsako opravljeno dejavnost oziroma podporo. Če sta vam OsmAnd in OSM všeč in bi želeli projekt podpreti, je to dober način za začetek sodelovanja.</string>
<string name="osm_live_header">Prijava omogoča dostop do urnih posodobitev vseh zemljevidov sveta.
\nDel prihodka se vrne v skupnost OSM in se izplačuje za vsako opravljeno dejavnost oziroma podporo.
\nČe sta vam OsmAnd in OSM všeč in bi želeli projekt podpreti, je to dober način za začetek sodelovanja.</string>
<string name="rendering_value_thin_name">Tanko</string>
<string name="rendering_value_medium_name">Srednje</string>
<string name="rendering_value_bold_name">Krepko</string>
@ -2534,7 +2536,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="map_orientation_change_in_accordance_with_speed">Prag usmerjenosti zemljevida</string>
<string name="all_markers_moved_to_history">Vse označbe zemljevida so premaknjene med zgodovino</string>
<string name="marker_moved_to_history">Označbe zemljevida so premaknjene med zgodovino</string>
<string name="osn_modify_dialog_error">Sporočila ni mogoče spremeniti</string>
<string name="osn_modify_dialog_error">Sporočila ni mogoče spremeniti.</string>
<string name="osn_modify_dialog_title">Spremeni sporočilo</string>
<string name="context_menu_item_modify_note">Spremeni sporočilo OSM</string>
<string name="make_round_trip_descr">Dodaj kopijo začetne točke kot ciljno.</string>
@ -2594,7 +2596,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="show_guide_line_descr">Prikaz vodilnih črt od trenutnega mesta do mest dejavnih označb.</string>
<string name="show_arrows_descr">Pokaži eno ali dve črti, ki določata smer do dejavnih označb.</string>
<string name="distance_indication_descr">Izbor načina za prikaz razdalje do dejavnih označb.</string>
<string name="active_markers_descr">Izbor števila prikazanih oznak smeri.</string>
<string name="active_markers_descr">Določite število oznak smeri:</string>
<string name="rename_marker">Preimenuj označbo</string>
<string name="mark_passed">Označba je dosežena</string>
<string name="waypoints_added_to_map_markers">Vmesne točke so dodane med označbe zemljevida.</string>
@ -2750,7 +2752,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="thank_you_for_feedback">Zahvaljujemo se vam za odziv</string>
<string name="shared_string_world">Svet</string>
<string name="search_no_results_feedback">Na iskalni niz ni zadetkov iskanja\?
\nPošljite nam odziv in podatke.</string>
\nPošljite nam odziv in podatke</string>
<string name="send_search_query">Ali želite poslati iskalno poizvedbo\?</string>
<string name="point_deleted">Točka %1$s je izbrisana.</string>
<string name="coord_input_edit_point">Uredi točko</string>
@ -2968,7 +2970,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
\n• Odstranjena je analitika Facebook in Firebase iz brezplačne različice (OsmAnd + je ne vključuje)</string>
<string name="exit_at">Izstopi na postaji</string>
<string name="sit_on_the_stop">Vstopi na postaji</string>
<string name="quick_action_show_hide_gpx_tracks_descr">S pritiskom na gumb dejanja se pokažejo ali skrijejo sledi GPX na zemljevidu</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Gumb za prikaz ali skritje izbrane sledi GPX na zemljevidu.</string>
<string name="routeInfo_roadClass_name">Vrsta ceste</string>
<string name="routeInfo_surface_name">Površina</string>
<string name="routeInfo_smoothness_name">Gladkost</string>
@ -2981,8 +2983,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="quick_action_day_night_mode">Način %s</string>
<string name="avoid_pt_types">Izogibanje vrstam transporta …</string>
<string name="shared_string_walk">Pešačenje</string>
<string name="save_poi_value_exceed_length">Najdaljša dovoljena dolžina oznake »%s« je 255 znakov.
\nPred nadaljevanjem je treba ime oznake skrajšati.</string>
<string name="save_poi_value_exceed_length">Skrajšajte dolžino oznake »%s« na manj kot 255 znakov.</string>
<string name="save_poi_value_exceed_length_title">Dolžina vrednosti »%s«</string>
<string name="routing_attr_avoid_sett_name">Izogni se tlakovcem vseh vrst</string>
<string name="routing_attr_avoid_sett_description">Izogni se tlakovcem vseh vrst</string>
@ -3063,7 +3064,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="base_profile_descr_car">Za osebne avtomobile, motorje, tovornjake ...</string>
<string name="base_profile_descr_bicycle">Za gorska kolesa, kolesa z motorjem, ježo s konji</string>
<string name="base_profile_descr_pedestrian">Za hojo, pohodništvo, tek ...</string>
<string name="base_profile_descr_public_transport">Uporaba vseh vrst javnega prevoza ...</string>
<string name="base_profile_descr_public_transport">Vrste javnega prevoza</string>
<string name="base_profile_descr_boat">Za potovanje z ladjo, jadranje, veslanje ...</string>
<string name="base_profile_descr_aircraft">Za letala, jadralna padala ...</string>
<string name="routing_profile_straightline">Hoja po azimutu</string>
@ -3079,15 +3080,24 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="new_profile">Nov profil</string>
<string name="last_launch_crashed">Med zadnjim zagonom programa OsmAnd je prišlo do napake. S posredovanjem sporočila o napaki pomagate pri izboljšanju programa.</string>
<string name="app_mode_ufo">Štopanje NLP (brisača obvezna)</string>
<string name="release_3_4">• Profili: ustvariti je mogoče osebni profil z izbrano ikono in barvo
\n• Mogoče je nastaviti določila prednostne hitrosti za vsak profil
\n• Dodan je gradnik za prikaz trenutnih koordinat
<string name="release_3_4">• Profili: ustvariti je mogoče osebni profil z izbrano ikono in barvo
\n
\n• Mogoče je nastaviti določila prednostne hitrosti za vsak profil
\n
\n• Dodan je gradnik za prikaz trenutnih koordinat
\n
\n• Dodana je možnost za prikaz kompasa in krožnega merila
\n• Popravljeno je delovanje beleženja poti v ozadju
\n• Izboljšan je način prejemanja zemljevidov v ozadju
\n• Ponovno je omogočena možnost »Ohrani prikaz na zaslonu«
\n• Popravljena je možnost izbora jezika na Wikipediji
\n• Popravljeno je delovanje gumba kompasa med navigacijo
\n
\n• Popravljeno je delovanje beleženja poti v ozadju
\n
\n• Izboljšan je način prejemanja zemljevidov v ozadju
\n
\n• Ponovno je omogočena možnost »Ohrani prikaz na zaslonu«
\n
\n• Popravljena je možnost izbora jezika na Wikipediji
\n
\n• Popravljeno je delovanje gumba kompasa med navigacijo
\n
\n• Dodane so številne druge posodobitve
\n
\n</string>
@ -3182,7 +3192,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="routing_attr_freeride_policy_name">Izven urejenih smučišč</string>
<string name="process_downloading_service">Storitev prejemanja posodobitev OsmAnd</string>
<string name="shared_string_color_magenta">Temno rdeča</string>
<string name="press_again_to_change_the_map_orientation">Pritisnite znova, da spremenite usmerjenost zemljevida.</string>
<string name="press_again_to_change_the_map_orientation">Pritisnite znova, da spremenite usmerjenost zemljevida</string>
<string name="shared_string_crash">Program se je sesul!</string>
<string name="rendering_attr_highway_class_track_grade1_name">Ocena 1</string>
<string name="rendering_attr_highway_class_track_grade2_name">Ocena 2</string>
@ -3254,7 +3264,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="logcat_buffer">Medpomnilnik Logcat</string>
<string name="plugins_settings">Nastavitve vstavka</string>
<string name="layer_osm_edits">Urejanja OSM</string>
<string name="tts_initialization_error">Programnika za izgovorjavo besedila ni mogoče začeti</string>
<string name="tts_initialization_error">Programnika za izgovorjavo besedila ni mogoče začeti.</string>
<string name="shared_string_revert">Povrni</string>
<string name="clear_confirmation_msg">Ali želite počistiti %1$s\?</string>
<string name="suggested_maps">Predlagani zemljevidi</string>

3
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -2222,7 +2222,7 @@
<string name="poi_health_specialty_psychiatry_yes">醫療專業：精神科</string>
<string name="poi_health_specialty_neurology_yes">醫療專業：神經科</string>
<string name="poi_seamark_dyke">防波堤</string>
<string name="poi_historic_period_villager">"歷史時期：村民 (新時代 I, II, 西元前 1580 年 – 西元 133 年)"</string>
<string name="poi_historic_period_villager">"歷史時期：村民（新時代 I, II, 西元前1580年 – 西元133年）"</string>
<string name="poi_historic_period_urban">歷史時期：城市（新時代 III，西元 133 年 - 西元 374 年）</string>
<string name="poi_fuel_type">燃料類型</string>
<string name="poi_fuel_avia_type">燃料類型 (avia)</string>
@ -3822,4 +3822,5 @@
<string name="poi_fire_hydrant_style_water_source_groundwater">地下水</string>
<string name="poi_fire_hydrant_type_pipe">管線</string>
<string name="poi_fire_hydrant_pressure_filter">壓力</string>
<string name="poi_pump_status_missing_beam">幫浦狀態：無桿</string>
</resources>

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

@ -11,31 +11,31 @@
Thx - Hardy
--> <string name="index_item_world_basemap_detailed">World overview map (detailed)</string>
<string name="profiles_for_action_not_found">Profiles selected for this action not found.</string>
<string name="change_application_profile">Change application profile</string>
<string name="profiles_for_action_not_found">Could not find any such profiles.</string>
<string name="change_application_profile">Change app profile</string>
<string name="shared_string_add_profile">Add profile</string>
<string name="quick_action_switch_profile_descr">Taping action button will switch between selected profiles.</string>
<string name="quick_action_switch_profile_descr">The action button switches between selected profiles.</string>
<string name="back_to_editing">Back to editing</string>
<string name="reset_deafult_order">Restore default items order</string>
<string name="add_edit_favorite">Add / Edit Favorite</string>
<string name="parking_positions">Parking positions</string>
<string name="create_edit_poi">Create/Edit POI</string>
<string name="quick_action_transport_descr">A button to show or hide public transport on the map.</string>
<string name="quick_action_show_hide_transport">Show/hide public transport</string>
<string name="create_edit_poi">Create / Edit POI</string>
<string name="quick_action_transport_descr">Button showing or hiding public transport on the map.</string>
<string name="quick_action_show_hide_transport">Show / hide public transport</string>
<string name="quick_action_transport_show">Show public transport</string>
<string name="quick_action_transport_hide">Hide public transport</string>
<string name="release_3_7">
• New offline Slope maps\n\n
• Full customization of Favorites and GPX Waypoints – custom colors, icons, shapes\n\n
• Customize items order in Context Menu, Configure Map, Drawer\n\n
• Customize items order in \"Context Menu\", \"Configure Map\" and \"Drawer\"\n\n
• Wikipedia as a separate layer in Configure map, select only needed languages\n\n
• Create your own POI filter/maps with total flexibility\n\n
• Create your own POI filter / maps with total flexibility\n\n
• Added options to restore settings for custom profiles\n\n
• Full GPX routes from Navigation support traffic lanes and complete turn instructions\n\n
• Full GPX routes from navigation support traffic lanes and complete turn instructions\n\n
• Fix UI sizes on tablets\n\n
• Fix bugs with RTL\n\n</string>
<string name="navigation_profiles_item">Navigation profiles</string>
<string name="legend_item_description">The guide to a map\'s symbology</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>
@ -48,7 +48,7 @@
<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 the left side for category selection.</string>
<string name="search_poi_types_descr">Combine POI types from different categories. Tapping \"Switch\" selects all, and the left side selects category.</string>
<string name="search_poi_types">Search for POI types</string>
<string name="osm_live_payment_subscription_management">Payment will be charged to your Google Play account at the confirmation of purchase.\n\n Subscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\n You can manage and cancel your subscriptions by going to your Google Play settings.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
@ -100,7 +100,7 @@
<string name="move_inside_category">You can move items only inside this category.</string>
<string name="additional_actions_descr">You can access these actions by tapping the “%1$s” button.</string>
<string name="main_actions">Main actions</string>
<string name="main_actions_descr">\'Main actions\' only contains 4 buttons.</string>
<string name="main_actions_descr">Only has four buttons.</string>
<string name="reset_items_descr">Hiding settings resets them to their original state.</string>
<string name="hidden_items_descr">These items are hidden from the menu, but the represented options or plugins will continue to work.</string>
<string name="shared_string_hidden">Hidden</string>
@ -111,7 +111,7 @@
<string name="shared_string_drawer">Drawer</string>
<string name="ui_customization">UI Customization</string>
<string name="ui_customization_short_descr">Drawer items, context menu</string>
<string name="ui_customization_description">Customize the quantity of items in Drawer, Configure Map and Context Menu.\n\nYou can turn off unused plugins, to hide all their controls from the application. %1$s.</string>
<string name="ui_customization_description">Customize the quantity of items in \"Drawer\", \"Configure Map\" and \"Context Menu\".\n\nTurn off unused plugins to hide all their controls. %1$s.</string>
<string name="shared_string_min">Min</string>
<string name="shared_string_square">Square</string>
<string name="shared_string_octagon">Octagon</string>
@ -123,7 +123,7 @@
<string name="quick_action_terrain_descr">A button to show or hide terrain layer on the map.</string>
<string name="quick_action_terrain_show">Show terrain</string>
<string name="quick_action_terrain_hide">Hide terrain</string>
<string name="quick_action_show_hide_terrain">Show/hide terrain</string>
<string name="quick_action_show_hide_terrain">Show / hide terrain</string>
<string name="download_slope_maps">Slopes</string>
<string name="n_items_of_z">%1$s of %2$s</string>
<string name="recalculate_route_distance_promo">The route will be recalculated if the distance from the route to the current location is more than selected value.</string>
@ -173,9 +173,9 @@
<string name="import_duplicates_title">Some items already exist</string>
<string name="select_data_to_import">Select the data to be imported.</string>
<string name="please_provide_profile_name_message">Please provide a name for the profile</string>
<string name="no_recalculation_setting">Disable recalculation</string>
<string name="no_recalculation_setting">No recalculation</string>
<string name="open_settings">Open settings</string>
<string name="plugin_disabled">Plugin disabled</string>
<string name="plugin_disabled">Plugin off</string>
<string name="plugin_disabled_descr">This plugin is a separate app, you will need to remove it separately if you no longer plan to use it.\n\nThe plugin will remain on the device after removing OsmAnd.</string>
<string name="shared_string_menu">Menu</string>
<string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
@ -201,7 +201,7 @@
<string name="reset_to_default_category_button_promo">Reset to default will reset sort order to the default state after installation.</string>
<string name="use_system_screen_timeout">Use system screen timeout</string>
<string name="use_system_screen_timeout_promo">Disabled by default, if OsmAnd running on foreground, the screen doesn’t time out.\n\nIf enabled OsmAnd will use system timeout settings.</string>
<string name="accessibility_mode_disabled">Accessibility mode disabled in your system.</string>
<string name="accessibility_mode_disabled">Accessibility mode turned off in your Android.</string>
<string name="rearrange_categories">Rearrange categories</string>
<string name="create_custom_categories_list_promo">Change the sort order of the list, hide unnecessary categories. You can import or export all changes with profiles.</string>
<string name="add_new_custom_category_button_promo">You can add a new custom category by selecting one or a few needed categories.</string>
@ -216,7 +216,7 @@
<string name="shared_string_routing">Routing</string>
<string name="shared_string_rendering_style">Rendering style</string>
<string name="shared_string_include_data">Include additional data</string>
<string name="import_profile_dialog_description">The imported profile contains additional data. Click Import to import only profile data or select additional data to import.</string>
<string name="import_profile_dialog_description">The imported profile contains additional data. Click \"Import\" to import only profile data, or select additional data.</string>
<string name="export_profile_dialog_description">You can select additional data to export along with the profile.</string>
<string name="permission_is_required">Permission is required to use this option.</string>
<string name="logcat_buffer_descr">Check and share detailed logs of the app</string>
@ -271,7 +271,7 @@
<string name="select_map_icon_descr">Icon shown at rest.</string>
<string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
<string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
<string name="reset_confirmation_descr">Tapping %1$s will discard all your changes.</string>
<string name="reset_confirmation_descr">Tapping %1$s discards all your changes.</string>
<string name="reset_all_profile_settings_descr">Reset all profile settings to installation defaults.</string>
<string name="reset_all_profile_settings">Reset all profile settings?</string>
<string name="select_navigation_icon">Position icon while moving</string>
@ -1343,7 +1343,7 @@
<string name="delete_filter">Delete filter</string>
<string name="new_filter">New filter</string>
<string name="new_filter_desc">Please enter a name for the new filter, this will be added to your \'Categories\' tab.</string>
<string name="osm_live_payment_desc">Subscription charged per month. Cancel it on Google Play at any time.</string>
<string name="osm_live_payment_desc">Subscription charged per selected period. Cancel it on Google Play at any time.</string>
<string name="donation_to_osm">Donation to the OSM community</string>
<string name="donation_to_osm_desc">Part of your donation is sent to OSM contributors. The subscription cost remains the same.</string>
<string name="osm_live_subscription_desc">Subscription enables hourly, daily, weekly updates, and unlimited downloads for all maps globally.</string>

4
OsmAnd/res/xml/configure_profile.xml
View file

@ -16,7 +16,7 @@
android:persistent="false"
android:summary="@string/general_settings_profile_descr"
android:title="@string/general_settings_2"
app:fragment="net.osmand.plus.settings.GeneralProfileSettingsFragment"
app:fragment="net.osmand.plus.settings.fragments.GeneralProfileSettingsFragment"
tools:icon="@drawable/ic_action_settings" />
<Preference
@ -25,7 +25,7 @@
android:persistent="false"
android:summary="@string/configure_navigation"
android:title="@string/routing_settings_2"
app:fragment="net.osmand.plus.settings.NavigationFragment"
app:fragment="net.osmand.plus.settings.fragments.NavigationFragment"
tools:icon="@drawable/ic_action_gdirections_dark" />
<Preference

2
OsmAnd/res/xml/general_profile_settings.xml
View file

@ -53,7 +53,7 @@
android:key="coordinates_format"
android:layout="@layout/preference_with_descr"
android:title="@string/coords_format"
app:fragment="net.osmand.plus.settings.CoordinatesFormatFragment" />
app:fragment="net.osmand.plus.settings.fragments.CoordinatesFormatFragment" />
<net.osmand.plus.settings.preferences.ListPreferenceEx
android:key="angular_measurement"

6
OsmAnd/res/xml/global_settings.xml
View file

@ -21,7 +21,7 @@
android:layout="@layout/preference_with_descr"
android:persistent="false"
android:title="@string/application_dir"
app:fragment="net.osmand.plus.settings.DataStorageFragment"
app:fragment="net.osmand.plus.settings.fragments.DataStorageFragment"
tools:icon="@drawable/ic_action_folder" />
<Preference
@ -48,7 +48,7 @@
android:persistent="false"
android:title="@string/dialogs_and_notifications_title"
android:summary="@string/shared_string_all"
app:fragment="net.osmand.plus.settings.DialogsAndNotificationsSettingsFragment"
app:fragment="net.osmand.plus.settings.fragments.DialogsAndNotificationsSettingsFragment"
tools:icon="@drawable/ic_action_notification" />
<net.osmand.plus.settings.preferences.SwitchPreferenceEx
@ -57,7 +57,7 @@
android:summaryOff="@string/shared_string_off"
android:summaryOn="@string/shared_string_on"
android:title="@string/proxy_pref_title"
app:fragment="net.osmand.plus.settings.ProxySettingsFragment"
app:fragment="net.osmand.plus.settings.fragments.ProxySettingsFragment"
tools:icon="@drawable/ic_action_proxy" />
<Preference

2
OsmAnd/res/xml/monitoring_settings.xml
View file

@ -109,7 +109,7 @@
android:summaryOff="@string/shared_string_disabled"
android:summaryOn="@string/shared_string_enabled"
android:title="@string/live_monitoring"
app:fragment="net.osmand.plus.settings.LiveMonitoringFragment"
app:fragment="net.osmand.plus.settings.fragments.LiveMonitoringFragment"
tools:icon="@drawable/ic_world_globe_dark" />
<Preference

12
OsmAnd/res/xml/navigation_settings_new.xml
View file

@ -16,7 +16,7 @@
android:layout="@layout/preference_with_descr"
android:summary="@string/route_parameters_descr"
android:title="@string/route_parameters"
app:fragment="net.osmand.plus.settings.RouteParametersFragment"
app:fragment="net.osmand.plus.settings.fragments.RouteParametersFragment"
tools:icon="@drawable/ic_action_route_distance" />
<net.osmand.plus.settings.preferences.SwitchPreferenceEx
@ -25,7 +25,7 @@
android:summaryOff="@string/shared_string_off"
android:summaryOn="@string/shared_string_on"
android:title="@string/screen_alerts"
app:fragment="net.osmand.plus.settings.ScreenAlertsFragment"
app:fragment="net.osmand.plus.settings.fragments.ScreenAlertsFragment"
tools:icon="@drawable/ic_action_alert" />
<net.osmand.plus.settings.preferences.SwitchPreferenceEx
@ -34,7 +34,7 @@
android:persistent="false"
android:summary="@string/voice_announces_descr"
android:title="@string/voice_announces"
app:fragment="net.osmand.plus.settings.VoiceAnnouncesFragment"
app:fragment="net.osmand.plus.settings.fragments.VoiceAnnouncesFragment"
tools:icon="@drawable/ic_action_volume_up" />
<Preference
@ -42,7 +42,7 @@
android:layout="@layout/preference_with_descr"
android:summary="@string/vehicle_parameters_descr"
android:title="@string/vehicle_parameters"
app:fragment="net.osmand.plus.settings.VehicleParametersFragment"
app:fragment="net.osmand.plus.settings.fragments.VehicleParametersFragment"
tools:icon="@drawable/ic_action_car_dark" />
<PreferenceCategory
@ -54,7 +54,7 @@
android:key="map_during_navigation"
android:layout="@layout/preference_with_descr"
android:title="@string/map_during_navigation"
app:fragment="net.osmand.plus.settings.MapDuringNavigationFragment" />
app:fragment="net.osmand.plus.settings.fragments.MapDuringNavigationFragment" />
<net.osmand.plus.settings.preferences.SwitchPreferenceEx
android:key="turn_screen_on_enabled"
@ -62,7 +62,7 @@
android:summaryOff="@string/shared_string_off"
android:summaryOn="@string/shared_string_on"
android:title="@string/turn_screen_on"
app:fragment="net.osmand.plus.settings.TurnScreenOnFragment"
app:fragment="net.osmand.plus.settings.fragments.TurnScreenOnFragment"
tools:icon="@drawable/ic_action_turn_screen_on" />
<net.osmand.plus.settings.preferences.SwitchPreferenceEx

4
OsmAnd/res/xml/settings_main_screen.xml
View file

@ -10,7 +10,7 @@
android:persistent="false"
android:summary="@string/osmand_settings_descr"
android:title="@string/osmand_settings"
app:fragment="net.osmand.plus.settings.GlobalSettingsFragment"
app:fragment="net.osmand.plus.settings.fragments.GlobalSettingsFragment"
tools:icon="@drawable/ic_action_settings" />
<Preference
@ -27,7 +27,7 @@
android:layout="@layout/preference_with_descr"
android:persistent="false"
android:title="@string/configure_profile"
app:fragment="net.osmand.plus.settings.ConfigureProfileFragment"
app:fragment="net.osmand.plus.settings.fragments.ConfigureProfileFragment"
tools:icon="@drawable/ic_action_car_dark" />
<PreferenceCategory

4
OsmAnd/src/net/osmand/access/AccessibilityPlugin.java
View file

@ -8,9 +8,9 @@ import androidx.annotation.NonNull;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import java.io.IOException;
import java.util.HashMap;

6
OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
View file

@ -19,7 +19,7 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import net.osmand.AndroidUtils;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
@ -28,8 +28,8 @@ import net.osmand.plus.access.RelativeDirectionStyle;
import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet.CopyAppModePrefsListener;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.OnPreferenceChanged;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.OnPreferenceChanged;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet.ResetAppModePrefsListener;
import net.osmand.plus.settings.preferences.ListPreferenceEx;

2
OsmAnd/src/net/osmand/access/NavigationInfo.java
View file

@ -15,7 +15,7 @@ import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.access.RelativeDirectionStyle;

2
OsmAnd/src/net/osmand/aidl/ConnectedApp.java
View file

@ -15,7 +15,7 @@ import net.osmand.AndroidUtils;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.views.AidlMapLayer;

8
OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
View file

@ -43,7 +43,7 @@ import net.osmand.data.PointDescription;
import net.osmand.plus.AppInitializer;
import net.osmand.plus.AppInitializer.AppInitializeListener;
import net.osmand.plus.AppInitializer.InitEvents;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.FavouritesDbHelper;
@ -52,12 +52,12 @@ import net.osmand.plus.GpxSelectionHelper;
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.MapMarkersHelper;
import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.settings.backend.OsmAndAppCustomization;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.SQLiteTileSource;
import net.osmand.plus.SettingsHelper;
import net.osmand.plus.settings.backend.SettingsHelper;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
import net.osmand.plus.dialogs.ConfigureMapMenu;

2
OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
View file

@ -86,7 +86,7 @@ import net.osmand.aidl.search.SearchParams;
import net.osmand.aidl.search.SearchResult;
import net.osmand.aidl.tiles.ASqliteDbFile;
import net.osmand.data.LatLon;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.settings.backend.OsmAndAppCustomization;
import net.osmand.plus.OsmandApplication;
import net.osmand.util.Algorithms;

2
OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java
View file

@ -87,7 +87,7 @@ import net.osmand.aidlapi.search.SearchParams;
import net.osmand.aidlapi.search.SearchResult;
import net.osmand.aidlapi.tiles.ASqliteDbFile;
import net.osmand.data.LatLon;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.settings.backend.OsmAndAppCustomization;
import net.osmand.plus.OsmandApplication;
import net.osmand.util.Algorithms;

4
OsmAnd/src/net/osmand/core/android/MapRendererContext.java
View file

@ -24,8 +24,8 @@ import net.osmand.core.jni.QStringStringHash;
import net.osmand.core.jni.ResolvedMapStyle;
import net.osmand.core.jni.SwigUtilities;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
import net.osmand.plus.render.RendererRegistry;
import net.osmand.render.RenderingRuleProperty;
import net.osmand.render.RenderingRuleStorageProperties;

4
OsmAnd/src/net/osmand/data/FavouritePoint.java
View file

@ -9,8 +9,8 @@ import androidx.annotation.StringRes;
import net.osmand.GPXUtilities.WptPt;
import net.osmand.plus.FavouritesDbHelper;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings.BooleanPreference;
import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.settings.backend.OsmandSettings.BooleanPreference;
import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
import net.osmand.plus.R;
import net.osmand.plus.parkingpoint.ParkingPositionPlugin;
import net.osmand.util.Algorithms;

2
OsmAnd/src/net/osmand/data/PointDescription.java
View file

@ -10,7 +10,7 @@ import com.google.openlocationcode.OpenLocationCode;
import net.osmand.LocationConvert;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.util.Algorithms;

3
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -53,6 +53,9 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.routing.TransportRoutingHelper;
import net.osmand.plus.search.QuickSearchHelper;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.SettingsHelper;
import net.osmand.plus.views.corenative.NativeCoreContext;
import net.osmand.plus.voice.CommandPlayer;
import net.osmand.plus.voice.CommandPlayerException;

7
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -36,8 +36,11 @@ import net.osmand.plus.activities.actions.AppModeDialog;
import net.osmand.plus.dialogs.ConfigureMapMenu;
import net.osmand.plus.dialogs.HelpArticleDialogFragment;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.OsmandSettings.ContextMenuItemsPreference;
import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmAndAppCustomization;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.ContextMenuItemsPreference;
import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;

1
OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
View file

@ -14,6 +14,7 @@ import net.osmand.binary.GeocodingUtilities.GeocodingResult;
import net.osmand.binary.RouteDataObject;
import net.osmand.plus.resources.ResourceManager.BinaryMapReaderResource;
import net.osmand.plus.resources.ResourceManager.BinaryMapReaderResourceType;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.router.GeneralRouter.GeneralRouterProfile;
import net.osmand.router.RoutePlannerFrontEnd;
import net.osmand.router.RoutingConfiguration;

18
OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java
View file

@ -17,14 +17,16 @@ import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.map.ITileSource;
import net.osmand.map.WorldRegion;
import net.osmand.plus.SettingsHelper.AvoidRoadsSettingsItem;
import net.osmand.plus.SettingsHelper.MapSourcesSettingsItem;
import net.osmand.plus.SettingsHelper.PluginSettingsItem;
import net.osmand.plus.SettingsHelper.PoiUiFilterSettingsItem;
import net.osmand.plus.SettingsHelper.ProfileSettingsItem;
import net.osmand.plus.SettingsHelper.QuickActionsSettingsItem;
import net.osmand.plus.SettingsHelper.SettingsCollectListener;
import net.osmand.plus.SettingsHelper.SettingsItem;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.SettingsHelper;
import net.osmand.plus.settings.backend.SettingsHelper.AvoidRoadsSettingsItem;
import net.osmand.plus.settings.backend.SettingsHelper.MapSourcesSettingsItem;
import net.osmand.plus.settings.backend.SettingsHelper.PluginSettingsItem;
import net.osmand.plus.settings.backend.SettingsHelper.PoiUiFilterSettingsItem;
import net.osmand.plus.settings.backend.SettingsHelper.ProfileSettingsItem;
import net.osmand.plus.settings.backend.SettingsHelper.QuickActionsSettingsItem;
import net.osmand.plus.settings.backend.SettingsHelper.SettingsCollectListener;
import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadIndexesThread;
import net.osmand.plus.download.DownloadResources;

2
OsmAnd/src/net/osmand/plus/GeocodingLookupService.java
View file

@ -1,13 +1,13 @@
package net.osmand.plus;
import android.os.AsyncTask;
import android.os.Build;
import net.osmand.Location;
import net.osmand.ResultMatcher;
import net.osmand.binary.GeocodingUtilities.GeocodingResult;
import net.osmand.binary.RouteDataObject;
import net.osmand.data.LatLon;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.util.Algorithms;
import java.util.ArrayList;

2
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -22,7 +22,7 @@ import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.plus.GPXDatabase.GpxDataItem;
import net.osmand.plus.MapMarkersHelper.MapMarkersGroup;
import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
import net.osmand.plus.activities.SavingTrackHelper;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType;

1
OsmAnd/src/net/osmand/plus/NavigationService.java
View file

@ -22,6 +22,7 @@ import android.widget.Toast;
import net.osmand.PlatformUtil;
import net.osmand.plus.notifications.OsmandNotification;
import net.osmand.plus.settings.backend.OsmandSettings;
public class NavigationService extends Service implements LocationListener {

8
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -13,9 +13,11 @@ import net.osmand.osm.AbstractPoiType;
import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.PoiCategory;
import net.osmand.osm.PoiType;
import net.osmand.plus.OsmandSettings.AngularConstants;
import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.OsmandSettings.SpeedConstants;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants;
import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
import net.osmand.plus.settings.backend.OsmandSettings.SpeedConstants;
import net.osmand.util.Algorithms;
import java.text.DateFormatSymbols;

2
OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
View file

@ -40,6 +40,8 @@ import net.osmand.data.QuadPoint;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.routing.RoutingHelper.RouteSegmentSearchResult;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.router.RouteSegmentResult;
import net.osmand.util.MapUtils;

1
OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java
View file

@ -19,6 +19,7 @@ import net.osmand.Location;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
import net.osmand.plus.settings.backend.ApplicationMode;
import java.util.ArrayList;
import java.util.List;

4
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -69,6 +69,10 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.routing.TransportRoutingHelper;
import net.osmand.plus.search.QuickSearchHelper;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmAndAppCustomization;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.SettingsHelper;
import net.osmand.plus.voice.CommandPlayer;
import net.osmand.plus.wikivoyage.data.TravelDbHelper;
import net.osmand.router.GeneralRouter;

2
OsmAnd/src/net/osmand/plus/OsmandBackupAgent.java
View file

@ -9,6 +9,8 @@ import android.os.ParcelFileDescriptor;
import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
import net.osmand.plus.osmedit.OsmBugsDbHelper;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmandSettings;
import java.io.IOException;
import java.util.List;

4
OsmAnd/src/net/osmand/plus/OsmandPlugin.java
View file

@ -41,7 +41,9 @@ import net.osmand.plus.osmedit.OsmEditingPlugin;
import net.osmand.plus.parkingpoint.ParkingPositionPlugin;
import net.osmand.plus.quickaction.QuickActionType;
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.skimapsplugin.SkiMapsPlugin;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import net.osmand.plus.views.OsmandMapTileView;

4
OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
View file

@ -12,7 +12,9 @@ import net.osmand.data.PointDescription;
import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
import net.osmand.plus.routing.RouteProvider.RouteService;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;

2
OsmAnd/src/net/osmand/plus/UiUtilities.java
View file

@ -3,7 +3,6 @@ package net.osmand.plus;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
@ -47,6 +46,7 @@ import net.osmand.AndroidUtils;
import net.osmand.Location;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.views.DirectionDrawable;
import net.osmand.plus.widgets.TextViewEx;

2
OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
View file

@ -18,7 +18,7 @@ import androidx.core.view.ViewCompat;
import net.osmand.AndroidUtils;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
public abstract class ActionBarPreferenceActivity extends AppCompatPreferenceActivity {

4
OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java
View file

@ -8,9 +8,9 @@ import java.util.TimeZone;
import net.osmand.Location;
import net.osmand.PlatformUtil;
import net.osmand.StateChangedListener;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings.DayNightMode;
import net.osmand.plus.settings.backend.OsmandSettings.DayNightMode;
import net.osmand.util.SunriseSunset;
import org.apache.commons.logging.Log;

40
OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java
View file

@ -51,11 +51,12 @@ public class DownloadTilesDialog {
public void openDialog(){
BaseMapLayer mainLayer = mapView.getMainLayer();
if(!(mainLayer instanceof MapTileLayer) || !((MapTileLayer) mainLayer).isVisible()){
if (!(mainLayer instanceof MapTileLayer) || !((MapTileLayer) mainLayer).isVisible()) {
Toast.makeText(ctx, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
return;
}
final ITileSource mapSource = ((MapTileLayer) mainLayer).getMap();
if(mapSource == null || !mapSource.couldBeDownloadedFromInternet()){
if (mapSource == null || !mapSource.couldBeDownloadedFromInternet()) {
Toast.makeText(ctx, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
return;
}
@ -66,29 +67,28 @@ public class DownloadTilesDialog {
// calculate pixel rectangle
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
LayoutInflater inflater = (LayoutInflater)ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View view = inflater.inflate(R.layout.download_tiles, null);
((TextView)view.findViewById(R.id.MinZoom)).setText(zoom+""); //$NON-NLS-1$
((TextView)view.findViewById(R.id.MaxZoom)).setText(max+""); //$NON-NLS-1$
((TextView) view.findViewById(R.id.MinZoom)).setText(String.valueOf(zoom));
((TextView) view.findViewById(R.id.MaxZoom)).setText(String.valueOf(max));
final Slider slider = (Slider) view.findViewById(R.id.ZoomToDownload);
slider.setValueTo(max - zoom);
int progress = (max - zoom) / 2;
slider.setValue(progress);
final TextView downloadText = ((TextView) view.findViewById(R.id.DownloadDescription));
final String template = ctx.getString(R.string.tiles_to_download_estimated_size);
updateLabel(zoom, rb.getLatLonBounds(), downloadText, template, (int) slider.getValue());
slider.addOnChangeListener(new Slider.OnChangeListener() {
@Override
public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) {
updateLabel(zoom, rb.getLatLonBounds(), downloadText, template, (int) value);
}
});
if (max > zoom) {
slider.setValueTo(max - zoom);
int progress = (max - zoom) / 2;
slider.setValue(progress);
slider.addOnChangeListener(new Slider.OnChangeListener() {
@Override
public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) {
updateLabel(zoom, rb.getLatLonBounds(), downloadText, template, (int) value);
}
});
}
builder.setPositiveButton(R.string.shared_string_download, new DialogInterface.OnClickListener(){
@Override

2
OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
View file

@ -26,7 +26,7 @@ import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.UiUtilities.UpdateLocationViewCache;

2
OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java
View file

@ -45,7 +45,7 @@ import net.osmand.plus.FavouritesDbHelper;
import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.myplaces.FavoritesActivity;

2
OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
View file

@ -44,7 +44,7 @@ import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
import net.osmand.plus.FavouritesDbHelper.FavoritesListener;
import net.osmand.plus.MapMarkersHelper;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.FavoriteImageDrawable;

29
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -66,18 +66,17 @@ import net.osmand.map.MapTileDownloader.IMapDownloaderCallback;
import net.osmand.plus.AppInitializer;
import net.osmand.plus.AppInitializer.AppInitializeListener;
import net.osmand.plus.AppInitializer.InitEvents;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
import net.osmand.plus.HuaweiDrmHelper;
import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
import net.osmand.plus.OnDismissDialogFragmentListener;
import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener;
import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener;
import net.osmand.plus.OsmAndConstants;
import net.osmand.plus.OsmAndLocationSimulation;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
@ -135,14 +134,15 @@ import net.osmand.plus.routing.TransportRoutingHelper.TransportRouteCalculationP
import net.osmand.plus.search.QuickSearchDialogFragment;
import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchTab;
import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.BaseSettingsFragment.SettingsScreenType;
import net.osmand.plus.settings.ConfigureMenuItemsFragment;
import net.osmand.plus.settings.ConfigureProfileFragment;
import net.osmand.plus.settings.DataStorageFragment;
import net.osmand.plus.settings.ImportCompleteFragment;
import net.osmand.plus.settings.ImportSettingsFragment;
import net.osmand.plus.settings.ProfileAppearanceFragment;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
import net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment;
import net.osmand.plus.settings.fragments.ConfigureProfileFragment;
import net.osmand.plus.settings.fragments.DataStorageFragment;
import net.osmand.plus.settings.fragments.ImportCompleteFragment;
import net.osmand.plus.settings.fragments.ImportSettingsFragment;
import net.osmand.plus.settings.fragments.ProfileAppearanceFragment;
import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
import net.osmand.plus.views.AnimateDraggingMapThread;
import net.osmand.plus.views.MapControlsLayer;
@ -173,9 +173,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID;
import static net.osmand.plus.OsmandSettings.GENERIC_EXTERNAL_DEVICE;
import static net.osmand.plus.OsmandSettings.PARROT_EXTERNAL_DEVICE;
import static net.osmand.plus.OsmandSettings.WUNDERLINQ_EXTERNAL_DEVICE;
import static net.osmand.plus.settings.backend.OsmandSettings.GENERIC_EXTERNAL_DEVICE;
import static net.osmand.plus.settings.backend.OsmandSettings.PARROT_EXTERNAL_DEVICE;
import static net.osmand.plus.settings.backend.OsmandSettings.WUNDERLINQ_EXTERNAL_DEVICE;
public class MapActivity extends OsmandActionBarActivity implements DownloadEvents,
OnRequestPermissionsResultCallback, IRouteInformationListener, AMapPointUpdateListener,
@ -1450,6 +1450,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
public void updateApplicationModeSettings() {
changeKeyguardFlags();
updateMapSettings();
app.getPoiFilters().loadSelectedPoiFilters();
mapViewTrackingUtilities.updateSettings();
//app.getRoutingHelper().setAppMode(settings.getApplicationMode());
if (mapLayers.getMapInfoLayer() != null) {

6
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -37,7 +37,7 @@ import net.osmand.data.PointDescription;
import net.osmand.data.QuadRect;
import net.osmand.data.RotatedTileBox;
import net.osmand.map.ITileSource;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.ItemClickListener;
import net.osmand.plus.ContextMenuItem;
@ -47,7 +47,7 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.UiUtilities;
@ -67,7 +67,7 @@ import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
import net.osmand.plus.routepreparationmenu.WaypointsFragment;
import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.BaseMapLayer;
import net.osmand.plus.views.MapControlsLayer;
import net.osmand.plus.views.MapTileLayer;

4
OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
View file

@ -27,8 +27,8 @@ import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.DialogListItemAdapter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
import net.osmand.plus.R;
import net.osmand.plus.SQLiteTileSource;
import net.osmand.plus.activities.MapActivity.ShowQuickSearchMode;

2
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -19,7 +19,7 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.Version;
import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
import net.osmand.plus.notifications.OsmandNotification.NotificationType;

8
OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
View file

@ -23,11 +23,11 @@ import androidx.appcompat.app.AlertDialog.Builder;
import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
import net.osmand.plus.R;
import net.osmand.plus.profiles.AppProfileArrayAdapter;
import net.osmand.plus.profiles.ProfileDataObject;

10
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -39,12 +39,12 @@ import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.data.PointDescription;
import net.osmand.osm.io.NetworkUtils;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.AngularConstants;
import net.osmand.plus.OsmandSettings.DrivingRegion;
import net.osmand.plus.OsmandSettings.MetricsConstants;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants;
import net.osmand.plus.settings.backend.OsmandSettings.DrivingRegion;
import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.base.MapViewTrackingUtilities;

10
OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
View file

@ -30,15 +30,15 @@ import androidx.core.content.ContextCompat;
import com.google.android.material.slider.Slider;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.AutoZoomMap;
import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.OsmandSettings.SpeedConstants;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.AutoZoomMap;
import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
import net.osmand.plus.settings.backend.OsmandSettings.SpeedConstants;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.Version;

4
OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
View file

@ -32,9 +32,9 @@ import net.osmand.plus.GpxSelectionHelper;
import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.LockableViewPager;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.settings.backend.OsmAndAppCustomization;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.mapmarkers.CoordinateInputDialogFragment;
import net.osmand.plus.measurementtool.NewGpxData;

4
OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
View file

@ -19,9 +19,9 @@ import androidx.core.content.ContextCompat;
import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;

2
OsmAnd/src/net/osmand/plus/activities/actions/OsmAndAction.java
View file

@ -1,7 +1,7 @@
package net.osmand.plus.activities.actions;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.views.OsmandMapTileView;

4
OsmAnd/src/net/osmand/plus/activities/actions/OsmAndDialogs.java
View file

@ -11,9 +11,9 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import net.osmand.CallbackWithObject;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;

2
OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java
View file

@ -18,7 +18,7 @@ import net.osmand.plus.AppInitializer.AppInitializeListener;
import net.osmand.plus.AppInitializer.InitEvents;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.OsmandListActivity;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
View file

@ -26,7 +26,7 @@ import net.osmand.data.LatLon;
import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.FavoritesListActivity;
import net.osmand.plus.activities.FavoritesListFragment;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
View file

@ -22,7 +22,7 @@ import androidx.fragment.app.Fragment;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.FileNameTranslationHelper;

1
OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java
View file

@ -10,7 +10,6 @@ import net.osmand.data.City;
import net.osmand.data.LatLon;
import net.osmand.data.Street;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation;
import net.osmand.plus.resources.RegionAddressRepository;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
View file

@ -46,7 +46,7 @@ import net.osmand.data.MapObject;
import net.osmand.data.PointDescription;
import net.osmand.plus.OsmAndConstants;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.OsmandListActivity;

3
OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java
View file

@ -19,10 +19,9 @@ import net.osmand.data.LatLon;
import net.osmand.data.Postcode;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.resources.RegionAddressRepository;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
import java.util.Collection;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
View file

@ -30,7 +30,7 @@ import net.osmand.data.PointDescription;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.UiUtilities.UpdateLocationViewCache;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -49,7 +49,7 @@ import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.R.color;
import net.osmand.plus.UiUtilities;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java
View file

@ -7,7 +7,7 @@ import net.osmand.data.City;
import net.osmand.data.MapObject.MapObjectComparator;
import net.osmand.data.Street;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation;
import net.osmand.plus.resources.RegionAddressRepository;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java
View file

@ -18,7 +18,7 @@ import net.osmand.data.MapObject.MapObjectComparator;
import net.osmand.data.Street;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation;
import net.osmand.plus.resources.RegionAddressRepository;

2
OsmAnd/src/net/osmand/plus/api/AudioFocusHelper.java
View file

@ -2,7 +2,7 @@ package net.osmand.plus.api;
import android.content.Context;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
public interface AudioFocusHelper {

2
OsmAnd/src/net/osmand/plus/api/AudioFocusHelperImpl.java
View file

@ -2,7 +2,7 @@ package net.osmand.plus.api;
import net.osmand.PlatformUtil;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandApplication;
import org.apache.commons.logging.Log;

8
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -47,14 +47,14 @@ import net.osmand.PlatformUtil;
import net.osmand.data.DataTileManager;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.ItemClickListener;
import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;
@ -66,7 +66,7 @@ import net.osmand.plus.mapcontextmenu.MapContextMenu;
import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.quickaction.QuickActionType;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.MapInfoLayer;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import net.osmand.plus.views.OsmandMapTileView;

6
OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java
View file

@ -24,8 +24,8 @@ import androidx.preference.PreferenceViewHolder;
import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmAndAppCustomization;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
@ -33,7 +33,7 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet;
import net.osmand.plus.profiles.SelectCopyAppModeBottomSheet.CopyAppModePrefsListener;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet;
import net.osmand.plus.settings.bottomsheets.ResetProfilePrefsBottomSheet.ResetAppModePrefsListener;
import net.osmand.plus.settings.preferences.ListPreferenceEx;

2
OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
View file

@ -34,7 +34,7 @@ import net.osmand.GPXUtilities.WptPt;
import net.osmand.PlatformUtil;
import net.osmand.data.PointDescription;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings.NotesSortByMode;
import net.osmand.plus.settings.backend.OsmandSettings.NotesSortByMode;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.activities.ActionBarProgressActivity;

4
OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java
View file

@ -3,8 +3,8 @@ package net.osmand.plus.audionotes;
import android.os.Bundle;
import android.view.View;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.NotesSortByMode;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.NotesSortByMode;
import net.osmand.plus.R;
import net.osmand.plus.base.MenuBottomSheetDialogFragment;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;

2
OsmAnd/src/net/osmand/plus/base/BaseOsmAndDialogFragment.java
View file

@ -12,7 +12,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.DialogFragment;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;

2
OsmAnd/src/net/osmand/plus/base/BaseOsmAndFragment.java
View file

@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.OsmandActionBarActivity;

2
OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
View file

@ -18,7 +18,7 @@ import androidx.fragment.app.DialogFragment;
import net.osmand.plus.OnDialogFragmentResultListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
public abstract class BottomSheetDialogFragment extends DialogFragment {

2
OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
View file

@ -14,7 +14,7 @@ import net.osmand.GPXUtilities.GPXFile;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.TargetPointsHelper.TargetPoint;

2
OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
View file

@ -20,7 +20,7 @@ import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.dashboard.DashboardOnMap;
import net.osmand.plus.mapcontextmenu.MapContextMenu;

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

@ -36,7 +36,7 @@ import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.Version;

4
OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
View file

@ -23,8 +23,8 @@ import androidx.fragment.app.FragmentManager;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.BaseOsmAndDialogFragment;

2
OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
View file

@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment;
import com.google.android.material.snackbar.Snackbar;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.settings.backend.OsmAndAppCustomization;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;

2
OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java
View file

@ -32,7 +32,7 @@ import androidx.fragment.app.FragmentActivity;
import net.osmand.AndroidUtils;
import net.osmand.ValueHolder;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.ProgressImplementation;
import net.osmand.plus.R;
import net.osmand.plus.download.DownloadActivity;

2
OsmAnd/src/net/osmand/plus/dashboard/DashDashboardOrDrawerFragment.java
View file

@ -5,7 +5,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.tools.DashFragmentData;

2
OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java
View file

@ -14,7 +14,7 @@ import androidx.core.view.ViewCompat;
import com.google.android.material.snackbar.Snackbar;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.OsmandActionBarActivity;

4
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -49,13 +49,13 @@ import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil;
import net.osmand.ValueHolder;
import net.osmand.data.LatLon;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;

2
OsmAnd/src/net/osmand/plus/dashboard/tools/DashFragmentData.java
View file

@ -2,7 +2,7 @@ package net.osmand.plus.dashboard.tools;
import androidx.annotation.NonNull;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashBaseFragment;

4
OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
View file

@ -24,8 +24,8 @@ import androidx.fragment.app.FragmentActivity;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;

2
OsmAnd/src/net/osmand/plus/dashboard/tools/TransactionBuilder.java
View file

@ -5,7 +5,7 @@ import android.util.Log;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashBaseFragment;

2
OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java
View file

@ -9,7 +9,7 @@ import net.osmand.plus.OsmAndLocationSimulation;
import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.render.NativeOsmandLibrary;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
import net.osmand.util.SunriseSunset;

2
OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
View file

@ -14,7 +14,7 @@ import net.osmand.plus.Version;
import net.osmand.plus.activities.ContributionVersionActivity;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.tools.DashFragmentData;
import net.osmand.plus.settings.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.views.MapInfoLayer;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import net.osmand.plus.views.OsmandMapTileView;

Some files were not shown because too many files have changed in this diff Show more