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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-01-13 00:04:20 +01:00
commit 191ac39847
9 changed files with 478 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/res/layout/dashboard.xml
View file

@ -47,12 +47,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<fragment
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<!--<fragment-->
<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
<!--android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"-->
<!--android:layout_marginTop="@dimen/dashCardMargin"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"/>-->
<fragment
xmlns:android="http://schemas.android.com/apk/res/android"

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

@ -1964,10 +1964,10 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="no_internet_connection">Немагчыма cьцягнуць. Калі ласка, праверце ваша Інтэрнэт-злучэньне.</string>
<string name="download_tab_downloads">Усе cьцягваньні</string>
<string name="download_tab_updates">Абнаўленьні</string>
<string name="download_tab_local">Лякальны</string>
<string name="download_tab_local">Лякальныя</string>
<string name="navigate_point_zone">Зона</string>
<string name="navigate_point_northing">На поўнач</string>
<string name="navigate_point_easting">На ўсход</string>
<string name="navigate_point_northing">Па шыраце</string>
<string name="navigate_point_easting">Па даўгаце</string>
<string name="map_locale">Мова мапы</string>
<string name="rendering_attr_transportStops_name">Прыпынкі транспарту</string>
<string name="dash_download_msg_none">Вы хочаце cьцягнуць якія-небудзь мапы?</string>
@ -1982,7 +1982,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="routing_attr_no_new_routing_description">Не выкарыстоўваць правілы маршрутызацыі ўведзеныя ў v1.9</string>
<string name="rendering_value_default_name">Па змоўчаньні</string>
<string name="rendering_attr_roadStyle_name">Стыль аўтадарог</string>
<string name="show_pedestrian_warnings">Паказваць папярэджаньні для пешаходаў</string>
<string name="show_pedestrian_warnings">Паказваць пешаходныя пераходы</string>
<string name="traffic_warning_pedestrian">Пешаходны пераход</string>
<string name="traffic_warning_railways">Чыгуначны пераезд</string>
<string name="show_railway_warnings">Паказваць чыгуначныя пераезды</string>

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

@ -1810,4 +1810,5 @@ s často kladenými otázkami.</string>
<string name="routing_attr_no_new_routing_name">Nepoužívat routovací pravidla v1.9</string>
<string name="routing_attr_no_new_routing_description">Nepoužívat pravidla výpočtu trasy zavedené ve verzi 1.9</string>
<string name="speak_pedestrian">Oznamovat přechody pro chodce</string>
</resources>
<string name="rendering_value__name">Výchozí</string>
</resources>

394
OsmAnd/res/values-nl/phrases.xml
View file

@ -24,14 +24,14 @@
<string name="poi_bicycle_shop">Fietswinkel</string>
<string name="poi_anime_shop">Animewinkel</string>
<string name="poi_antiques_shop">Antiekwinkel</string>
<string name="poi_art_shop">Kunstwinkel</string>
<string name="poi_art_shop">Galerie</string>
<string name="poi_baby_goods">Babywinkel</string>
<string name="poi_bag_shop">Tassenwinkel</string>
<string name="poi_bathroom_furnishing_shop">Badkamermeubelwinkel</string>
<string name="poi_bed_shop">Slaapkamermeubelwinkel</string>
<string name="poi_bed_shop">Beddenwinkel</string>
<string name="poi_boutique">Modezaak</string>
<string name="poi_carpet_shop">Tapijtwinkel</string>
<string name="poi_chemist_shop">Apotheek</string>
<string name="poi_chemist_shop">Drogisterij</string>
<string name="poi_clothes_shop">Kledingwinkel</string>
<string name="poi_children_clothes_shop">Kinderkledingwinkel</string>
<string name="poi_shoes">Schoenenwinkel</string>
@ -50,4 +50,392 @@
<string name="poi_glaziery_shop">Glashandel</string>
<string name="poi_hardware_shop">IJzerhandel</string>
<string name="poi_hearing_aids_shop">Hoorapparaten</string>
<string name="poi_fishing_shop">Hengelsportzaak</string>
<string name="poi_frame_shop">Fotolijstwinkel</string>
<string name="poi_furniture_shop">Meubelwinkel</string>
<string name="poi_general_shop">Winkel in diverse goederen</string>
<string name="poi_herbalist">Kruidenierszaak</string>
<string name="poi_hifi_shop">Hi-Fi-winkel</string>
<string name="poi_houseware_shop">Huishoudelijke winkel</string>
<string name="poi_hunting_shop">Jachtwinkel</string>
<string name="poi_interior_decoration_shop">Interieurdecoratiewinkel</string>
<string name="poi_jewelry_shop">Juwelier</string>
<string name="poi_kiosk">Kiosk</string>
<string name="poi_kitchen_shop">Keukengereiwinkel</string>
<string name="poi_mobile_phone_shop">Mobiele telefoon-winkel</string>
<string name="poi_motorcycle_shop">Motorwinkel</string>
<string name="poi_musical_instrument_shop">Muziekinstrumentenwinkel</string>
<string name="poi_newsagent_shop">Persagentschap</string>
<string name="poi_optician_shop">Opticien</string>
<string name="poi_organic_shop">Biologische voedingswinkel</string>
<string name="poi_outdoor_shop">Outdoor-winkel</string>
<string name="poi_paint_shop">Verfwinkel</string>
<string name="poi_pet_shop">Dierenwinkel</string>
<string name="poi_radiotechnics_shop">Radiotechnics-winkel</string>
<string name="poi_second_hand">Tweedehandswinkel</string>
<string name="poi_ship_chandler">Scheepsbevoorrader</string>
<string name="poi_sports_shop">Sportwinkel</string>
<string name="poi_stationery_shop">Briefpapierwinkel</string>
<string name="poi_tableware_shop">Servieswinkel</string>
<string name="poi_ticket_shop">Ticketwinkel</string>
<string name="poi_tobacco_shop">Tabakswinkel</string>
<string name="poi_toys_shop">Speelgoedwinkel</string>
<string name="poi_trade_shop">Handelspost</string>
<string name="poi_vacuum_cleaner_shop">Stofzuigerwinkel</string>
<string name="poi_variety_store">Variëteitenzaak</string>
<string name="poi_video_shop">Videotheek</string>
<string name="poi_window_blind_shop">Rolluikenwinkel</string>
<string name="poi_department_store">Warenhuis</string>
<string name="poi_electronics_shop">Elektronica-winkel</string>
<string name="poi_car_shop">Autohandelaar</string>
<string name="poi_car_parts_shop">Auto-onderdelenwinkel</string>
<string name="poi_atv_shop">Quad-winkel</string>
<string name="poi_cosmetics_shop">Cosmeticazaak</string>
<string name="poi_marketplace">Marktplaats</string>
<string name="poi_sewing_shop">Confectiewinkel</string>
<string name="poi_police">Politie</string>
<string name="poi_fire_station">Brandweer</string>
<string name="poi_emergency_phone">Noodtelefoon</string>
<string name="poi_fire_hydrant">Brandkraan</string>
<string name="poi_fire_extinguisher">Brandblusapparaat</string>
<string name="poi_fire_flapper">Brandflapper</string>
<string name="poi_fire_hose">Brandslang</string>
<string name="poi_fire_water_pond">Brandwatervijver</string>
<string name="poi_grit_bin">Zoutbak</string>
<string name="poi_ambulance_station">Ambulancestandplaats</string>
<string name="poi_ses_station">SES-standplaats</string>
<string name="poi_emergency_access_point">Nood-toegangspunt</string>
<string name="poi_ford">Ford</string>
<string name="poi_mountain_pass">Bergpas</string>
<string name="poi_gate">Poort</string>
<string name="poi_city_wall">Stadsmuur</string>
<string name="poi_lift_gate">Liftpoort</string>
<string name="poi_toll_booth">Tolpoort</string>
<string name="poi_border_control">Grenscontrole</string>
<string name="poi_traffic_calming_bump">Snelheidsdrempel</string>
<string name="poi_traffic_calming_hump">Bult</string>
<string name="poi_traffic_calming_cushion">Kussen</string>
<string name="poi_traffic_signals">Stoplicht</string>
<string name="poi_fuel">Tankstation</string>
<string name="poi_parking">Parking</string>
<string name="poi_motorcycle_parking">Motorparking</string>
<string name="poi_parking_entrance">Parkingsingang</string>
<string name="poi_garages">Garages</string>
<string name="poi_public_transport_platform">Halte voor openbaar vervoer</string>
<string name="poi_public_transport_platform_bus">Bushalte</string>
<string name="poi_public_transport_platform_trolleybus">Trolleybushalte</string>
<string name="poi_bus_stop">Bushalte (verouderd)</string>
<string name="poi_public_transport_platform_tram">Tramhalte</string>
<string name="poi_tram_stop">Tramhalte (verouderd)</string>
<string name="poi_public_transport_station">Station voor openbaar vervoer</string>
<string name="poi_bus_station">Busstation (verouderd)</string>
<string name="poi_railway_station">Treinstation (verouderd)</string>
<string name="poi_railway_platform">Perron (verouderd)</string>
<string name="poi_railway_halt">Treinhalte (verouderd)</string>
<string name="poi_subway_entrance">Metro-ingang</string>
<string name="poi_subway_station">Metrostation</string>
<string name="poi_taxi">Taxistandplaats</string>
<string name="poi_airport">Luchthaven</string>
<string name="poi_helipad">Helikopterplatform</string>
<string name="poi_runway">Landingsbaan</string>
<string name="poi_aeroway_terminal">Terminal</string>
<string name="poi_aeroway_gate">Gate</string>
<string name="poi_slipway">Scheepshelling</string>
<string name="poi_ferry_terminal">Veerstoep</string>
<string name="poi_lighthouse">Vuurtoren</string>
<string name="poi_bicycle_rental">Fietsverhuur</string>
<string name="poi_bicycle_parking">Fietsenstalling</string>
<string name="poi_aerialway_gondola">Gondola</string>
<string name="poi_water_tower">Watertoren</string>
<string name="poi_dam">Dam</string>
<string name="poi_power_plant">Elektriciteitscentrale</string>
<string name="poi_post_office">Postkantoor</string>
<string name="poi_post_box">Postbus</string>
<string name="poi_telephone">Telefoon</string>
<string name="poi_communication_tower">Communicatietoren</string>
<string name="poi_pier">Pier</string>
<string name="poi_observatory">Observatorium</string>
<string name="poi_astronomical_observatory">Sterrenwacht</string>
<string name="poi_tower">Toren</string>
<string name="poi_mast">Mast</string>
<string name="poi_radar">Radar</string>
<string name="poi_vineyard">Wijngaard</string>
<string name="poi_orchard">Boomgaard</string>
<string name="poi_school">School</string>
<string name="poi_kindergarten">Kleuterschool</string>
<string name="poi_university">Universiteit</string>
<string name="poi_college">College</string>
<string name="poi_prison">Gevangenis</string>
<string name="poi_embassy">Ambassade</string>
<string name="poi_government">Regering</string>
<string name="poi_customs">Douane</string>
<string name="poi_city">Stad</string>
<string name="poi_hamlet">Gehucht</string>
<string name="poi_village">Dorp</string>
<string name="poi_town">Gemeente</string>
<string name="poi_suburb">Buitenwijk</string>
<string name="poi_isolated_dwelling">Geïsoleerde woning</string>
<string name="poi_neighbourhood">Buurt</string>
<string name="poi_locality">Nederzetting</string>
<string name="poi_place_allotments">Volkstuin</string>
<string name="poi_place_farm">Boerderij</string>
<string name="poi_pharmacy">Apotheek</string>
<string name="poi_hospital">Ziekenhuis</string>
<string name="poi_clinic">Kliniek</string>
<string name="poi_doctors">Dokters</string>
<string name="poi_first_aid">Eerste hulp</string>
<string name="poi_dentist">Tandarts</string>
<string name="poi_nursing_home">Verpleeghuis</string>
<string name="poi_baby_hatch">Vondelingenluik</string>
<string name="poi_veterinary">Dierenarts</string>
<string name="poi_sanatorium">Sanatorium</string>
<string name="poi_audiologist">Audioloog</string>
<string name="poi_blood_bank">Bloedbank</string>
<string name="poi_physiotherapist">Fysiotherapeut</string>
<string name="poi_optometrist">Opticien</string>
<string name="poi_podiatrist">Podoloog</string>
<string name="poi_psychotherapist">Psychotherapeut</string>
<string name="poi_company">Bedrijf</string>
<string name="poi_insurance">Verzekeraar</string>
<string name="poi_estate_agent">Vastgoedmakelaar</string>
<string name="poi_lawyer">Advocaat</string>
<string name="poi_ngo">NGO</string>
<string name="poi_town_hall">Stadhuis</string>
<string name="poi_advertising_agency">Reclamebureau</string>
<string name="poi_educational_institution">Onderwijsinstelling</string>
<string name="poi_architect_office">Architectenkantoor</string>
<string name="poi_research_office">Onderzoekskantoor</string>
<string name="poi_studio">Studio</string>
<string name="poi_bookmaker">Bookmaker</string>
<string name="poi_stadium">Stadion</string>
<string name="poi_museum">Museum</string>
<string name="poi_memorial">Gedenkteken</string>
<string name="poi_archaeological_site">Archeologische site</string>
<string name="poi_battlefield">Slagveld</string>
<string name="poi_cannon">Historisch kanon</string>
<string name="poi_castle">Kasteel</string>
<string name="poi_city_gate">Stadspoort</string>
<string name="poi_fort">Fort</string>
<string name="poi_fountain">Fontein</string>
<string name="poi_ruins_historic">Historische ruïnes</string>
<string name="poi_ship_historic">Historisch schip</string>
<string name="poi_wreck">Scheepswrak</string>
<string name="poi_monument">Monument</string>
<string name="poi_zoo">Zoo</string>
<string name="poi_aquarium">Aquarium</string>
<string name="poi_attraction">Toeristische attractie</string>
<string name="poi_attraction_animal">Dier (attractie)</string>
<string name="poi_ferris_wheel">Reuzenrad</string>
<string name="poi_carousel">Draaimolen</string>
<string name="poi_maze">Doolhof</string>
<string name="poi_roller_coaster">Achtbaan</string>
<string name="poi_amusement_ride">Attractie</string>
<string name="poi_theme_park">Pretpark</string>
<string name="poi_slide">Glijbaan</string>
<string name="poi_summer_toboggan">Zomerrodelbaan</string>
<string name="poi_swing_carousel">Zweefmolen</string>
<string name="poi_attraction_train">Trein (attractie)</string>
<string name="poi_water_slide">Waterglijbaan</string>
<string name="poi_hotel">Hotel</string>
<string name="poi_hostel">Hostel</string>
<string name="poi_motel">Motel</string>
<string name="poi_guest_house">Guest house</string>
<string name="poi_alpine_hut">Berghut</string>
<string name="poi_chalet">Chalet</string>
<string name="poi_monastery">Klooster</string>
<string name="poi_historic_monastery">Historisch klooster</string>
<string name="poi_place_of_worship_taoist">Gebedshuis: taoïstisch</string>
<string name="poi_place_of_worship">Gebedshuis</string>
<string name="poi_place_of_worship_christian">Gebedshuis: christelijk</string>
<string name="poi_place_of_worship_jewish">Gebedshuis: joods</string>
<string name="poi_place_of_worship_muslim">Gebedshuis: islamitisch</string>
<string name="poi_place_of_worship_sikh">Gebedshuis: sikh</string>
<string name="poi_place_of_worship_buddhist">Gebedshuis: boeddhistisch</string>
<string name="poi_place_of_worship_hindu">Gebedshuis: hindu</string>
<string name="poi_place_of_worship_shinto">Gebedshuis: shinto</string>
<string name="poi_clock">Klok</string>
<string name="poi_travel_agent">Reisbureau</string>
<string name="poi_spring">Bron</string>
<string name="poi_hot_spring">Warmwaterbron</string>
<string name="poi_geyser">Geiser</string>
<string name="poi_cemetery">Begraafplaats</string>
<string name="poi_grave_yard">Kerkhof</string>
<string name="poi_shelter">Schuilplaats</string>
<string name="poi_funicular">Kabelbaan</string>
<string name="poi_resort">Resort</string>
<string name="poi_club_art">Kunstvereniging</string>
<string name="poi_club_astronomy">Astronomievereniging</string>
<string name="poi_club_computer">Computervereniging</string>
<string name="poi_club_board_games">Bordspellenvereniging</string>
<string name="poi_club_motorcycle">Motorvereniging</string>
<string name="poi_club_sport">Sportvereniging</string>
<string name="poi_club_game">Spellenvereniging</string>
<string name="poi_club_automobile">Autovereniging</string>
<string name="poi_club_chess">Schaakvereniging</string>
<string name="poi_club_cinema">Cinemavereniging</string>
<string name="poi_club_fan">Fanclub</string>
<string name="poi_club_fishing">Visvereniging</string>
<string name="poi_club_veterans">Veteranenvereniging</string>
<string name="poi_club_linux">Linuxvereniging</string>
<string name="poi_club_theatre">Theatervereniging</string>
<string name="poi_club_history">Geschiedenisvereniging</string>
<string name="poi_club_music">Muziekvereniging</string>
<string name="poi_club_ethnic">Ethnische vereniging</string>
<string name="poi_club_nature">Natuurvereniging</string>
<string name="poi_club_photography">Fotografievereniging</string>
<string name="poi_club_hunting">Jachtvereniging</string>
<string name="poi_club_shooting">Schietvereniging</string>
<string name="poi_club_tourism">Toerismevereniging</string>
<string name="poi_club_charity">Liefdadigheidsvereniging</string>
<string name="poi_library">Bibliotheek</string>
<string name="poi_arts_centre">Kunstencentrum</string>
<string name="poi_cinema">Cinema</string>
<string name="poi_casino">Casino</string>
<string name="poi_community_centre">Gemeenschapscentrum</string>
<string name="poi_social_centre">Sociaal centrum</string>
<string name="poi_theatre">Theater</string>
<string name="poi_circus">Circus</string>
<string name="poi_dance_floor">Dansvloer</string>
<string name="poi_nightclub">Nachtclub</string>
<string name="poi_stripclub">Stripclub</string>
<string name="poi_beach_resort">Badplaats</string>
<string name="poi_dog_park">Hondenpark</string>
<string name="poi_fishing_place">Visplaats</string>
<string name="poi_hunting_stand">Jachttoren</string>
<string name="poi_harbour">Haven</string>
<string name="poi_marina">Jachthaven</string>
<string name="poi_miniature_golf">Minigolf</string>
<string name="poi_playground">Speeltuin</string>
<string name="poi_swimming_pool">Zwembad</string>
<string name="poi_water_park">Waterpretpark</string>
<string name="poi_park">Park</string>
<string name="poi_cafe">Café</string>
<string name="poi_biergarten">Biergarten</string>
<string name="poi_restaurant">Restaurant</string>
<string name="poi_fast_food">Fastfood</string>
<string name="poi_bar">Bar</string>
<string name="poi_pub">Kroeg</string>
<string name="poi_barbecue">Barbecue</string>
<string name="poi_blacksmith">Smid</string>
<string name="poi_beekeeper">Imker</string>
<string name="poi_basket_maker">Mandenvlechter</string>
<string name="poi_brewery">Brouwerij</string>
<string name="poi_boatbuilder">Botenbouwer</string>
<string name="poi_bookbinder">Boekbinder</string>
<string name="poi_carpenter">Timmerman</string>
<string name="poi_electrician">Elektricien</string>
<string name="poi_gardener">Tuinier</string>
<string name="poi_locksmith">Slotenmaker</string>
<string name="poi_jeweller">Juwelier</string>
<string name="poi_key_cutter">Sleutelsnijder</string>
<string name="poi_optician">Opticien</string>
<string name="poi_painter">Schilder</string>
<string name="poi_photographer">Fotograaf</string>
<string name="poi_photographic_laboratory">Fotografisch laboratorium</string>
<string name="poi_plumber">Loodgieter</string>
<string name="poi_plasterer">Stukadoor</string>
<string name="poi_rigger">Tuiger</string>
<string name="poi_roofer">Dakdekker</string>
<string name="poi_saddler">Zadelaar</string>
<string name="poi_shoemaker">Schoenmaker</string>
<string name="poi_tailor">Kleermaker</string>
<string name="poi_beauty_salon">Schoonheidssalon</string>
<string name="poi_beauty_salon_nails">Nagelsalon</string>
<string name="poi_hairdresser">Kapper</string>
<string name="poi_massage">Massagesalon</string>
<string name="poi_tattoo">Tattoosalon</string>
<string name="poi_car_rental">Autoverhuur</string>
<string name="poi_dock">Dok</string>
<string name="poi_toilets">Toilet</string>
<string name="poi_sauna">Sauna</string>
<string name="poi_brothel">Bordeel</string>
<string name="poi_mortuary">Mortuarium</string>
<string name="poi_crematorium">Crematorium</string>
<string name="poi_internet_cafe">Internetcafé</string>
<string name="poi_bank">Bank</string>
<string name="poi_atm">Geldautomaat</string>
<string name="poi_accountant">Accountant</string>
<string name="poi_cave_entrance">Grot-ingang</string>
<string name="poi_peak">Bergtop</string>
<string name="poi_saddle"/>
<string name="poi_volcano">Vulkaan</string>
<string name="poi_crater">Krater</string>
<string name="poi_ridge">Bergrug</string>
<string name="poi_glacier">Gletsjer</string>
<string name="poi_sinkhole">Zinkgat</string>
<string name="poi_waterfall">Waterval</string>
<string name="poi_river">Rivier</string>
<string name="poi_stream">Stroom</string>
<string name="poi_rapids">Stroomversnellingen</string>
<string name="poi_beach">Strand</string>
<string name="poi_bay">Baai</string>
<string name="poi_fjord">Fjord</string>
<string name="poi_reef">Rif</string>
<string name="poi_wetland">Drasland</string>
<string name="poi_nature_reserve">Natuurreservaat</string>
<string name="poi_island">Eiland</string>
<string name="poi_islet">Eilandje</string>
<string name="poi_seamark_dyke">Dijk</string>
<string name="poi_seamark_harbour">Haven</string>
<string name="poi_traffic_calming_chicane">Chicane</string>
<string name="poi_traffic_calming_rumble_strip">Rammelstrook</string>
<string name="poi_traffic_calming_table">Plateau</string>
<string name="poi_traffic_calming_choker">Wegversmalling</string>
<string name="poi_car_repair">Autoreparateur</string>
<string name="poi_service_tyres">Banden</string>
<string name="poi_vehicle_inspection">Autokeuring</string>
<string name="poi_car_wash">Wasstraat</string>
<string name="poi_charging_station">Oplaadpunt</string>
<string name="poi_vehicle_ramp">Voertuighelling</string>
<string name="poi_compressed_air">Perslucht</string>
<string name="poi_aerialway_cable_car">Kabelbaan</string>
<string name="poi_aerialway_chair_lift">Stoeltjeslift</string>
<string name="poi_aerialway_t_bar">T-bar-lift</string>
<string name="poi_aerialway_j_bar">J-bar-lift</string>
<string name="poi_aerialway_platter">Knoplift</string>
<string name="poi_aerialway_mixed_lift">Gemengde lift</string>
<string name="poi_aerialway_drag_lift">Sleeplift</string>
<string name="poi_aerialway_rope_tow">Sleeplift</string>
<string name="poi_aerialway_goods">Goederenlift</string>
<string name="poi_aerialway_magic_carpet">Tapijtlift</string>
<string name="poi_tunnel">Tunnel</string>
<string name="poi_bridge">Brug</string>
<string name="poi_speed_camera">Snelheidscamera</string>
<string name="poi_turning_circle">Draaicirkel</string>
<string name="poi_motorway_junction">Knooppunt</string>
<string name="poi_water_well">Waterput</string>
<string name="poi_standpipe">Standpijp</string>
<string name="poi_water_works">Waterwerken</string>
<string name="poi_boatyard">Scheepswerf</string>
<string name="poi_wastewater_plant">Afvalwaterstation</string>
<string name="poi_lock_gate">Schutsluis</string>
<string name="poi_waterway_turning_point">Draaipunt van vaarweg</string>
<string name="poi_weir">Stuw</string>
<string name="poi_water_mill">Watermolen</string>
<string name="poi_power_substation">Onderstation</string>
<string name="poi_power_transformer">Transformator</string>
</resources>

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

@ -20,13 +20,13 @@
<string name="tip_map_styles">Стилови мапа</string>
<string name="local_index_tile_data_expire">Истиче(минута): %1$s</string>
<string name="local_index_tile_data_maxzoom">Максимално увеличање: %1$s</string>
<string name="edit_tilesource_elliptic_tile">Elliptic mercator</string>
<string name="edit_tilesource_elliptic_tile">Еклиптични приказ земљине кугле</string>
<string name="edit_tilesource_maxzoom">Максимално увеличање</string>
<string name="edit_tilesource_minzoom">Минимално увеличање</string>
<string name="edit_tilesource_url_to_load">URL</string>
<string name="edit_tilesource_choose_existing">Изаберите постојећи…</string>
<string name="edit_tilesource_name">Име</string>
<string name="map_widget_fps_info">FPS debug info</string>
<string name="map_widget_fps_info">Подаци о грешкама брзине приказа сличица</string>
<string name="driving_region_japan">Јапан</string>
<string name="driving_region_us">Сједињене Америчке Државе</string>
<string name="driving_region_canada">Канада</string>
@ -223,4 +223,36 @@
<string name="dropbox_plugin_description">Dropbox додатак омогућава да синхронизујете путање и аудио/видео белешке са вашим Dropbox налогом.</string>
<string name="dropbox_plugin_name">Dropbox додатак</string>
<string name="intermediate_points_change_order">Промени редослед</string>
</resources>
<string name="rendering_value__name">Подразумевано</string>
<string name="rendering_value_default_name">Подразумевано</string>
<string name="traffic_warning_pedestrian">Пешачки прелаз</string>
<string name="show_pedestrian_warnings">Прикажи пешачке прелазе</string>
<string name="dash_download_msg_none">Да ли желите да преузмете мапе за коришћење ван мреже?</string>
<string name="dash_download_msg">Преузели сте %1$s мапа</string>
<string name="dash_download_new_one">Преузми нову мапу</string>
<string name="dash_download_manage">Управљајте</string>
<string name="map_locale">Језик мапе</string>
<string name="application_dir_change_warning2">Да ли желите да Османд умножи и своје податке на ново место? Изаберите „Не“ да би Османд само направио и користио нову фасциклу.</string>
<string name="navigate_point_zone">Област</string>
<string name="download_tab_downloads">Сва преузимања</string>
<string name="download_tab_updates">Надоградње</string>
<string name="download_tab_local">Месно</string>
<string name="no_internet_connection">Преузимање је немогуће, проверите везу са Интернетом.</string>
<string name="dismiss">Откажи</string>
<string name="everything_up_to_date">Све датотеке су свеже</string>
<string name="use_opengl_render">Користи ОпенГЛ за приказ</string>
<string name="use_opengl_render_descr">Користи хардверско убрзање ОпенГЛ-а за приказ (можда не ради на неким уређајима)</string>
<string name="osmo_use_https_descr">Користи безбедну везу са сервером</string>
<string name="osmo_use_https">Користи ХТТПС</string>
<string name="advanced_settings">Напредно</string>
<string name="map_update">Доступне су надоградње %1$s мапа</string>
<string name="search_for">Потражи</string>
<string name="show_map">ПРИКАЖИ МАПУ</string>
<string name="show_all">ПРИКАЖИ СВЕ</string>
<string name="coordinates">Координате</string>
<string name="wake_on_voice_never">Никад</string>
<string name="select_impassable_road">Означи на мапи…</string>
<string name="rendering_category_hide">Сакриј</string>
<string name="rendering_category_details">Појединости</string>
<string name="hide_all_waypoints">Уклони све</string>
</resources>

21
OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
View file

@ -30,6 +30,12 @@ import net.osmand.plus.api.SQLiteAPI.SQLiteCursor;
public class FavouritesDbHelper {
public interface FavoritesUpdatedListener {
void updateFavourites();
}
private List<FavoritesUpdatedListener> favoritesUpdatedListeners = new ArrayList<FavoritesUpdatedListener>();
private static final org.apache.commons.logging.Log log = PlatformUtil.getLog(FavouritesDbHelper.class);
public static final String FILE_TO_SAVE = "favourites.gpx"; //$NON-NLS-1$
@ -82,10 +88,25 @@ public class FavouritesDbHelper {
if(changed) {
saveCurrentPointsIntoFile();
}
favouritesUpdated();
}
private void favouritesUpdated(){
for (FavoritesUpdatedListener listener : favoritesUpdatedListeners){
listener.updateFavourites();
}
}
public void addFavoritesUpdatedListener(FavoritesUpdatedListener listener){
if (!favoritesUpdatedListeners.contains(listener)){
favoritesUpdatedListeners.add(listener);
}
}
public void removeFavoritesUpdatedListener(FavoritesUpdatedListener listener){
favoritesUpdatedListeners.remove(listener);
}
private boolean merge(Map<String, FavouritePoint> source, Map<String, FavouritePoint> destination) {
boolean changed = false;

5
OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
View file

@ -491,11 +491,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
if (f instanceof DashDownloadMapsFragment && !f.isDetached()) {
((DashDownloadMapsFragment) f).refreshData();
}
//Needed to reliably initialize DashFavoritesFragement on devices without compass
// [Victor]: This doesn't look as a proper place, then it highly depends on internet connection and download list
if (f instanceof DashFavoritesFragment && !f.isDetached()) {
((DashFavoritesFragment) f).setupFavorites();
}
}
}

19
OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
View file

@ -38,7 +38,7 @@ import android.widget.TextView;
/**
* Created by Denis on 24.11.2014.
*/
public class DashFavoritesFragment extends DashBaseFragment {
public class DashFavoritesFragment extends DashBaseFragment implements FavouritesDbHelper.FavoritesUpdatedListener {
public static final String TAG = "DASH_FAVORITES_FRAGMENT";
private net.osmand.Location location = null;
private LatLon loc = null;
@ -97,10 +97,16 @@ public class DashFavoritesFragment extends DashBaseFragment {
} else {
loc = new LatLon(0f, 0f);
}
getMyApplication().getFavorites().addFavoritesUpdatedListener(this);
setupFavorites();
}
@Override
public void onPause() {
super.onPause();
getMyApplication().getFavorites().removeFavoritesUpdatedListener(this);
}
public void setupFavorites(){
View mainView = getView();
@ -255,4 +261,13 @@ public class DashFavoritesFragment extends DashBaseFragment {
updateArrows();
}
@Override
public void updateFavourites() {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
setupFavorites();
}
});
}
}

6
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -107,8 +107,7 @@ public class ConfigureMapMenu {
return false;
} else if(itemId == R.string.layer_gpx_layer && cm.getSelection(pos) == 1) {
ma.getMapLayers().showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView());
//sync tick mark
cm.item(R.string.layer_gpx_layer).selected(ma.getMyApplication().getSelectedGpxHelper().isShowingAnyGpxFiles() ? 1 : 0).reg();
// TODO: tick mark of "Show GPX" needs to be synced after return form sub-selection screen (user may or may not have selected files!)
return false;
} else {
return super.onRowItemClick(adapter, view, itemId, pos);
@ -133,8 +132,7 @@ public class ConfigureMapMenu {
} else {
ma.getMapLayers().showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView());
}
//sync tick mark
cm.item(R.string.layer_gpx_layer).selected(ma.getMyApplication().getSelectedGpxHelper().isShowingAnyGpxFiles() ? 1 : 0).reg();
// TODO: tick mark of "Show GPX" needs to be synced after return form sub-selection screen (user may or may not have selected files!)
} else if (itemId == R.string.layer_transport_route) {
ma.getMapLayers().getTransportInfoLayer().setVisible(isChecked);
}