Skip to content

Commit

Permalink
Merge branch 'osmandapp:master' into hardy_Afa
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonora
sonora authored Jan 15, 2025
2 parents c7ac627 + 8dcf32a commit b48fd41
Show file tree
Hide file tree
Showing 10 changed files with 238 additions and 48 deletions.
2 changes: 1 addition & 1 deletion OsmAnd/res/values-es-rAR/phrases.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<string name="poi_traffic_calming_cushion">Cojín berlinés</string>
<string name="poi_traffic_calming_chicane">Chicana</string>
<string name="poi_traffic_calming_rumble_strip">Banda sonora</string>
<string name="poi_traffic_calming_table">Peatonal elevada;Plataforma elevada</string>
<string name="poi_traffic_calming_table">Peatonal elevada;Plataforma elevada;Paso peatonal elevado</string>
<string name="poi_traffic_calming_choker">Calzada reducida;Gargantilla</string>
<string name="poi_traffic_signals">Semáforo</string>
<string name="poi_car_repair">Taller de automóviles;Taller mecánico; Reparación de automotores</string>
Expand Down
126 changes: 103 additions & 23 deletions OsmAnd/res/values-hr/phrases.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<string name="poi_information_type">Vrsta</string>
<string name="poi_information_contents">Sadržaj</string>
<string name="poi_theatre_genre">Žanr</string>
<string name="poi_fee">Naknada</string>
<string name="poi_fee">Pristojba</string>
<string name="poi_delivery">Dostava</string>
<string name="poi_cocktails">Koktejli</string>
<string name="poi_shelter_type">Vrsta</string>
Expand Down Expand Up @@ -277,7 +277,7 @@
<string name="poi_generator_type_phwr">Vrsta generatora: PHWR</string>
<string name="poi_generator_type_gcr">Vrsta generatora: GCR</string>
<string name="poi_faculty_arts">Umjetnost</string>
<string name="poi_computer_sales_yes">Da</string>
<string name="poi_computer_sales_yes">Da;Prodaja računala</string>
<string name="poi_fuel_avia_type">Vrsta goriva (avia)</string>
<string name="poi_payment_type">Vrsta plaćanja</string>
<string name="poi_additional_type">Dodatno</string>
Expand Down Expand Up @@ -573,7 +573,7 @@
<string name="poi_abandoned">Napušteno</string>
<string name="poi_abandoned_poi">Napušteni objekt</string>
<string name="poi_operator">Operator</string>
<string name="poi_fee_yes">Da</string>
<string name="poi_fee_yes">Da;Pristojba</string>
<string name="poi_fee_no">Ne</string>
<string name="poi_drinking_water_yes">Da;Pitka voda</string>
<string name="poi_drinking_water_no">Ne</string>
Expand Down Expand Up @@ -856,7 +856,7 @@
<string name="poi_scout_yes">Da</string>
<string name="poi_group_only_yes">Samo grupa: da</string>
<string name="poi_group_only_no">Samo grupa: ne</string>
<string name="poi_washing_machine_yes">Da</string>
<string name="poi_washing_machine_yes">Da;Vešmašina</string>
<string name="poi_shower_filter_yes">Da</string>
<string name="poi_shower_yes">Tuš: da</string>
<string name="poi_shower_no">Tuš: ne</string>
Expand Down Expand Up @@ -1146,7 +1146,7 @@
<string name="poi_gambling_slot_machines">Slot uređaji</string>
<string name="poi_gambling_betting">Klađenje</string>
<string name="poi_e_cigarette">Prodavaonica elektronskih cigareta</string>
<string name="poi_fast_food_cafeteria">Da</string>
<string name="poi_fast_food_cafeteria">Da;Kafeterija</string>
<string name="poi_drink_wine_yes">Vino: da</string>
<string name="poi_drink_wine_retail">Vino: maloprodaja</string>
<string name="poi_drink_wine_served">Vino: nudi se</string>
Expand Down Expand Up @@ -1401,19 +1401,19 @@
<string name="poi_volcano_status_inactive">Neaktivan</string>
<string name="poi_volcano_number_of_eruptions">Broj erupcija</string>
<string name="poi_bowling_alley">Kuglana</string>
<string name="poi_sms_yes">Da</string>
<string name="poi_sms_yes">Da;SMS</string>
<string name="poi_sms_no">Ne</string>
<string name="poi_video_yes">Da</string>
<string name="poi_video_yes">Da;Video</string>
<string name="poi_video_no">Ne</string>
<string name="poi_tactile_paving_contrasted">Kontrastno</string>
<string name="poi_tactile_paving_primitive">Jednostavno</string>
<string name="poi_tactile_paving_incorrect">Neispravno</string>
<string name="poi_drinking_water_refill_yes">Da</string>
<string name="poi_drinking_water_refill_yes">Da:Točenje pitke vode;Točenje</string>
<string name="poi_drinking_water_refill_no">Točenje pitke vode: ne</string>
<string name="poi_drinking_water_refill_network">Mreža točenja pitke vode</string>
<string name="poi_traffic_signals_vibration_no">Vibriranje: ne</string>
<string name="poi_traffic_signals_vibration_yes">Da</string>
<string name="poi_traffic_signals_arrow_yes">Da</string>
<string name="poi_traffic_signals_vibration_yes">Da;Vibracija prometnih signala</string>
<string name="poi_traffic_signals_arrow_yes">Da;Strelica prometnih signala</string>
<string name="poi_traffic_signals_arrow_no">Strelica: ne</string>
<string name="poi_borough">Slobodni grad</string>
<string name="poi_elevator">Lift</string>
Expand Down Expand Up @@ -1479,8 +1479,8 @@
<string name="poi_authentication_short_message_no">Autentifikacija pomoću kratke poruke: ne</string>
<string name="poi_authentication_short_message_yes">Da</string>
<string name="poi_authentication_none_no">Autentifikacija nije potrebna: ne</string>
<string name="poi_authentication_none_yes">Da</string>
<string name="poi_permanent_camping_yes">Da</string>
<string name="poi_authentication_none_yes">Da;Bez autentifikacije</string>
<string name="poi_permanent_camping_yes">Da;Stalno kamiranje</string>
<string name="poi_permanent_camping_no">Ne</string>
<string name="poi_permanent_camping_only">Samo</string>
<string name="poi_destination">Odredište</string>
Expand Down Expand Up @@ -1509,20 +1509,20 @@
<string name="poi_butcher_lamb">Janjetina</string>
<string name="poi_butcher_pork">Svinjetina</string>
<string name="poi_butcher_halal">Halal</string>
<string name="poi_coffee_yes">Da</string>
<string name="poi_coffee_yes">Da;Kava</string>
<string name="poi_coffee_no">Ne</string>
<string name="poi_ice_cream_yes">Da</string>
<string name="poi_ice_cream_yes">Da;Sladoled</string>
<string name="poi_origin">Izvor</string>
<string name="poi_tobacco_yes">Da</string>
<string name="poi_membership_yes">Da</string>
<string name="poi_tobacco_yes">Da;Duhan</string>
<string name="poi_membership_yes">Da;Članstvo</string>
<string name="poi_membership_no">Ne</string>
<string name="poi_medical_supply_diabetic">Dijabetes</string>
<string name="poi_medical_supply_diagnostic">Dijagnostika</string>
<string name="poi_beauty_salon_spa">Spa</string>
<string name="poi_beauty_salon_hair_removal">Uklanjanje kose</string>
<string name="poi_massage_chiropractic">Kiropraktika</string>
<string name="poi_massage_shiatsu">Shiatsu</string>
<string name="poi_agrarian_yes">Da</string>
<string name="poi_agrarian_yes">Da;Poljoprivreda</string>
<string name="poi_agrarian_tools">Alati</string>
<string name="poi_generator_type_bwr_2">Vrsta generatora: BWR-2</string>
<string name="poi_generator_type_bwr_3">Vrsta generatora: BWR-3</string>
Expand All @@ -1539,15 +1539,15 @@
<string name="poi_generator_type_icf">Vrsta generatora: ICF</string>
<string name="poi_generator_type_boiler">Vrsta generatora: bojler</string>
<string name="poi_generator_type_bioreactor">Vrsta generatora: bioreaktor</string>
<string name="poi_service_fleurop_yes">Da</string>
<string name="poi_mattress_yes">Da</string>
<string name="poi_service_fleurop_yes">Da;Fleurop</string>
<string name="poi_mattress_yes">Da;Madrac</string>
<string name="poi_mattress_no">Ne</string>
<string name="poi_furniture_used">Korišteno</string>
<string name="poi_furniture_office">Ured</string>
<string name="poi_furniture_living_room">Dnevna soba</string>
<string name="poi_furniture_kitchen">Kuhinja</string>
<string name="poi_furniture_bedroom">Spavaća soba</string>
<string name="poi_furniture_yes">Da</string>
<string name="poi_furniture_yes">Da;Namještaj</string>
<string name="poi_furniture_no">Ne</string>
<string name="poi_furniture_bed">Krevet</string>
<string name="poi_furniture_sofa">Fotelja</string>
Expand All @@ -1556,7 +1556,7 @@
<string name="poi_heating_stove">Štednjak</string>
<string name="poi_heating_gas">Plin</string>
<string name="poi_heating_radiator">Radijator</string>
<string name="poi_fridge_yes">Da</string>
<string name="poi_fridge_yes">Da;Frižider</string>
<string name="poi_fridge_no">Ne</string>
<string name="poi_faculty_architecture">Arhitektura</string>
<string name="poi_faculty_biology">Biologija</string>
Expand All @@ -1573,9 +1573,9 @@
<string name="poi_faculty_nursing">Njega</string>
<string name="poi_faculty_psychology">Psihologija</string>
<string name="poi_computer_sales_used">Korišteno</string>
<string name="poi_computer_repair_yes">Da</string>
<string name="poi_computer_repair_yes">Da;Popravljanje računala</string>
<string name="poi_computer_sales_no">Prodaja računala: ne</string>
<string name="poi_computer_parts_yes">Da</string>
<string name="poi_computer_parts_yes">Da;Dijelovi za računala</string>
<string name="poi_computer_parts_no">Dijelovi računala: ne</string>
<string name="poi_optometrist">Optometričar</string>
<string name="poi_resource_stone">Kamen</string>
Expand Down Expand Up @@ -2144,4 +2144,84 @@
<string name="poi_toll_hgv_yes">Cestarina za kamione</string>
<string name="poi_craft">Radionica</string>
<string name="poi_route_activity_type_car">Auto</string>
<string name="poi_route_activity_type_train_riding">Vožnja vlakom</string>
<string name="poi_medical_supply_respiratory">Respiracija</string>
<string name="poi_generator_method_water_pumped_storage">Metoda generatora: pumpna akumulacija vode</string>
<string name="poi_generator_method_thermal">Metoda generatora: termalna</string>
<string name="poi_payment_efectivo_no">Efectivo se ne prihvaća</string>
<string name="poi_route_activity_type_caving">Spilja</string>
<string name="poi_route_activity_type_inline_skates">Inline koturaljke</string>
<string name="poi_stream">Potok</string>
<string name="poi_rapids">Brzaci</string>
<string name="poi_payment_efectivo_yes">Efectivo</string>
<string name="poi_washing_machine_no">Vešmašina: ne</string>
<string name="poi_snowmobile_private">Pristup motornim sanjkama: privatno</string>
<string name="poi_trailer_yes">Da;Prikolica</string>
<string name="poi_trailer_designated">Određeno;Određeno za prikolice</string>
<string name="poi_cash_withdrawal_girocard">Žiro kartica</string>
<string name="poi_medical_supply_mobility">Mobilnost</string>
<string name="poi_agrarian_seed">Sjeme</string>
<string name="poi_reef">Greben</string>
<string name="poi_valley">Dolina</string>
<string name="poi_us_maps_recreation_area_activity_climbing">Penjanje</string>
<string name="poi_fjord">Fjord</string>
<string name="poi_water_source_stream">Potok</string>
<string name="poi_glacier_type_valley">Dolina</string>
<string name="poi_us_maps_recreation_area_activity_caving">Spilja</string>
<string name="poi_us_maps_recreation_area_fee_description">Opis pritojbe</string>
<string name="poi_payment_girocard_no">Girocard se ne prihvaća</string>
<string name="poi_payment_girocard_yes">Girocard</string>
<string name="poi_payment_litecoin_no">Litecoin se ne prihvaća</string>
<string name="poi_generator_source_waste">Izvor energije: smeće</string>
<string name="poi_agrarian_pesticide">Pesticidi</string>
<string name="poi_snowmobile_no">Pristup motornim sanjkama: ne</string>
<string name="poi_generator_method_water_storage">Metoda generatora: akumulacija vode</string>
<string name="poi_camp_site_serviced">Uslužno</string>
<string name="poi_generator_method_fusion">Metoda generatora: fuzija</string>
<string name="poi_snowmobile_yes">Da;Motorne sanjke</string>
<string name="poi_medical_supply_orthopedic">Ortopedija</string>
<string name="poi_generator_source_biogas">Izvor energije: bioplin</string>
<string name="poi_generator_method_battery_storage">Metoda generatora: baterije</string>
<string name="poi_mofa_designated">Određeno;Određeno za motocikle</string>
<string name="poi_medical_supply_orthotics">Ortoza</string>
<string name="poi_agrarian_fertilizer">Gnojivo</string>
<string name="poi_generator_source_gasoline">Izvor energije: benzin</string>
<string name="poi_city_block">Kvart</string>
<string name="poi_payment_discover_card_yes">Discover Card</string>
<string name="poi_payment_discover_card_no">Discover Card se ne prihvaća</string>
<string name="poi_payment_litecoin_yes">Litecoin</string>
<string name="poi_moped_yes">Da;Moped</string>
<string name="poi_bay">Zaljev</string>
<string name="poi_river">Rijeka</string>
<string name="poi_camp_site_deluxe">Luksuzno</string>
<string name="poi_bath_type_river">Rijeka</string>
<string name="poi_generator_source_wave">Izvor energije: valovi</string>
<string name="poi_agrarian_agricultural_machinery">Poljoprivredni strojevi</string>
<string name="poi_snowmobile_filter">Pristup motornim sanjkama</string>
<string name="poi_caravan_yes">Da;Karavan</string>
<string name="poi_mofa_yes">Da;Motocikl</string>
<string name="poi_hgv_yes">Da;Kamion;Kamioni</string>
<string name="poi_disabled_yes">Da;Osobe s invaliditetom</string>
<string name="poi_bath_type_lake">Jezero</string>
<string name="poi_caravan_designated">Određeno;Određeno za karavane</string>
<string name="poi_motorcycle_designated">Određeno;Određeno za motore</string>
<string name="poi_moped_designated">Određeno;Određeno za mopede</string>
<string name="poi_medical_supply_home_care">Kućna njega</string>
<string name="poi_agrarian_feed">Krma</string>
<string name="poi_agrarian_machine_parts">Dijelovi strojeva</string>
<string name="poi_generator_source_tidal">Izvor energije: plima</string>
<string name="poi_generator_source_biofuel">Izvor energije: biogorivo</string>
<string name="poi_generator_method_fission">Metoda generatora: fisija</string>
<string name="poi_generator_method_wind_turbine">Metoda generatora: vjetroturbina</string>
<string name="poi_generator_method_barrage">Metoda generatora: brana</string>
<string name="poi_generator_method_stream">Metoda generatora: tok</string>
<string name="poi_generator_method_photovoltaic">Metoda generatora: solarna</string>
<string name="poi_generator_method_combustion">Metoda generatora: sagorijevanje</string>
<string name="poi_generator_method_gasification">Metoda generatora: plinifikacija</string>
<string name="poi_generator_method_anaerobic_digestion">Metoda generatora: anaerobna razgradnja</string>
<string name="poi_route_activity_type_motor_scooter">Moto-skuter</string>
<string name="poi_climbing_boulder">Stijena za penjanje</string>
<string name="poi_climbing_area">Područje za penjanje</string>
<string name="poi_climbing_route">Ruta penjanja</string>
<string name="poi_climbing_route_bottom">Početak rute penjanja</string>
</resources>
15 changes: 15 additions & 0 deletions OsmAnd/res/values-hr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1721,4 +1721,19 @@
<string name="receiving_data_from_server">Primanje podataka od servera …</string>
<string name="download_hillshade_maps">Sjenčani reljef</string>
<string name="shared_string_wikipedia">Wikipedija</string>
<string name="tab_title_basic">Osnovno</string>
<string name="app_mode_wheelchair">Invalidska kolica</string>
<string name="app_mode_enduro_motorcycle">Enduro motor</string>
<string name="app_mode_go_cart">Go-kart</string>
<string name="please_provide_point_name_error">Zadaj ime za ovu točku</string>
<string name="gpx_direction_arrows">Strelice smjera</string>
<string name="shared_string_uninstall_and_restart">Deinstaliraj i ponovo pokreni</string>
<string name="app_mode_motor_scooter">Moto-skuter</string>
<string name="app_mode_inline_skates">Inline koturaljke</string>
<string name="app_mode_climbing">Penjanje</string>
<string name="search_download_wikipedia_maps">Preuzmi Wikipedija karte</string>
<string name="select_track_width">Odaberi širinu</string>
<string name="app_mode_wheelchair_forward">Invalidska kolica naprijed</string>
<string name="shared_string_custom">Prilagođeno</string>
<string name="track_show_start_finish_icons">Prikaži ikone početka i kraja</string>
</resources>
Loading

0 comments on commit b48fd41

Please sign in to comment.