From 04dd17d3921fee20e92f0bba7285fe9dfcfcc495 Mon Sep 17 00:00:00 2001
From: Thomas Tonino <ttonino@home.nl>
Date: Sat, 8 Nov 2014 09:55:04 +0100
Subject: [PATCH 01/53] Translated using Weblate (Dutch)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-nl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index c0bd25760a..b422efae41 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2005,4 +2005,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="select_impassable_road">Selecteer op kaart</string>
     <string name="impassable_road">Vermijd wegen…</string>
     <string name="rendering_category_hide">Verberg</string>
+    <string name="wake_on_voice_never">Nooit</string>
+    <string name="lock_screen_request_explanation">%1$s heeft deze permissie nodig om het scherm uit te kunnen schakelen (stroombesparing).</string>
     </resources>

From 5105e3d55452d54d19eaccf962e3b0f9686265a8 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Sat, 8 Nov 2014 18:45:27 +0300
Subject: [PATCH 02/53] Redone from scratch main phrases.xml

---
 OsmAnd/res/values/phrases.xml | 960 ++++++++++++++++++++--------------
 1 file changed, 578 insertions(+), 382 deletions(-)

diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index d8004a0fdd..e82e26cdb9 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1,388 +1,584 @@
 <?xml version="1.0" ?>
 <resources>
-	<string name="poi_abandoned">Abandoned Railway</string>
-	<string name="poi_airport">Airport</string>
-	<string name="poi_alcohol">Off License</string>
-	<string name="poi_allotments">Allotment</string>
-	<string name="poi_alpine_hut">Alpine Hut</string>
-	<string name="poi_apartments">Apartment Block</string>
-	<string name="poi_apparel">Apparel Shop</string>
-	<string name="poi_archaeological_site">Archaeological Site</string>
-	<string name="poi_arts_centre">Arts Center</string>
-	<string name="poi_artwork">Artwork</string>
-	<string name="poi_atm">cash machine</string>
-	<string name="poi_attraction">Attraction</string>
-	<string name="poi_auditorium">Auditorium</string>
-	<string name="poi_bakery">Bakery</string>
-	<string name="poi_bank">Bank</string>
-	<string name="poi_bar">Pub</string>
-	<string name="poi_basin">Basin</string>
-	<string name="poi_battlefield">Battlefield</string>
-	<string name="poi_bay">Bay</string>
-	<string name="poi_beach">Beach</string>
-	<string name="poi_beach_resort">Beach Resort</string>
-	<string name="poi_beauty_salon">Beauty Shop</string>
-	<string name="poi_bed_and_breakfast">Bed and Breakfast</string>
-	<string name="poi_bench">Bench</string>
-	<string name="poi_beverages">Beverages Shop</string>
-	<string name="poi_bicycle">Bicycle Shop</string>
-	<string name="poi_bicycle_parking">Cycle Parking</string>
-	<string name="poi_bicycle_rental">Cycle Rental</string>
-	<string name="poi_block">Building Block</string>
-	<string name="poi_boat_sharing">Boat Share</string>
-	<string name="poi_boatyard">Boatyard</string>
-	<string name="poi_bookshop">Book Shop</string>
-	<string name="poi_boundary_stone">Boundary Stone</string>
-	<string name="poi_bridleway">Bridleway</string>
-	<string name="poi_brothel">Brothel</string>
-	<string name="poi_brownfield">Brownfield Land</string>
-	<string name="poi_building">Building</string>
-	<string name="poi_bunker">Bunker</string>
-	<string name="poi_bus_guideway">Guided Bus Lane</string>
-	<string name="poi_bus_station">Bus Station</string>
-	<string name="poi_bus_stop">Bus Stop</string>
-	<string name="poi_butcher">Butcher</string>
-	<string name="poi_byway">Byway</string>
-	<string name="poi_cabin">Cabin</string>
-	<string name="poi_cafe">Cafe</string>
-	<string name="poi_camp_site">Camp Site</string>
-	<string name="poi_canal">Canal</string>
-	<string name="poi_cape">Cape</string>
-	<string name="poi_car">Car Shop</string>
-	<string name="poi_car_dealer">Car Dealer</string>
-	<string name="poi_car_parts">Car Parts</string>
-	<string name="poi_car_rental">Car Rental</string>
-	<string name="poi_car_repair">Car Repair</string>
-	<string name="poi_car_sharing">Car Sharing</string>
-	<string name="poi_car_wash">Car Wash</string>
-	<string name="poi_caravan_site">Caravan Site</string>
-	<string name="poi_carpet">Carpet Shop</string>
-	<string name="poi_casino">Casino</string>
-	<string name="poi_castle">Castle</string>
-	<string name="poi_cave_entrance">Cave Entrance</string>
-	<string name="poi_cemetery">Cemetery</string>
-	<string name="poi_chalet">Chalet</string>
-	<string name="poi_channel">Channel</string>
-	<string name="poi_chapel">Chapel</string>
-	<string name="poi_chemist">Chemist</string>
-	<string name="poi_church">Church</string>
-	<string name="poi_city">City</string>
-	<string name="poi_city_hall">City Hall</string>
-	<string name="poi_cliff">Cliff</string>
-	<string name="poi_clinic">Clinic</string>
-	<string name="poi_clothes">Clothes Shop</string>
-	<string name="poi_club">Club</string>
-	<string name="poi_club_art">Art Shop</string>
-	<string name="poi_club_charity">Charity Shop</string>
-	<string name="poi_club_cinema">Cinema</string>
-	<string name="poi_club_computer">Computer Shop</string>
-	<string name="poi_club_motorcycle">Motorcycle Shop</string>
-	<string name="poi_club_music">Music Shop</string>
-	<string name="poi_club_theatre">Theatre</string>
-	<string name="poi_coastline">Coastline</string>
-	<string name="poi_college">College</string>
-	<string name="poi_commercial">Commercial Area</string>
-	<string name="poi_common">Common Land</string>
-	<string name="poi_community_centre">Community Center</string>
-	<string name="poi_confectionery">Confectionery Shop</string>
-	<string name="poi_connector">Waterway Connector</string>
-	<string name="poi_conservation">Conservation</string>
-	<string name="poi_construction">Railway under Construction</string>
-	<string name="poi_convenience">Convenience Store</string>
-	<string name="poi_copyshop">Copy Shop</string>
-	<string name="poi_cosmetics">Cosmetics Shop</string>
-	<string name="poi_country">Country</string>
-	<string name="poi_county">County</string>
-	<string name="poi_courthouse">Courthouse</string>
-	<string name="poi_crater">Crater</string>
-	<string name="poi_crematorium">Crematorium</string>
-	<string name="poi_currencyexchange">Bureau de Change</string>
-	<string name="poi_cycleway">Cycle Path</string>
-	<string name="poi_dam">Dam</string>
-	<string name="poi_dentist">Dentist</string>
-	<string name="poi_department_store">Department Store</string>
-	<string name="poi_derelict_canal">Derelict Canal</string>
-	<string name="poi_discount">Discount Items Shop</string>
-	<string name="poi_distance_marker">Distance Marker</string>
-	<string name="poi_disused">Disused Railway</string>
-	<string name="poi_disused_station">Disused Railway Station</string>
-	<string name="poi_ditch">Ditch</string>
-	<string name="poi_dock">Dock</string>
-	<string name="poi_doctors">Doctor</string>
-	<string name="poi_doityourself">Do-It-Yourself</string>
-	<string name="poi_dormitory">Dormitory</string>
-	<string name="poi_drain">Drain</string>
-	<string name="poi_drinking_water">Drinking Water</string>
-	<string name="poi_driving_school">Driving School</string>
-	<string name="poi_drugstore">Drugstore</string>
-	<string name="poi_dry_cleaning">Dry Cleaning</string>
-	<string name="poi_electronics">Electronics Shop</string>
-	<string name="poi_embassy">Embassy</string>
-	<string name="poi_emergency_access_point">Emergency Access Point</string>
-	<string name="poi_emergency_phone">Emergency Phone</string>
-	<string name="poi_entrance">Building Entrance</string>
-	<string name="poi_estate_agent">Estate Agent</string>
-	<string name="poi_faculty">Faculty Building</string>
-	<string name="poi_farm">Farm Shop</string>
-	<string name="poi_farmland">Farmland</string>
-	<string name="poi_farmyard">Farmyard</string>
-	<string name="poi_fashion">Fashion Shop</string>
-	<string name="poi_fast_food">Food</string>
-	<string name="poi_feature">Feature</string>
-	<string name="poi_fell">Fell</string>
-	<string name="poi_ferry_terminal">Ferry Terminal</string>
-	<string name="poi_fire_hydrant">Fire Hydrant</string>
-	<string name="poi_fire_station">Fire Station</string>
-	<string name="poi_fish">Fish Shop</string>
-	<string name="poi_fishing_shop">Fishing Area</string>
-	<string name="poi_fjord">Fjord</string>
-	<string name="poi_flats">Flats</string>
-	<string name="poi_florist">Florist</string>
-	<string name="poi_food">Food Shop</string>
-	<string name="poi_footway">Footpath</string>
-	<string name="poi_ford">Building</string>
-	<string name="poi_forest">Forest</string>
-	<string name="poi_fountain">Fountain</string>
-	<string name="poi_fuel">Petrol Station</string>
-	<string name="poi_funeral_directors">Funeral Director</string>
-	<string name="poi_funicular">Funicular Railway</string>
-	<string name="poi_furniture">Furniture</string>
-	<string name="poi_gallery">Gallery</string>
-	<string name="poi_garage">Garage</string>
-	<string name="poi_garden">Garden</string>
-	<string name="poi_garden_centre">Garden Center</string>
-	<string name="poi_gate">Gate</string>
-	<string name="poi_general">General Store</string>
-	<string name="poi_geyser">Geyser</string>
-	<string name="poi_gift">Gift Shop</string>
-	<string name="poi_glacier">Glacier</string>
-	<string name="poi_golf_course">Golf Course</string>
-	<string name="poi_grass">Grass</string>
-	<string name="poi_grave_yard">Grave Yard</string>
-	<string name="poi_greenfield">Greenfield Land</string>
+	<string name="poi_bakery">Bakery shop</string>
+	<string name="poi_alcohol">Alcohol shop</string>
+	<string name="poi_convenience">Convenience store</string>
+	<string name="poi_mall">Mall</string>
+	<string name="poi_beverages">Beverages shop</string>
+	<string name="poi_butcher">Butcher shop</string>
+	<string name="poi_deli">Fine foods shop</string>
+	<string name="poi_shop_farm">Farm produce shop</string>
 	<string name="poi_greengrocer">Greengrocer</string>
-	<string name="poi_grocery">Grocery Shop</string>
-	<string name="poi_guest_house">Guest House</string>
-	<string name="poi_gym">Gym</string>
-	<string name="poi_hackerspace">Hackerspace</string>
-	<string name="poi_hairdresser">Hairdresser</string>
-	<string name="poi_hall">Hall</string>
-	<string name="poi_hamlet">Hamlet</string>
-	<string name="poi_hardware">Hardware Store</string>
-	<string name="poi_health_centre">Health Center</string>
-	<string name="poi_heath">Heath</string>
-	<string name="poi_hifi">Hi-Fi</string>
-	<string name="poi_hill">Hill</string>
-	<string name="poi_historic_station">Historic Railway Station</string>
-	<string name="poi_hospital">Hospital Building</string>
-	<string name="poi_hostel">Hostel</string>
-	<string name="poi_hotel">Hotel</string>
-	<string name="poi_house">House</string>
-	<string name="poi_houses">Houses</string>
-	<string name="poi_hunting_stand">Hunting Stand</string>
-	<string name="poi_ice_cream">Ice Cream</string>
-	<string name="poi_ice_rink">Ice Rink</string>
-	<string name="poi_icon">Icon</string>
-	<string name="poi_industrial">Industrial Area</string>
-	<string name="poi_information">Information</string>
+	<string name="poi_seafood">Seafood shop</string>
+	<string name="poi_confectionery">Confectionery Shop</string>
+	<string name="poi_ice_cream">Ice cream</string>
+	<string name="poi_supermarket">Supermarket</string>
+	<string name="poi_shop_tea">Tea shop</string>
+	<string name="poi_dairy">Dairy shop</string>
+	<string name="poi_vending_machine">Vending machine</string>
+
+	<string name="poi_bookshop">Book shop</string>
+	<string name="poi_bicycle_shop">Bicycle shop</string>
+	<string name="poi_anime_shop">Anime shop</string>
+	<string name="poi_antiques_shop">Antiques shop</string>
+	<string name="poi_art_shop">Art shop</string>
+	<string name="poi_baby_goods">Baby goods</string>
+	<string name="poi_bag_shop">Bag shop</string>
+	<string name="poi_bathroom_furnishing_shop">Bathroom furnishing shop</string>
+	<string name="poi_bed_shop">Bed shop</string>
+	<string name="poi_boutique">Boutique shop</string>
+	<string name="poi_carpet_shop">Carpet shop</string>
+	<string name="poi_chemist_shop">Chemist shop</string>
+	<string name="poi_clothes_shop">Clothes shop</string>
+	<string name="poi_children_clothes_shop">Children clothes shop</string>
+	<string name="poi_shoes">Shoes shop</string>
+	<string name="poi_computer_shop">Computer shop</string>
+	<string name="poi_copyshop">Copy shop</string>
+	<string name="poi_curtain_shop">Curtain shop</string>
+	<string name="poi_fabric_shop">Fabric shop</string>
+	<string name="poi_bedding_shop">Bedding shop</string>
+	<string name="poi_dive_shop">Dive shop</string>
+	<string name="poi_doityourself_shop">Do-It-Yourself shop</string>
+	<string name="poi_erotic_shop">Sex shop</string>
+	<string name="poi_fishing_shop">Fishing shop</string>
+	<string name="poi_florist">Florist shop</string>
+	<string name="poi_frame_shop">Frame shop</string>
+	<string name="poi_furniture_shop">Furniture shop</string>
+	<string name="poi_garden_centre">Garden centre</string>
+	<string name="poi_gas_shop">Bottled gas shop</string>
+	<string name="poi_general_shop">General shop</string>
+	<string name="poi_gift_shop">Gift shop</string>
+	<string name="poi_glaziery_shop">Glaziery shop</string>
+	<string name="poi_hardware_shop">Hardware shop</string>
+	<string name="poi_hearing_aids_shop">Hearing aids shop</string>
+	<string name="poi_herbalist">Herbalist shop</string>
+	<string name="poi_hifi_shop">HiFi shop</string>
+	<string name="poi_houseware_shop">Houseware shop</string>
+	<string name="poi_hunting_shop">Hunting shop</string>
+	<string name="poi_interior_decoration_shop">Interior decoration shop</string>
+	<string name="poi_jewelry_shop">Jewelry shop</string>
+	<string name="poi_kiosk">Kiosk</string>
+	<string name="poi_kitchen_shop">Kitchen shop</string>
+	<string name="poi_mobile_phone_shop">Mobile phone shop</string>
+	<string name="poi_motorcycle_shop">Motorcycle shop</string>
+	<string name="poi_musical_instrument_shop">Musical instrument shop</string>
+	<string name="poi_newsagent_shop">Newsagent shop</string>
+	<string name="poi_optician_shop">Optician shop</string>
+	<string name="poi_organic_shop">Organic store</string>
+	<string name="poi_outdoor_shop">Outdoor shop</string>
+	<string name="poi_paint_shop">Paint shop</string>
+	<string name="poi_pet_shop">Pet shop</string>
+	<string name="poi_radiotechnics_shop">Radiotechnics shop</string>
+	<string name="poi_second_hand">Second hand shop</string>
+	<string name="poi_ship_chandler">Ship chandler</string>
+	<string name="poi_sports_shop">Sports shop</string>
+	<string name="poi_stationery_shop">Stationery shop</string>
+	<string name="poi_tableware_shop">Tableware shop</string>
+	<string name="poi_ticket_shop">Ticket shop</string>
+	<string name="poi_tobacco_shop">Tobacco shop</string>
+	<string name="poi_toys_shop">Toys shop</string>
+	<string name="poi_trade_shop">Trade shop</string>
+	<string name="poi_vacuum_cleaner_shop">Vacuum cleaner shop</string>
+	<string name="poi_variety_store">Variety store</string>
+	<string name="poi_video_shop">Video shop</string>
+	<string name="poi_window_blind_shop">Window blind shop</string>
+	<string name="poi_department_store">Department store</string>
+	<string name="poi_electronics_shop">Electronics shop</string>
+	<string name="poi_car_shop">Car shop</string>
+	<string name="poi_car_parts_shop">Car parts shop</string>
+	<string name="poi_atv_shop">Quad shop</string>
+	<string name="poi_cosmetics_shop">Cosmetics shop</string>
+	<string name="poi_marketplace">Marketplace</string>
+	<string name="poi_sewing_shop">Sewing shop</string>
+
+	<string name="poi_police">Police</string>
+	<string name="poi_fire_station">Fire station</string>
+	<string name="poi_emergency_phone">Emergency phone</string>
+	<string name="poi_fire_hydrant">Fire hydrant</string>
+	<string name="poi_fire_extinguisher">Fire extinguisher</string>
+	<string name="poi_fire_flapper">Fire flapper</string>
+	<string name="poi_fire_hose">Fire hose</string>
+	<string name="poi_fire_water_pond">Fire water pond</string>
+	<string name="poi_grit_bin">Grit bin</string>
+	<string name="poi_ambulance_station">Ambulance station</string>
+	<string name="poi_ses_station">SES station</string>
+	<string name="poi_emergency_access_point">Emergency access point</string>
+
+	<string name="poi_ford">Ford</string>
+	<string name="poi_mountain_pass">Mountain pass</string>
+	<string name="poi_gate">Gate</string>
+	<string name="poi_city_wall">City wall</string>
+	<string name="poi_lift_gate">Lift gate</string>
+	<string name="poi_toll_booth">Toll booth</string>
+	<string name="poi_border_control">Border control</string>
+	<string name="poi_traffic_calming_bump">Bump</string>
+	<string name="poi_traffic_calming_hump">Hump</string>
+	<string name="poi_traffic_calming_cushion">Cushion</string>
+	<string name="poi_traffic_calming_chicane">Chicane</string>
+	<string name="poi_traffic_calming_rumble_strip">Rumble strip</string>
+	<string name="poi_traffic_calming_table">Table</string>
+	<string name="poi_traffic_calming_choker">Choker</string>
+	<string name="poi_traffic_signals">Traffic signals</string>
+
+	<string name="poi_car_repair">Car repair</string>
+	<string name="poi_service_tyres">Tire</string>
+	<string name="poi_vehicle_inspection">Vehicle inspection</string>
+	<string name="poi_car_wash">Car wash</string>
+	<string name="poi_fuel">Petrol station</string>
+	<string name="poi_charging_station">Charging station</string>
+	<string name="poi_vehicle_ramp">Vehicle ramp</string>
+	<string name="poi_compressed_air">Compressed air</string>
+	<string name="poi_parking">Parking</string>
+	<string name="poi_motorcycle_parking">Motorcycle parking</string>
+	<string name="poi_parking_entrance">Parking entrance</string>
+	<string name="poi_garages">Garages</string>
+
+	<string name="poi_bus_station">Bus station</string>
+	<string name="poi_subway_entrance">Subway entrance</string>
+	<string name="poi_railway_station">Railway station</string>
+	<string name="poi_public_transport_platform">Public transport platform</string>
+	<string name="poi_railway_platform">Railway platform</string>
+	<string name="poi_railway_halt">Railway halt</string>
+	<string name="poi_public_transport_station">Public transport station</string>
+	<string name="poi_subway_station">Subway station</string>
+	<string name="poi_bus_stop">Bus stop</string>
+	<string name="poi_tram_stop">Tram stop</string>
+	<string name="poi_taxi">Taxi stand</string>
+	<string name="poi_funicular">Funicular</string>
+
+	<string name="poi_airport">Airport</string>
+	<string name="poi_helipad">Helipad</string>
+	<string name="poi_runway">Runway</string>
+	<string name="poi_aeroway_terminal">Aeroway terminal</string>
+	<string name="poi_aeroway_gate">Aeroway gate</string>
+
+	<string name="poi_slipway">Slipway</string>
+	<string name="poi_ferry_terminal">Ferry terminal</string>
+	<string name="poi_lighthouse">Lighthouse</string>
+
+	<string name="poi_bicycle_rental">Bicycle rental</string>
+	<string name="poi_bicycle_parking">Bicycle parking</string>
+
+	<string name="poi_aerialway_station">Aerialway station</string>
+	<string name="poi_aerialway_cable_car">Cable car</string>
+	<string name="poi_aerialway_gondola">Gondola</string>
+	<string name="poi_aerialway_chair_lift">Chair lift</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">Platter lift</string>
+	<string name="poi_aerialway_mixed_lift">Mixed lift</string>
+	<string name="poi_aerialway_drag_lift">Drag lift</string>
+	<string name="poi_aerialway_rope_tow">Rope tow lift</string>
+	<string name="poi_aerialway_goods">Goods lift</string>
+	<string name="poi_aerialway_magic_carpet">Carpet lift</string>
+
+	<string name="poi_tunnel">Tunnel</string>
+	<string name="poi_bridge">Bridge</string>
+
+	<string name="poi_speed_camera">Speed camera</string>
+	<string name="poi_turning_circle">Turning circle</string>
+
+	<string name="poi_water_well">Water well</string>
+	<string name="poi_standpipe">Standpipe</string>
+	<string name="poi_water_works">Water works</string>
+	<string name="poi_boatyard">Boatyard</string>
+	<string name="poi_wastewater_plant">Wastewater plant</string>
+	<string name="poi_water_tower">Water tower</string>
+	<string name="poi_lock_gate">Lock gate</string>
+	<string name="poi_waterway_turning_point">Waterway turning point</string>
+	<string name="poi_weir">Weir</string>
+	<string name="poi_dam">Dam</string>
+	<string name="poi_mill_pond">Mill pond</string>
+	<string name="poi_water_mill">Water mill</string>
+
+	<string name="poi_power_substation">Substation</string>
+	<string name="poi_power_transformer">Transformer</string>
+	<string name="poi_power_plant">Power plant</string>
+	<string name="poi_power_generator">Power generator</string>
+
+	<string name="poi_post_office">Post office</string>
+	<string name="poi_post_box">Post box</string>
+	<string name="poi_telephone">Telephone</string>
+	<string name="poi_communication_tower">Communication tower</string>
+	<string name="poi_telephone_exchange">Telephone exchange</string>
+
+	<string name="poi_recycling">Recycling</string>
+	<string name="poi_landfill">Landfill</string>
+	<string name="poi_waste_disposal">Waste disposal</string>
+	<string name="poi_waste_basket">Waste basket</string>
+
+	<string name="poi_surveillance">Surveillance</string>
+	<string name="poi_construction">Construction</string>
+	<string name="poi_works">Works</string>
+	<string name="poi_mineshaft">Mineshaft</string>
+	<string name="poi_adit">Adit</string>
+	<string name="poi_petroleum_well">Petroleum well</string>
+	<string name="poi_survey_point">Survey point</string>
+	<string name="poi_windmill">Windmill</string>
+	<string name="poi_quarry">Quarry</string>
+	<string name="poi_vineyard">Vineyard</string>
+	<string name="poi_orchard">Orchard</string>
+	<string name="poi_salt_pond">Salt pond</string>
+
+	<string name="poi_driving_school">Driving school</string>
+	<string name="poi_school">School</string>
+	<string name="poi_kindergarten">Kindergarten</string>
+	<string name="poi_college">College</string>
+	<string name="poi_university">University</string>
+
+	<string name="poi_social_facility">Social facility</string>
+	<string name="poi_courthouse">Courthouse</string>
+	<string name="poi_prison">Prison</string>
+	<string name="poi_register_office">Register office</string>
+	<string name="poi_embassy">Embassy</string>
+	<string name="poi_government">Government</string>
+	<string name="poi_bailiff">Bailiff</string>
+	<string name="poi_prosecutor">Prosecutor</string>
+	<string name="poi_pension_fund">Pension fund</string>
+	<string name="poi_migration">Migration</string>
+	<string name="poi_tax_inspection">Tax inspection</string>
+	<string name="poi_administrative_office">Administrative office</string>
+	<string name="poi_customs">Customs</string>
+
+	<string name="poi_pharmacy">Pharmacy</string>
+	<string name="poi_hospital">Hospital</string>
+	<string name="poi_doctors">Doctors</string>
+	<string name="poi_clinic">Clinic</string>
+	<string name="poi_first_aid">First aid</string>
+	<string name="poi_dentist">Dentist</string>
+	<string name="poi_nursing_home">Nursing home</string>
+	<string name="poi_baby_hatch">Baby hatch</string>
+	<string name="poi_veterinary">Veterinary</string>
+	<string name="poi_sanatorium">Sanatorium</string>
+
+	<string name="poi_company">Company</string>
 	<string name="poi_insurance">Insurance</string>
+	<string name="poi_estate_agent">Estate agent</string>
+	<string name="poi_lawyer">Lawyer</string>
+	<string name="poi_telecommunication_office">Telecommunication office</string>
+	<string name="poi_ngo">NGO</string>
+	<string name="poi_town_hall">Town hall</string>
+	<string name="poi_employment_agency">Employement office</string>
+	<string name="poi_research_office">Research office</string>
+	<string name="poi_it_office">IT office</string>
+	<string name="poi_newspaper_office">Newspaper office</string>
+	<string name="poi_architect_office">Architect office</string>
+	<string name="poi_advertising_agency">Advertising agency</string>
+	<string name="poi_educational_institution">Educational institution</string>
+	<string name="poi_studio">Studio</string>
+	<string name="poi_bookmaker">Bookmaker</string>
+
+	<string name="poi_stadium">Stadium</string>
+	<string name="poi_sports_centre">Sports center</string>
+	<string name="poi_golf_course">Golf course</string>
+	<string name="poi_ice_rink">Ice rink</string>
+	<string name="poi_pitch">Pitch</string>
+	<string name="poi_running_track">Running track</string>
+	<string name="poi_bicycle_track">Bicycle track</string>
+	<string name="poi_horse_track">Horse track</string>
+	<string name="poi_raceway">Raceway</string>
+	<string name="poi_9pin">Nine pin bowling</string>
+	<string name="poi_10pin">Ten pin bowling</string>
+	<string name="poi_archery">Archery</string>
+	<string name="poi_athletics">Athletics</string>
+	<string name="poi_australian_football">Australian football</string>
+	<string name="poi_baseball">Baseball</string>
+	<string name="poi_basketball">Basketball</string>
+	<string name="poi_beachvolleyball">Beach volleyball</string>
+	<string name="poi_boules">Boules</string>
+	<string name="poi_bowls">Bowls</string>
+	<string name="poi_canoe">Canoe</string>
+	<string name="poi_chess">Chess</string>
+	<string name="poi_climbing">Climbing</string>
+	<string name="poi_cricket">Cricket</string>
+	<string name="poi_cricket_nets">Cricket nets</string>
+	<string name="poi_croquet">Croquet</string>
+	<string name="poi_cycling">Cycling</string>
+	<string name="poi_diving">Diving</string>
+	<string name="poi_scuba_diving">Scuba diving</string>
+	<string name="poi_dog_racing">Dog racing</string>
+	<string name="poi_equestrian">Equestrian</string>
+	<string name="poi_football">Football</string>
+	<string name="poi_golf">Golf</string>
+	<string name="poi_gymnastics">Gymnastics</string>
+	<string name="poi_hockey">Hockey</string>
+	<string name="poi_horse_racing">Horse racing</string>
+	<string name="poi_ice_stock">Ice stock</string>
+	<string name="poi_korfbal">Korfbal</string>
+	<string name="poi_motor_sport">Motor sport</string>
+	<string name="poi_multi_sport">Multi sport</string>
+	<string name="poi_orienteering">Orienteering</string>
+	<string name="poi_paddle_tennis">Paddle tennis</string>
+	<string name="poi_paragliding">Paragliding</string>
+	<string name="poi_pelota">Pelota</string>
+	<string name="poi_racquet">Racquet</string>
+	<string name="poi_rowing">Rowing</string>
+	<string name="poi_rugby">Rugby</string>
+	<string name="poi_shooting">Shooting</string>
+	<string name="poi_skating">Skating</string>
+	<string name="poi_skateboard">Skateboard</string>
+	<string name="poi_skiing">Skiing</string>
+	<string name="poi_soccer">Soccer</string>
+	<string name="poi_swimming">Swimming</string>
+	<string name="poi_table_tennis">Table tennis</string>
+	<string name="poi_team_handball">Team handball</string>
+	<string name="poi_tennis">Tennis</string>
+	<string name="poi_toboggan">Toboggan</string>
+	<string name="poi_volleyball">Volleyball</string>
+
+	<string name="poi_museum">Museum</string>
+	<string name="poi_attraction">Tourism attraction</string>
+	<string name="poi_memorial">Memorial</string>
+	<string name="poi_artwork">Artwork</string>
+	<string name="poi_archaeological_site">Archaeological site</string>
+	<string name="poi_battlefield">Battlefield</string>
+	<string name="poi_boundary_stone">Boundary stone</string>
+	<string name="poi_castle">Castle</string>
+	<string name="poi_city_gate">City gate</string>
+	<string name="poi_fort">Fort</string>
+	<string name="poi_fountain">Fountain</string>
+	<string name="poi_ruins_historic">Historic ruins</string>
+	<string name="poi_rune_stone">Rune stone</string>
+	<string name="poi_wreck">Shipwreck</string>
+	<string name="poi_ship_historic">Historic ship</string>
+	<string name="poi_mine_historic">Historic mine</string>
+	<string name="poi_monument">Monument</string>
+	<string name="poi_zoo">Zoo</string>
+	<string name="poi_theme_park">Theme park</string>
+
+	<string name="poi_hotel">Hotel</string>
+	<string name="poi_guest_house">Guest house</string>
+	<string name="poi_hostel">Hostel</string>
+	<string name="poi_motel">Motel</string>
+	<string name="poi_alpine_hut">Alpine hut</string>
+	<string name="poi_chalet">Chalet</string>
+
+	<string name="poi_place_of_worship">Place of worship</string>
+	<string name="poi_place_of_worship_christian">Place of worship: christian</string>
+	<string name="poi_place_of_worship_jewish">Place of worship: jewish</string>
+	<string name="poi_place_of_worship_muslim">Place of worship: muslim</string>
+	<string name="poi_place_of_worship_sikh">Place of worship: sikh</string>
+	<string name="poi_place_of_worship_buddhist">Place of worship: buddhist</string>
+	<string name="poi_place_of_worship_hindu">Place of worship: hindu</string>
+	<string name="poi_place_of_worship_shinto">Place of worship: shinto</string>
+	<string name="poi_place_of_worship_taoist">Place of worship: taoist</string>
+	<string name="poi_monastery">Monastery</string>
+	<string name="poi_historic_monastery">Historic monastery</string>
+	<string name="poi_wayside_cross">Wayside cross</string>
+	<string name="poi_wayside_shrine">Wayside shrine</string>
+	<string name="poi_tourism_information">Tourist information</string>
+	<string name="poi_clock">Clock</string>
+	<string name="poi_travel_agent">Travel agent</string>
+	<string name="poi_viewpoint">Viewpoint</string>
+	<string name="poi_camp_site">Camp site</string>
+	<string name="poi_caravan_site">Caravan site</string>
+	<string name="poi_picnic_site">Picnic site</string>
+	<string name="poi_spring">Spring</string>
+	<string name="poi_cemetery">Cemetery</string>
+	<string name="poi_grave_yard">Grave yard</string>
+	<string name="poi_shelter">Shelter</string>
+	<string name="poi_funicular">Funicular</string>
+	<string name="poi_resort">Resort</string>
+
+	<string name="poi_club_art">Art club</string>
+	<string name="poi_club_astronomy">Astronomy club</string>
+	<string name="poi_club_computer">Computer club</string>
+	<string name="poi_club_board_games">Board games club</string>
+	<string name="poi_club_motorcycle">Motorcycle club</string>
+	<string name="poi_club_sport">Sport club</string>
+	<string name="poi_club_game">Game club</string>
+	<string name="poi_club_automobile">Automobile club</string>
+	<string name="poi_club_chess">Chess club</string>
+	<string name="poi_club_cinema">Cinema club</string>
+	<string name="poi_club_fan">Fan club</string>
+	<string name="poi_club_fishing">Fishing club</string>
+	<string name="poi_club_veterans">Veterans club</string>
+	<string name="poi_club_linux">Linux club</string>
+	<string name="poi_club_theatre">Theatre club</string>
+	<string name="poi_club_history">History club</string>
+	<string name="poi_club_music">Music club</string>
+	<string name="poi_club_ethnic">Ethnic club</string>
+	<string name="poi_club_nature">Nature club</string>
+	<string name="poi_club_photography">Photography club</string>
+	<string name="poi_club_hunting">Hunting club</string>
+	<string name="poi_club_shooting">Shooting club</string>
+	<string name="poi_club_tourism">Tourism club</string>
+	<string name="poi_club_charity">Charity club</string>
+
+	<string name="poi_library">Library</string>
+	<string name="poi_arts_centre">Arts centre</string>
+	<string name="poi_cinema">Cinema</string>
+	<string name="poi_casino">Casino</string>
+	<string name="poi_community_centre">Community centre</string>
+	<string name="poi_social_centre">Social centre</string>
+	<string name="poi_theatre">Theatre</string>
+	<string name="poi_circus">Circus</string>
+	<string name="poi_dance_floor">Dance floor</string>
+	<string name="poi_nightclub">Nightclub</string>
+	<string name="poi_stripclub">Stripclub</string>
+	<string name="poi_beach_resort">Beach resort</string>
+	<string name="poi_dog_park">Dog park</string>
+	<string name="poi_fishing_place">Fishing place</string>
+	<string name="poi_hunting_stand">Hunting stand</string>
+	<string name="poi_marina">Marina</string>
+	<string name="poi_miniature_golf">Miniature golf</string>
+	<string name="poi_playground">Playground</string>
+	<string name="poi_swimming_pool">Swimming pool</string>
+	<string name="poi_water_park">Water park</string>
+	<string name="poi_park">Park</string>
+
+	<string name="poi_cafe">Cafe</string>
+	<string name="poi_biergarten">Biergarten</string>
+	<string name="poi_restaurant">Restaurant</string>
+	<string name="poi_fast_food">Fast food</string>
+	<string name="poi_bar">Bar</string>
+	<string name="poi_pub">Pub</string>
+	<string name="poi_food_court">Food court</string>
+	<string name="poi_drinking_water">Drinking water</string>
+	<string name="poi_barbecue">Barbecue</string>
+
+	<string name="poi_agricultural_engines_craft">Agricultural engines</string>
+	<string name="poi_basket_maker">Basket maker</string>
+	<string name="poi_beekeeper">Beekeeper</string>
+	<string name="poi_blacksmith">Blacksmith</string>
+	<string name="poi_brewery">Brewery</string>
+	<string name="poi_boatbuilder">Boatbuilder</string>
+	<string name="poi_bookbinder">Bookbinder</string>
+	<string name="poi_carpenter">Carpenter</string>
+	<string name="poi_carpet_layer">Carpet layer</string>
+	<string name="poi_caterer">Caterer</string>
+	<string name="poi_clockmaker">Clockmaker</string>
+	<string name="poi_dressmaker">Dressmaker</string>
+	<string name="poi_electrician">Electrician</string>
+	<string name="poi_gardener">Gardener</string>
+	<string name="poi_glaziery_craft">Glaziery craft</string>
+	<string name="poi_handicraft">Handicraft</string>
+	<string name="poi_hvac">Heating, ventilation, air conditioning</string>
+	<string name="poi_insulation_craft">Insulation</string>
+	<string name="poi_jeweller">Jeweller</string>
+	<string name="poi_locksmith">Locksmith</string>
+	<string name="poi_key_cutter">Key cutter</string>
+	<string name="poi_metal_construction_craft">Metal construction craft</string>
+	<string name="poi_optician">Optician</string>
+	<string name="poi_painter">Painter</string>
+	<string name="poi_parquet_layer">Parquet layer</string>
+	<string name="poi_photographer">Photographer</string>
+	<string name="poi_photographic_laboratory">Photographic laboratory</string>
+	<string name="poi_plasterer">Plasterer</string>
+	<string name="poi_plumber">Plumber</string>
+	<string name="poi_pottery_craft">Pottery craft</string>
+	<string name="poi_rigger">Rigger</string>
+	<string name="poi_roofer">Roofer</string>
+	<string name="poi_saddler">Saddler</string>
+	<string name="poi_sailmaker">Sailmaker</string>
+	<string name="poi_sawmill">Sawmill</string>
+	<string name="poi_scaffolder">Scaffolder</string>
+	<string name="poi_sculptor">Sculptor</string>
+	<string name="poi_shoemaker">Shoemaker</string>
+	<string name="poi_stand_builder">Stand builder</string>
+	<string name="poi_stonemason">Stonemason</string>
+	<string name="poi_sun_protection_craft">Sun protection craft</string>
+	<string name="poi_sweep">Sweep</string>
+	<string name="poi_tailor">Tailor</string>
+	<string name="poi_tiler">Tiler</string>
+	<string name="poi_tinsmith">Tinsmith</string>
+	<string name="poi_upholsterer">Upholsterer</string>
+	<string name="poi_watchmaker">Watchmaker</string>
+	<string name="poi_window_construction">Window construction</string>
+
+	<string name="poi_funeral_directors">Funeral directors</string>
+	<string name="poi_computer_craft">Computer craft</string>
+	<string name="poi_beauty_salon">Beauty salon</string>
+	<string name="poi_beauty_salon_nails">Nail salon</string>
+	<string name="poi_hairdresser">Hairdresser</string>
+	<string name="poi_massage">Massage salon</string>
+	<string name="poi_tattoo">Tattoo salon</string>
+	<string name="poi_dry_cleaning">Dry cleaning</string>
+	<string name="poi_laundry">Laundry</string>
+	<string name="poi_car_rental">Car rental</string>
+	<string name="poi_car_sharing">Car sharing</string>
+	<string name="poi_boat_sharing">Boat sharing</string>
+	<string name="poi_toilets">Toilets</string>
+	<string name="poi_sauna">Sauna</string>
+	<string name="poi_brothel">Brothel</string>
+	<string name="poi_mortuary">Mortuary</string>
+	<string name="poi_crematorium">Crematorium</string>
+	<string name="poi_internet_cafe">Internet cafe</string>
+
+	<string name="poi_bank">Bank</string>
+	<string name="poi_atm">ATM</string>
+	<string name="poi_money_lender">Money lender</string>
+	<string name="poi_pawnbroker">Pawnbroker</string>
+	<string name="poi_currencyexchange">Bureau de change</string>
+	<string name="poi_accountant">Accountant</string>
+	<string name="poi_bitcoin_yes">Bitcoin payment</string>
+
+	<string name="poi_cave_entrance">Cave entrance</string>
+	<string name="poi_peak">Mountain peak</string>
+	<string name="poi_saddle">Saddle</string>
+	<string name="poi_volcano">Volcano</string>
+	<string name="poi_crater">Crater</string>
+	<string name="poi_sinkhole">Sinkhole</string>
+	<string name="poi_waterfall">Waterfall</string>
+	<string name="poi_rapids">Rapids</string>
+	<string name="poi_stone">Remarkable stone</string>
+	<string name="poi_cape">Cape</string>
+	<string name="poi_beach">Beach</string>
+	<string name="poi_bay">Bay</string>
+	<string name="poi_fjord">Fjord</string>
+	<string name="poi_reef">Reef</string>
+	<string name="poi_wetland">Wetland</string>
+	<string name="poi_nature_reserve">Nature reserve</string>
+	<string name="poi_strait">Strait</string>
 	<string name="poi_island">Island</string>
 	<string name="poi_islet">Islet</string>
-	<string name="poi_jewelry">Jewelry Shop</string>
-	<string name="poi_junction">Railway Junction</string>
-	<string name="poi_kindergarten">Kindergarten</string>
-	<string name="poi_kiosk">Kiosk Shop</string>
-	<string name="poi_land">Land</string>
-	<string name="poi_landfill">Landfill</string>
-	<string name="poi_laundry">Laundry</string>
-	<string name="poi_lean_to">Lean To</string>
-	<string name="poi_level_crossing">Level Crossing</string>
-	<string name="poi_library">Library</string>
-	<string name="poi_light_rail">Light Rail</string>
-	<string name="poi_living_street">Living Street</string>
-	<string name="poi_locality">Locality</string>
-	<string name="poi_lock">Lock</string>
-	<string name="poi_lock_gate">Lock Gate</string>
-	<string name="poi_mall">Mall</string>
-	<string name="poi_manor">Manor</string>
-	<string name="poi_marina">Marina</string>
-	<string name="poi_market">Market</string>
-	<string name="poi_marketplace">Marketplace</string>
-	<string name="poi_marsh">Marsh</string>
-	<string name="poi_meadow">Meadow</string>
-	<string name="poi_memorial">Memorial</string>
-	<string name="poi_military">Military Area</string>
-	<string name="poi_mine">Mine</string>
-	<string name="poi_mineral_spring">Mineral Spring</string>
-	<string name="poi_miniature_golf">Miniature Golf</string>
-	<string name="poi_minor">Minor Road</string>
-	<string name="poi_mobile_phone">Mobile Phone Shop</string>
-	<string name="poi_monorail">Monorail</string>
-	<string name="poi_monument">Monument</string>
-	<string name="poi_moor">Moor</string>
-	<string name="poi_mooring">Mooring</string>
-	<string name="poi_motel">Motel</string>
-	<string name="poi_motorway">Motorway</string>
-	<string name="poi_motorway_junction">Motorway Junction</string>
-	<string name="poi_motorway_link">Motorway Road</string>
-	<string name="poi_mountain">Mountain</string>
-	<string name="poi_mountain_rescue">Mountain Rescue</string>
-	<string name="poi_mud">Mud</string>
-	<string name="poi_municipality">Municipality</string>
-	<string name="poi_museum">Museum</string>
-	<string name="poi_narrow_gauge">Narrow Gauge Railways</string>
-	<string name="poi_nature_reserve">Nature Reserves</string>
-	<string name="poi_newsagent">Newsagents</string>
-	<string name="poi_nightclub">Night Clubs</string>
-	<string name="poi_nursery">Nurseries</string>
-	<string name="poi_nursing_home">Nursing Homes</string>
-	<string name="poi_office">Office Building</string>
-	<string name="poi_optician_shop">Optician</string>
-	<string name="poi_organic">Organic Food Shop</string>
-	<string name="poi_outdoor">Outdoor Shop</string>
-	<string name="poi_park">Park</string>
-	<string name="poi_parking">Parking</string>
-	<string name="poi_path">Path</string>
-	<string name="poi_peak">Peak</string>
-	<string name="poi_pedestrian">Pedestrian Way</string>
-	<string name="poi_pet">Pet Shop</string>
-	<string name="poi_pharmacy">Pharmacy</string>
-	<string name="poi_photo">Photo Shop</string>
-	<string name="poi_picnic_site">Picnic Site</string>
-	<string name="poi_piste">Piste</string>
-	<string name="poi_pitch">Sports Pitch</string>
-	<string name="poi_place_of_worship">Place of Worship</string>
-	<string name="poi_platform">Railway Platform</string>
-	<string name="poi_playground">Playground</string>
-	<string name="poi_plaza">Plaza</string>
-	<string name="poi_point">Point</string>
-	<string name="poi_police">Police</string>
-	<string name="poi_post_box">Post Box</string>
-	<string name="poi_post_office">Post Office</string>
-	<string name="poi_postcode">Postcode</string>
-	<string name="poi_preschool">Pre-School</string>
-	<string name="poi_preserved">Preserved Railway</string>
-	<string name="poi_primary">Primary Road</string>
-	<string name="poi_primary_link">Primary Road</string>
-	<string name="poi_prison">Prison</string>
-	<string name="poi_pub">Pub</string>
-	<string name="poi_public">Public Building</string>
-	<string name="poi_public_building">Public Building</string>
-	<string name="poi_public_market">Public Market</string>
-	<string name="poi_quarry">Quarry</string>
-	<string name="poi_raceway">Raceway</string>
-	<string name="poi_railway">Railway</string>
-	<string name="poi_railway_halt">Train Stop</string>
-	<string name="poi_railway_station">Station</string>
-	<string name="poi_rapids">Rapids</string>
-	<string name="poi_reception_area">Reception Area</string>
-	<string name="poi_recreation_ground">Recreation Ground</string>
-	<string name="poi_recycling">Recycling Point</string>
-	<string name="poi_reef">Reef</string>
-	<string name="poi_region">Region</string>
-	<string name="poi_religion">Religion</string>
-	<string name="poi_religion_christian">Christian</string>
-	<string name="poi_religion_jewish">Jewish</string>
-	<string name="poi_religion_muslim">Muslim</string>
-	<string name="poi_reservoir">Reservoir</string>
-	<string name="poi_residential">Residential Area</string>
-	<string name="poi_rest_area">Rest Stop</string>
-	<string name="poi_restaurant">Restaurant</string>
-	<string name="poi_retail">Retail</string>
-	<string name="poi_retirement_home">Retirement Home</string>
-	<string name="poi_ridge">Ridge</string>
-	<string name="poi_river">River</string>
-	<string name="poi_riverbank">Riverbank</string>
-	<string name="poi_road">Road</string>
-	<string name="poi_rock">Rock</string>
-	<string name="poi_ruins">Ruin</string>
-	<string name="poi_salon">Salon</string>
-	<string name="poi_sauna">Sauna</string>
-	<string name="poi_school">School Building</string>
-	<string name="poi_scree">Scree</string>
-	<string name="poi_scrub">Scrub</string>
-	<string name="poi_sea">Sea</string>
-	<string name="poi_secondary">Secondary Road</string>
-	<string name="poi_secondary_link">Secondary Road</string>
-	<string name="poi_service">Service Road</string>
-	<string name="poi_services">Motorway Services</string>
-	<string name="poi_shelter">Shelter</string>
-	<string name="poi_shoal">Shoal</string>
-	<string name="poi_shoes">Shoe Shop</string>
-	<string name="poi_shop">Shop</string>
-	<string name="poi_shopping">Shopping</string>
-	<string name="poi_shopping_centre">Shopping Center</string>
-	<string name="poi_slipway">Slipway</string>
-	<string name="poi_social_club">Social Club</string>
-	<string name="poi_sports">Sports Shop</string>
-	<string name="poi_sports_centre">Sports Centre</string>
-	<string name="poi_spring">Spring</string>
-	<string name="poi_spur">Railway Spur</string>
-	<string name="poi_stadium">Stadium</string>
-	<string name="poi_state">State</string>
-	<string name="poi_stationery">Stationery Shop</string>
-	<string name="poi_steps">Steps</string>
-	<string name="poi_stile">Stile</string>
-	<string name="poi_store">Store</string>
-	<string name="poi_strait">Strait</string>
-	<string name="poi_stream">Stream</string>
-	<string name="poi_studio">Studio</string>
-	<string name="poi_subdivision">Subdivision</string>
-	<string name="poi_suburb">Suburb</string>
-	<string name="poi_subway">Subway Station</string>
-	<string name="poi_subway_entrance">Subway Entrance</string>
-	<string name="poi_supermarket">Supermarket</string>
-	<string name="poi_swimming_pool">Swimming Pool</string>
-	<string name="poi_switch">Railway Points</string>
-	<string name="poi_taxi">Taxi Rank</string>
-	<string name="poi_telephone">Phone Booth</string>
-	<string name="poi_terrace">Terrace</string>
-	<string name="poi_tertiary">Tertiary Road</string>
-	<string name="poi_theme_park">Theme Park</string>
-	<string name="poi_toilets">Toilet</string>
-	<string name="poi_tower">Tower</string>
-	<string name="poi_town">Town</string>
-	<string name="poi_town_hall">Town Hall</string>
-	<string name="poi_toys">Toy Shop</string>
-	<string name="poi_track">Running Track</string>
-	<string name="poi_trail">Trail</string>
-	<string name="poi_train_station">Station</string>
-	<string name="poi_tram">Tramway</string>
-	<string name="poi_tram_stop">Tram Stop</string>
-	<string name="poi_travel_agency">Travel Agency</string>
-	<string name="poi_tree">Tree</string>
-	<string name="poi_trunk">Trunk Road</string>
-	<string name="poi_trunk_link">Trunk Road</string>
-	<string name="poi_unclassified">Unclassified Road</string>
-	<string name="poi_unincorporated_area">Unincorporated Area</string>
-	<string name="poi_university">University Building</string>
-	<string name="poi_unsurfaced">Unsurfaced Road</string>
-	<string name="poi_valley">Valley</string>
-	<string name="poi_vending_machine">Vending Machine</string>
-	<string name="poi_veterinary">Veterinary Surgery</string>
-	<string name="poi_video">Video Shop</string>
-	<string name="poi_viewpoint">Viewpoint</string>
-	<string name="poi_village">Village</string>
-	<string name="poi_village_green">Village Green</string>
-	<string name="poi_village_hall">Village Hall</string>
-	<string name="poi_vineyard">Vineyard</string>
-	<string name="poi_volcano">Volcano</string>
-	<string name="poi_wadi">Wadi</string>
-	<string name="poi_waste_basket">Bin</string>
-	<string name="poi_water">Water</string>
-	<string name="poi_water_park">Water Park</string>
-	<string name="poi_water_point">Water Point</string>
-	<string name="poi_waterfall">Waterfall</string>
-	<string name="poi_wayside_cross">Wayside Cross</string>
-	<string name="poi_wayside_shrine">Wayside Shrine</string>
-	<string name="poi_weir">Weir</string>
-	<string name="poi_wetland">Wetland</string>
-	<string name="poi_wetlands">Wetlands</string>
-	<string name="poi_wifi">WiFi Point</string>
-	<string name="poi_windmill">Windmill</string>
-	<string name="poi_wine">Off License</string>
-	<string name="poi_wood">Wood</string>
-	<string name="poi_wreck">Wreck</string>
-	<string name="poi_yard">Railway Yard</string>
-	<string name="poi_youth_centre">Youth Center</string>
-	<string name="poi_zoo">Zoo</string></resources>
\ No newline at end of file
+
+	<string name="poi_seamark_anchorage">Anchorage</string>
+	<string name="poi_seamark_anchor_berth">Anchor berth</string>
+	<string name="poi_seamark_beacon">Beacon</string>
+	<string name="poi_seamark_beacon_cardinal">Cardinal beacon</string>
+	<string name="poi_seamark_beacon_lateral">Lateral beacon</string>
+	<string name="poi_seamark_beacon_safe_water">Safe water beacon</string>
+	<string name="poi_seamark_beacon_special_purpose">Special purpose beacon</string>
+	<string name="poi_seamark_berth">Berth</string>
+	<string name="poi_seamark_building">Seamark building</string>
+	<string name="poi_seamark_bridge">Seamark bridge</string>
+	<string name="poi_seamark_buoy_cardinal">Cardinal buoy</string>
+	<string name="poi_seamark_buoy_installation">Installation buoy</string>
+	<string name="poi_seamark_buoy_isolated_danger">Buoy, isolated danger</string>
+	<string name="poi_seamark_buoy_lateral">Lateral buoy</string>
+	<string name="poi_seamark_buoy_safe_water">Safe water bouy</string>
+	<string name="poi_seamark_buoy_special_purpose">Special purpose buoy</string>
+	<string name="poi_seamark_daymark">Daymark</string>
+	<string name="poi_seamark_distance_mark">Distance mark</string>
+	<string name="poi_seamark_dry_dock">Dry dock</string>
+	<string name="poi_seamark_dyke">Dyke</string>
+	<string name="poi_seamark_floating_dock">Floating dock</string>
+	<string name="poi_seamark_fog_signal">Fog signal</string>
+	<string name="poi_seamark_harbour_basin">Harbour basin</string>
+	<string name="poi_seamark_harbour">Harbour</string>
+	<string name="poi_seamark_landmark">Landmark</string>
+	<string name="poi_seamark_light">Light, seamark</string>
+	<string name="poi_seamark_light_major">Major light, seamark</string>
+	<string name="poi_seamark_light_minor">Minor light, seamark</string>
+	<string name="poi_seamark_light_float">Float light, seamark</string>
+	<string name="poi_seamark_light_vessel">Vessel light, seamark</string>
+	<string name="poi_seamark_mooring">Mooring</string>
+	<string name="poi_seamark_notice">Notice, seamark</string>
+	<string name="poi_seamark_pile">Pile</string>
+	<string name="poi_seamark_radar_transponder">Radar transponder, seamark</string>
+	<string name="poi_seamark_radio_station">Radio station, seamark</string>
+	<string name="poi_seamark_signal_station_traffic">Signal station, traffic</string>
+	<string name="poi_seamark_signal_station_warning">Signal station, warning</string>
+	<string name="poi_seamark_small_craft_facility">Small craft facility</string>
+	<string name="poi_seamark_topmark">Topmark, seamark</string>
+	<string name="poi_seamark_rock">Rock, seamark</string>
+	<string name="poi_seamark_wreck">Wreck, seamark</string>
+	<string name="poi_military_airfield">Military airfield</string>
+	<string name="poi_military_bunker">Military bunker</string>
+	<string name="poi_military_barracks">Barracks</string>
+	<string name="poi_military_danger_area">Danger area</string>
+	<string name="poi_military_range">Military range</string>
+	<string name="poi_military_naval_base">Military naval base</string>
+	<string name="poi_military_nuclear_explosion_site">Nuclear explosion site</string>
+</resources>
\ No newline at end of file

From 09a50db9f3a534488be00687873a157cd482a7cd Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 7 Nov 2014 22:22:00 +0100
Subject: [PATCH 03/53] Translated using Weblate (Danish)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-da/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index c5b550a069..06cc789a76 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1851,7 +1851,7 @@ Nogle af de centrale funktioner:
     <string name="rendering_attr_shareTaxiRoutes_name">Delebilruter</string>
     <string name="rendering_attr_trolleybusRoutes_name">Trolleybusruter</string>
     <string name="rendering_attr_busRoutes_name">Busruter</string>
-    <string name="rendering_attr_tramTrainRoutes_name">Sporvogns- og togruter</string>
+    <string name="rendering_attr_tramTrainRoutes_name">Tog- og sporvognsruter</string>
     <string name="select_impassable_road">Vælg på kort</string>
     <string name="impassable_road">Undgå veje…</string>
     <string name="rendering_category_hide">Skjul</string>

From d400d163caa95050dba9ecd278a51f8a49ed94a3 Mon Sep 17 00:00:00 2001
From: Thomas Tonino <ttonino@home.nl>
Date: Sat, 8 Nov 2014 09:59:23 +0100
Subject: [PATCH 04/53] Translated using Weblate (Dutch)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-nl/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index b422efae41..831f676c08 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1911,7 +1911,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="lang_sr">Servisch</string>
 	<string name="lang_zh_CN">Vereenvoudigd Chinees</string>
 	<string name="lang_zh_TW">Traditioneel Chinees</string>
-	<string name="rendering_attr_subwayMode_name">Tunnel modus</string>
+	<string name="rendering_attr_subwayMode_name">Metrolijnen</string>
  	<string name="continue_navigation">Navigatie voortzetten</string>
     <string name="pause_navigation">navigatie pauzeren</string>
 	<string name="rendering_attr_alpineHiking_name">Alpine wandelschaal (SAC)</string>
@@ -1953,7 +1953,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="save_track_to_gpx_globally">Track maken in GPX-bestand</string>
 	<string name="save_track_to_gpx_globally_descr">Het registreren van de afgelegde weg in een GPX-bestand kan worden aan- en uitgeschakeld met een knop op het kaartscherm</string>
 	<string name="save_track_interval_globally">Interval tussen geregistreerde punten</string>
-	<string name="rendering_attr_publicTransportMode_name">Openbaar vervoer-modus</string>
+	<string name="rendering_attr_publicTransportMode_name">Bus-, trolleybus- en minibuslijnen</string>
 	<string name="confirm_every_run">Altijd vragen</string>
 	<string name="save_global_track_interval_descr">Selecteer de loggings-interval voor de standaard track opname (te starten via de GPX opname widget in het scherm)</string>
 	<string name="save_global_track_interval">Standaard loggings-interval</string>
@@ -1999,7 +1999,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="rendering_attr_shareTaxiRoutes_name">Deeltaxi routes</string>
     <string name="rendering_attr_trolleybusRoutes_name">Trolleybus lijnen</string>
     <string name="rendering_attr_busRoutes_name">Buslijnen</string>
-    <string name="rendering_attr_tramTrainRoutes_name">Tram en trein</string>
+    <string name="rendering_attr_tramTrainRoutes_name">Tram- en treinverbindingen</string>
     <string name="wake_on_voice">Zet het scherm aan</string>
     <string name="wake_on_voice_descr">Zet het scherm aan bij nieuwe instructies</string>
     <string name="select_impassable_road">Selecteer op kaart</string>

From 7a8c51538e385b4c9e1b93501b0adfbfe69d0abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= <chobkwon@gmail.com>
Date: Sat, 8 Nov 2014 14:21:12 +0100
Subject: [PATCH 05/53] Translated using Weblate (Korean)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-ko/strings.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index c7f97f0f07..0570c8eb9b 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -127,7 +127,7 @@
 	<string name="settings_preset_descr">각 프로필마다 맵뷰어 와 라우팅 설정을 기억합니다. 여기에 기본 프로필을 설정합니다.</string>
 	
 	
-	<string name="routing_settings">라우팅 설정</string>
+	<string name="routing_settings">운행 (라우팅)</string>
 	<string name="routing_settings_descr">라우팅을 위한 옵션을 설정합니다</string>
 	<string name="global_settings">글로벌 설정</string>
 	<string name="index_settings">지도 데이터 관리</string>
@@ -385,7 +385,7 @@
 	<string name="tip_favorites">즐겨찾기 포인트</string>
 	<string name="tip_favorites_t">"자주 사용되는 포인트는 아래처럼 즐겨 찾기에 저장할 수 있습니다. ↵
 \n\n포인트를 즐겨 찾기에 저장하려면 맵 컨텍스트 메뉴로 이동하여 \'즐겨 찾기에 추가\'옵션을 선택하고 이름을 붙여주세요.
-\n\n즐겨 찾기 저장 후 \'메인 메뉴\'-&gt; \'내 장소\'를 통해 사용할 수 있습니다.  \'즐겨 찾기\'메뉴에서 즐겨 찾기를 길게 누르면 탐색 할 옵션이 나타나고, 편집 및 삭제할 수 있습니다. ↵
+\n\n즐겨 찾기 저장 후 \'메인 메뉴\'-&gt; \'장소\'를 통해 사용할 수 있습니다.  \'즐겨 찾기\'메뉴에서 즐겨 찾기를 길게 누르면 탐색 할 옵션이 나타나고, 편집 및 삭제할 수 있습니다. ↵
 \n\n지도에 직접 모든 즐겨 찾기 지점을 표시하려면 \'맵 컨텍스트 메뉴\'-&gt; \'지도 구성\'의 \'즐겨 찾기\'레이어를 활성화하십시오. "</string>
 
 	<string name="create_poi_link_to_osm_doc">이미지와 함께 <u>온라인 OSM</u> 맵 분류</string>
@@ -444,7 +444,7 @@
 	<string name="amenity_type_entertainment">오락기관</string>
 	<string name="amenity_type_finance">은행</string>
 	<string name="amenity_type_geocache">지오캐시</string>
-	<string name="amenity_type_healthcare">헬스장</string>
+	<string name="amenity_type_healthcare">병의원</string>
 	<string name="amenity_type_historic">유적지</string>
 	<string name="amenity_type_landuse">사유지</string>
 	<string name="amenity_type_leisure">레저</string>
@@ -689,7 +689,7 @@
 	<string name="max_level_download_tile_descr">다운로드할 최대 줌 레벨을 선택하세요</string>
 	<string name="route_general_information">전체거리 %1$s, 여행시간 %2$d h %3$d m.</string>
 	<string name="router_service_descr">온라인 또는 오프라인 라우팅 서비스를 선택합니다</string>
-	<string name="router_service">라우터 서비스</string>
+	<string name="router_service">라우팅 서비스</string>
 	<string name="sd_dir_not_accessible">저장할 SD 카드 디렉토리에 접근할 수 없습니다</string>
 	<string name="download_question">{0} - {1} 을 다운로드할까요?</string>
 	<string name="download_question_exist">{0} 에 대한 오프라인 데이터가 이미 존재합니다({1}). 업데이트할까요({2}) ?</string>
@@ -798,7 +798,7 @@
 <string name="exit_Button">종료</string>
 <string name="map_Button">지도</string>
 <string name="settings_Button">설정</string>
-<string name="favorites_Button">내 장소</string>
+<string name="favorites_Button">장소</string>
 <string name="search_button">검색</string>
 <string name="search_activity">검색</string>
 
@@ -978,7 +978,7 @@
     <string name="speech_rate">음성 속도</string>
     <string name="complex_route_calculation_failed">빠른 경로 계산 실패(%s), 느린 계산으로 돌아감.</string>
     <string name="disable_complex_routing">복잡한 라우팅 사용불가</string>
-    <string name="amenity_type_seamark">Seamark</string>
+    <string name="amenity_type_seamark">만조선(Seamark)</string>
     <string name="app_modes_choose">앱 프로필</string>
 	<string name="map_widget_map_rendering">지도 렌더링</string>
     <string name="app_mode_hiking">하이킹</string>
@@ -1787,7 +1787,7 @@
 	<string name="osmo_settings_uuid">고유 장치 id</string>
     <string name="osmo_settings_descr">모니터링 설정을 구성하고 개인 모니터링 채널을 설정</string>
     <string name="osmo_plugin_description">"OpenStreetMap 고급 실시간 모니터링. 이에 대해서는 http://osmo.mobi를 참조 하십시오. 다른 장치를 추적하고 추적받는 가능성을 제공 합니다. 익명 그룹을 만들고, 서로의 위치를 공유하고 소통한다. 세션 트래킹 또는 영구 트래킹에 대한 다양한 설정을 합니다. 익명그룹는 수많은 날에 제한되며  일부 기능 즉, 원격 제어 및 그룹 관리자는 제한된다. 완벽하게 기능적인 그룹은 웹사이트에 생성하고 그들에게 등록된 사용자만 액세스할 수 있습니다. "</string>
-    <string name="osmo_plugin_name">OsMo (실시간 친구위치 공유)</string>
+    <string name="osmo_plugin_name">OsMo (친구위치 공유)</string>
     <string name="osmo_settings">OsMo (실시간 친구찾기)</string>
    	<string name="share_route_as_gpx">루트를 GPX 파일로 공유</string>
 	<string name="share_route_subject">OsmAnd를 통해 공유된 경로</string>
@@ -1892,8 +1892,8 @@
     <string name="selected_track">선택된 경로</string>
     <string name="my_tracks">내 GPX경로</string>
     <string name="my_favorites">내 즐겨찾기</string>
-    <string name="my_data_Button">내 장소</string>
-    <string name="my_data_activity">내 장소</string>
+    <string name="my_data_Button">장소</string>
+    <string name="my_data_activity">장소</string>
     <string name="gpx_info_subtracks">"하위 경로 : %1$s "</string>
 	<string name="gpx_info_distance">거리: %1$s (%2$s points) </string>
 	<string name="gpx_info_start_time">시작 시간: %1$tF,  %1$tR </string>

From fc44f207c0cc10828fb3edee6150ec57cf97fa4a Mon Sep 17 00:00:00 2001
From: IreuN <gatkowski.michal@gmail.com>
Date: Sat, 8 Nov 2014 13:54:49 +0100
Subject: [PATCH 06/53] Translated using Weblate (Polish)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-pl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 7b7b6897eb..fd258cef9f 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1976,10 +1976,10 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="select_impassable_road">Wybierz mapę</string>
     <string name="impassable_road">Unikaj dróg…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Trasy tramwajowe i kolejowe</string>
-    <string name="tip_recent_changes_1_9_t">"Zmiany w 1.9: * Aktualizacja stylów mapy z renderowaniem warstw nawierzchni drogi, transportu i symboli turystycznych * Wyszukiwanie punktów POI wzdłuż trasy * Zaznacz nieprzejezdną drogę dla danego przejazdu * Łatwiejsze do pobrania i aktualizacji mapy * Otrzymywanie powiadomień wizualnych i audio podczas zbliżania się do punktu * Drukuj informacje o trasie i manewrach * Wsparcie dla asystenta pasa ruchu * Wsparcie Android Wear * Dużo zmiany UI * Oddzielne powiększenie rozmiaru dla tekstu na mapie * Specjalne powiadomienia dźwiękowe w przypadku niewyświetlania trasy * Funkcjonalności logowania do Osmo * Poprawienie niezgodności versio Osmo "</string>
+    <string name="tip_recent_changes_1_9_t">"Zmiany w 1.9: * Aktualizacja stylów mapy z renderowaniem warstw nawierzchni drogi, transportu i symboli turystycznych * Wyszukiwanie punktów POI wzdłuż trasy * Zaznaczanie nieprzejezdnej drogi dla danego przejazdu * Ułatwienia pobrania i aktualizacji mapy * Otrzymywanie powiadomień wizualnych i audio podczas zbliżania się do punktu * Drukuj informacje o trasie i manewrach * Wsparcie dla asystenta pasa ruchu * Wsparcie Android Wear * Dużo zmian UI * Oddzielne powiększenie rozmiaru dla tekstu na mapie * Specjalne powiadomienia dźwiękowe w przypadku zjechania z trasy * Funkcjonalności logowania do Osmo * Poprawienie niezgodności wersji OsMo "</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Trasy pociągów</string>
     <string name="rendering_attr_tramRoutes_name">Trasy tramwajowe</string>
-    <string name="rendering_attr_shareTaxiRoutes_name">Trasy taxi</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Udostępniaj trasy taxi</string>
     <string name="rendering_attr_trolleybusRoutes_name">Trasy trolejbusowe</string>
     <string name="rendering_attr_busRoutes_name">Trasy autobusowe</string>
     <string name="rendering_category_hide">Ukryj</string>

From 5d97c89f692b806c1d7023a2dd73e768c8aa9888 Mon Sep 17 00:00:00 2001
From: Damjan Gerl <damjan@damjan.net>
Date: Sat, 8 Nov 2014 16:25:09 +0100
Subject: [PATCH 07/53] Translated using Weblate (Slovenian)

Currently translated at 98.4% (1535 of 1559 strings)
---
 OsmAnd/res/values-sl/strings.xml | 64 ++++++++++++++++----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 5553e2b430..12ac27207e 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -719,9 +719,8 @@
 	<string name="index_settings">Upravljanje datotek zemljevidov</string>
 	<string name="osmand_service">Način spanja</string>
 	<string name="osmand_service_descr">Uporabi za izvajanje OsmAnd, ko je zaslon izklopljen</string>
-	<string name="binary_map_download_success">Prejem je uspešen.
-		\n\t\n\tZa uporabo omogočite \'Meni\' → \'Sloji zemljevida\' → \'Vir zemljevidov …\' → Nepovezani vektorski zemljevidi\'.
-	</string>
+	<string name="binary_map_download_success">"Prejem je uspešen.
+\n\t\n\tZa uporabo omogočite \'Meni\' → \'Nastavitve zemljevida\' → \'Vir zemljevidov …\' → \'Nepovezani vektorski zemljevidi\'. "</string>
 	<string name="tip_day_night_mode">Način dneva/noči</string>
 	<string name="daynight_mode_auto">Sončni vzhod / zahod</string>
 	<string name="daynight_mode_day">Dnevni</string>
@@ -729,14 +728,13 @@
 	<string name="daynight_mode_sensor">Svetlobno tipalo</string>
 	<string name="daynight">Dnevni / nočni način</string>
 	<string name="daynight_descr">Izberi način preklopa za Dnevni / Nočni način</string>
-	<string name="tip_day_night_mode_t_v2">Izgled zemljevida se lahko za vektorske karte menja med dnevnim (svetlejšim) in nočnim (temnejšim) videzom. Nočne barve so varnejše za nočno vožnjo.
-		\n\nPreklop med dnevnim in nočnim načinom lahko nastavljate v \'Meni\' → \'Nastavitev zaslona …\' → \'zemljevid dan/noč\'.
-		\n\nMožnosti so:
-		\n\t\* \'Sončni vzhod/zahod\': avtomatski način glede na položaj sonca (privzeto)
-		\n\t\* \'Dnevni\': vedno se uporablja dnevni način
-		\n\t\* \'Nočni\': vedno se uporablja nočni način
-		\n\t\* \'Svetlobni senzor\': izgled zemljevida nadzoruje svetlobno tipalo naprave (če je na voljo)
-	</string>	
+	<string name="tip_day_night_mode_t_v2">"Izgled zemljevida se lahko za vektorske karte menja med dnevnim (svetlejšim) in nočnim (temnejšim) videzom. Nočne barve so varnejše za nočno vožnjo.
+\n\nPreklop med dnevnim in nočnim načinom lahko nastavljate v \'Meni\' → \'Nastavitve zemljevida\' → \'Zemljevid dan/noč\'.
+\n\nMožnosti so:
+\n\t* \'Sončni vzhod/zahod\': avtomatski način glede na položaj sonca (privzeto)
+\n\t* \'Dnevni\': vedno se uporablja dnevni način
+\n\t* \'Nočni\': vedno se uporablja nočni način
+\n\t* \'Svetlobni senzor\': izgled zemljevida nadzoruje svetlobno tipalo naprave (če je na voljo) "</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">Razpoložljiv prostor je sedaj {2}MB! Ali želite prejeti {0} datotek(o) ({1}MB)?</string>
 	
@@ -793,7 +791,7 @@
 	<string name="gpx_option_reverse_route">Obratna smer GPX</string>
 	<string name="gpx_option_destination_point">Uporabi trenuten cilj</string>
 	<string name="gpx_option_from_start_point">Podaj celotno sled</string>
-	<string name="switch_to_vector_map_to_see">Za to mesto so na voljo vektorski zemljevidi za uporabo brez povezave.\n\t\n\tZa njihovo uporabi omogočite \'Meni\' → \'Sloji zemljevida\' → \'Vir zemljevida …\' → \'Vektorski zemljevidi za uporabo brez povezave\'.</string>
+	<string name="switch_to_vector_map_to_see">Za to mesto so na voljo vektorski zemljevidi za uporabo brez povezave.\n\t\n\tZa njihovo uporabi omogočite \'Meni\' → \'Nastavitve zemljevida\' → \'Vir zemljevida …\' → \'Vektorski zemljevidi za uporabo brez povezave\'.</string>
 	<string name="voice_stream_notification">Obvestilni zvok</string>
 	<string name="voice_stream_music">Zvok predstavnosti/glasbe</string>
 	<string name="warning_tile_layer_not_downloadable">Program ne more prejeti plasti zemljevida %1$s, poskusite jo ponovno namestiti.</string>
@@ -828,7 +826,7 @@
 	<string name="tip_favorites_t">"Pogosto uporabljene točke si lahko shranite kot Priljubljene na naslednji način:
 \n\nPojdite v \'Uporabi lokacijo\' kontekstni meni katerikoli točke zemljevida in izberite \'Dodaj med priljubljene\' in nato vnesite ime.
 \n\nPo shranjevanju priljubljene točke je ta dostopna preko \'Meni\' → \'Moji kraji\'. Dolg pritisk na priljubljeni točki v meniju \'Priljubljene\' vam nudi možnost, da jo določite kot cilj, uredite ali izbrišete.
-\n\nZa prikaz vseh priljubljenih točk direktno na zemljevidu, omogočite sloj \'Priljubljene\' v \'Meni\' → \'Sloji zemljevida\'. "</string>
+\n\nZa prikaz vseh priljubljenih točk direktno na zemljevidu, omogočite sloj \'Priljubljene\' v \'Meni\' → \'Nastavitve zemljevida\'. "</string>
 	<string name="transport">Prevoz</string>
 	<string name="additional_settings">Dodatne nastavitve</string>
 	<string name="settings">Nastavitve</string>
@@ -992,10 +990,9 @@ Pomembnejše lastnosti:
 	<string name="first_time_download">Prenos območij</string>
 	<string name="search_poi_location">Iskanje znaka …</string>
 	<string name="search_near_map">Iskanje v bližini zadnje lokacije</string>
-	<string name="tip_map_switch_t_v2">Vir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' → \'Sloji zemljevida\'.
-		\n\nPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\' v \'Nastavitve\' → \'Upravljalnik vtičnikov\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku.
-		\n\nOsmAnd podpira tudi vire po meri.
-	</string>
+	<string name="tip_map_switch_t_v2">"Vir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' → \'Nastavitve zemljevida\'.
+\n\nPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\' v \'Nastavitve\' → \'Upravljalnik vtičnikov\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku.
+\n\nOsmAnd podpira tudi vire po meri. "</string>
 	<string name="fav_saved_sucessfully">Priljubljene točke uspešno shranjene v {0}</string>
 	<string name="opening_hours_not_supported">Oblika delovnega časa ni podprta za urejanje</string>
 	<string name="add_new_rule">Dodajanje novega pravila</string>
@@ -1549,12 +1546,9 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="edit_tilesource_choose_existing">Izberite obstoječo…</string>
     <string name="edit_tilesource_name">Ime</string>
     <string name="maps_define_edit">Določi/Uredi …</string>
-	<string name="tip_map_styles_t">OsmAnd podpira prikazovanje vektorskih zemljevidov za uporabo brez povezave v različnih slogih, tako da ustrezajo vašim potrebam:
-		\n\nRazen \'privzetega\' sloga zemljevida, lahko v \'Meni\' → \'Nastavitve zaslona\' → \'Slog zemljevida\' zberete npr.:
-		\n\t* 
-		\n\t* 
-		\n\t*
-	</string>
+	<string name="tip_map_styles_t">"OsmAnd podpira prikazovanje vektorskih zemljevidov za uporabo brez povezave v različnih slogih, tako da ustrezajo vašim potrebam:
+\n\nRazen \'privzetega\' sloga zemljevida, lahko v \'Meni\' → \'Nastavitve zemljevida\' → \'Slog zemljevida\' zberete npr.:
+\n\t* The \'Touring view\' style, which contains the most detailed information feasable for traveling and touring, including optimization for professional drivers (higher contrast, distinguishable roads), options for Alpine hiking (SAC scale), cycle routes, hiking symbol support, etc. ↵\n\t* \'High contrast roads\' shows roads in very accentuated colors for bright ambient lighting situations ↵\n\t* \'Winter and ski\' creates a (snow covered) winter landscape view, and shows global ski slopes and lifts (in connection with the \'World ski\' map download) "</string>
     <string name="base_world_map">Osnovni zemljevid sveta</string>
 	<string name="default_and">in</string>
     <string name="default_or">ali</string>
@@ -1647,8 +1641,8 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="routing_attr_avoid_ferries_description">Izogibanje trajektom</string>
 	<string name="routing_attr_avoid_motorway_name">Izogibanje avtocestam</string>
 	<string name="routing_attr_avoid_motorway_description">Izogibanje avtocestam</string>
-	<string name="routing_attr_weight_name">Največja teža</string>
-	<string name="routing_attr_weight_description">Določite težo vozila za omejitve</string>
+	<string name="routing_attr_weight_name">Omejitev teže</string>
+	<string name="routing_attr_weight_description">Označuje dovoljeno težo vozila na poti</string>
     <string name="app_mode_truck">Tovornjak</string>
     <string name="index_item_world_bitcoin_payments">Svetovna Bitcoin plačila</string>
 	<string name="index_item_world_basemap">Pregledni zemljevid sveta</string>
@@ -1884,7 +1878,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="lang_zh_CN">Poenostavljena kitajščina</string>
 	<string name="lang_zh_TW">Tradicionalna kitajščina</string>
 	<string name="lang_sc">Sardinščina</string>
-	<string name="rendering_attr_subwayMode_name">Način podzemne železnice</string>
+	<string name="rendering_attr_subwayMode_name">Proge podzemne železnice</string>
  	<string name="continue_navigation">Nadaljuj navigacijo</string>
     <string name="rendering_attr_alpineHiking_name">Skala alpskega pohodništva (SAC)</string>
     <string name="osmo_invite">Povabite...</string>
@@ -1916,7 +1910,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="save_global_track_interval">Splošni interval beleženja</string>
 	<string name="save_track_to_gpx_globally">Beleži sled v datoteko GPX</string>
 	<string name="save_track_interval_globally">Interval beleženja</string>
-	<string name="rendering_attr_publicTransportMode_name">Način javni prevoz</string>
+	<string name="rendering_attr_publicTransportMode_name">Avtobusne, trolejbusne in druge proge</string>
 	<string name="record_plugin_name">Registracija vaših potovanj</string>
     <string name="index_tours">Izleti</string>
     <string name="waypoints">Točke</string>
@@ -1942,12 +1936,18 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="rendering_attr_osmcTraces_name">Prosojnica s simboli za pohodništvo</string>
     <string name="select_impassable_road">Izberi na zemljevidu</string>
     <string name="impassable_road">Izogibanje cestam…</string>
-    <string name="rendering_attr_tramTrainRoutes_name">Tramvaj in vlak</string>
-    <string name="rendering_attr_busRoutes_name">Avtobusne linije</string>
+    <string name="rendering_attr_tramTrainRoutes_name">Proge tramvaja in vlaka</string>
+    <string name="rendering_attr_busRoutes_name">Proge avtobusov</string>
     <string name="rendering_category_hide">Skrij</string>
     <string name="rendering_category_routes">Proge</string>
-    <string name="rendering_attr_trolleybusRoutes_name">Troljebusne linije</string>
-    <string name="rendering_attr_tramRoutes_name">Tramvajske proge</string>
-    <string name="rendering_attr_shareTaxiRoutes_name">Linije deljenih taksijev</string>
+    <string name="rendering_attr_trolleybusRoutes_name">Proge trolejbusa</string>
+    <string name="rendering_attr_tramRoutes_name">Proge tramvaja</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Proge deljenih taksijev</string>
     <string name="rendering_category_details">Podrobnosti</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Proge vlakov</string>
+    <string name="wake_on_voice">Vklopiti zaslon</string>
+    <string name="wake_on_voice_descr">Zaslon telefona se vklopi, ko se približujete obratu</string>
+    <string name="wake_on_voice_never">Nikoli</string>
+    <string name="rendering_category_transport">Prevoz</string>
+    <string name="rendering_category_others">Druge lastnosti zemljevida</string>
     </resources>

From e95c43a53805c79b6c06c6e8641fe6eae527e18d Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Sat, 8 Nov 2014 03:29:08 +0100
Subject: [PATCH 08/53] Translated using Weblate (Traditional Chinese)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-zh-rTW/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 7c9ed261b1..e8f0d3465b 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -890,7 +890,7 @@
 	<string name="save_track_interval">在導航期間的記錄間隔</string>
 	<string name="save_track_interval_descr">在導航整個期間，為軌跡記錄選取記錄間隔</string>
 	<string name="save_track_to_gpx_descrp">在導航的整個期間，軌跡將會儲存在 track 目錄</string>
-	<string name="save_track_to_gpx">在導航的整個期間，記錄軌跡成 GPX 檔案</string>
+	<string name="save_track_to_gpx">導航期間記錄軌跡成 GPX 檔案</string>
 	<string name="update_tile">更新地圖</string>
 	<string name="reload_tile">重新載入圖磚</string>
 	<string name="mark_point">目的地</string>

From 3f4b37b0471c9084447b4db4ccfcc4848451a2cf Mon Sep 17 00:00:00 2001
From: Damjan Gerl <damjan@damjan.net>
Date: Sat, 8 Nov 2014 22:09:39 +0100
Subject: [PATCH 09/53] Translated using Weblate (Slovenian)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-sl/strings.xml | 38 ++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 12ac27207e..1c5e549ca6 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -187,7 +187,7 @@
 	<string name="starting_point_too_far">Izhodišče predaleč od najbližje ceste.</string>
 	<string name="rendering_attr_noPolygons_description">Naredite vse ploskovne entitete na zemljevidu prosojne</string>
 	<string name="rendering_attr_noPolygons_name">Brez ploskev</string>
-	<string name="rendering_attr_appMode_name">Način izrisa</string>
+	<string name="rendering_attr_appMode_name">Način upodabljanja</string>
 	<string name="rendering_attr_appMode_description">Optimiziranje karte za</string>
 	<string name="rendering_attr_contourLines_name">Prikaži izohipse</string>
 	<string name="zoomOut">Oddalji</string>
@@ -618,7 +618,7 @@
 	<string name="osm_editing_plugin_description">Pokaži nastavitve, ki so zahtevane za povratne informacije OSM kot so zbiranje/spreminjanje predmetov POI OSM, odpiranje/komentiranje hroščev OSM in prispevanje posnetih sledi GPX (zahteva poverila OSM).</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Vektorski zemljevidi se bodo verjetno prikazali hitreje. Morda na nekaterih napravah ne bodo dobro delovali.</string>
 	<string name="debugging_and_development">Razvoj OsmAnd</string>
-	<string name="native_rendering">Nativno izrisovanje</string>
+	<string name="native_rendering">Izvirno upodabljanje</string>
 	<string name="switch_to_raster_map_to_see">Za to mesto krajevni zemljevidi niso prisotni. Prejmete jih lahko v nastavitvah (Upravljanje datotek zemljevidov) ali preklopite na spletne zemljevide (za to morate omogočiti vtičnik za spletne zemljevide).</string>
 	<string name="gpx_tags_txt">Oznake</string>
 	<string name="gpx_description_txt">Opis</string>
@@ -782,8 +782,8 @@
 	<string name="local_index_installed">Izdaja</string>
 	<string name="map_text_size_descr">Izberite velikost besedila za imena na zemljevidu</string>
 	<string name="map_text_size">Velikost pisave zemljevida</string>
-	<string name="trace_rendering">Podatki razhroščevanja izrisovanja</string>
-	<string name="trace_rendering_descr">Prikaži zmogljivost izrisovanja</string>
+	<string name="trace_rendering">Podatki razhroščevanja upodabljanja</string>
+	<string name="trace_rendering_descr">Prikaži zmogljivost upodabljanja</string>
 	<string name="voice_not_use">Ne uporabi</string>
 	<string name="voice_not_specified">Brez</string>
 	<string name="internet_connection_required_for_online_route">Izbrana je storitev spletne navigacije, vendar internetna povezava ni na voljo.</string>
@@ -868,13 +868,13 @@
 	<string name="context_menu_item_download_map">Prenos zemljevida</string>
 	<string name="select_max_zoom_preload_area">Izberite največjo povečavo za predhodno nalaganje</string>
 	<string name="maps_could_not_be_downloaded">Tega zemljevida ni bilo mogoče prejeti</string>
-	<string name="continuous_rendering">Stalno izrisovanje</string>
-	<string name="continuous_rendering_descr">Prikaži stalno izrisovanje namesto slike-na-enkrat</string>
+	<string name="continuous_rendering">Stalno upodabljanje</string>
+	<string name="continuous_rendering_descr">Prikaži stalno upodabljanje namesto slike-na-enkrat</string>
 	<string name="rendering_exception">Med izrisovanjem izbranega področja je prišlo do napake</string>
 	<string name="renderer_load_sucess">Izrisovalnik je bil uspešno naložen</string>
 	<string name="renderer_load_exception">Prišlo je do izjeme: izrisovalnik ni bil naložen</string>
 	<string name="renderers">Vektorski izrisovalnik</string>
-	<string name="renderers_descr">Izberite videz izrisovalnika</string>
+	<string name="renderers_descr">Izberite videz upodabljanja</string>
 	<string name="poi_context_menu_website">Pokaži spletišče POI</string>
 	<string name="poi_context_menu_call">Pokaži telefon POI</string>
 	<string name="download_type_to_filter">tipkajte za filtriranje</string>
@@ -1950,4 +1950,28 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="wake_on_voice_never">Nikoli</string>
     <string name="rendering_category_transport">Prevoz</string>
     <string name="rendering_category_others">Druge lastnosti zemljevida</string>
+    <string name="map_widget_appearance_rem">Preostali elementi</string>
+    <string name="map_widget_top">Statusna vrstica</string>
+	<string name="map_widget_right">Desna plošča</string>
+	<string name="map_widget_left">Leva plošča</string>
+    <string name="layers_category_show">Pokaži</string>
+	<string name="configure_map">Nastavitve zemljevida</string>
+    <string name="search_radius_proximity">V bližini</string>
+    <string name="osmo_device_not_found">Naprave ni mogoče najti</string>
+    <string name="osmo_no_connection_msg">OsMo storitev ni na voljo:\n- preverite povezavo;\n- preverite nastavitve;\n- oglejte si naš Twitter: https://twitter.com/OsMomobi</string>
+    <string name="anonymous_user_hint">Anonimni uporabnik ne more:\n- ustvariti skupin;\n- sinhronizirati skupin in naprav s strežnikom;\n- upravljati skupin in naprav v zasebnem uradu.</string>
+    <string name="anonymous_user">Anonimni uporabnik</string>
+    <string name="logged_as">Prijavljen kot %1$s</string>
+	<string name="speed_limit_exceed">Toleranca omejitve hitrosti</string>
+	<string name="speed_limit_exceed_message">Izberite mejo tolerance omejitve hitrosti, nad katero boste prejeli glasovno opozorilo.</string>
+	<string name="print_route">Tiskanje poti</string>
+    <string name="test_native_render">Poskus izvirnega upodabljanja</string>
+    <string name="use_native_render_descr">Uporabi C++ upodabljanje namesto Java</string>
+    <string name="tip_recent_changes_1_9_t">"Spremembe v 1.9:\n\t* Posodobljeni stili zemljevida s upodabljanjem površine cestišča, transportnih plasti in pohodniških simbolov\n\t* Iskanje POI na poti\n\t* Označi cesto kot neprehodno na sejo\n\t* Lažje nalaganje in posodabljanje zemljevidov\n\t* Vizualno in zvočno obvestilo, ki se izvede ko se približujete točkam\n\t* Tisk poti in informacij o zavojih\n\t* Podpora pasov za zavijanje\n\t* Podpora Android Wear\n\t* Veliko sprememb grafičnega vmesnika\n\t* Ločena povečava za velikost črk na zemljevidu\n\t* Posebna zvočna obvestila v primeru, da niste na poti\n\t* Funkcionalnost prijave v OsMo\n\t* Popravilo OsMo nezdružljivosti različic "</string>
+    <string name="test_native_render_msg">Začetek aktivnosti z izvirnim upodabljanjem</string>
+    <string name="fav_point_dublicate">Podvojeno ime priljubljene lokacije</string>
+    <string name="fav_point_dublicate_message">Ime vaše priljubljene lokacije je bilo spremenjeno v %1$s, da bi se izognili podvojenih imen.</string>
+    <string name="use_native_render">Uporabi izvirno upodabljanje</string>
+    <string name="lock_screen_request_explanation">%1$s potrebuje to dovoljenje za izklop zaslona za funkcijo varčevanja z energijo.</string>
+    <string name="fav_point_emoticons_message">Ime vaše priljubljene lokacije je bilo spremenjeno v %1$s, da se omogoči pravilno shranjevanje nizov s smeški v datoteko.</string>
     </resources>

From e01a98fa13876b3f86b1b9e4e1eb8047c7d21966 Mon Sep 17 00:00:00 2001
From: Zahnstocher <openstreetmap.org@nurfuerspam.de>
Date: Sun, 9 Nov 2014 03:41:08 +0100
Subject: [PATCH 10/53] fix route recalculation and screen update issue on
 MapActivity resume

---
 OsmAnd/src/net/osmand/plus/TargetPointsHelper.java     | 10 +++++++++-
 OsmAnd/src/net/osmand/plus/activities/MapActivity.java |  8 +++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
index 4695406e8f..2be0be1dfb 100644
--- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
@@ -124,7 +124,15 @@ public class TargetPointsHelper {
 		return intermediatePoints;
 	}
 	
-
+	public List<LatLon> getIntermediatePointsLatLon() {
+		List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>();
+		
+		for (TargetPoint t : intermediatePoints) {
+			intermediatePointsLatLon.add(t.point);
+		}
+		
+		return intermediatePointsLatLon;
+	}
 
 	public List<TargetPoint> getIntermediatePointsWithTarget() {
 		List<TargetPoint> res = new ArrayList<TargetPoint>();
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 406a47e1b8..2b8184403d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -312,9 +312,7 @@ public class MapActivity extends AccessibleActivity implements
 	@Override
 	protected void onResume() {
 		super.onResume();
-		if (wakeLock != null) {
-			return;
-		}
+
 		cancelNotification();
 		//fixing bug with action bar appearing on android 2.3.3
 		if (getSupportActionBar() != null){
@@ -356,8 +354,8 @@ public class MapActivity extends AccessibleActivity implements
 		TargetPointsHelper targets = app.getTargetPointsHelper();
 		RoutingHelper routingHelper = app.getRoutingHelper();
 		if (routingHelper.isFollowingMode() && (
-				!Algorithms.objectEquals(targets.getPointToNavigate(), routingHelper.getFinalLocation() )||
-				!Algorithms.objectEquals(targets.getIntermediatePoints(), routingHelper.getIntermediatePoints())
+				!Algorithms.objectEquals(targets.getPointToNavigate().point, routingHelper.getFinalLocation() )||
+				!Algorithms.objectEquals(targets.getIntermediatePointsLatLon(), routingHelper.getIntermediatePoints())
 				)) {
 			targets.updateRouteAndReferesh(true);
 		}

From 004bf6919c459a6bf8751f764582df00291e4139 Mon Sep 17 00:00:00 2001
From: User99gmxat <user_99@gmx.at>
Date: Sun, 9 Nov 2014 19:35:06 +0100
Subject: [PATCH 11/53] Update strings.xml

New strings updated
---
 OsmAnd/res/values-de/strings.xml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index fb42bd54bc..9cfa7b5965 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
 	<string name="traffic_warning_border_control">Grenzkontrolle</string>
@@ -684,9 +684,9 @@
 		\n\tZur Verwendung aktivieren: \'Menu\' → \'Karte konfigurieren\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'.</string>
 	<string name="choose_audio_stream">Navi-Sprachausgabe</string>
 	<string name="choose_audio_stream_descr">Ausgabemodus für Sprachansagen wählen (Systemabhängig)</string>
-	<string name="voice_stream_voice_call">wie Anrufe</string>
-	<string name="voice_stream_notification">wie Benachrichtigungen</string>
-	<string name="voice_stream_music">wie Medien/Musik</string>
+	<string name="voice_stream_voice_call">Wie Anrufe</string>
+	<string name="voice_stream_notification">Wie Benachrichtigungen</string>
+	<string name="voice_stream_music">Wie Medien/Musik</string>
 	<string name="warning_tile_layer_not_downloadable">Kartenebene %1$s wurde nicht heruntergeladen, bitte nochmal laden.</string>
 	<string name="overlay_transparency_descr">Transparenz der Overlay-Karte ändern</string>
 	<string name="overlay_transparency">Overlay-Transparenz</string>
@@ -1596,8 +1596,8 @@
 	<string name="sort_by_distance">Sortieren nach Entfernung</string>
 	<string name="sort_by_name">Sortieren nach Namen</string>
 	<string name="visible_element">Auf Karte anzeigen</string>
-	<string name="show_zoom_buttons_navigation_descr">Zoom-Buttons bei Navigation anzeigen</string>
-	<string name="show_zoom_buttons_navigation">Zeige Zoom-Buttons</string>
+	<string name="show_zoom_buttons_navigation_descr">Zoom-Tasten bei Navigation anzeigen</string>
+	<string name="show_zoom_buttons_navigation">Zoom-Tasten anzeigen</string>
 	<string name="no_index_file_to_download">Download-Ziel nicht gefunden. Bitte Internet-Verbindung überprüfen.</string>
 	<string name="none_selected_gpx">Keine GPX-Spur ausgewählt. Zum Auswählen auf eine Spur lange drücken.</string>
 	<string name="local_index_unselect_gpx_file">Deselektieren</string>
@@ -1848,8 +1848,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="osmo_auto_send_locations_descr">Aufzeichnung automatisch starten und Standorte nach dem Starten der Anwendung senden</string>
 	<string name="osmo_auto_send_locations">Aufzeichnung automatisch starten</string>
 	<string name="osmo_tracker_id">Persönliche Aufzeichnungs-ID</string>
-	<string name="osmo_tracker_id_descr">Zum Anzeigen oder Teilen der Aufzeichnungs-ID tippen.
-	Mit der Aufzeichnungs-ID verbundene Geräte können alle Bewegungen dieses Geräts aufzeigen! Zum Trennen der Verbindung die Regenerieren-Option auswählen.</string>
+	<string name="osmo_tracker_id_descr">Zum Anzeigen oder Teilen der Aufzeichnungs-ID tippen. Mit der Aufzeichnungs-ID verbundene Geräte können alle Bewegungen dieses Geräts aufzeigen! Zum Trennen der Verbindung die Regenerieren-Option auswählen.</string>
 	<string name="osmo_session_token">Sitzungstoken: %1$s</string>
 	<string name="osmo_auth_pending">Auf Autorisierung warten…</string>
 	<string name="osmo_locations_sent">Gesendete Standorte %1$d (im Zwischenspeicher %2$d) </string>
@@ -1971,7 +1970,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="way_alarms">Verkehrswarnungen</string>
     <string name="record_plugin_description">Speichern Sie Ihre Tracks mit einem Klick. Zeigt die Einstellung, wie Strecken aufgezeichnet werden – in lokale GPX-Dateien oder online via Web-Service.</string>
     <string name="route_descr_destination"/>
-    <string name="local_index_description">Antippen eines Elements um mehr Details zu erfahren, Tippen und Halten zum Deaktivieren oder Löschen des Elements. Aktuell auf dem Gerät vorhandene Daten (%1$s frei):</string>
+    <string name="local_index_description">Ein Element antippen, um mehr Details zu erfahren oder antippen und halten zum Deaktivieren oder Löschen. Aktuell auf dem Gerät vorhandene Daten (%1$s frei):</string>
 	<string name="text_size_descr">Karten-Schriftgröße festlegen</string>
     <string name="text_size">Schriftgröße</string>
     <string name="fav_point_dublicate">Doppelung beim Favoriten-Namen</string>
@@ -1987,23 +1986,24 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="osmo_device_not_found">Gerät wurde nicht gefunden</string>
     <string name="osmo_no_connection_msg">OsMo-Dienst ist nicht verfügbar:\n- bitte Verbindung prüfen;\n- bitte Einstellungen prüfen;\n- ggf. Meldung auf Twitter: https://twitter.com/OsMomobi</string>
     <string name="anonymous_user">Anonymer Benutzer</string>
-    <string name="logged_as">angemeldet als %1$s</string>
+    <string name="logged_as">Angemeldet als %1$s</string>
 	<string name="anonymous_user_hint">Anonyme Benutzer können nicht:\n- Gruppen bilden;\n- Gruppen und Geräte mit dem Server synchronisieren;\n- Gruppen und Geräte im Privatbereich verwalten.</string>
     <string name="rendering_category_routes">Routen</string>
     <string name="rendering_category_details">Details</string>
     <string name="rendering_category_transport">Routen und ÖPNV</string>
-    <string name="map_widget_appearance_rem">verbleibende Elemente</string>
+    <string name="map_widget_appearance_rem">Verbleibende Elemente</string>
     <string name="map_widget_top">Statuszeile</string>
-	<string name="map_widget_right">rechtes Panel</string>
-	<string name="map_widget_left">linkes Panel</string>
+	<string name="map_widget_right">Rechtes Panel</string>
+	<string name="map_widget_left">Linkes Panel</string>
     <string name="layers_category_show">Anzeigen</string>
 	<string name="configure_map">Karte konfigurieren</string>
-    <string name="search_radius_proximity">im Umkreis von</string>
+    <string name="search_radius_proximity">Im Umkreis von</string>
     <string name="tip_recent_changes_1_9_t">"Änderungen in 1.9: * Verbesserte Karten-Stile mit Darstellung der Straßenoberflächen, ÖPNV-Layer und Wander-Symbolen * POI-Suche entlang einer berechneten Route * pro Sitzung eine Straße als nicht passierbar kennzeichnen * Vereinfachung des Karten-Downloads und der Karten-Updates * Audio-visuelle Benachrichtigung bei Annäherung an ein Zwischenziel  * Ausdruck der Reiseroute und der Fahr-Anweisungen * Auswertung von Abbiegespuren * Unterstützung von Android Wear Geräten * viele Änderungen an der Programm-Oberfläche * Separater Zoom nur für die Beschriftungen auf der Karte * Besondere Benachrichtigung bei Abweichen von der vorgegebenen Route * Anmeldung beim Dienst OsMo * Verbesserungen bei der Kompatibilität zu OsMo-Versionen "</string>
     <string name="rendering_category_others">Sonstiges</string>
     <string name="rendering_attr_tramRoutes_name">Straßenbahnenlinien</string>
     <string name="wake_on_voice">Bildschirm aktivieren</string>
-    <string name="wake_on_voice_descr">Bildschirm aktivieren bei Navigations-Anweisung</string>
+    <string name="wake_on_voice_descr">Bildschirm bei Navigationsanweisung aktivieren</string>
+    <string name="wake_on_voice_never">Niemals</string>
     <string name="select_impassable_road">Auswählen auf der Karte</string>
     <string name="impassable_road">Straße blockieren …</string>
     <string name="rendering_attr_tramTrainRoutes_name">Straßen- und Eisenbahnlinien</string>
@@ -2012,4 +2012,5 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="rendering_attr_trolleybusRoutes_name">Oberleitungsbuslinien</string>
     <string name="rendering_attr_busRoutes_name">Buslinien</string>
     <string name="rendering_category_hide">Ausblenden</string>
+    <string name="lock_screen_request_explanation">%1$s benötigt diese Berechtigung, um den Bildschirm auszuschalten (Energiesparfunktion).</string>
     </resources>

From 950f6024214054270cefd77bb0b4fcd3c579e9a5 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Sun, 9 Nov 2014 11:45:22 +0100
Subject: [PATCH 12/53] Translated using Weblate (Danish)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-da/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 06cc789a76..776eeb7915 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -379,7 +379,7 @@
 	<string name="native_rendering">Indbygget optegning</string>
 	<string name="test_voice_prompts">Test stemmemeddelelser</string>    
 	<string name="switch_to_raster_map_to_see">Ingen offline vektorkort til stede for denne placering. Hent et kort i \'Indstillinger\' → \'Korthåndtering\' eller skifte til onlinekort (aktiver online kort udvidelsen først).</string>
-	<string name="send_files_to_osm">Send GPX-filer til OSM?</string>
+	<string name="send_files_to_osm">Sende GPX-filer til OSM?</string>
 	<string name="gpx_visibility_txt">Synlighed</string>
 	<string name="gpx_description_txt">Beskrivelse</string>
 	<string name="validate_gpx_upload_name_pwd">Angiv OSM brugernavn og kodeord til at sende GPX-filer.</string>

From 5676ade4140082dc7d687c7f3ff31465d139ff0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= <chobkwon@gmail.com>
Date: Sun, 9 Nov 2014 13:27:40 +0100
Subject: [PATCH 13/53] Translated using Weblate (Korean)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-ko/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 0570c8eb9b..bd144d9b89 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -129,12 +129,12 @@
 	
 	<string name="routing_settings">운행 (라우팅)</string>
 	<string name="routing_settings_descr">라우팅을 위한 옵션을 설정합니다</string>
-	<string name="global_settings">글로벌 설정</string>
+	<string name="global_settings">일반 설정</string>
 	<string name="index_settings">지도 데이터 관리</string>
 	<string name="index_settings_descr">기기에 저장된 오프라인 지도를 다운로드하고 관리합니다</string>
 	<string name="general_settings">일반</string>
 	<string name="general_settings_descr">앱에 대한 디스플레이와 일반 설정을 구성합니다</string>
-	<string name="global_app_settings">글로벌 앱 설정</string>
+	<string name="global_app_settings">일반 앱 설정</string>
 	<string name="user_name">OSM 사용자 이름</string>
 	<string name="user_name_descr">http://openstreetmap.org 에 데이터 제출을 위해 필요합니다</string>
 	<string name="user_password">OSM 패스워드</string>
@@ -200,8 +200,8 @@
 	<string name="pref_vector_map">벡터 지도 설정</string>
 	<string name="delete_confirmation_msg">%1$s 를 삭제하시겠습니까?</string>
 	
-	<string name="animate_route_off">시뮬레이션 정지</string>
-	<string name="animate_route">시뮬레이션을 시작합니다</string>
+	<string name="animate_route_off">모의주행 정지</string>
+	<string name="animate_route">모의주행 시작</string>
 	
 	<string name="tip_recent_changes_0_6_8_t">0.6.8 버전에 대한 변경사항들 :
 \n\t- 완전히 재설계한 검색 (POI, 주소)! 주소 검색을 훨씬 빠르게 응답하도록 함. 여러가지 많은 옵션을 가진 단일 검색 인터페이스 생성.
@@ -810,7 +810,7 @@
 <string name="choose_available_region">목록에서 지역을 선택합니다</string>
 <string name="choose_intersected_street">교차로를 선택합니다</string>
 <string name="Closest_Amenities">가장 가까운 시설들</string>
-<string name="app_mode_default">지도 찾기</string>
+<string name="app_mode_default">지도 보기</string>
 <string name="app_mode_car">자동차</string>
 <string name="app_mode_bicycle">자전거</string>
 <string name="app_mode_pedestrian">보행자</string>

From 8ccf4fd8d0ab4e71afa6fb3e31c6decc0d34f8fb Mon Sep 17 00:00:00 2001
From: 8c6311e901274f6baef2068792c8ab <ft-002@safe-mail.net>
Date: Sun, 9 Nov 2014 15:31:59 +0100
Subject: [PATCH 14/53] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 57.7% (900 of 1559 strings)
---
 OsmAnd/res/values-nb/strings.xml | 336 ++++++++++++++++++++++---------
 1 file changed, 246 insertions(+), 90 deletions(-)

diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index f02564d14d..7d45c1d0a9 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
 	<string name="rendering_attr_roadColors_name">Veifargeskjema</string>
     <string name="map_widget_show_destination_arrow">Vis retning til målet</string>
     <string name="gps_not_available">Aktiver GPS i innstillingene</string>
@@ -12,7 +13,7 @@
     <string name="add_as_last_destination_point">Legg til som siste rutepunkt</string>
     <string name="add_as_first_destination_point">Legg til som første rutepunkt</string>
     <string name="replace_destination_point">Erstatt reisemålpunkt</string>
-    <string name="new_destination_point_dialog">Du har allerede satt reisemålpunkt.</string>
+    <string name="new_destination_point_dialog">Du har allerede satt reisemålpunktet.</string>
     <string name="target_points">Rutepunkter</string>
     <string name="intermediate_point_too_far">Rutepunkt %1$s for langt fra nærmeste vei.</string>
     <string name="arrived_at_intermediate_point">Du har kommet til ditt rutepunkt</string>
@@ -33,7 +34,7 @@
 	<string name="poi_filter_for_tourists">For turister</string>
 	<string name="poi_filter_fuel">Drivstoff</string>
 	<string name="show_warnings_title">Vis alarmer…</string>
-	<string name="show_warnings_descr">Still inn trafikkadvarsler (fartsgrenser, tvungne stopp, fartsdumper), fotoboksadvarsler og kjørefeltinformasjon</string>
+	<string name="show_warnings_descr">Still inn trafikkvarsler (fartsgrenser, tvungne stopp, fartsdumper), fotoboksvarsler og kjørefeltinformasjon</string>
 	<string name="use_compass_navigation_descr">Bruk kompass hvis det ikke er mulig med annen retningsfastsettelse</string>
 	<string name="use_compass_navigation">Bruk kompass</string>
 	<string name="avoid_motorway">Unngå motorveier</string>
@@ -44,11 +45,11 @@
 	<string name="osmand_short_description_80_chars">OsmAnd er et navigeringsprogram for offline og online kart og som er åpen kildekode</string>
 	<string name="osmand_plus_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbasert OSM-kart</string>
 	<string name="recalculate_route_to_your_location">Transportmodus:</string>
-	<string name="select_navigation_mode">Velg transportmetode</string>
+	<string name="select_navigation_mode">Velg transportmåte</string>
 	<string name="day_night_info_description">Soloppgang: %1$s \nSolnedgang: %2$s</string>
 	<string name="day_night_info">Dag/natt-info</string>
 	<string name="map_widget_day_night">Dag/natt-kart</string>
-	<string name="map_widget_vector_attributes">Opptegningsattributter:</string>
+	<string name="map_widget_vector_attributes">Opptegningsattributter</string>
 	<string name="map_widget_renderer">Kartstil</string>
 	<string name="layer_map_appearance">Still inn skjerm</string>
 	<string name="show_lanes">Vis kjørefelt</string>
@@ -84,7 +85,7 @@
 	<string name="bg_service_screen_lock_toast">Skjermen er låst</string>
 	<string name="bg_service_interval">Sett oppvåkningsintervall:</string>
 	<string name="show_cameras">Vis fotobokser</string>
-	<string name="show_traffic_warnings">Vis fartsgrenser</string>
+	<string name="show_traffic_warnings">Vis trafikkvarsler</string>
 	<string name="avoid_toll_roads">Unngå bomveier</string>
 	<string name="continue_follow_previous_route_auto">Forrige navigering var ikke ferdig. Fortsette å følge den? (%1$s sekunder)</string>
 	<string name="route_updated_loc_found">Ruten blir beregnet på nytt når sted blir funnet</string>
@@ -109,10 +110,10 @@
 	<string name="download_link_and_local_description">Klikk her for å laste ned eller oppdatere offline-data. \nKlikk eksisterende element for å se flere detaljer, trykk og hold for å deaktivere eller slette. Gjeldende data på enheten (%1$s ledig):</string>
 	<string name="unknown_from_location">Startpunkt er ennå ikke bestemt</string>
 	<string name="unknown_location">Posisjon ennå ikke kjent</string>
-	<string name="local_indexes_cat_tile">Nettbaserte kart (fliser)</string>
+	<string name="local_indexes_cat_tile">Nettbaserte kart og kartfliser</string>
 	<string name="local_indexes_cat_map">Offline-kart (vektor)</string>
 	
-	<string name="index_settings_descr">Last ned, vis detaljer og behandle offline-kart</string>
+	<string name="index_settings_descr">Last ned og håndter offline-kart lagret på enheten</string>
 	<string name="map_online_plugin_is_not_installed">Aktiver programtillegg for nettbaserte kart for å velge ulike kartkilder</string>
 	<string name="map_online_data">Nettbaserte kart (fliser)</string>
 	<string name="map_online_data_descr">Bruk nettbaserte kart (laste ned og mellomlagre fliser på SD-kort)</string>
@@ -170,7 +171,7 @@
 	<string name="direction_style_sidewise">Sideveis (8 sektorer)</string>
 	<string name="direction_style_clockwise">Med klokken (12 sektorer)</string>
 	<string name="settings_direction_style">Retningsstil</string>
-	<string name="settings_direction_style_descr">Velg stil å uttrykke relative retninger under bevegelse</string>
+	<string name="settings_direction_style_descr">Velg stil til å uttrykke relative retninger under bevegelse</string>
 	<string name="auto_announce_on">Start auto-annonsering</string>
 	<string name="auto_announce_off">Stopp auto-annonsering</string>
 	<string name="scroll_map_by_gestures_descr">Rull kartet med bevegelser på berøringsskjermen</string>
@@ -211,11 +212,11 @@
 	<string name="fav_export_confirmation">Fil med tidligere eksporterte favoritter finnes allerede. Vil du erstatte den?</string>
 	<string name="profile_settings">Profilspesifikke innstillinger</string>
 	<string name="settings_preset">Standardprofil</string>
-	<string name="settings_preset_descr">Velg en brukerprofil med egendefinert kart og navigeringsinnstillinger.</string>
+	<string name="settings_preset_descr">Kartvisning- og navigeringsinnstillinger lagres per profil. Sett din standardprofil her.</string>
 	<string name="routing_settings">Navigering</string>
 	<string name="routing_settings_descr">Spesifiser navigeringsalternativer</string>
 	<string name="global_settings">Globale innstillinger</string>
-	<string name="index_settings">Databehandling</string>
+	<string name="index_settings">Karthåndtering</string>
 	<string name="general_settings">Generelt</string>
 	<string name="general_settings_descr">Still inn visning og generelle programinnstillinger</string>
 	<string name="global_app_settings">Globale programinnstillinger</string>
@@ -226,17 +227,12 @@
 		\n\t\'I bevegelsesretning\' - Kartorienteringen justeres kontinuerlig til bevegelsesretningen
 		\n\t\'Ifølge kompass\' - Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten
 	</string>
-	<string name="binary_map_download_success">Nedlasting vellykket.\n\t\n\tFor å bruke aktiver \'Meny\' -&gt; \'Vis\' -&gt; \'Kartkilde...\' -&gt; \'Offline vektorkart\'.</string>
+	<string name="binary_map_download_success">"Nedlasting vellykket.
+\n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'. "</string>
 	<string name="tip_day_night_mode">Dag/natt-modus</string>
-	<string name="tip_day_night_mode_t_v2">\tKartutseende kan for noen vektorkart endres mellom dag (lysere) og natt (mørkere).
-		\n\tNattfarger er tryggere for mørkekjøring.
-		\n\tDag/natt-veksling kan velges i \'Meny\' -&gt; \'Konfigurer skjerm...\' -&gt;\'Dag/natt-kart\'.
-		\n\tValgene er:
-		\n\t\'Soloppgang/-nedgang\' - automatisk modus, kontrollert av solens posisjon (standard)
-		\n\t\'Dag\' - bruk alltid dagmodus
-		\n\t\'Natt\' - bruk alltid nattmodus 
-		\n\t\'Lyssensor\' - kartutseende styres av lyssensoren på enheten (kun hvis utstyrt med)
-	</string>	
+	<string name="tip_day_night_mode_t_v2">"Kartutseende kan for offline-vektorkart endres mellom dag (lysere) og natt (mørkere).\tNattfarger er tryggere og mer komfortable for mørkekjøring.
+\n\nSett regler for skifte av dag/natt i \'Meny\' → \'Still inn kart\' → \'Dag/natt-kart\'.
+\n\nValgene er: ↵\n→* \'Soloppgang/-nedgang\': Automatisk modus, kontrollert av solens posisjon (standard) ↵\n→* \'Dag\': Bruk alltid dagmodus ↵\n→* \'Natt\': Bruk alltid nattmodus ↵\n→* \'Lyssensor\': Kartutseende styres av lyssensoren på enheten (kun hvis utstyrt med) "</string>	
 	
 	 
 	<string name="choose_auto_follow_route">Auto-sentrer kartvisning</string>
@@ -293,7 +289,7 @@
 	<string name="vector_map_not_needed">Nei takk</string>
 	<string name="basemap_missing">Basis-verdenskart (som dekker hele verden ved lav zoom) mangler. Vurder å laste ned World_basemap_x.obf for et komplett miljø.</string>
 	<string name="local_index_gpx_info_show">\n\nTrykk og hold for alternativer</string>
-	<string name="local_index_descr_title">Databehandling</string>
+	<string name="local_index_descr_title">Karthåndtering</string>
 	<string name="local_index_mi_restore">Aktiver</string>
 	<string name="local_index_mi_backup">Deaktiver</string>
 	<string name="local_index_mi_delete">Slett</string>
@@ -319,42 +315,43 @@
 	<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 Android TTS(tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.</string>
 	<string name="tts_missing_language_data_title">Manglende data</string>
-	<string name="switch_to_vector_map_to_see">Offline-vektorkart til stede for dette stedet. \n\t\n\tFor å bruke aktiver \'Meny\' -&gt; \'Vis\' -&gt; \'Kartkilde…\' -&gt; \'Offline-vektorkart\'.</string>
+	<string name="switch_to_vector_map_to_see">Offline-vektorkart foreligger for dette stedet.
+\n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'.</string>
 	<string name="install_more">Installer flere…</string>
 	<string name="tip_favorites">Favorittpunkter</string>
-	<string name="tip_favorites_t">\tOfte brukte punkter kan lagres som favoritter.
-		\n\tFor å lagre et punkt som favoritt gå til kartets lokalmeny, velg alternativet \'Legg til i favoritter\' og skriv deretter inn et navn for den. Etter å ha lagret en favoritt er den tilgjengelig via \'Hovedskjerm\' -&gt; \'Favoritter\'.
-		\n\tLang-trykking på en favoritt i \'Favoritter\'-menyen gir muligheter for å sette den som reisemål, redigere eller slette den.
-		\n\tFor å vise alle favorittpunkter direkte på kartet, aktiver på kartskjermen laget \'Favoritter\' under \'Meny\' -&gt; \'Vis\'.
-	</string>
+	<string name="tip_favorites_t">"Ofte brukte punkter kan lagres som favoritter, som følger:
+\n\nI lokalmenyen \'Bruk posisjon\' for et punkt, velg alternativet \'Legg til i favoritter\' og skriv deretter inn et navn for den.
+\n\nEtter å ha lagret en favoritt er den tilgjengelig via \'Meny\' → \'Mine steder\'. Trykking på en oppføring i \'Favoritter\'-listen gir muligheter som å navigere til den, redigere eller slette den.
+\n\nFor å vise alle favorittpunkter direkte på kartet, aktiver på kartskjermen laget \'Favoritter\' i \'Meny\' → \'Still inn kart\'. "</string>
 	<string name="search_osm_offline">Søk adresse ved bruk av offline-kart</string>
 	<string name="system_locale">System</string>
-	<string name="preferred_locale_descr">Velg skjermspråk</string>
+	<string name="preferred_locale_descr">Velg visningsspråk</string>
 	<string name="preferred_locale">Språk</string>
 	<string name="tip_map_switch">Velg en kartkilde</string>
-	<string name="tip_map_switch_t_v2">\tKartkilden og lag som vises endres via \'Meny\' -&gt; \'Vis\' i kartvisning.
-		\n\tUnder \'Kartkilde…\' kan du velge å bruke de forhåndslastede offline vektorkartene, forhåndsdefinerte (nettbaserte) fliskilder (aktiver programtillegget for \'Nettbaserte kart\' for dette), eller kart manuelt opprettet ved bruk av f.eks. OsmAndMapCreator på en PC.
-		\n\tOsmAnd støtter også egendefinerte kilder.
-	</string>
+	<string name="tip_map_switch_t_v2">"Kartkilden og kartlag som vises endres via \'Meny\' → \'Still inn kart\'.
+\n\nUnder \'Kartkilde…\' kan du velge å bruke de forhåndslastede offline vektorkartene (standard, trengs også for offline navigering), eller forhåndsdefinerte (nettbaserte eller bufret offline) fliskilder (aktiver programtillegget for \'Nettbaserte kart\' under \'Innstillinger\' → \'Programtillegg\' for dette), eller kart manuelt opprettet ved bruk av f.eks. OsmAndMapCreator på en PC.
+\n\nOsmAnd støtter også egendefinerte kilder. "</string>
 	<string name="tip_app_mode">Bruk profil</string>
-	<string name="tip_app_mode_t_v2">\tOsmAnd støtter forskjellige (tilpasningsbare) programprofiler for ulike bruksmåter.
-		\n\tDu kan endre profiler via profilknappen i nedre venstre hjørne av kartskjermen (ikon for bil, sykkel eller fotgjenger), eller når du oppretter en rute.
-	</string>
+	<string name="tip_app_mode_t_v2">"OsmAnd støtter forskjellige (tilpasningsbare) programprofiler for ulike bruksmåter.
+\n\nDu kan endre profiler via profilknappen i nedre venstre hjørne av kartskjermen (ikon for bil, sykkel eller fotgjenger), eller når du oppretter en rute (\'transportmodus\'). "</string>
 	<string name="tip_navigation">Navigering</string>
-	<string name="tip_navigation_t">\tFør du starter en navigering må du velge et reisemål. Etterpå trykk \'Meny\' -&gt; \'Anvisninger\' på kartet og velg navigeringstypen.</string>
+	<string name="tip_navigation_t"/>
 	<string name="tip_search">Søk</string>
-	<string name="tip_search_t">\tDu kan søke etter steder direkte på kartet, eller etter adresse, etter plassering, interessepunkt eller som forhåndsdefinert favoritt.
-		\n\tÅ trykke \'Søk\' på hovedskjermen åpner søkeaktivitetene. For alle treff tilbyr en lokalmeny 2 valg: \'Sett som reisemål\' eller \'Vis på kart\'.
-	</string>
-	<string name="tip_map_context_menu">\'Bruk sted\' meny</string>
-	<string name="tip_map_context_menu_t">\tLokalmenyen for kart er tilgjengelig ved å trykke og holde på kartet eller ved å trykke på styrekule-knappen.
-		\n\tDette gir en boks med punktkoordinater. Kort trykk på den åpner lokalmenyen. (Eller trykk og hold på den for å skjule boksen igjen.)
-		\n\tLokalmenyen for kart inneholder alle handlinger som refererer til et punkt (sted).
-	</string>
-	<string name="tip_initial">Tips og triks</string>
-	<string name="tip_initial_t">\tOsmAnd er et navigeringsprogram med mange funksjoner. 
-		\n\tSom en grunnleggende innføring er noen brukertips og triks lenket til på hovedskjermen.
-	</string>
+	<string name="tip_search_t">"Du kan søke etter steder direkte på kartet via \'Bruk posisjon\' → \'Søk nær her\', eller ved å kalle søkeskjermen via \'Meny\' → \'Søk\'.
+\n\nSøkeskjermen gir maler for søk
+\n\t* etter adresse
+\n\t* via koordinater
+\n\t* som interessepunkt (etter type eller etter navn)
+\n\t* via din søkehistorikk
+\n\t* eller via dine forhåndsdefinerte favoritter.
+\n\nFor alle treff tilbyr en lokalmeny eller en handlingslinje alternativer som \'Anvisninger til\' eller \'Vis på kart\' etc. "</string>
+	<string name="tip_map_context_menu">\'Bruk posisjon\'-meny</string>
+	<string name="tip_map_context_menu_t">"Lokalmenyen \'Bruk posisjon\' inneholder alle handlinger som refererer til et punkt (posisjon).
+\n\nDen er tilgjengelig ved å trykke lenge på ethvert punkt på kartet (deretter trykkes på markøren), eller ved å trykke styrekule-knappen, eller ved å velge \'Meny\' → \'Bruk posisjon\' (de to siste måtene tar kartsenteret som referanse).
+\n\nEn markør-boks kan skjules igjen ved å trykke lenge på den. "</string>
+	<string name="tip_initial">Hjelp</string>
+	<string name="tip_initial_t">"OsmAnd er et navigeringsprogram med mange funksjoner.
+\n\tSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "</string>
 	<string name="next_button">Neste</string>
 	<string name="previous_button">Forrige</string>
 	<string name="unit_of_length_descr">Endre lengde- og hastighetsenhet</string>
@@ -461,7 +458,7 @@
 	<string name="hide_poi_filter">Skjul filter</string>
 	<string name="show_poi_filter">Vis filter</string>
 	<string name="search_poi_filter">Filter</string>
-	<string name="voice_provider_descr">Velg taleveiledning for navigering (språkkoder se ISO 639-1)</string>
+	<string name="voice_provider_descr">Velg taleveiledning for navigering</string>
 	<string name="voice_provider">Taleveiledning</string>
 	<string name="search_near_map">Søk i nærheten av siste kartplassering</string>
 	<string name="search_nearby">Søk i nærheten</string>
@@ -485,7 +482,7 @@
 	<string name="search_history_int_streets">Veikryss: {0} x {1} i {2}</string>
 	<string name="search_history_building">Bygning: {0}, {1}, {2}</string>
 	<string name="favorite">Favoritt</string>
-	<string name="clear_all">Fjern alle</string>
+	<string name="clear_all">Slett alle</string>
 	<string name="history">Historikk</string>
 	<string name="uploading_data">Laster opp data…</string>
 	<string name="uploading">Laster opp…</string>
@@ -525,10 +522,10 @@
 	<string name="settings">Innstillinger</string>
 	<string name="save_current_track_descr">Lagre gjeldende spor til SD nå</string>
 	<string name="save_current_track">Lagre gjeldende GPX-spor</string>
-	<string name="save_track_interval">Loggeintervall</string>
-	<string name="save_track_interval_descr">Velg posisjoneringsintervall for spor</string>
-	<string name="save_track_to_gpx_descrp">Spor vil lagres i spor-mappe gruppert etter dager</string>
-	<string name="save_track_to_gpx">Logg spor til GPX-fil</string>
+	<string name="save_track_interval">Loggeintervall under navigering</string>
+	<string name="save_track_interval_descr">Velg loggeintervall for sporregistrering under navigering</string>
+	<string name="save_track_to_gpx_descrp">Spor blir lagret i spor-mappe under navigering</string>
+	<string name="save_track_to_gpx">Logg spor til GPX-fil under navigering</string>
 	<string name="update_tile">Oppdater kart</string>
 	<string name="reload_tile">Last kartdel på nytt</string>
 	<string name="mark_point">Mål</string>
@@ -562,7 +559,7 @@
 	<string name="exit_Button">Avslutt</string>
 	<string name="map_Button">Kart</string>
 	<string name="settings_Button">Innstillinger</string>
-	<string name="favorites_Button">Favoritter</string>
+	<string name="favorites_Button">Mine steder</string>
 	<string name="search_button">Søk</string>
 	<string name="search_activity">Søk</string>
 	<string name="searchpoi_activity">Velg interessepunkt</string>
@@ -573,13 +570,13 @@
 	<string name="choose_available_region">Velg region fra liste</string>
 	<string name="choose_intersected_street">Velg kryssende gate</string>
 	<string name="Closest_Amenities">Nærmeste fasiliteter</string>
-	<string name="app_mode_default">Se på kartet</string>
+	<string name="app_mode_default">Se gjennom kart</string>
 	<string name="app_mode_car">Bil</string>
 	<string name="app_mode_bicycle">Sykkel</string>
 	<string name="app_mode_pedestrian">Fotgjenger</string>
 	<string name="position_on_map_center">Senter</string>
 	<string name="position_on_map_bottom">Nederst</string>
-	<string name="navigate_point_top_text">Oppfør bredde- og lengdegrad i følgende format (G - grader, M - minutter, S - sekunder)</string>
+	<string name="navigate_point_top_text">Oppfør bredde- og lengdegrad i det valgte formatet (G - grader, M - minutter, S - sekunder)</string>
 	<string name="navigate_point_latitude">Breddegrad</string>
 	<string name="navigate_point_longitude">Lengdegrad</string>
 	<string name="navigate_point_format_D">GGG.GG</string>
@@ -652,30 +649,20 @@
 	<string name="driving_region">Region for bilkjøring</string>
 	<string name="osmodroid_mode_on">Stopp OsMoDroid</string>    
     <string name="osmodroid_mode_off">Start OsMoDroid</string>
-    <string name="announce_gpx_waypoints">Fortell om GPX-rutepunkter</string>
-    <string name="speak_title">Les opp…</string>
-	<string name="speak_descr">Still inn for å lese opp gatenavn, trafikkadvarsler (f.eks. fartsdumper), fotoboksadvarsler, fartsgrenser</string>
-	<string name="speak_street_names">Les opp gatenavn (TTS)</string>
-    <string name="speak_speed_limit">Informer om fartsgrense</string>
-    <string name="speak_cameras">Informer om fotobokser</string>
-	<string name="speak_traffic_warnings">Les opp trafikkmeldinger</string>
-    <string name="tip_recent_changes_1_5_t">Endringer i 1.5:↵
-→\n\t* Stemmevarslinger om fartsgrenser og fotobokser
-↵
-→\n\t* Flere muligheter for opplesning (gatenavn blir lest opp)
-↵
-→\n\t* Kartikoner i høy oppløsning
-↵
-→\n\t* Flere endringer i brukergrensesnittet
-↵
-→\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering
-    </string>
+    <string name="announce_gpx_waypoints">Meld om GPX-rutepunkter</string>
+    <string name="speak_title">Meddel…</string>
+	<string name="speak_descr">Still inn for å meddele gatenavn, trafikkvarsler (tvungne stopp, fartsdumper), fotoboksvarsler, fartsgrenser</string>
+	<string name="speak_street_names">Meddel gatenavn (TTS)</string>
+    <string name="speak_speed_limit">Meddel fartsgrense</string>
+    <string name="speak_cameras">Meld om fotobokser</string>
+	<string name="speak_traffic_warnings">Meld trafikkvarsler</string>
+    <string name="tip_recent_changes_1_5_t">"Endringer i 1.5:↵ →\n\t* Stemmevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for opplesning (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "</string>
     <string name="osb_author_or_password_not_specified">Oppgi OSM brukernavn og passord i Innstillinger</string>
     <string name="clear_intermediate_points">Slett mellomliggende rutepunkter</string>
     <string name="keep_intermediate_points">Behold mellomliggende rutepunkter</string>
     <string name="new_directions_point_dialog">Mellomliggende rutepunkter er allerede angitt.</string>
-    <string name="context_menu_item_directions_to">Kjøreveiledning til</string>
-    <string name="context_menu_item_directions_from">Kjøreveiledning fra</string>
+    <string name="context_menu_item_directions_to">Anvisninger til</string>
+    <string name="context_menu_item_directions_from">Anvisninger fra</string>
     <string name="route_descr_map_location">Kart: </string>
     <string name="route_descr_lat_lon">Br %1$.3f, Le %2$.3f</string>
     <string name="route_descr_current_location">Aktuell posisjon</string>
@@ -691,11 +678,11 @@
     <string name="tip_map_styles">Kartstiler</string>
 	<string name="about_version">Utgave:</string>
     <string name="about_settings">Om</string>
-    <string name="about_settings_descr">Versjonsinformasjon, lisenser, prosjektmedlem</string>
-    <string name="tips_and_tricks">Tips</string>
+    <string name="about_settings_descr">Versjonsinformasjon, lisenser, prosjektmedlemmer</string>
+    <string name="tips_and_tricks">Hjelp</string>
     <string name="local_index_tile_data_downloadable">Nedlastbar: %1$s</string>
-    <string name="local_index_tile_data_maxzoom">Største zoom: %1$s</string>
-    <string name="local_index_tile_data_minzoom">Minste zoomnivå: %1$s</string>
+    <string name="local_index_tile_data_maxzoom">Maksimum zoom: %1$s</string>
+    <string name="local_index_tile_data_minzoom">Minimum zoom: %1$s</string>
     <string name="edit_tilesource_maxzoom">Maks-zoom</string>
     <string name="edit_tilesource_minzoom">Min-zoom</string>
     <string name="edit_tilesource_url_to_load">URL</string>
@@ -703,7 +690,7 @@
     <string name="edit_tilesource_name">Navn</string>
     <string name="maps_define_edit">Definer/rediger …</string>
 	<string name="route_is_too_long">OsmAnd offline ruteplanlegging kan ta veldig lang tid (eller ikke virke noen ganger) for punkter mere enn 200km fra hverandre. Man kan da legge til mellomliggende rutepunkter for bedre ytelse.</string>
-	<string name="auto_zoom_none">Ingen autozoom</string>
+	<string name="auto_zoom_none">Ingen auto-zoom</string>
 	<string name="auto_zoom_close">Nært hold</string>
 	<string name="auto_zoom_far">Middels hold</string>
 	<string name="auto_zoom_farthest">Langt hold</string>
@@ -711,7 +698,7 @@
 	<string name="base_world_map">Grunnkart verden</string>
 	<string name="amenity_type_seamark">Sjømerke</string>
     <string name="app_modes_choose">Programprofiler</string>
-	<string name="map_widget_map_rendering">Kartopptegning:</string>
+	<string name="map_widget_map_rendering">Kartopptegning</string>
     <string name="app_mode_hiking">Vandring</string>
     <string name="app_mode_motorcycle">Motorsykkel</string>
     <string name="app_mode_boat">Båt</string>
@@ -750,7 +737,7 @@
 	<string name="lang_it">Italiensk</string>
 	<string name="lang_ja">Japansk</string>
 	<string name="lang_ko">Koreansk</string>
-	<string name="lang_lv">Lettisk</string>
+	<string name="lang_lv">Latvisk</string>
 	<string name="lang_lt">Litauisk</string>
 	<string name="lang_mr">Marathi</string>
 	<string name="lang_no">Norsk</string>
@@ -781,8 +768,177 @@
     <string name="calculate_osmand_route_without_internet">Beregn OsmAnd rutesegment uten internett</string>
     <string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd rute for første og siste rute segment</string>
     <string name="osmo_settings_uuid">Unik enhets-id</string>
-    <string name="osmo_settings_descr">Se unik registreringsnøkkel for enheten og andre spesifikke innstillinger </string>
-    <string name="osmo_plugin_description">OpenStreetMap-Overvåkning - Avansert Live Overvåkning med mange funksjoner for fjernkontroll http://osmo.mobi</string>
-    <string name="osmo_plugin_name">OSMo (Avansert Live Overvåkning)</string>
-    <string name="osmo_settings">OSMo</string>
-   	</resources>
\ No newline at end of file
+    <string name="osmo_settings_descr">Still inn overvåking og personlig overvåkingskanal</string>
+    <string name="osmo_plugin_description"/>
+    <string name="osmo_plugin_name">OsMo (Avansert Live Overvåkning)</string>
+    <string name="osmo_settings">OpenStreetMap-overvåking</string>
+   	<string name="map_widget_top">Statuslinje</string>
+	<string name="map_preferred_locale_descr">Foretrukket språk for påskrifter på kartet (hvis det ikke er tilgjengelig skiftes til engelsk eller til lokale navn)</string>
+    <string name="map_preferred_locale">Foretrukket språk på kart</string>
+    <string name="home">Hjem</string>
+    <string name="rendering_attr_showCycleRoutes_name">Vis sykkelruter</string>
+    <string name="show_zoom_buttons_navigation_descr">Vis zoom-knapper under navigering</string>
+    <string name="show_zoom_buttons_navigation">Vis zoom-knapper</string>
+    <string name="map_widget_plain_time">Gjeldende tid</string>
+    <string name="my_data_Button">Mine steder</string>
+    <string name="my_data_activity">Mine steder</string>
+    <string name="osmo_edit_color">Visningsfarge</string>
+    <string name="always_center_position_on_map">Vis posisjon alltid i midten</string>
+    <string name="guidance_preferences_descr">Innstillinger for navigering</string>
+    <string name="routing_preferences_descr">Innstillinger for ruteplanlegging</string>
+    <string name="rendering_attr_noAdminboundaries_name">Skjul grenser</string>
+	<string name="map_widget_max_speed">Fartsgrense</string>
+    <string name="map_widget_transparent">Gjennomsiktig layout</string>
+	<string name="rendering_attr_noPolygons_name">Skjul polygoner</string>
+	<string name="plugins_screen">Programtillegg</string>
+	<string name="prefs_plugins_descr">Programtillegg aktiverer avanserte innstillinger og flere funksjoner</string>
+	<string name="prefs_plugins">Programtillegg</string>
+	<string name="show_point_options">Bruk posisjon…</string>
+	<string name="wake_on_voice">Slå på skjermen</string>
+    <string name="select_impassable_road">Velg på kart</string>
+    <string name="impassable_road">Unngå veier…</string>
+    <string name="rendering_attr_busRoutes_name">Bussruter</string>
+    <string name="rendering_category_hide">Skjul</string>
+    <string name="rendering_category_routes">Ruter</string>
+    <string name="rendering_category_details">Detaljer</string>
+    <string name="rendering_category_transport">Transport</string>
+    <string name="map_widget_right">Høyre panel</string>
+	<string name="map_widget_left">Venstre panel</string>
+    <string name="layers_category_show">Vis</string>
+	<string name="configure_map">Still inn kart</string>
+    <string name="osmo_device_not_found">Enhet ikke funnet</string>
+    <string name="speed_limit_exceed">Toleranse for fartsgrense</string>
+	<string name="text_size_descr">Sett tekststørrelsen på kartet.</string>
+    <string name="text_size">Tekststørrelse</string>
+    <string name="traffic_warning_speed_limit">Fartsgrense</string>
+    <string name="rendering_value_car_name">Bil</string>
+    <string name="rendering_value_bicycle_name">Sykkel</string>
+    <string name="rendering_value_pedestrian_name">Fotgjenger</string>
+    <string name="local_map_names">Lokale navn</string>
+    <string name="lang_sw">Swahili</string>
+    <string name="lang_he">Hebraisk</string>
+    <string name="rendering_attr_hideText_name">Skjul tekst</string>
+    <string name="visible_element">Vis på kart</string>
+    <string name="switch_to_raster_map_to_see">Ingen offline-vektorkart foreligger for dette stedet. Du kan laste ned et kart i Innstillinger (Karthåndtering), eller skifte til nettbaserte kart (aktiver programtillegg for online-kart for dette).</string>
+	<string name="rendering_category_others">Andre kartattributter</string>
+    <string name="av_control_start">Start</string>
+    <string name="save_route_as_gpx">Lagre rute som GPX-fil</string>
+	<string name="rendering_attr_publicTransportMode_name">Buss-, trolleybuss-, skyttelbussruter</string>
+	<string name="rendering_attr_tramTrainRoutes_name">Trikk- og togruter</string>
+	<string name="rendering_attr_subwayMode_name">Undergrunnsruter</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Togruter</string>
+    <string name="rendering_attr_tramRoutes_name">Trikkeruter</string>
+    <string name="rendering_attr_trolleybusRoutes_name">Trolleybussruter</string>
+    <string name="map_widget_appearance_rem">Resterende elementer</string>
+    <string name="print_route">Skriv ut rute</string>
+    <string name="traffic_warning_border_control">Grensekontroll</string>
+    <string name="traffic_warning_stop">Stoppskilt</string>
+    <string name="traffic_warning_speed_camera">Fotoboks</string>
+    <string name="traffic_warning">Trafikkvarsel</string>
+	<string name="way_alarms">Trafikkvarsler</string>
+	<string name="save_track_interval_globally">Loggeintervall</string>
+	<string name="waypoints">Rutepunkter</string>
+    <string name="targets">Reisemål</string>
+    <string name="rendering_attr_hideBuildings_name">Skjul bygninger</string>
+    <string name="osmand_parking_warning">Varsel</string>
+	<string name="wake_on_voice_descr">Slå på telefonskjermen når du nærmer deg en sving</string>
+    <string name="wake_on_voice_never">Aldri</string>
+    <string name="search_radius_proximity">I nærhet av</string>
+    <string name="speed_limit_exceed_message">Velg toleransemargin for fartsgrense, overskrides denne vil du få talevarsel.</string>
+	<string name="fav_point_dublicate">Duplisering av favorittpunktnavn</string>
+    <string name="traffic_warning_payment">Bomstasjon</string>
+    <string name="speak_favorites">Meld om nærliggende favoritter</string>
+	<string name="speak_poi">Meld om nærliggende interessepunkter</string>
+	<string name="save_global_track_interval">Generelt loggeintervall</string>
+	<string name="int_hour">t</string>
+    <string name="duration">Varighet</string>
+    <string name="distance">Avstand</string>
+    <string name="index_tours">Turer</string>
+    <string name="flat_list_waypoints">Alle</string>
+    <string name="more">Mer...</string>
+    <string name="rendering_value_browse_map_name">Se gjennom kart</string>  
+    <string name="rendering_attr_coloredBuildings_name">Fargekod bygninger etter type</string>
+    <string name="rendering_attr_buildings15zoom_name">Bygninger på zoom 15</string>
+    <string name="rendering_attr_moreDetailed_name">Flere detaljer</string>
+    <string name="rendering_attr_hideAccess_name">Skjul adgangsrestriksjoner</string>
+    <string name="rendering_attr_showAccess_name">Vis adgangsrestriksjoner</string>
+    <string name="rendering_attr_showSurfaceGrade_name">Vis veikvalitet</string>
+    <string name="rendering_attr_showSurfaces_name">Vis veidekke</string>
+    <string name="select_destination_and_intermediate_points">Velg rutepunkter</string>
+    <string name="layer_amenity_label">Punktnavn</string>
+    <string name="gpx_wpt">Rutepunkt</string>
+    <string name="voice_pref_title">Tale</string>
+    <string name="misc_pref_title">Diverse</string>
+    <string name="localization_pref_title">Lokaltilpassing</string>
+    <string name="lang_al">Albansk</string>
+	<string name="lang_ar">Arabisk</string>
+	<string name="lang_fa">Persisk</string>
+	<string name="lang_sc">Sardinsk</string>
+	<string name="route_descr_select_destination">Velg reisemål</string>
+    <string name="routing_attr_prefer_motorway_name">Foretrekk motorveier</string>
+	<string name="routing_attr_prefer_motorway_description">Foretrekk motorveier</string>
+	<string name="routing_attr_short_way_name">Korteste vei</string>
+	<string name="routing_attr_short_way_description">Bruk korteste vei</string>
+	<string name="routing_attr_avoid_toll_name">Unngå bomveier</string>
+	<string name="routing_attr_avoid_toll_description">Unngå bomveier</string>
+	<string name="routing_attr_avoid_unpaved_name">Unngå uasfalterte veier</string>
+	<string name="routing_attr_avoid_unpaved_description">Unngå uasfalterte veier</string>
+	<string name="routing_attr_avoid_ferries_name">Unngå ferger</string>
+	<string name="routing_attr_avoid_ferries_description">Unngå ferger</string>
+	<string name="routing_attr_avoid_motorway_name">Unngå motorveier</string>
+	<string name="routing_attr_avoid_motorway_description">Unngå motorveier</string>
+	<string name="routing_attr_weight_name">Vektgrense</string>
+	<string name="routing_attr_weight_description">Angi kjøretøyets vekt som er tillatt på ruter</string>
+    <string name="copying_osmand_files_descr">Kopierer OsmAnd-filer til nytt sted (%s)</string>
+    <string name="distance_measurement_clear_route">Slett alle punkter</string>
+    <string name="use_kalman_filter_compass_descr">Bruk Kalmanfilter for å unngå kompassavvik</string>
+    <string name="use_kalman_filter_compass">Bruk Kalmanfilter</string>
+    <string name="other_location">Annen</string>
+    <string name="available_downloads_left">Er tilgjengelig %1$d filer til nedlasting</string>
+    <string name="install_paid">Fullversjon</string>
+    <string name="clear_destination">Slett reisemål</string>
+    <string name="street_name">Gate</string>
+	<string name="choose_osmand_theme">Tema</string>
+    <string name="clear_dest_confirm">Er du sikker på at du vil slette reisemålpunktet (og rutepunkter)?</string>
+    <string name="rendering_attr_osmcTraces_name">Fottursymbol-overlegg</string>
+    <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 (kan deaktiveres i Innstillinger).</string>
+    <string name="interrupt_music_descr">Avbryt musikk ved meldinger</string>
+	<string name="interrupt_music">Avbryt musikk</string>
+	<string name="gpxup_public">Offentlig</string>
+	<string name="rendering_attr_appMode_description">Optimaliser kart for</string>
+	<string name="rendering_attr_contourLines_description">Vis fra zoom-nivå (krever kote-data):</string>
+	<string name="local_index_description">Klikk på et eksisterende element for å se flere detaljer, trykk og hold for å deaktivere eller slette. Gjeldende data på enheten (%1$s ledig):</string>
+	<string name="send_files_to_osm">Sende GPX-filer til OSM?</string>
+	<string name="arrival_distance_factor_early">Tidlig</string>
+    <string name="arrival_distance_factor_normally">Normal</string>
+    <string name="arrival_distance_factor_late">Sen</string>
+    <string name="arrival_distance_factor_at_last">De siste meterne</string>
+    <string name="arrival_distance">Ankomstmelding</string>
+    <string name="arrival_distance_descr">Hvor raskt vil du ha ankomstmeldingen?</string>
+    <string name="keep_informing_descr">Gjenta navigeringsinstruksjoner med jevne mellomrom</string>
+    <string name="keep_informing">Gjenta navigeringsinstruksjoner</string>
+	<string name="show_more_map_detail_descr">Vis noen vektorkartdetaljer (veier etc.) allerede ved lavere zoom</string>
+	<string name="choose_audio_stream">Utdata for taleveiledning</string>
+	<string name="choose_audio_stream_descr">Velg kanal til å avspille taleveiledning (systemavhengig)</string>
+	<string name="voice_stream_voice_call">Taleanropslyd</string>
+	<string name="voice_stream_notification">Varslingslyd</string>
+	<string name="voice_stream_music">Media-/musikklyd</string>
+	<string name="level_to_switch_vector_raster_descr">Minimum zoomnivå for å bruke vektorkart</string>
+	<string name="level_to_switch_vector_raster">Min. vektor-zoomnivå</string>
+	<string name="incomplete_locale">ufullstendig</string>
+	<string name="context_menu_item_add_waypoint">Legg til GPX-rutepunkt</string>
+	<string name="voice_is_not_available_title">Ingen taleveiledning valgt</string>
+	<string name="select_max_zoom_preload_area">Velg maksimum zoom til å forhåndslaste</string>
+	<string name="voice_data_initializing">Initialiserer taledata…</string>
+	<string name="update_poi_is_not_available_for_zoom">Oppdatering av interessepunkter er ikke tilgjengelig ved lave zoomnivåer</string>
+	<string name="arrived_at_destination">Du har ankommet ditt reisemål</string>
+	<string name="download_indexes_descr">Last ned eller oppdater data for offline bruk fra internett</string>
+	<string name="download_indexes">Last ned offline-data</string>
+	<string name="use_online_routing_descr">Bruk internett til å beregne rute</string>
+	<string name="use_online_routing">Bruk nettbasert navigering</string>
+	<string name="map_preferences_descr">Spesifiser kartinnstillinger: Kartkilde, rotasjon, markørposisjon, skjermorientering</string>
+	<string name="navigation_intent_invalid">Ugyldig format: %s</string>
+    <string name="hide_all_waypoints">Fjern alle</string>
+</resources>

From 205c1b23a31c58a61f0376fe51782d06f232fce9 Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Sun, 9 Nov 2014 21:34:09 +0100
Subject: [PATCH 15/53] Translated using Weblate (Sardinian)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-sc/strings.xml | 83 ++++++++++++++++----------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index c70ca99624..b191710cd2 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -68,16 +68,16 @@
 	<string name="routing_attr_prefer_motorway_description">Preferre sas autostradas</string>
 	<string name="routing_attr_short_way_name">Istrada prus curtza</string>
 	<string name="routing_attr_short_way_description">Imprea sa caminera prus curtza</string>
-	<string name="routing_attr_avoid_toll_name">Istranse sas istradas a pagamentu</string>
-	<string name="routing_attr_avoid_toll_description">Istranse sas istradas a pagamentu</string>
-	<string name="routing_attr_avoid_unpaved_name">Istranse sas istradas non apamentadas</string>
-	<string name="routing_attr_avoid_unpaved_description">Istranse sas istradas non apamentadas</string>
-	<string name="routing_attr_avoid_ferries_name">Istranse sos naviles</string>
-	<string name="routing_attr_avoid_ferries_description">Istranse sos naviles</string>
-	<string name="routing_attr_avoid_motorway_name">Istranse sas autostradas</string>
-	<string name="routing_attr_avoid_motorway_description">Istranse sas autostradas</string>
+	<string name="routing_attr_avoid_toll_name">Istransi sas istradas a pagamentu</string>
+	<string name="routing_attr_avoid_toll_description">Istransi sas istradas a pagamentu</string>
+	<string name="routing_attr_avoid_unpaved_name">Istransi sas istradas non apamentadas</string>
+	<string name="routing_attr_avoid_unpaved_description">Istransi sas istradas non apamentadas</string>
+	<string name="routing_attr_avoid_ferries_name">Istransi sos naviles</string>
+	<string name="routing_attr_avoid_ferries_description">Istransi sos naviles</string>
+	<string name="routing_attr_avoid_motorway_name">Istransi sas autostradas</string>
+	<string name="routing_attr_avoid_motorway_description">Istransi sas autostradas</string>
 	<string name="routing_attr_weight_name">Lìmite de pesu</string>
-	<string name="routing_attr_weight_description">Dislinda su lìmite de pesu de sa vettura</string>
+	<string name="routing_attr_weight_description">Dislinda su lìmite de pesu de su veìculu</string>
     <string name="android_19_location_disabled">Dae sa versione KitKat non est prus possìbile iscarrigare e pònnere a die sas mapas in s\'indiritzu de ammentu antepostu (%s). Lu bòles remplasare cun su chi est acusentidu e copiare in cue totus sos datos?
 	\n Nota: sos datos antepostos non at a èssere mudados. 
 	\n Nota: non at a èssere possìbile cumpartzire sos datos intra OsmAnd e OsmAnd+. </string>
@@ -211,9 +211,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="route_from">Dae:</string>
 	
 	
-	<string name="app_mode_default">Predefinitu</string>
-	<string name="settings_preset">Perfilu de impreu</string>
-	<string name="settings_preset_descr">Issèbera unu perfilu de impreu cun impostaduras pro sa mapa e su nàvigu pessonalizzau.</string>
+	<string name="app_mode_default">Predefinidu</string>
+	<string name="settings_preset">Profilu predefinidu</string>
+	<string name="settings_preset_descr">Issèbera unu profilu de impreu cun impostaduras pessonalizadas pro sa mapa e su nàvigu.</string>
     <string name="destination_point">Destinatzione %1$s</string>
     <string name="context_menu_item_destination_point">Imposta comente destinatzione</string>
     <string name="please_select_address">Issèbera in antis sa citade o s\'istrada</string>
@@ -230,7 +230,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="intermediate_items_sort_return">Puntos mesanos cussertaos pro perfetzionare s\'andala pro sa destinatzione.</string>
     <string name="intermediate_items_sort_by_distance">Cusserta (ghenna a ghenna)</string>
     <string name="local_osm_changes_backup_successful">Creatzione documentu de muda OSM %1$s acabada</string>
-    <string name="local_osm_changes_backup_failed">Creatzione de sa còpia locale de seguràntzia (backup) de sas mudas faddida</string>
+    <string name="local_osm_changes_backup_failed">Creatzione de sa còpia locale de seguràntzia (backup) de sas modìficas faddida</string>
     <string name="local_osm_changes_backup">Crea una còpia de seguràntzia comente muda OSM</string>
     <string name="delete_point">Burra puntu</string>
     <string name="plugin_distance_point_time">orariu</string>
@@ -241,7 +241,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="gpx_file_name">Nùmene de su documentu GPX</string>
     <string name="gpx_saved_sucessfully">Documentu GPX sarbadu cun sutzessu in {0}</string>
     <string name="osmand_distance_planning_plugin_description">Creare àndalas (o impreare/mudare documentos GPX esistentes) pro medire sa distantzia intra \'e tres puntos. Sarbare comente GPX, at a poder èssere impreau pro pianificare una caminera GPX.</string>
-    <string name="osmand_distance_planning_plugin_name">Aina Calcoladore de distànzia e Pianificatzione</string>
+    <string name="osmand_distance_planning_plugin_name">Aina Calcoladore de distàntzia e Pianificatzione</string>
     <string name="use_distance_measurement_help">* Toca pro sinnare unu puntu.\n 
         * Carca e tene carcau in sa mapa pro burrare sos puntos antepostos.\n
         * Carca e tene carcau supra de unu puntu pro bìdere e alliongiare una descrizione.\n
@@ -294,7 +294,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="accessibility_options">Optziones pro s\'atzessibilidade</string>
     <string name="select_address_activity">Issèbera s\'indiritzu</string>
     <string name="favourites_list_activity">Issèbera preferridu</string>
-    <string name="local_openstreetmap_act_title">Mudas OSM</string>
+    <string name="local_openstreetmap_act_title">Modìficas OSM</string>
     <string name="default_buttons_other_actions">Àteras atziones</string>
     
 	<string name="tip_recent_changes_1_2_t">Curretziones in sa 1.2.1:
@@ -312,10 +312,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	</string>
     <string name="layer_hillshade">Istratu umbradura rilievos</string>
     <string name="map_widget_gps_info">Informatziones GPS</string>
-    <string name="tip_recent_changes_1_1_4_t">Mudas in sa 1.1.4:
-        \n\t* Redisinnu de sa UI
-		\n\t* Curretzione de errores
-    </string>
+    <string name="tip_recent_changes_1_1_4_t">"Modìficas in sa 1.1.4:
+\n\t* Redisinnu de sa UI
+\n\t* Curretzione de errores "</string>
     <string name="access_arrival_time">Oràriu de lòmpida</string>
     <string name="item_checked">sinnau</string>
     <string name="item_unchecked">non sinnau</string>
@@ -441,7 +440,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	\n\t* Sa Mapa non pèrdet sa positzione a pustis de sas interrutziones
 	\n\t* Abilitatzione de sa modalidade "a reposu" durante su nàvigu.
     </string>
-    <string name="close_changeset">Serra sas mudas</string>
+    <string name="close_changeset">Serra sas modìficas</string>
 	<string name="zxing_barcode_scanner_not_found">S\'aplicu ZXing Barcode Scanner non est installada. La boles chircare in su Market?</string>
 	<string name="rendering_attr_roadColors_description">Issèbera una cumbinatzione de colores pro sas istradas:</string>
 	<string name="rendering_attr_roadColors_name">Ischema de colores de sas istradas</string>
@@ -488,7 +487,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="poi_filter_for_tourists">Pro sos turistas</string>
 	<string name="poi_filter_fuel">Carburante</string>
 	<string name="show_warnings_title">Ammustra avertimentos…</string>
-	<string name="show_warnings_descr">Cunfigura sos avisos pro su traficu (lìmites de lestresa, stop fortzados, dossos e rallentadores), avisos autovelox e indicatziones de corsia</string>
+	<string name="show_warnings_descr">Cunfigura sos avisos pro su tràficu (lìmites de lestresa, stop fortzados, dossos e rallentadores), avisos autovelox e indicatziones de corsia</string>
 	<string name="use_compass_navigation_descr">Imprea sa bùssola cando sa filada/diretzione non est istada individuada</string>
 	<string name="use_compass_navigation">Imprea sa bùssola</string>
 	<string name="avoid_motorway">Istense sas autostradas</string>
@@ -977,7 +976,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 <string name="default_buttons_selectall">Ischerta totu</string>
 	<string name="edit_filter_delete_menu_item">Burra</string>
 	<string name="filter_current_poiButton">Filtru</string>
-	<string name="poi_dialog_comment_default">Muda PDI</string>
+	<string name="poi_dialog_comment_default">Modìfica PDI</string>
 	<string name="poi_dialog_other_tags_message">Totu sas etichetas sunt sarbadas</string>
 	<string name="poi_dialog_comment">Cummentu</string>
 	<string name="poi_dialog_name">Nùmene</string>
@@ -1053,10 +1052,10 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 \n\t- Indicatzione visiva, tramite muda de su colore de sa fritza, de bortada imbeniente intre 100m
 \n\t- Como fintzas sos documentos deativados benint visualizzados in s\'ischermada de icarrigamentu, in birde e blu iscuru
 \n\t- Àteras mudas "</string>
-	<string name="update_poi_does_not_change_indexes">Sa mudas de sos PDI intre s\'aplicu non tenent efetos in sas mapas iscarrigadas, imbetzes sunt sarbadas in unu documentu locale.</string>
+	<string name="update_poi_does_not_change_indexes">Sa modìficas de sos PDI intre s\'aplicu non tenent efetos in sas mapas iscarrigadas, sunt imbetzes sarbadas in unu documentu locale.</string>
 	<string name="local_openstreetmap_were_uploaded">{0} PDI/sos errores sunt istados carrigados</string>
-	<string name="local_openstreetmap_upload">Càrriga sa muda in OSM</string>
-	<string name="local_openstreetmap_delete">Burra sa muda</string>
+	<string name="local_openstreetmap_upload">Càrriga sa modìfica in OSM</string>
+	<string name="local_openstreetmap_delete">Burra sa modìfica</string>
 	<string name="local_openstreetmap_descr_title">Muda asìncrona de OSM:</string>
 	<string name="local_openstreetmap_settings_descr">Ammustra e gesti sos PDI/errores OSM in intro de su database locale</string>
 	<string name="live_monitoring_interval_descr">Dislinda s\'intervallu de s\'arrastamentu in lìnia</string>
@@ -1064,7 +1063,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="live_monitoring_url_descr">Dislinda s\'indiritzu ìnternet cun sa sintassi de sos paràmetros: lat={0}, lon={1}, data/ora={2}, hdop={3}, artària={4}, lestresa={5}, àngulu={6}</string>
 	<string name="live_monitoring_url">Indiritzu ìnternet pro s\'arrastamentu in dereta</string>
 	<string name="gpx_monitoring_disabled_warn">Abìlita in sas impostaduras \'Registratzione de sa rasta in su documentu GPX\'.</string>
-	<string name="tip_recent_changes_0_7_0_t">"Mudas in sa 0.7.0:
+	<string name="tip_recent_changes_0_7_0_t">"Modìficas in sa 0.7.0:
 \n\t- Artìculos de Wikipeda atzessìbiles sena lìnia
 \n\t- Mapas agiornadas
 \n\t- Àteras caraterìsticas minores "</string>    
@@ -1093,7 +1092,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 \n\t* \'Note\': imprea semper sa modalidade noturna
 \n\t* \'Sensore de lughentesa\': s\'aparèntzia de sa mapa est cuntrollada dae su sensore de lughentesa de su dispositivu (petzi si est disponìbile) "</string>	
 	<string name="download_files_not_enough_space">Non b\'est memòria bastante pro iscarrigare %1$s MB (lìberos: %2$s).</string>
-	<string name="download_files_question_space">Sa memòria disponìbile est de {2} MB! Iscarriga {0} documentu(os) ({1} MB)?</string>
+	<string name="download_files_question_space">Sa memòria disponìbile est de {2} MB! Iscarrigare {0} documentu(os) ({1} MB)?</string>
 	<string name="use_transparent_map_theme">Tema transparente</string>
 	<string name="native_library_not_supported">Sa libreria nativa no est suportada dae custu dispositivu.</string>
 	<string name="init_native_library">Inizalizatzione libreria nativa…</string>
@@ -1143,7 +1142,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="poi_query_by_name_matches_categories">Agatadas categorias PDI chi ispricant sa chirca:</string>
 	<string name="data_to_search_poi_not_available">Datos locales cuntenentes PDI non presentes.</string>
 	<string name="old_poi_file_should_be_deleted">Su documentu de datos PDI \'%1$s\' est bundajolu e podet èssere burrau.</string>
-	<string name="update_poi_file_not_found">Su documentu pro registrare sas mudas de sos PDI no est istadu ne agatadu nen creadu.</string>
+	<string name="update_poi_file_not_found">Su documentu pro registrare sas modìficas de sos PDI no est istadu ne agatadu nen creadu.</string>
 	<string name="map_version_changed_info">In su server bi sunt documentos de mapas non compatìbiles cun sa versione atuale de su programma. Pro los iscarrigare e impreare agiorna s\'aplicu a s\'ùritma versione.</string>
 	<string name="local_index_mi_rename">Torra a numenare</string>
 	<string name="search_position_undefined">Non dessinidu</string>
@@ -1174,7 +1173,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="local_index_mi_delete">Burra</string>
 	<string name="local_index_mi_export">Esporta</string>
 	<string name="local_index_mi_reload">Torra a carrigare dae s\'ischeda SD</string>
-	<string name="local_index_download">Iscarriga</string>
+	<string name="local_index_download">Iscàrriga</string>
 	<string name="local_index_address_data">Datos indiritzos</string>
 	<string name="local_index_transport_data">Datos trasportos</string>
 	<string name="local_index_map_data">Datos mapa</string>
@@ -1188,7 +1187,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="map_text_size">Mannaria testos mapa</string>
 	<string name="trace_rendering">Informatziones diagnosticas disinnu</string>
 	<string name="trace_rendering_descr">Ammustra sa prestatzione de su disinnu</string>
-	<string name="tip_recent_changes">Mudas reghentes</string>
+	<string name="tip_recent_changes">Modìficas reghentes</string>
 	<string name="voice_not_use">No l\'impreare</string>
 	<string name="voice_not_specified">Peruna</string>
 	<string name="installing_new_resources">Aperinde datos novos…</string>
@@ -1294,7 +1293,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="use_osmand_routing_service">Nàvigu OsmAnd &gt;20km</string>
 	<string name="use_osmand_routing_service_descr">S\'impreu de su nàvigu sena lìnia OsmAnd s\'aplicat petzi a sas àndalas&gt;20 km (isperimentale)</string>
 	<string name="specified_dir_doesnt_exist">Impossìbile agatare sa cartella dislindada.</string>
-	<string name="application_dir">Cartella depòsitu</string>
+	<string name="application_dir">Cartella datos</string>
 	
 	<string name="build_installed">Build {0} installada curretamente ({1}).</string>
 	<string name="downloading_build">Iscarrigamentu de sa versione…</string>
@@ -1436,9 +1435,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="search_nearby">Chirca a curtzu</string>
 	<string name="map_orientation_default">Orientamentu predefinidu</string>
 	<string name="map_orientation_portrait">Verticale</string>
-	<string name="map_orientation_landscape">Orizzontale</string>
+	<string name="map_orientation_landscape">Orizontale</string>
 	<string name="map_screen_orientation">Orientamentu de s\'ischermu</string>
-	<string name="map_screen_orientation_descr">Verticale, orizzontale, o predefinidu (dispositivu)</string>
+	<string name="map_screen_orientation_descr">Verticale, orizontale, o predefinidu (dispositivu)</string>
 	<string name="opening_hours_not_supported">Su formatu de s\'oràriu pro abèrrere no est suportadu pro sa muda</string>
 	<string name="add_new_rule">Annanghe una regula noa</string>
 	<string name="transport_Routes">Àndalas</string>
@@ -1503,8 +1502,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="get_directions">Indicatziones</string>
 	<string name="show_gps_status">Ammustra s\'istadu de su GPS</string>
 	<string name="opening_hours">Oràrios pro abèrrere</string>
-	<string name="opening_changeset">Abertura mudas…</string>
-	<string name="closing_changeset">Serradura mudas…</string>
+	<string name="opening_changeset">Abertura modìficas…</string>
+	<string name="closing_changeset">Serradura modìficas…</string>
 	<string name="commiting_node">Sutaponende su nodu…</string>
 	<string name="converting_names">Cunversione nùmenes locales/nùmenes inglesos…</string>
 	<string name="loading_streets_buildings">Carrigamentu istradas/edifìtzios…</string>
@@ -1535,7 +1534,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="data_settings_descr">Dislinda sa limba, iscàrriga/torra a carrigare sos datos</string>
 	<string name="data_settings">Datos</string>
 	<string name="map_preferences_descr">Dislinda impostaduras mapa: mitza, rotatzione, sinnadore de positzione, orientatzione ischermu</string>
-	<string name="osm_settings">Mudas OSM</string>
+	<string name="osm_settings">Modìficas OSM</string>
 	<string name="additional_settings">Impostaduras annativas</string>
 	<string name="settings">Impostaduras</string>
 	<string name="save_current_track_descr">Sarba como sa rasta currente in s\'ischeda SD</string>
@@ -1628,13 +1627,13 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="osb_comment_menu_item">Annanghe unu cummentu</string>
 	<string name="osb_comment_dialog_message">Messàgiu</string>
 	<string name="osb_comment_dialog_author">Nùmene autore</string>
-	<string name="osb_comment_dialog_title">Annanghe unu commentu a s\'errore</string>
+	<string name="osb_comment_dialog_title">Annanghe unu cummentu a s\'errore</string>
 	<string name="osb_comment_dialog_add_button">Annanghe cummentu</string>
 	<string name="osb_comment_dialog_success">Su cummentu est istadu annantu curretamente</string>
 	<string name="osb_comment_dialog_error">S\'est verificadu un afrancu: su cummentu no est istadu annantu</string>
-	<string name="osb_close_menu_item">Serra errore</string>
+	<string name="osb_close_menu_item">Serra s\'errore</string>
 	<string name="osb_close_dialog_title">Serradura errore</string>
-	<string name="osb_close_dialog_close_button">Serra errore</string>
+	<string name="osb_close_dialog_close_button">Serra s\'errore</string>
 	<string name="osb_close_dialog_success">S\'errore est istadu serradu curretamente</string>
 	<string name="osb_close_dialog_error">S\'est verificadu un afrancu: s\'errore no est istadu serradu</string>
 	<string name="poi_edit_title">Muda PDI</string>
@@ -1675,7 +1674,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="background_router_service_descr">Allughe su servìtziu a reposu de OsmAnd pro s\'arrastamentu de sa positzione cando s\'ischermu est istudau</string>
 	<string name="off_router_service_no_gps_available">Su servìtziu de nàvigu a reposu de OsmAnd netzèssitat de su sistema de positzionamentu ativadu.</string>
 	<string name="tip_recent_changes_0_6_7_t">"Mudas in sa 0.6.7:
-\n\t- Gestore datos non in lìnia (iscarriga, burra, ativa / deativa datos sena lìnia deretamente dae OsmAnd)
+\n\t- Gestore datos non in lìnia (iscàrriga, burra, ativa / deativa datos sena lìnia deretamente dae OsmAnd)
 \n\t- Puntos prefèrridos e grupos (categoriza, burra, gesti sos prefèrridos)
 \n\t- GPX Explorer in s\'aplicu (bie minujas de sas rastas, distantzia, lestresa, artària, etc.)
 \n\t- Nàvigu GPX (prus optziones, sighi su nàvigu a pustis de un errore (crash), suportu pro sas rutundas)
@@ -1698,8 +1697,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="tip_map_switch_t_v2">"Sa mitza de sa mapa e sos livellos/istratos ammustrados podent èssere mudados tràmite \'Menù\' → \'Cunfigura mapa\'.
 \n\nSuta de \'Mitza mapa…\' podes isseberare de impreare sas mapas vetoriales non in lìnia giai carrigadas (predefinidu, netzessàriu pro su nàvigu sena lìnia), sas mapas a tasseddos predefinidas, in lìnia o in sa cache (ativa su cumponente agiuntivu (plugin) \'Mapas in lìnia\' in \'Impostaduras\' → \'Gestore plugins\' pro custu), o mapas creadas manualmente impreande, pro fàghere un\'esèmpiu, OsmAndMapCreator in su PC.
 \n\nOsmAnd suportada fintzas mitzas pessonalizadas. "</string>
-	<string name="tip_app_mode_t_v2">"OsmAnd suportada perfilos de s\'aplicu diferentes (e pessonalizados) pro diferentes maneras de impreu .
-\n\nPOdes mudare perfilu impreande su pursante perfilu in s\'àngulu in bassu a manca de s\'ischermada de sa mapa (icona màchina, bitzicleta, o a pedes), o cando ses creande un\'àndala (\'modalidade trasportu\'). "</string>
+	<string name="tip_app_mode_t_v2">"OsmAnd suportada profilos de s\'aplicu diferentes (e pessonalizados) pro diferentes maneras de impreu .
+\n\nPodes mudare profilu impreande su pursante profilu in s\'àngulu in bassu a manca de s\'ischermada de sa mapa (icona màchina, bitzicleta, o a pedes), o cando ses creande un\'àndala (\'modalidade trasportu\'). "</string>
 	<string name="tip_search_t">"Podes chircare sos logos deretamente in sa mapa tràmite \'Imprea positzione\' → \'Chirca a curtzu de inoghe\' o fintzas tràmite \'Menù\' → \'Chirca\'.
 \n\nS\'ischermada de chirca frunidi medas ischedas pro chircare
 \n\t* tràmite indiritzu

From 4f3caa724fc2fb02d391e7c5208d14ed954bec13 Mon Sep 17 00:00:00 2001
From: Roberto GEB <robertogeb@gmail.com>
Date: Sun, 9 Nov 2014 20:26:35 +0100
Subject: [PATCH 16/53] Translated using Weblate (Spanish)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-es/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 588c37c98a..3b83648ba8 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1861,7 +1861,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="distance">Distancia</string>
     <string name="record_plugin_name">Grabar tus viajes</string>
     <string name="record_plugin_description">Guardar tus trazas tocando un botón en la pantalla del mapa. Mostrar las opciones para grabar tus viajes a archivos GPX locales o usando un servicio web en línea.</string>
-    <string name="rendering_attr_publicTransportMode_name">Modo de transporte público</string>
+    <string name="rendering_attr_publicTransportMode_name">Rutas de autobús</string>
 	<string name="save_track_to_gpx_globally">Guardar traza en fichero GPX</string>
 	<string name="save_track_interval_globally">Intervalo de guardado</string>
 	<string name="save_track_to_gpx_globally_descr">El registro de la posición en un archivo GPX puede activarse o desactivarse usando el control de grabación GPX en la pantalla del mapa</string>
@@ -1903,14 +1903,14 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="layers_category_show">Mostrar</string>
 	<string name="configure_map">Configurar mapa</string>
     <string name="search_radius_proximity">En las proximidades de</string>
-    <string name="tip_recent_changes_1_9_t">"Cambios en 1.9: * Actualizados los estilos de los mapas con dibujado de la superficie de la carretera, capa de transporte y símbolos de senderismo * Buscar PDI a lo largo de la ruta * Marcar ruta como intransitable por sesión * Más facilidades para descargar y actualizar mapas * Recibir notificaciones visuales y sonoras al acercarse a un punto de la ruta * Imprimir itinerario e información de giros * Soporte de carriles de giro * Soporte de Android Wear * Muchos cambios en la IU * Zoom separado para el Tamaño del Texto en el mapa * Notificación de audio especial en caso de que estés fuera de la ruta * Funcionalidad de login en OsMo * Corregidas incompatibilidades de versión de OsMo "</string>
+    <string name="tip_recent_changes_1_9_t">"Cambios en 1.9: * Actualizados los estilos de los mapas con dibujado de la superficie de la carretera, capas de transporte y símbolos de senderismo * Buscar PDI a lo largo de la ruta * Marcar ruta como intransitable, por sesión * Descarga y actualización de mapas, más sencillas * Recibir notificaciones visuales y sonoras al acercarse a un punto de la ruta * Imprimir itinerario e información de giros * Soporte de carriles de giro * Soporte de Android Wear * Muchos cambios en la IU * Zoom separado para el Tamaño del Texto en el mapa * Notificación de audio especial en caso de que estés fuera de la ruta * Funcionalidad de login en OsMo * Corregidas incompatibilidades de versión de OsMo "</string>
     <string name="rendering_category_routes">Rutas</string>
     <string name="select_impassable_road">Seleccionar en el mapa</string>
     <string name="impassable_road">Evitar carreteras…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Rutas de tranvía y tren</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Rutas de tren</string>
     <string name="rendering_attr_tramRoutes_name">Rutas de tranvía</string>
-    <string name="rendering_attr_shareTaxiRoutes_name">Compartir rutas de taxi</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Rutas de taxi compartido</string>
     <string name="rendering_attr_trolleybusRoutes_name">Rutas de trolebús</string>
     <string name="rendering_attr_busRoutes_name">Rutas de autobús</string>
     <string name="rendering_category_hide">Ocultar</string>

From 48e787a1b964b436a33a7b0162029b18fc3a9c0b Mon Sep 17 00:00:00 2001
From: 8c6311e901274f6baef2068792c8ab <ft-002@safe-mail.net>
Date: Sun, 9 Nov 2014 16:09:53 +0100
Subject: [PATCH 17/53] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (5 of 5 strings)
---
 plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
index 670842ebec..fd7e092f97 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
@@ -2,6 +2,6 @@
 <resources><string name="default_buttons_yes">Ja</string>
     <string name="default_buttons_no">Nei</string>
     <string name="osmand_app_not_found">OsmAnd er ikke installert</string>
-    <string name="app_name">OsmAnd - parkering</string>
-    <string name="parking_plugin_installed">OsmAnd-pluginen er installert og aktivert i innstillingene for OsmAnd.</string>
+    <string name="app_name">OsmAnd-Parkering</string>
+    <string name="parking_plugin_installed">Programtillegget OsmAnd-Parkering er installert og aktivert i innstillingene for OsmAnd.</string>
 </resources>

From bb03777d725d7a9d25d3185ad51354929737a1e0 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 09:42:36 +0200
Subject: [PATCH 18/53] Fixed issue with drawer menu opened with slide change
 status

---
 OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index ab0c182eb8..d8de09029f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -94,6 +94,7 @@ public class MapActivityActions implements DialogProvider {
 
 	private enum DrawerType{
 		WAYPOINTS,
+		CONFIGURE_SCREEN,
 		CONFIGURE_MAP,
 		MAIN_MENU
 	}
@@ -816,6 +817,7 @@ public class MapActivityActions implements DialogProvider {
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
+						currentDrawer = DrawerType.CONFIGURE_MAP;
 						prepareConfigureMap();
 						return false;
 					}
@@ -825,7 +827,7 @@ public class MapActivityActions implements DialogProvider {
 			.listen(new OnContextMenuClick() {
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-					currentDrawer = DrawerType.CONFIGURE_MAP;
+					currentDrawer = DrawerType.CONFIGURE_SCREEN;
 					ContextMenuAdapter cm = mapActivity.getMapLayers().getMapInfoLayer().getViewConfigureMenuAdapter();
 					prepareOptionsMenu(cm);
 					return false;

From 77bd876864e38dc90cf2ed16b4d6229575a200da Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 09:55:17 +0200
Subject: [PATCH 19/53] Fixed app mode button not fit in drawer

---
 .../src/net/osmand/plus/activities/actions/AppModeDialog.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
index c83aca5217..7dfd4ae0dd 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
@@ -102,7 +102,7 @@ public class AppModeDialog {
 		newButtons[buttons.length] = tb;
 		tb.setTextOn("");
 		tb.setTextOff("");
-		int left = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, a.getResources().getDisplayMetrics());
+		int left = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, a.getResources().getDisplayMetrics());
 		int metrics = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64, a.getResources().getDisplayMetrics());
 		tb.setButtonDrawable(R.drawable.ic_other_modes);
 		LayoutParams lp = new LayoutParams(metrics, metrics);
@@ -238,7 +238,7 @@ public class AppModeDialog {
 	static private ToggleButton createToggle(Context ctx, LinearLayout layout, ApplicationMode mode, boolean drawer){
 		int margin = 0;
 		if (drawer) {
-			margin = 5;
+			margin = 2;
 		} else {
 			margin = 10;
 		}

From c77271459c3cc2813a460f4bdb0930bb86c5be9a Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 09:58:41 +0200
Subject: [PATCH 20/53] Fixed crush on lt language when opening downloads

---
 OsmAnd/res/values-lt/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 9329289654..4941a05c95 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1839,7 +1839,7 @@ OsmAnd yra aktyviai tobulinama ir mūsų projektas bei jo tolesnis progresas pri
     <string name="text_size">Teksto dydis</string>
     <string name="fav_point_dublicate">Pasikartojantis įsimintinos vietos pavadinimas</string>
     <string name="fav_point_dublicate_message">Mes pakeitėme įsimintinos vietos pavadinimą į %1$s kad išvengtume pasikartojimų.</string>
-    <string name="local_index_description">Spustelėkite bet kurį elementą, norėdami gauti daugiau informacijos, paspauskite ir laikykite, norėdami išjungti arba ištrinti. Dabartiniai duomenys įrenginyje (%1$ s laisva):</string>
+    <string name="local_index_description">Spustelėkite bet kurį elementą, norėdami gauti daugiau informacijos, paspauskite ir laikykite, norėdami išjungti arba ištrinti. Dabartiniai duomenys įrenginyje (%1$s laisva):</string>
 	<string name="print_route">Išspausdinti maršrutą</string>
     <string name="fav_point_emoticons_message">Mes pakeitėme jūsų įsimintos vietos pavadinimą į %1$s, nes teksto su veidukais išsaugoti faile neįmanoma.</string>
     <string name="test_native_render">Testuoti aparatinį atvaizdavimą</string>

From e458ebefd34d647dca607e27adda2aed9cbca8f6 Mon Sep 17 00:00:00 2001
From: Marcin Mieszczuk <m.mieszczuk@gmail.com>
Date: Mon, 10 Nov 2014 08:39:28 +0100
Subject: [PATCH 21/53] Translated using Weblate (Polish)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-pl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index fd258cef9f..1e74184d79 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1963,7 +1963,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="rendering_category_routes">Trasy</string>
     <string name="rendering_category_details">Szczegóły</string>
     <string name="rendering_category_transport">Transport</string>
-    <string name="rendering_category_others">Inny atrybuty map</string>
+    <string name="rendering_category_others">Inne atrybuty mapy</string>
     <string name="map_widget_appearance_rem">Pozostałe elementy</string>
     <string name="map_widget_top">Pasek statusu</string>
 	<string name="map_widget_right">Prawy panel</string>

From cb6a9983fc58135657d480155d57c88e57e027b5 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 10:04:13 +0200
Subject: [PATCH 22/53] Fixed wrong string in Korean language

---
 OsmAnd/res/values-ko/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index bd144d9b89..8fa1e2d2d8 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -2037,7 +2037,7 @@
     <string name="traffic_warning_calming">교통량 감소</string>
     <string name="traffic_warning_speed_camera">속도 경고 카메라</string>
     <string name="traffic_warning">트래픽 경고</string>
-	<string name="local_index_description">기존 항목을 클릭하여 더 많은 정보를 보세요. 비활성화 하려면 꾹 눌러주시거나 삭제하세요. 현재 데이터는 (%1$ s 무료):</string>
+	<string name="local_index_description">기존 항목을 클릭하여 더 많은 정보를 보세요. 비활성화 하려면 꾹 눌러주시거나 삭제하세요. 현재 데이터는 (%1$s 무료):</string>
 	<string name="text_size_descr">지도에 텍스트 크기를 설정 합니다.</string>
     <string name="text_size">텍스트 크기</string>
     <string name="fav_point_dublicate">즐겨찾기 포인트 이름 중복</string>

From eee6eddf6f1d05241c94a71e23de3ba247da78d0 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 11:11:26 +0200
Subject: [PATCH 23/53] Fixed NPE in UpdatesIntexFragment

---
 .../src/net/osmand/plus/download/UpdatesIndexFragment.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index f666b9196f..336367be19 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -41,7 +41,12 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 		format = getMyApplication().getResourceManager().getDateFormat();
 		updateColor = getResources().getColor(R.color.color_update);
 		osmandRegions = getMyApplication().getResourceManager().getOsmandRegions();
-		listAdapter = new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, DownloadActivity.downloadListIndexThread.getItemsToUpdate());
+		List<IndexItem> indexItems = new ArrayList<IndexItem>();
+		if (DownloadActivity.downloadListIndexThread != null &&
+				DownloadActivity.downloadListIndexThread.getItemsToUpdate() != null) {
+			indexItems = DownloadActivity.downloadListIndexThread.getItemsToUpdate();
+		}
+		listAdapter = new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, indexItems);
 		listAdapter.sort(new Comparator<IndexItem>() {
 			@Override
 			public int compare(IndexItem indexItem, IndexItem indexItem2) {

From d9ab5c40424e10b52251c931ce7df3dfe59a013a Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 11:16:54 +0200
Subject: [PATCH 24/53] Fixed NPE in LocalIndexesFragment in onPostExecute

---
 OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index fd3549998d..eecbb89880 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -701,6 +701,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 
 			@Override
 			protected void onPostExecute(List<String> warnings) {
+				if ( getDownloadActivity() == null) {
+					return;
+				}
 				getDownloadActivity().setProgressBarIndeterminateVisibility(false);
 				if (!warnings.isEmpty()) {
 					final StringBuilder b = new StringBuilder();

From 38126a8df676d93da5f590dbea8701d027fdf79b Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 11:19:13 +0200
Subject: [PATCH 25/53] Hotfix to NPE in UpdatesIndexFragment

---
 OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index 336367be19..fd193284d1 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -42,8 +42,7 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 		updateColor = getResources().getColor(R.color.color_update);
 		osmandRegions = getMyApplication().getResourceManager().getOsmandRegions();
 		List<IndexItem> indexItems = new ArrayList<IndexItem>();
-		if (DownloadActivity.downloadListIndexThread != null &&
-				DownloadActivity.downloadListIndexThread.getItemsToUpdate() != null) {
+		if (DownloadActivity.downloadListIndexThread != null) {
 			indexItems = DownloadActivity.downloadListIndexThread.getItemsToUpdate();
 		}
 		listAdapter = new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, indexItems);

From 7e7a8306710637ab75eb6f2ac859f20cb7eab109 Mon Sep 17 00:00:00 2001
From: Ivan Gonzalez Martin <cain1986@gmail.com>
Date: Mon, 10 Nov 2014 10:17:59 +0100
Subject: [PATCH 26/53] Translated using Weblate (Spanish)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-es/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 3b83648ba8..4462cd4f51 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1861,7 +1861,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="distance">Distancia</string>
     <string name="record_plugin_name">Grabar tus viajes</string>
     <string name="record_plugin_description">Guardar tus trazas tocando un botón en la pantalla del mapa. Mostrar las opciones para grabar tus viajes a archivos GPX locales o usando un servicio web en línea.</string>
-    <string name="rendering_attr_publicTransportMode_name">Rutas de autobús</string>
+    <string name="rendering_attr_publicTransportMode_name">Rutas de autobús, trolebús, transporte</string>
 	<string name="save_track_to_gpx_globally">Guardar traza en fichero GPX</string>
 	<string name="save_track_interval_globally">Intervalo de guardado</string>
 	<string name="save_track_to_gpx_globally_descr">El registro de la posición en un archivo GPX puede activarse o desactivarse usando el control de grabación GPX en la pantalla del mapa</string>
@@ -1910,7 +1910,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="rendering_attr_tramTrainRoutes_name">Rutas de tranvía y tren</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Rutas de tren</string>
     <string name="rendering_attr_tramRoutes_name">Rutas de tranvía</string>
-    <string name="rendering_attr_shareTaxiRoutes_name">Rutas de taxi compartido</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Compartir rutas de taxi</string>
     <string name="rendering_attr_trolleybusRoutes_name">Rutas de trolebús</string>
     <string name="rendering_attr_busRoutes_name">Rutas de autobús</string>
     <string name="rendering_category_hide">Ocultar</string>

From bb695deaedcc8e9cbac070d751b359462ba71c79 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 11:29:44 +0200
Subject: [PATCH 27/53] Fixed NPE in localIndexFragment in onPostExecute

---
 .../src/net/osmand/plus/download/LocalIndexesFragment.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index eecbb89880..2b830af740 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -268,9 +268,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 		protected void onPostExecute(List<LocalIndexInfo> result) {
 			this.result = result;
 			listAdapter.sortData();
-			
-			getDownloadActivity().setSupportProgressBarIndeterminateVisibility(false);
-			getDownloadActivity().setLocalIndexInfos(result);
+			if (getDownloadActivity() != null){
+				getDownloadActivity().setSupportProgressBarIndeterminateVisibility(false);
+				getDownloadActivity().setLocalIndexInfos(result);
+			}
 		}
 
 		public List<LocalIndexInfo> getResult() {

From a7012e74ac8131c51221acdd108cf8845df720cf Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 10 Nov 2014 14:29:48 +0200
Subject: [PATCH 28/53] Fixed issue with wrong context for dialog

---
 OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index f4ff2726a1..65f4a51cd9 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -190,8 +190,9 @@ public class FavouritesDbHelper {
 				}
 			}
 		}
-		if (index.length() > 0 || emoticons){
-			AlertDialog.Builder builder = new AlertDialog.Builder(context);
+		if ((index.length() > 0 || emoticons)&&
+				context.getMapActivity() != null){
+			AlertDialog.Builder builder = new AlertDialog.Builder(context.getMapActivity());
 			builder.setTitle(R.string.fav_point_dublicate);
 			if (emoticons){
 				builder.setMessage(context.getString(R.string.fav_point_emoticons_message, name));

From e3b295a3f48fcb11cc47cef8ea46d9f44def0c9f Mon Sep 17 00:00:00 2001
From: xmd5a2 <lornaderek@mail.ru>
Date: Tue, 11 Nov 2014 17:42:30 +0300
Subject: [PATCH 29/53] Add ru phrases.xml (incomplete)

---
 OsmAnd/res/values-ru/phrases.xml | 585 +++++++++++++++++++++++++++++++
 OsmAnd/res/values/phrases.xml    |  21 +-
 2 files changed, 596 insertions(+), 10 deletions(-)
 create mode 100644 OsmAnd/res/values-ru/phrases.xml

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
new file mode 100644
index 0000000000..85cd71cc9b
--- /dev/null
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -0,0 +1,585 @@
+<?xml version="1.0" ?>
+<resources>
+	<string name="poi_bakery">Булочная</string>
+	<string name="poi_alcohol">Винно-водочный магазин</string>
+	<string name="poi_convenience">Магазин</string>
+	<string name="poi_mall">Торговый центр</string>
+	<string name="poi_beverages">Напитки</string>
+	<string name="poi_butcher">Мясная лавка</string>
+	<string name="poi_deli">Деликатесы</string>
+	<string name="poi_shop_farm">Фермерские продукты</string>
+	<string name="poi_greengrocer">Овощи и фрукты</string>
+	<string name="poi_seafood">Морепродукты</string>
+	<string name="poi_confectionery">Кондитерская</string>
+	<string name="poi_ice_cream">Мороженое</string>
+	<string name="poi_supermarket">Супермаркет</string>
+	<string name="poi_shop_tea">Чайный магазин</string>
+	<string name="poi_dairy">Молочный магазин</string>
+	<string name="poi_vending_machine">Торговый автомат</string>
+
+	<string name="poi_bookshop">Книжный магазин</string>
+	<string name="poi_bicycle_shop">Магазин велосипедов</string>
+	<string name="poi_anime_shop">Магазин аниме</string>
+	<string name="poi_antiques_shop">Антиквариат</string>
+	<string name="poi_art_shop">Предметы искусства</string>
+	<string name="poi_baby_goods">Товары для детей</string>
+	<string name="poi_bag_shop">Сумки, чемоданы</string>
+	<string name="poi_bathroom_furnishing_shop">Сантехника, ванные</string>
+	<string name="poi_bed_shop">Спальные принадлежности</string>
+	<string name="poi_boutique">Бутик</string>
+	<string name="poi_carpet_shop">Магазин ковров</string>
+	<string name="poi_chemist_shop">Бытовая химия, косметика</string>
+	<string name="poi_clothes_shop">Одежда</string>
+	<string name="poi_children_clothes_shop">Детская одежда</string>
+	<string name="poi_shoes">Обувь</string>
+	<string name="poi_computer_shop">Компьютеры</string>
+	<string name="poi_copyshop">Ксерокопия, полиграфия</string>
+	<string name="poi_curtain_shop">Шторы, портьеры</string>
+	<string name="poi_fabric_shop">Ткани</string>
+	<string name="poi_bedding_shop">Постельное бельё</string>
+	<string name="poi_dive_shop">Снаряжение для дайвинга</string>
+	<string name="poi_doityourself_shop">Инструменты и стройматериалы</string>
+	<string name="poi_erotic_shop">Секс-шоп</string>
+	<string name="poi_fishing_shop">Рыболовный магазин</string>
+	<string name="poi_florist">Цветочный магазин</string>
+	<string name="poi_frame_shop">Рамки, багет</string>
+	<string name="poi_furniture_shop">Мебель</string>
+	<string name="poi_garden_centre">Садово-огородный магазин</string>
+	<string name="poi_gas_shop">Газ в баллонах</string>
+	<string name="poi_general_shop">Магазин</string>
+	<string name="poi_gift_shop">Подарки, сувениры</string>
+	<string name="poi_glaziery_shop">Окна, стёкла</string>
+	<string name="poi_hardware_shop">Скобяные изделия и инструмент</string>
+	<string name="poi_hearing_aids_shop">Слуховые аппараты</string>
+	<string name="poi_herbalist">Травы (народная медицина)</string>
+	<string name="poi_hifi_shop">Hi-Fi аппаратура</string>
+	<string name="poi_houseware_shop">Хозяйственные товары</string>
+	<string name="poi_hunting_shop">Охотничий магазин</string>
+	<string name="poi_interior_decoration_shop">Декор и оформление</string>
+	<string name="poi_jewelry_shop">Ювелирный магазин</string>
+	<string name="poi_kiosk">Киоск, ларёк</string>
+	<string name="poi_kitchen_shop">Кухни</string>
+	<string name="poi_mobile_phone_shop">Салон связи</string>
+	<string name="poi_motorcycle_shop">Мотоциклы</string>
+	<string name="poi_musical_instrument_shop">Музыкальные инструменты</string>
+	<string name="poi_newsagent_shop">Журнальный киоск</string>
+	<string name="poi_optician_shop">Оптика</string>
+	<string name="poi_organic_shop">Натуральные продукты</string>
+	<string name="poi_outdoor_shop">Товары для активного отдыха</string>
+	<string name="poi_paint_shop">Краски</string>
+	<string name="poi_pet_shop">Зоомагазин</string>
+	<string name="poi_radiotechnics_shop">Радиодетали</string>
+	<string name="poi_second_hand">Секонд-хенд</string>
+	<string name="poi_ship_chandler">Яхты, запчасти, оснастка</string>
+	<string name="poi_sports_shop">Спорттовары</string>
+	<string name="poi_stationery_shop">Канцелярские товары</string>
+	<string name="poi_tableware_shop">Кухонные принадлежности</string>
+	<string name="poi_ticket_shop">Продажа, бронирование билетов</string>
+	<string name="poi_tobacco_shop">Табак</string>
+	<string name="poi_toys_shop">Игрушки</string>
+	<string name="poi_trade_shop">Оптовый склад</string>
+	<string name="poi_vacuum_cleaner_shop">Пылесосы и аксессуары</string>
+	<string name="poi_variety_store">Всё по одной цене</string>
+	<string name="poi_video_shop">Продажа, прокат DVD</string>
+	<string name="poi_window_blind_shop">Жалюзи, ставни, маркизы</string>
+	<string name="poi_department_store">Универмаг</string>
+	<string name="poi_electronics_shop">Электроника</string>
+	<string name="poi_car_shop">Автосалон</string>
+	<string name="poi_car_parts_shop">Автозапчасти</string>
+	<string name="poi_atv_shop">Квадроциклы</string>
+	<string name="poi_cosmetics_shop">Косметика, парфюмерия</string>
+	<string name="poi_marketplace">Рынок</string>
+	<string name="poi_sewing_shop">Шитьё и рукоделие</string>
+
+	<string name="poi_police">Отделение полиции</string>
+	<string name="poi_fire_station">Пожарная часть</string>
+	<string name="poi_emergency_phone">Экстренный телефон</string>
+	<string name="poi_fire_hydrant">Пожарный гидрант</string>
+	<string name="poi_fire_extinguisher">Огнетушитель</string>
+	<string name="poi_fire_flapper">Ручное средство пожаротушения</string>
+	<string name="poi_fire_hose">Пожарный шланг</string>
+	<string name="poi_fire_water_pond">Пожарный водоём</string>
+	<string name="poi_grit_bin">Ящик с песком</string>
+	<string name="poi_ambulance_station">Станция скорой помощи</string>
+	<string name="poi_ses_station">Станция SES</string>
+	<string name="poi_emergency_access_point">Табличка с кодом для службы спасения</string>
+
+	<string name="poi_ford">Брод</string>
+	<string name="poi_mountain_pass">Перевал</string>
+	<string name="poi_gate">Ворота</string>
+	<string name="poi_city_wall">Городская стена</string>
+	<string name="poi_lift_gate">Шлагбаум</string>
+	<string name="poi_toll_booth">Пункт оплаты проезда</string>
+	<string name="poi_border_control">Пограничный контроль</string>
+	<string name="poi_traffic_calming_bump">Лежачий полицейский</string>
+	<string name="poi_traffic_calming_hump">Лежачий полицейский (широкий)</string>
+	<string name="poi_traffic_calming_cushion">Лежачий полицейский с разрывами</string>
+	<string name="poi_traffic_calming_chicane">Шикана</string>
+	<string name="poi_traffic_calming_rumble_strip">Лежачий полицейский (стиральная доска)</string>
+	<string name="poi_traffic_calming_table">Лежачий полицейский (стол)</string>
+	<string name="poi_traffic_calming_choker">Сужение</string>
+	<string name="poi_traffic_signals">Светофор</string>
+
+	<string name="poi_car_repair">Автосервис</string>
+	<string name="poi_service_tyres">Шиномонтаж</string>
+	<string name="poi_vehicle_inspection">Пункт техосмотра</string>
+	<string name="poi_car_wash">Автомойка</string>
+	<string name="poi_fuel">Заправка</string>
+	<string name="poi_charging_station">Зарядная станция</string>
+	<string name="poi_vehicle_ramp">Ремонтная эстакада/яма</string>
+	<string name="poi_compressed_air">Компрессор для подкачки шин</string>
+	<string name="poi_parking">Парковка</string>
+	<string name="poi_motorcycle_parking">Парковка для мотоциклов</string>
+	<string name="poi_parking_entrance">Въезд на парковку</string>
+	<string name="poi_garages">Гаражи</string>
+
+	<string name="poi_public_transport_platform">Остановка общественного транспорта</string>
+	<string name="poi_public_transport_platform_bus">Остановка автобуса</string>
+	<string name="poi_public_transport_platform_trolleybus">Остановка троллейбуса</string>
+	<string name="poi_bus_stop">Остановка автобуса (устар.)</string>
+	<string name="poi_public_transport_platform_tram">Остановка трамвая</string>
+	<string name="poi_tram_stop">Остановка трамвая (устар.)</string>
+	<string name="poi_public_transport_station">Станция общественного транспорта</string>
+	<string name="poi_bus_station">Автобусная станция (устар.)</string>
+	<string name="poi_railway_station">Ж/д станция (устар.)</string>
+	<string name="poi_railway_platform">Ж/д платформа (устар.)</string>
+	<string name="poi_railway_halt">Ж/д платформа (устар.)</string>
+	<string name="poi_subway_entrance">Вход в метро</string>
+	<string name="poi_subway_station">Станция метро</string>
+	<string name="poi_taxi">Стоянка такси</string>
+
+	<string name="poi_airport">Аэропорт</string>
+	<string name="poi_helipad">Вертолётная площадка</string>
+	<string name="poi_runway">Взлётная полоса</string>
+	<string name="poi_aeroway_terminal">Терминал аэропорта</string>
+	<string name="poi_aeroway_gate">Выход на посадку в аэропорту</string>
+
+	<string name="poi_slipway">Скат для лодок</string>
+	<string name="poi_ferry_terminal">Причал парома</string>
+	<string name="poi_lighthouse">Маяк</string>
+
+	<string name="poi_bicycle_rental">Прокат велосипедов</string>
+	<string name="poi_bicycle_parking">Велопарковка</string>
+
+	<string name="poi_aerialway_station">Станция канатной дороги</string>
+	<string name="poi_aerialway_cable_car">Канатная дорога с кабинами</string>
+	<string name="poi_aerialway_gondola">Канатная дорога с небольшими кабинами</string>
+	<string name="poi_aerialway_chair_lift">Канатная дорога с открытыми креслами</string>
+	<string name="poi_aerialway_t_bar">T-образный подъёмник</string>
+	<string name="poi_aerialway_j_bar">J-образный подъёмник</string>
+	<string name="poi_aerialway_platter">Тарелочный подъёмник</string>
+	<string name="poi_aerialway_mixed_lift">Подъёмник смешанного типа</string>
+	<string name="poi_aerialway_drag_lift">Бугельная канатная дорога</string>
+	<string name="poi_aerialway_rope_tow">Движущийся канат</string>
+	<string name="poi_aerialway_goods">Грузовой подъёмник</string>
+	<string name="poi_aerialway_magic_carpet">Ленточный подъёмник</string>
+
+	<string name="poi_tunnel">Туннель</string>
+	<string name="poi_bridge">Мост</string>
+
+	<string name="poi_speed_camera">Камера для замера скорости</string>
+	<string name="poi_turning_circle">Разворотный круг</string>
+
+	<string name="poi_water_well">Колодец</string>
+	<string name="poi_standpipe">Напорная труба</string>
+	<string name="poi_water_works">Водозабор</string>
+	<string name="poi_boatyard">Шлюпочная мастерская</string>
+	<string name="poi_wastewater_plant">Очистные сооружения</string>
+	<string name="poi_water_tower">Водонапорная башня</string>
+	<string name="poi_lock_gate">Ворота шлюза</string>
+	<string name="poi_waterway_turning_point">Поворотная точка на воде</string>
+	<string name="poi_weir">Небольшая плотина</string>
+	<string name="poi_dam">Дамба</string>
+	<string name="poi_water_mill">Водяная мельница</string>
+
+	<string name="poi_power_substation">Подстанция</string>
+	<string name="poi_power_transformer">Трансформатор</string>
+	<string name="poi_power_plant"></string>
+	<string name="poi_power_generator"></string>
+
+	<string name="poi_post_office"></string>
+	<string name="poi_post_box"></string>
+	<string name="poi_telephone"></string>
+	<string name="poi_communication_tower"></string>
+	<string name="poi_telephone_exchange"></string>
+
+	<string name="poi_recycling"></string>
+	<string name="poi_landfill"></string>
+	<string name="poi_waste_disposal"></string>
+	<string name="poi_waste_basket"></string>
+
+	<string name="poi_surveillance"></string>
+	<string name="poi_construction"></string>
+	<string name="poi_works"></string>
+	<string name="poi_mineshaft"></string>
+	<string name="poi_adit"></string>
+	<string name="poi_petroleum_well"></string>
+	<string name="poi_survey_point"></string>
+	<string name="poi_windmill"></string>
+	<string name="poi_quarry"></string>
+	<string name="poi_vineyard"></string>
+	<string name="poi_orchard"></string>
+	<string name="poi_salt_pond"></string>
+
+	<string name="poi_driving_school"></string>
+	<string name="poi_school"></string>
+	<string name="poi_kindergarten"></string>
+	<string name="poi_college"></string>
+	<string name="poi_university"></string>
+
+	<string name="poi_social_facility"></string>
+	<string name="poi_courthouse"></string>
+	<string name="poi_prison"></string>
+	<string name="poi_register_office"></string>
+	<string name="poi_embassy"></string>
+	<string name="poi_government"></string>
+	<string name="poi_bailiff"></string>
+	<string name="poi_prosecutor"></string>
+	<string name="poi_pension_fund"></string>
+	<string name="poi_migration"></string>
+	<string name="poi_tax_inspection"></string>
+	<string name="poi_administrative_office">Административное учреждение</string>
+	<string name="poi_customs"></string>
+
+	<string name="poi_pharmacy"></string>
+	<string name="poi_hospital"></string>
+	<string name="poi_doctors"></string>
+	<string name="poi_clinic"></string>
+	<string name="poi_first_aid"></string>
+	<string name="poi_dentist"></string>
+	<string name="poi_nursing_home"></string>
+	<string name="poi_baby_hatch"></string>
+	<string name="poi_veterinary"></string>
+	<string name="poi_sanatorium"></string>
+
+	<string name="poi_company"></string>
+	<string name="poi_insurance"></string>
+	<string name="poi_estate_agent"></string>
+	<string name="poi_lawyer"></string>
+	<string name="poi_telecommunication_office"></string>
+	<string name="poi_ngo"></string>
+	<string name="poi_town_hall">Администрация населенного пункта</string>
+	<string name="poi_employment_agency"></string>
+	<string name="poi_research_office"></string>
+	<string name="poi_it_office"></string>
+	<string name="poi_newspaper_office"></string>
+	<string name="poi_architect_office"></string>
+	<string name="poi_advertising_agency"></string>
+	<string name="poi_educational_institution"></string>
+	<string name="poi_studio"></string>
+	<string name="poi_bookmaker"></string>
+
+	<string name="poi_stadium"></string>
+	<string name="poi_sports_centre"></string>
+	<string name="poi_golf_course"></string>
+	<string name="poi_ice_rink"></string>
+	<string name="poi_pitch"></string>
+	<string name="poi_running_track"></string>
+	<string name="poi_bicycle_track"></string>
+	<string name="poi_horse_track"></string>
+	<string name="poi_raceway"></string>
+	<string name="poi_9pin"></string>
+	<string name="poi_10pin"></string>
+	<string name="poi_archery"></string>
+	<string name="poi_athletics"></string>
+	<string name="poi_australian_football"></string>
+	<string name="poi_baseball"></string>
+	<string name="poi_basketball"></string>
+	<string name="poi_beachvolleyball"></string>
+	<string name="poi_boules"></string>
+	<string name="poi_bowls"></string>
+	<string name="poi_canoe"></string>
+	<string name="poi_chess"></string>
+	<string name="poi_climbing"></string>
+	<string name="poi_cricket"></string>
+	<string name="poi_cricket_nets"></string>
+	<string name="poi_croquet"></string>
+	<string name="poi_cycling"></string>
+	<string name="poi_diving"></string>
+	<string name="poi_scuba_diving"></string>
+	<string name="poi_dog_racing"></string>
+	<string name="poi_equestrian"></string>
+	<string name="poi_football"></string>
+	<string name="poi_golf"></string>
+	<string name="poi_gymnastics"></string>
+	<string name="poi_hockey"></string>
+	<string name="poi_horse_racing"></string>
+	<string name="poi_ice_stock"></string>
+	<string name="poi_korfbal"></string>
+	<string name="poi_motor_sport"></string>
+	<string name="poi_multi_sport"></string>
+	<string name="poi_orienteering"></string>
+	<string name="poi_paddle_tennis"></string>
+	<string name="poi_paragliding"></string>
+	<string name="poi_pelota"></string>
+	<string name="poi_racquet"></string>
+	<string name="poi_rowing"></string>
+	<string name="poi_rugby"></string>
+	<string name="poi_shooting"></string>
+	<string name="poi_skating"></string>
+	<string name="poi_skateboard"></string>
+	<string name="poi_skiing"></string>
+	<string name="poi_soccer"></string>
+	<string name="poi_swimming"></string>
+	<string name="poi_table_tennis"></string>
+	<string name="poi_team_handball"></string>
+	<string name="poi_tennis"></string>
+	<string name="poi_toboggan"></string>
+	<string name="poi_volleyball"></string>
+
+	<string name="poi_museum"></string>
+	<string name="poi_attraction"></string>
+	<string name="poi_memorial"></string>
+	<string name="poi_artwork"></string>
+	<string name="poi_archaeological_site"></string>
+	<string name="poi_battlefield"></string>
+	<string name="poi_boundary_stone"></string>
+	<string name="poi_castle"></string>
+	<string name="poi_city_gate"></string>
+	<string name="poi_fort"></string>
+	<string name="poi_fountain"></string>
+	<string name="poi_ruins_historic"></string>
+	<string name="poi_rune_stone"></string>
+	<string name="poi_wreck"></string>
+	<string name="poi_ship_historic"></string>
+	<string name="poi_mine_historic"></string>
+	<string name="poi_monument"></string>
+	<string name="poi_zoo"></string>
+	<string name="poi_theme_park"></string>
+
+	<string name="poi_hotel"></string>
+	<string name="poi_guest_house"></string>
+	<string name="poi_hostel"></string>
+	<string name="poi_motel"></string>
+	<string name="poi_alpine_hut"></string>
+	<string name="poi_chalet"></string>
+
+	<string name="poi_place_of_worship"></string>
+	<string name="poi_place_of_worship_christian"></string>
+	<string name="poi_place_of_worship_jewish"></string>
+	<string name="poi_place_of_worship_muslim"></string>
+	<string name="poi_place_of_worship_sikh"></string>
+	<string name="poi_place_of_worship_buddhist"></string>
+	<string name="poi_place_of_worship_hindu"></string>
+	<string name="poi_place_of_worship_shinto"></string>
+	<string name="poi_place_of_worship_taoist"></string>
+	<string name="poi_monastery"></string>
+	<string name="poi_historic_monastery"></string>
+	<string name="poi_wayside_cross"></string>
+	<string name="poi_wayside_shrine"></string>
+	<string name="poi_tourism_information"></string>
+	<string name="poi_clock"></string>
+	<string name="poi_travel_agent"></string>
+	<string name="poi_viewpoint"></string>
+	<string name="poi_camp_site"></string>
+	<string name="poi_caravan_site"></string>
+	<string name="poi_picnic_site"></string>
+	<string name="poi_spring"></string>
+	<string name="poi_cemetery"></string>
+	<string name="poi_grave_yard"></string>
+	<string name="poi_shelter"></string>
+	<string name="poi_funicular"></string>
+	<string name="poi_resort"></string>
+
+	<string name="poi_club_art"></string>
+	<string name="poi_club_astronomy"></string>
+	<string name="poi_club_computer"></string>
+	<string name="poi_club_board_games"></string>
+	<string name="poi_club_motorcycle"></string>
+	<string name="poi_club_sport"></string>
+	<string name="poi_club_game"></string>
+	<string name="poi_club_automobile"></string>
+	<string name="poi_club_chess"></string>
+	<string name="poi_club_cinema"></string>
+	<string name="poi_club_fan"></string>
+	<string name="poi_club_fishing"></string>
+	<string name="poi_club_veterans"></string>
+	<string name="poi_club_linux"></string>
+	<string name="poi_club_theatre"></string>
+	<string name="poi_club_history"></string>
+	<string name="poi_club_music"></string>
+	<string name="poi_club_ethnic"></string>
+	<string name="poi_club_nature"></string>
+	<string name="poi_club_photography"></string>
+	<string name="poi_club_hunting"></string>
+	<string name="poi_club_shooting"></string>
+	<string name="poi_club_tourism"></string>
+	<string name="poi_club_charity"></string>
+
+	<string name="poi_library"></string>
+	<string name="poi_arts_centre"></string>
+	<string name="poi_cinema"></string>
+	<string name="poi_casino"></string>
+	<string name="poi_community_centre"></string>
+	<string name="poi_social_centre"></string>
+	<string name="poi_theatre"></string>
+	<string name="poi_circus"></string>
+	<string name="poi_dance_floor"></string>
+	<string name="poi_nightclub"></string>
+	<string name="poi_stripclub"></string>
+	<string name="poi_beach_resort"></string>
+	<string name="poi_dog_park"></string>
+	<string name="poi_fishing_place"></string>
+	<string name="poi_hunting_stand"></string>
+	<string name="poi_marina"></string>
+	<string name="poi_miniature_golf"></string>
+	<string name="poi_playground"></string>
+	<string name="poi_swimming_pool"></string>
+	<string name="poi_water_park"></string>
+	<string name="poi_park"></string>
+
+	<string name="poi_cafe"></string>
+	<string name="poi_biergarten"></string>
+	<string name="poi_restaurant"></string>
+	<string name="poi_fast_food"></string>
+	<string name="poi_bar"></string>
+	<string name="poi_pub"></string>
+	<string name="poi_food_court"></string>
+	<string name="poi_drinking_water"></string>
+	<string name="poi_barbecue"></string>
+
+	<string name="poi_agricultural_engines_craft"></string>
+	<string name="poi_basket_maker"></string>
+	<string name="poi_beekeeper"></string>
+	<string name="poi_blacksmith"></string>
+	<string name="poi_brewery"></string>
+	<string name="poi_boatbuilder"></string>
+	<string name="poi_bookbinder"></string>
+	<string name="poi_carpenter"></string>
+	<string name="poi_carpet_layer"></string>
+	<string name="poi_caterer"></string>
+	<string name="poi_clockmaker"></string>
+	<string name="poi_dressmaker"></string>
+	<string name="poi_electrician"></string>
+	<string name="poi_gardener"></string>
+	<string name="poi_glaziery_craft"></string>
+	<string name="poi_handicraft"></string>
+	<string name="poi_hvac"></string>
+	<string name="poi_insulation_craft"></string>
+	<string name="poi_jeweller"></string>
+	<string name="poi_locksmith"></string>
+	<string name="poi_key_cutter"></string>
+	<string name="poi_metal_construction_craft"></string>
+	<string name="poi_optician"></string>
+	<string name="poi_painter"></string>
+	<string name="poi_parquet_layer"></string>
+	<string name="poi_photographer"></string>
+	<string name="poi_photographic_laboratory"></string>
+	<string name="poi_plasterer"></string>
+	<string name="poi_plumber"></string>
+	<string name="poi_pottery_craft"></string>
+	<string name="poi_rigger"></string>
+	<string name="poi_roofer"></string>
+	<string name="poi_saddler"></string>
+	<string name="poi_sailmaker"></string>
+	<string name="poi_sawmill"></string>
+	<string name="poi_scaffolder"></string>
+	<string name="poi_sculptor"></string>
+	<string name="poi_shoemaker"></string>
+	<string name="poi_stand_builder"></string>
+	<string name="poi_stonemason"></string>
+	<string name="poi_sun_protection_craft"></string>
+	<string name="poi_sweep"></string>
+	<string name="poi_tailor"></string>
+	<string name="poi_tiler"></string>
+	<string name="poi_tinsmith"></string>
+	<string name="poi_upholsterer"></string>
+	<string name="poi_watchmaker"></string>
+	<string name="poi_window_construction"></string>
+
+	<string name="poi_funeral_directors"></string>
+	<string name="poi_computer_craft"></string>
+	<string name="poi_beauty_salon"></string>
+	<string name="poi_beauty_salon_nails"></string>
+	<string name="poi_hairdresser"></string>
+	<string name="poi_massage"></string>
+	<string name="poi_tattoo"></string>
+	<string name="poi_dry_cleaning"></string>
+	<string name="poi_laundry"></string>
+	<string name="poi_car_rental"></string>
+	<string name="poi_car_sharing"></string>
+	<string name="poi_boat_sharing"></string>
+	<string name="poi_toilets"></string>
+	<string name="poi_sauna"></string>
+	<string name="poi_brothel"></string>
+	<string name="poi_mortuary"></string>
+	<string name="poi_crematorium"></string>
+	<string name="poi_internet_cafe"></string>
+
+	<string name="poi_bank"></string>
+	<string name="poi_atm"></string>
+	<string name="poi_money_lender"></string>
+	<string name="poi_pawnbroker">Ломбард</string>
+	<string name="poi_currencyexchange"></string>
+	<string name="poi_accountant"></string>
+	<string name="poi_bitcoin_yes"></string>
+
+	<string name="poi_cave_entrance">Вход в пещеру</string>
+	<string name="poi_peak"></string>
+	<string name="poi_saddle">Седловая точка (перевал)</string>
+	<string name="poi_volcano">Вулкан</string>
+	<string name="poi_crater">Кратер</string>
+	<string name="poi_sinkhole"></string>
+	<string name="poi_waterfall"></string>
+	<string name="poi_rapids"></string>
+	<string name="poi_stone"></string>
+	<string name="poi_cape"></string>
+	<string name="poi_beach"></string>
+	<string name="poi_bay"></string>
+	<string name="poi_fjord"></string>
+	<string name="poi_reef"></string>
+	<string name="poi_wetland"></string>
+	<string name="poi_nature_reserve"></string>
+	<string name="poi_strait"></string>
+	<string name="poi_island"></string>
+	<string name="poi_islet"></string>
+
+	<string name="poi_seamark_anchorage"></string>
+	<string name="poi_seamark_anchor_berth"></string>
+	<string name="poi_seamark_beacon"></string>
+	<string name="poi_seamark_beacon_cardinal"></string>
+	<string name="poi_seamark_beacon_lateral"></string>
+	<string name="poi_seamark_beacon_safe_water"></string>
+	<string name="poi_seamark_beacon_special_purpose"></string>
+	<string name="poi_seamark_berth"></string>
+	<string name="poi_seamark_building"></string>
+	<string name="poi_seamark_bridge"></string>
+	<string name="poi_seamark_buoy_cardinal"></string>
+	<string name="poi_seamark_buoy_installation"></string>
+	<string name="poi_seamark_buoy_isolated_danger"></string>
+	<string name="poi_seamark_buoy_lateral"></string>
+	<string name="poi_seamark_buoy_safe_water"></string>
+	<string name="poi_seamark_buoy_special_purpose"></string>
+	<string name="poi_seamark_daymark"></string>
+	<string name="poi_seamark_distance_mark"></string>
+	<string name="poi_seamark_dry_dock"></string>
+	<string name="poi_seamark_dyke"></string>
+	<string name="poi_seamark_floating_dock"></string>
+	<string name="poi_seamark_fog_signal"></string>
+	<string name="poi_seamark_harbour_basin"></string>
+	<string name="poi_seamark_harbour"></string>
+	<string name="poi_seamark_landmark"></string>
+	<string name="poi_seamark_light"></string>
+	<string name="poi_seamark_light_major"></string>
+	<string name="poi_seamark_light_minor"></string>
+	<string name="poi_seamark_light_float"></string>
+	<string name="poi_seamark_light_vessel"></string>
+	<string name="poi_seamark_mooring"></string>
+	<string name="poi_seamark_notice"></string>
+	<string name="poi_seamark_pile"></string>
+	<string name="poi_seamark_radar_transponder"></string>
+	<string name="poi_seamark_radio_station"></string>
+	<string name="poi_seamark_signal_station_traffic"></string>
+	<string name="poi_seamark_signal_station_warning"></string>
+	<string name="poi_seamark_small_craft_facility"></string>
+	<string name="poi_seamark_topmark"></string>
+	<string name="poi_seamark_rock"></string>
+	<string name="poi_seamark_wreck"></string>
+	<string name="poi_military_airfield"></string>
+	<string name="poi_military_bunker"></string>
+	<string name="poi_military_barracks"></string>
+	<string name="poi_military_danger_area"></string>
+	<string name="poi_military_range"></string>
+	<string name="poi_military_naval_base"></string>
+	<string name="poi_military_nuclear_explosion_site"></string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index e82e26cdb9..2c9bad3d60 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -133,18 +133,20 @@
 	<string name="poi_parking_entrance">Parking entrance</string>
 	<string name="poi_garages">Garages</string>
 
-	<string name="poi_bus_station">Bus station</string>
-	<string name="poi_subway_entrance">Subway entrance</string>
-	<string name="poi_railway_station">Railway station</string>
-	<string name="poi_public_transport_platform">Public transport platform</string>
-	<string name="poi_railway_platform">Railway platform</string>
-	<string name="poi_railway_halt">Railway halt</string>
+	<string name="poi_public_transport_platform">Public transport stop</string>
+	<string name="poi_public_transport_platform_bus">Bus stop</string>
+	<string name="poi_public_transport_platform_trolleybus">Trolleybus stop</string>
+	<string name="poi_bus_stop">Bus stop (obsolete)</string>
+	<string name="poi_public_transport_platform_tram">Tram stop</string>
+	<string name="poi_tram_stop">Tram stop (obsolete)</string>
 	<string name="poi_public_transport_station">Public transport station</string>
+	<string name="poi_bus_station">Bus station (obsolete)</string>
+	<string name="poi_railway_station">Railway station (obsolete)</string>
+	<string name="poi_railway_platform">Railway platform (obsolete)</string>
+	<string name="poi_railway_halt">Railway stop (obsolete)</string>
+	<string name="poi_subway_entrance">Subway entrance</string>
 	<string name="poi_subway_station">Subway station</string>
-	<string name="poi_bus_stop">Bus stop</string>
-	<string name="poi_tram_stop">Tram stop</string>
 	<string name="poi_taxi">Taxi stand</string>
-	<string name="poi_funicular">Funicular</string>
 
 	<string name="poi_airport">Airport</string>
 	<string name="poi_helipad">Helipad</string>
@@ -188,7 +190,6 @@
 	<string name="poi_waterway_turning_point">Waterway turning point</string>
 	<string name="poi_weir">Weir</string>
 	<string name="poi_dam">Dam</string>
-	<string name="poi_mill_pond">Mill pond</string>
 	<string name="poi_water_mill">Water mill</string>
 
 	<string name="poi_power_substation">Substation</string>

From 73f6cba4aedd964c2c3f2e320b806688bfe17c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= <chobkwon@gmail.com>
Date: Tue, 11 Nov 2014 13:02:47 +0100
Subject: [PATCH 30/53] Translated using Weblate (Korean)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-ko/strings.xml | 39 ++++++++++++++------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 8fa1e2d2d8..5931a75e97 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -130,7 +130,7 @@
 	<string name="routing_settings">운행 (라우팅)</string>
 	<string name="routing_settings_descr">라우팅을 위한 옵션을 설정합니다</string>
 	<string name="global_settings">일반 설정</string>
-	<string name="index_settings">지도 데이터 관리</string>
+	<string name="index_settings">지도 관리</string>
 	<string name="index_settings_descr">기기에 저장된 오프라인 지도를 다운로드하고 관리합니다</string>
 	<string name="general_settings">일반</string>
 	<string name="general_settings_descr">앱에 대한 디스플레이와 일반 설정을 구성합니다</string>
@@ -547,7 +547,7 @@
 	<string name="voice">음성</string>
 	<string name="no_vector_map_loaded">벡터 맵을 적재하지 않았습니다</string>
 
-	<string name="map_route_by_gpx">GPX파일을 변환한 루트</string>
+	<string name="map_route_by_gpx">GPX파일을 이용한 경로안내</string>
 	<string name="gpx_files_not_found">GPX 파일을 /osmand/tracks 폴더에서 찾을 수 없습니다</string>
 	<string name="layer_gpx_layer">GPX 경로…</string>
 	<string name="error_reading_gpx">GPX 데이터를 읽는 도중 오류</string>
@@ -632,9 +632,8 @@
 	<string name="route_head">전방</string>
 	<string name="first_time_continue">계속하세요</string>
 	<string name="first_time_download">영역 다운로드</string>
-	<string name="first_time_msg">OsmAnd 를 선택해 주셔서 감사합니다. 
-앱의 모든 기능을 사용하려면, 인덱스 파일을 다운로드(설정-&gt;데이터관리)하거나 준비하세요. 
-그런 다음, 지도를 보거나 주소, POI, 대중교통을 검색할 수 있습니다.</string>
+	<string name="first_time_msg">"OsmAnd 를 선택해 주셔서 감사합니다. 앱의 모든 기능을 사용하려면, 인덱스 파일을 (설정-&gt;지도 관리)  다운로드 하여 준비하세요.
+\n그런 다음, 지도를 보거나 주소, POI, 공공장소 등등을 찾을 수 있습니다."</string>
 	<string name="search_poi_location">신호 위치 찾는 중…</string>
 	<string name="search_near_map">지난번 지도 위치 검색</string>
 	<string name="search_nearby">근처 검색</string>
@@ -689,7 +688,7 @@
 	<string name="max_level_download_tile_descr">다운로드할 최대 줌 레벨을 선택하세요</string>
 	<string name="route_general_information">전체거리 %1$s, 여행시간 %2$d h %3$d m.</string>
 	<string name="router_service_descr">온라인 또는 오프라인 라우팅 서비스를 선택합니다</string>
-	<string name="router_service">라우팅 서비스</string>
+	<string name="router_service">라우터 선택</string>
 	<string name="sd_dir_not_accessible">저장할 SD 카드 디렉토리에 접근할 수 없습니다</string>
 	<string name="download_question">{0} - {1} 을 다운로드할까요?</string>
 	<string name="download_question_exist">{0} 에 대한 오프라인 데이터가 이미 존재합니다({1}). 업데이트할까요({2}) ?</string>
@@ -793,7 +792,7 @@
     <string name="settings_activity">설정</string>
     <string name="show_gps_coordinates_text">지도에 GPS 좌표 표시</string>
     <string name="use_internet_to_download_tile">누락된 맵 타일을 다운로드하기 위해 인터넷을 사용합니다</string>
-    <string name="app_description">내비게이션 앱</string>
+    <string name="app_description">운행 (라우팅) 앱</string>
 
 <string name="exit_Button">종료</string>
 <string name="map_Button">지도</string>
@@ -1208,7 +1207,7 @@
     <string name="audionotes_plugin_name">오디오/비디오 노트</string>
     <string name="index_srtm_parts">부분</string>
     <string name="index_srtm_ele">등고선</string>
-    <string name="srtm_plugin_description">오프라인 등고선 과 음영은 다운로드를 용이하게 한다. (설정→데이터 관리→다운로드→ 원하는 지도 유형 선택)</string>
+    <string name="srtm_plugin_description">오프라인 등고선 과 음영은 다운로드를 용이하게 한다. (설정→지도 관리→다운로드→ 원하는 지도 유형 선택)</string>
     <string name="srtm_plugin_name">등고선 플러그인</string>
     <string name="download_select_map_types">다른 지도</string>
     <string name="download_roads_only_item">도로 전용</string>
@@ -1377,8 +1376,14 @@
 \n- 중동 : ** ↵
 \n- 아프리카 : ** ↵
 \n- 남극 : * ↵ ↵
-\n\n지원하는 국가의 목록 (기본적으로 전세계 대응) : ↵
-\n아프가니스탄, 알바니아 알제리 안도라, 앙골라, 앵 귈라, 안티구아 바부 다, 아르헨티나, 아르메니아, 아루바, 호주, 오스트리아, 아제르바이잔, 바하마, 바레인, 방글라데시, 바베이도스, 벨로루시, 벨기에, 벨리즈, 베냉, 버뮤다, 부탄, 볼리비아, 보네르 보스니아 헤르체고비나, 보츠와나, 브라질, 영국령 버진 아일랜드, 브루나이, 불가리아, 부르 키나 파소, 부룬디, 캄보디아, 카메룬, 캐나다, 카보 베르데, 중앙 아프리카 공화국, 차드, 칠레, 중국, 콜롬비아, 코모로, 콩고, 코스타리카, 코트 디부 아르, 크로아티아, 쿠바, 큐라 소, 키프로스, 체코, 덴마크, 지부티, 도미니카, 도미니카 공화국, 에콰도르, 이집트, 엘살바도르, 적도 기니, 에리트레아, 에스토니아, 에티오피아, 피지, 핀란드, 프랑스, 프랑스 령 기아나, 프랑스 령 폴리네시아, 가봉, 감비아, 조지아, 독일, 가나, 지브롤터, 그리스, 그린 랜드, 그레나다, 과들루프, 괌, 과테말라, 건지, 기니, 기니 비사우, 가이아나, 아이티, 바티칸, 온두라스, 홍콩, 헝가리, 아이슬란드, 인도, 인도네시아,이란, 이라크 아일랜드 맨섬 이스라엘 이탈리아 자메이카 일본 저지 요르단 카자흐스탄 케냐 키리바시 북한과 한국, 쿠웨이트, 키르기스스탄, 라오스, 라트비아, 레바논, 레소토, 라이베리아, 리비아, 리히텐슈타인, 리투아니아, 룩셈부르크, 마카오, 마케도니아, 마다가스카르, 말라위, 말레이시아, 몰디브, 말리, 몰타, 마르티니크, 모리타니, 모리셔스, 마 요트, 멕시코, 미크로네시아, 몰도바, 모나코, 몽골, 몬테네그로, 몬세 라트, 모로코, 모잠비크, 미얀마, 나미비아, 나우루, 네팔, 네덜란드, 네덜란드 령 안틸레스, 뉴 칼레도니아, 뉴질랜드, 니카라과, 니제르, 나이지리아, 노르웨이, 오만, 파키스탄, 팔라우, 팔레스타인, 파나마, 파푸아 뉴기니, 파라과이, 페루, 필리핀, 폴란드, 포르투갈, 푸에르토 리코, 카타르, 루마니아, 러시아, 르완다, 생 바르 텔레 미 세인트 헬레나 세인트 키츠 네비스, 세인트 루시아, 세인트 마틴, 생 피에르 미 클롱, 세인트 빈센트 그레나딘, 사모아, 산 마리노, 사우디 아라비아, 세네갈, 세르비아, 세이셸, 시에라 리온, 싱가포르 , 슬로바키아, 슬로베니아, 소말리아, 남아프리카 공화국, 사우스 조지아 남부 수단, 스페인, 스리랑카, 수단, 수리남, 스와질란드, 스웨덴, 스위스, 시리아, 대만, 타지키스탄, 탄자니아, 태국, 동 티모르, 토고, 토켈 라우, 통가, 트리니다드 토바고, 튀니지, 터키, 투르크 메니스탄, 투발루, 우간다, 우크라이나, 아랍 에미리트, 영국 (UK), 미국 (USA), 우루과이, 우즈베키스탄, 바누아투, 베네수엘라, 베트남, 월리스 푸 투나 서부 사하라 예멘 잠비아 짐바브웨 "</string>
+\n\n\n지원하는 국가의 목록 (기본적으로 전세계 대응) : ↵
+\n\n아프가니스탄, 알바니아 알제리 안도라, 앙골라, 앵 귈라, 안티구아 바부 다, 아르헨티나, 아르메니아, 아루바, 호주, 오스트리아, 아제르바이잔, 바하마, 바레인, 방글라데시, 바베이도스, 벨로루시, 벨기에, 벨리즈, 베냉, 버뮤다, 부탄, 볼리비아, 보네르 보스니아 헤르체고비나, 보츠와나, 브라질, 영국령 버진 아일랜드, 브루나이, 불가리아, 부르 키나 파소, 부룬디,
+\n\n캄보디아, 카메룬, 캐나다, 카보 베르데, 중앙 아프리카 공화국, 차드, 칠레, 중국, 콜롬비아, 코모로, 콩고, 코스타리카, 코트 디부 아르, 크로아티아, 쿠바, 큐라 소, 키프로스, 체코, 덴마크, 지부티, 도미니카, 도미니카 공화국, 에콰도르, 이집트, 엘살바도르, 적도 기니, 에리트레아, 에스토니아, 에티오피아, 피지, 핀란드, 프랑스, 프랑스 령 기아나, 프랑스 령 폴리네시아,
+\n\n가봉, 감비아, 조지아, 독일, 가나, 지브롤터, 그리스, 그린 랜드, 그레나다, 과들루프, 괌, 과테말라, 건지, 기니, 기니 비사우, 가이아나, 아이티, 바티칸, 온두라스, 홍콩, 헝가리, 아이슬란드, 인도, 인도네시아,이란, 이라크 아일랜드 맨섬 이스라엘 이탈리아 자메이카 일본 저지 요르단
+\n\n카자흐스탄 케냐 키리바시 북한과 한국, 쿠웨이트, 키르기스스탄, 라오스, 라트비아, 레바논, 레소토, 라이베리아, 리비아, 리히텐슈타인, 리투아니아, 룩셈부르크, 마카오, 마케도니아, 마다가스카르, 말라위, 말레이시아, 몰디브, 말리, 몰타, 마르티니크, 모리타니, 모리셔스, 마 요트, 멕시코, 미크로네시아, 몰도바, 모나코, 몽골, 몬테네그로, 몬세 라트, 모로코, 모잠비크, 미얀마,
+\n\n나미비아, 나우루, 네팔, 네덜란드, 네덜란드 령 안틸레스, 뉴 칼레도니아, 뉴질랜드, 니카라과, 니제르, 나이지리아, 노르웨이, 오만, 파키스탄, 팔라우, 팔레스타인, 파나마, 파푸아 뉴기니, 파라과이, 페루, 필리핀, 폴란드, 포르투갈, 푸에르토 리코, 카타르, 루마니아, 러시아, 르완다,
+\n\n생 바르 텔레 미 세인트 헬레나 세인트 키츠 네비스, 세인트 루시아, 세인트 마틴, 생 피에르 미 클롱, 세인트 빈센트 그레나딘, 사모아, 산 마리노, 사우디 아라비아, 세네갈, 세르비아, 세이셸, 시에라 리온, 싱가포르 , 슬로바키아, 슬로베니아, 소말리아, 남아프리카 공화국, 사우스 조지아 남부 수단, 스페인, 스리랑카, 수단, 수리남, 스와질란드, 스웨덴, 스위스, 시리아,
+\n\n대만, 타지키스탄, 탄자니아, 태국, 동 티모르, 토고, 토켈 라우, 통가, 트리니다드 토바고, 튀니지, 터키, 투르크 메니스탄, 투발루, 우간다, 우크라이나, 아랍 에미리트, 영국 (UK), 미국 (USA), 우루과이, 우즈베키스탄, 바누아투, 베네수엘라, 베트남, 월리스 푸 투나 서부 사하라 예멘 잠비아 짐바브웨 "</string>
 	<string name="filterpoi_activity">POI 필터 만들기</string>
 	<string name="select_navigation_mode">전송 모드 선택</string>
 	<string name="day_night_info_description">일출: %1$s \n일몰: %2$s</string>
@@ -1583,20 +1588,10 @@
 \n\t* 경로 플래닝에서 새로운 화면(더 직관적이고 더 강력하게).
 \n\t* 주의! GPS 경로파일은 경로설정 버튼으로 이용할 수 있습니다.
 \n\t* 길안내모드에서 자동 숨김 버튼.
-\n\t* GPX 경로파일의 첫 포인트에서 오프라인 경로를 계산.
+\n\t* GPX 경로파일의 첫 포인트에서 오프라인 경로를 계산  ( \"pass the whole track\"옵션).
 \n\t* 터널에서 시뮬레이션 활성화.
 \n\t* 많은 UX 개선 및 사용성 고정.
-\n\t* 음성 속도 접근성 설정.
-\n\n1.7의 변경 사항 : ↵ ↵
-\n→ * 중요한지도는 2014 년 2 월 이후의 것을 사용하십시오. ↵ ↵
-\n→ * 라우팅 기능 업데이트 (빨리 더 정확하게) - ↵ ↵
-\n→ * 루트 설정을 위한 새로운 화면을 추가 (더 직관적이고 더 강력하게) ↵ ↵
-\n→ * 참고 GPX 라우팅 경로 설정 버튼에서 가능하게되었습니다 ↵ ↵
-\n→ * 운행 모드에서 자동으로 버튼을 숨기도록했습니다 ↵ ↵
-\n→ * GPX 루트의 첫 번째 포인트에 오프라인 루트를 계산 ( \"pass the whole track\"옵션) ↵ ↵
-\n→ * 터널의 동적 시뮬레이션 ↵ ↵
-\n→ * 섬세한 조작감 (사용자 경험) 등의 개선, 접근성의 수정 ↵
-\n→ * 음성 속도 설정 추가 (접근성 설정에서) ↵ "</string>
+\n\t* 음성 속도 설정 추가. "</string>
     <string name="av_camera_focus_edof">필드의 확장된 깊이(EDoF )</string>
 	<string name="local_index_installed">편집</string>
 	<string name="voice_not_specified">지정없음</string>

From ae775e319124429959107112365febb8de78d21c Mon Sep 17 00:00:00 2001
From: 8c6311e901274f6baef2068792c8ab <ft-002@safe-mail.net>
Date: Tue, 11 Nov 2014 11:26:39 +0100
Subject: [PATCH 31/53] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 57.8% (902 of 1559 strings)
---
 OsmAnd/res/values-nb/strings.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 7d45c1d0a9..33081a48e0 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -33,7 +33,7 @@
 	<string name="poi_filter_food_shop">Matbutikk</string>
 	<string name="poi_filter_for_tourists">For turister</string>
 	<string name="poi_filter_fuel">Drivstoff</string>
-	<string name="show_warnings_title">Vis alarmer…</string>
+	<string name="show_warnings_title">Vis varsler…</string>
 	<string name="show_warnings_descr">Still inn trafikkvarsler (fartsgrenser, tvungne stopp, fartsdumper), fotoboksvarsler og kjørefeltinformasjon</string>
 	<string name="use_compass_navigation_descr">Bruk kompass hvis det ikke er mulig med annen retningsfastsettelse</string>
 	<string name="use_compass_navigation">Bruk kompass</string>
@@ -335,7 +335,11 @@
 	<string name="tip_app_mode_t_v2">"OsmAnd støtter forskjellige (tilpasningsbare) programprofiler for ulike bruksmåter.
 \n\nDu kan endre profiler via profilknappen i nedre venstre hjørne av kartskjermen (ikon for bil, sykkel eller fotgjenger), eller når du oppretter en rute (\'transportmodus\'). "</string>
 	<string name="tip_navigation">Navigering</string>
-	<string name="tip_navigation_t"/>
+	<string name="tip_navigation_t">"For å få anvisninger til et sted, enten trykk lenge direkte på det på kartet, (så trykk dets beskrivelsesmarkør og velg \'Anvisninger til\'), eller velg \'Anvisninger til\' etter å ha trykket på en oppføring i en liste med søkeresultater eller favorittliste.
+\n\nReisemålet er markert som et målflagg på kartet og OsmAnd viser avstanden til det og retningen til det (orange trekant).
+\n\nVelg enten \'Start navigering\', som betyr at OsmAnd gir veiledning og taleinstruksjoner (hvis aktivert) etc. Eller velg \'Vis rute\', som resulterer i en statisk rute uten veiledning eller justeringer mens du beveger deg.
+\n\nFor å vise en rute til det valgte reisemålet fra ethvert punkt annet enn din gjeldende posisjon, velg startpunktet på kartet og trykk \'Anvisninger fra\'.
+\n\nHvis du bruker \'Anvisninger fra\' sammen med \'Start navigering\', vil OsmAnd skifte til din faktiske posisjon så snart den er funnet (slik at dette kan brukes til å hurtig-starte ruting før posisjonen er funnet), mens \'Anvisninger fra\' i kombinasjon med \'Vis rute\' bare viser deg ruten fra ethvert vilkårlig punkt du hadde valgt uten påfølgende oppdateringer. "</string>
 	<string name="tip_search">Søk</string>
 	<string name="tip_search_t">"Du kan søke etter steder direkte på kartet via \'Bruk posisjon\' → \'Søk nær her\', eller ved å kalle søkeskjermen via \'Meny\' → \'Søk\'.
 \n\nSøkeskjermen gir maler for søk
@@ -941,4 +945,5 @@
 	<string name="map_preferences_descr">Spesifiser kartinnstillinger: Kartkilde, rotasjon, markørposisjon, skjermorientering</string>
 	<string name="navigation_intent_invalid">Ugyldig format: %s</string>
     <string name="hide_all_waypoints">Fjern alle</string>
-</resources>
+<string name="rendering_attr_shareTaxiRoutes_name">Samletaxi-ruter</string>
+    </resources>

From 80bc54b8f5cf67862d4e2134282e03a3f3734062 Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Mon, 10 Nov 2014 14:23:54 +0100
Subject: [PATCH 32/53] Translated using Weblate (Sardinian)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-sc/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index b191710cd2..38061f4e18 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1095,7 +1095,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="download_files_question_space">Sa memòria disponìbile est de {2} MB! Iscarrigare {0} documentu(os) ({1} MB)?</string>
 	<string name="use_transparent_map_theme">Tema transparente</string>
 	<string name="native_library_not_supported">Sa libreria nativa no est suportada dae custu dispositivu.</string>
-	<string name="init_native_library">Inizalizatzione libreria nativa…</string>
+	<string name="init_native_library">Inizializatzione libreria nativa…</string>
 	<string name="rendering_value_browse_map_name">Esploratzione mapa</string>  
     <string name="rendering_value_car_name">Màchina</string>
     <string name="rendering_value_bicycle_name">Bitzicleta</string>

From 23fe779fe1287dac52c97712a70ac0c5c6772dcf Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Tue, 11 Nov 2014 14:30:40 +0100
Subject: [PATCH 33/53] Translated using Weblate (Swedish)

Currently translated at 99.4% (1550 of 1559 strings)
---
 OsmAnd/res/values-sv/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 3a1008ac92..6ee640ad10 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1432,7 +1432,7 @@
 	<string name="index_item_world_basemap">Översiktskarta (världen)</string>
     <string name="index_item_world_ski">Skidkarta (världen)</string>
     <string name="lang_hr">Kroatiska</string>
-    <string name="always_center_position_on_map">Visa alltid positionen i mitten</string>
+    <string name="always_center_position_on_map">Visa alltid min position i mitten</string>
     <string name="voice_pref_title">Röst</string>
     <string name="misc_pref_title">Diverse</string>
     <string name="localization_pref_title">Översättning</string>
@@ -1624,7 +1624,7 @@
     <string name="rendering_attr_showAccess_name">Visa tillfarts- inskränkningar</string>
     <string name="rendering_attr_showSurfaceGrade_name">Visa vägkvalitet</string>
     <string name="rendering_attr_showSurfaces_name">Visa vägbeläggning</string>
-    <string name="rendering_attr_showCycleRoutes_name">Visa cykelrutter</string>
+    <string name="rendering_attr_showCycleRoutes_name">Visa cykelleder</string>
     <string name="lang_fa">Persiska</string>
 	<string name="osmo_auth_error_short">Godkännandet misslyckades</string>
     <string name="osmo_auth_error">Fel vid godkännande av OsMo: %1$s.↵\nTjänsten kan vara tillfälligt nere eller så har din registrering förfallit.\nVill du fortsätta med en ny registrering?</string>

From 2b918acf91283d75933f3075d8744fd48d7cc32c Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 12 Nov 2014 10:43:42 +0200
Subject: [PATCH 34/53] Updated solution for map modes does not fit in drawer

---
 .../net/osmand/plus/activities/actions/AppModeDialog.java | 8 ++++----
 .../plus/development/SettingsDevelopmentActivity.java     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
index 7dfd4ae0dd..531044218e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
@@ -28,7 +28,7 @@ public class AppModeDialog {
 		if (showDefault || settings.getApplicationMode() != ApplicationMode.DEFAULT) {
 			selected.add(settings.getApplicationMode());
 		}
-		return prepareAppModeView(a, values, selected, parent, singleSelection, onClickListener);
+		return prepareAppModeView(a, values, selected, parent, singleSelection, false, onClickListener);
 	}
 
 	//special method for drawer menu
@@ -41,7 +41,7 @@ public class AppModeDialog {
 		if (values.size() > 4) {
 			return createDrawerView(a, visible, values, selected, allModes, onClickListener);
 		} else {
-			return prepareAppModeView(a, values, selected, null, true, onClickListener);
+			return prepareAppModeView(a, values, selected, null, true, true, onClickListener);
 		}
 	}
 
@@ -168,9 +168,9 @@ public class AppModeDialog {
 	}
 
 	public static View prepareAppModeView(Activity a, final List<ApplicationMode> values , final Set<ApplicationMode> selected, 
-			ViewGroup parent, final boolean singleSelection, final View.OnClickListener onClickListener) {
+			ViewGroup parent, final boolean singleSelection,boolean drawer, final View.OnClickListener onClickListener) {
 		LinearLayout ll = (LinearLayout) a.getLayoutInflater().inflate(R.layout.mode_toggles, parent);
-		final ToggleButton[] buttons = createToggles(values, ll, a, false);
+		final ToggleButton[] buttons = createToggles(values, ll, a, drawer);
 		for (int i = 0; i < buttons.length; i++) {
 			setButtonListener(values, selected, onClickListener, buttons, i, singleSelection);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
index 15684c5d9f..b80aadabaa 100644
--- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
@@ -126,7 +126,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 		modes.remove(ApplicationMode.DEFAULT);
 		final Set<ApplicationMode> selected = new LinkedHashSet<ApplicationMode>(ApplicationMode.values(settings));
 		selected.remove(ApplicationMode.DEFAULT);
-		View v = AppModeDialog.prepareAppModeView(this, modes, selected, null, false, 
+		View v = AppModeDialog.prepareAppModeView(this, modes, selected, null, false, false,
 				new View.OnClickListener() {
 
 					@Override

From 81cabf0ee5bc0f9c6ef5afe58a8ef272f1e35c46 Mon Sep 17 00:00:00 2001
From: Marko P <ma.pacic@gmail.com>
Date: Tue, 11 Nov 2014 17:05:18 +0100
Subject: [PATCH 35/53] Translated using Weblate (Croatian)

Currently translated at 79.2% (1236 of 1559 strings)
---
 OsmAnd/res/values-hr/strings.xml | 46 +++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index b63d801e4b..1cbaa1dbc8 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="map_widget_gps_info">GPS informacije</string>
     <string name="access_arrival_time">Vrijeme dolaska</string>
     <string name="item_checked">provjereno</string>
@@ -646,7 +646,7 @@
 	<string name="save_track_interval">Interval bilježenja</string>
 	<string name="save_track_interval_descr">Odaberite interval bilježenja za staze</string>
 	<string name="save_track_to_gpx_descrp">Staze se spremaju u direktorij \'tracks\' grupirane po danima</string>
-	<string name="save_track_to_gpx">Spremi stazu u GPX datoteku</string>
+	<string name="save_track_to_gpx">Spremi GPX tijekom navigacije</string>
 	<string name="map_view_3d_descr">Omogući 3D prikaz na karti</string>
 	<string name="map_view_3d">3D prikaz karte</string>
 	<string name="show_poi_over_map_description">Prikaži POI preko karte (koristi zadnji odabrani filtar)</string>
@@ -676,7 +676,7 @@
 	<string name="off_router_service_no_gps_available">Navigacija u stanju mirovanja zahtijeva da lokacijske usluge budu uključene.</string>
 	<string name="background_service_provider">Lokacijske usluge</string>
 	<string name="background_service_provider_descr">Odaberite lokaciju davatelja usluge koju koristi stanje mirovanja</string>
-	<string name="background_service_int">Interval buđenja</string>
+	<string name="background_service_int">Interval buđenja GPS-a</string>
 	<string name="background_service_int_descr">Postavite interval buđenja koji koristi stanje mirovanja</string>
 	<string name="int_min">min.</string>
 	<string name="process_navigation_service">OsmAnd navigacija</string>
@@ -1198,8 +1198,8 @@
     <string name="distance">Udaljenost</string>
     <string name="flat_list_waypoints">Sve</string>
     <string name="targets">Destinacije</string>
-    <string name="way_alarms">Prepreke</string>
-    <string name="speak_favorites">Najavi favorite</string>
+    <string name="way_alarms">Prometna upozorenja</string>
+    <string name="speak_favorites">Najavi favorite u blizini</string>
     <string name="speak_poi">Najavi POI</string>
     <string name="download_additional_maps">Preuzeti karte koje nedostaju %1$s (%2$d MB)?</string>
     <string name="live_monitoring_start">Započnite online praćenje</string>
@@ -1294,4 +1294,38 @@
     <string name="text_size_descr">Postavi veličinu teksta na karti.</string>
     <string name="text_size">Veličina teksta</string>
     <string name="save_track_interval_globally">Interval bilježenja</string>
-	</resources>
+	<string name="rendering_attr_tramTrainRoutes_name">Tramvajske i željezničke rute</string>
+	<string name="wake_on_voice">Uključi ekran</string>
+    <string name="wake_on_voice_descr">Uključiti zaslon telefona kada se približavate skretanju</string>
+    <string name="wake_on_voice_never">Nikad</string>
+    <string name="select_impassable_road">Označi na karti</string>
+    <string name="impassable_road">Izbjegavaj ceste…</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Željezničke rute</string>
+    <string name="rendering_attr_tramRoutes_name">Tramvajske rute</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Podijeli taxi rute</string>
+    <string name="rendering_attr_trolleybusRoutes_name">Trolejbus rute</string>
+    <string name="rendering_attr_busRoutes_name">Autobusne rute</string>
+    <string name="rendering_category_hide">Sakrij</string>
+    <string name="rendering_category_routes">Rute</string>
+    <string name="rendering_category_details">Detalji</string>
+    <string name="rendering_category_transport">Prijevoz</string>
+    <string name="rendering_category_others">Ostale značajke karte</string>
+    <string name="map_widget_top">Statusna traka</string>
+	<string name="map_widget_right">Desni panel</string>
+	<string name="map_widget_left">Lijevi panel</string>
+    <string name="layers_category_show">Prikaži</string>
+	<string name="configure_map">Konfiguracija karte</string>
+    <string name="search_radius_proximity">U blizini</string>
+    <string name="osmo_device_not_found">Uređaj nije pronađen</string>
+    <string name="anonymous_user">Anonimni korisnik</string>
+    <string name="logged_as">Prijavljen kao %1$s</string>
+	<string name="print_route">Ispis rute</string>
+    <string name="confirm_every_run">Uvijek pitaj</string>
+	<string name="speed_limit_exceed">Tolerancija ograničenja brzine</string>
+	<string name="gpx_info_diff_altitude">Raspon nadmorske visine: %1$s</string>
+	<string name="my_favorites">Moji favoriti</string>
+    <string name="my_data_Button">Moja mjesta</string>
+    <string name="my_data_activity">Moja mjesta</string>
+    <string name="osmo_show_group_notifications_descr">Prikaži obavjest kada se korisnik pridruži ili napusti grupu</string>
+    <string name="osmo_regenerate_login_ids">Regenerirajte korisničko ime</string>
+    </resources>

From c3a3e6cdc128128488d460aaed8caec70075be19 Mon Sep 17 00:00:00 2001
From: Yannis Gyftomitros <yannisg92@gmail.com>
Date: Tue, 11 Nov 2014 21:18:36 +0100
Subject: [PATCH 36/53] Translated using Weblate (Greek)

Currently translated at 92.8% (1447 of 1559 strings)
---
 OsmAnd/res/values-el/strings.xml | 57 ++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index d44f5ba165..9836de5b8b 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -96,7 +96,7 @@
 	<string name="day_night_info_description">Ανατολή : %1$s \nΔύση : %2$s</string>
 	<string name="day_night_info">Πληρ. Ημέρας/Νύχτας</string>
 	<string name="map_widget_day_night">Χάρτης ημέρας/νύχτας</string>
-	<string name="map_widget_vector_attributes">Χαρακτηριστικά απεικόνισης:</string>
+	<string name="map_widget_vector_attributes">Χαρακτηριστικά απεικόνισης</string>
 	<string name="map_widget_renderer">Στυλ χάρτη</string>
 	
 	
@@ -417,18 +417,16 @@
 		\n\t* \'Προς την κατεύθυνση κίνησης\': Ο χάρτης συνεχώς θα συγχρονίζεται με την κατεύθυνσή σας
 		\n\t* \'Πυξίδα\': Ο χάρτης συνεχώς θα συγχρονίζεται με την κατεύθυνση της πυξίδας
 	</string>
-	<string name="binary_map_download_success">Η λήψη ήταν επιτυχής.
-		\n\t\n\tΓια χρήση ενεργοποιήστε \'Μενού\' → \'Επίπεδα χάρτη\' → \'Πηγή χάρτη…\' → \'Offline διανυσματικοί χάρτες\'.
-	</string>
+	<string name="binary_map_download_success">"Η λήψη ήταν επιτυχής.
+\n\t\n\tΓια χρήση ενεργοποιήστε \'Μενού\' → \'Διαμόρφωση χάρτη\' → \'Πηγή χάρτη…\' → \'Offline διανυσματικοί χάρτες\'. "</string>
 	<string name="tip_day_night_mode">Λειτουργία ημέρας/νύχτας</string>
-	<string name="tip_day_night_mode_t_v2">Η εμφάνιση μπορεί στους διανυσματικούς χάρτες να αλλάξει μεταξύ ημέρας (πιο φωτεινό) και νύχτας (πιο σκοτεινό). Τα νυχτερινά χρώματα είναι πιο βολικά για νυχτερινή οδήγηση.
-		\n\nΜπορείτε να ορίσετε μια πολιτική για την εναλλαγή ημέρα/νύχτα στο \'Μενού\' → \'Ρύθμιση οθόνης …\' →\'Χάρτης ημέρας/νύχτας\'.
-		\n\nΟι επιλογές είναι:
-		\n\t* \'Ανατολή/Δύση\': αυτόματος τρόπος, ελεγχόμενο από τη θέση του ήλιου (προκαθορισμένο)
-		\n\t* \'Ημέρα\': πάντα χρήση της λειτουργίας ημέρας
-		\n\t* \'Νύχτα\': πάντα χρήση της λειτουργίας νύχτας
-		\n\t* \'Αισθητήρας φωτός\': η εμφάνιση του χάρτη ελέγχεται από τον αισθητήρα φωτός της συσκευής σας (μόνο αν υπάρχει)
-	</string>	
+	<string name="tip_day_night_mode_t_v2">"Η εμφάνιση μπορεί στους διανυσματικούς χάρτες να αλλάξει μεταξύ ημέρας (πιο φωτεινό) και νύχτας (πιο σκοτεινό). Τα νυχτερινά χρώματα είναι πιο βολικά για νυχτερινή οδήγηση.
+\n\nΜπορείτε να ορίσετε μια πολιτική για την εναλλαγή ημέρα/νύχτα στο \'Μενού\' → \'Διαμόρφωση χάρτη\' →\'Χάρτης ημέρας/νύχτας\'.
+\n\nΟι επιλογές είναι:
+\n\t* \'Ανατολή/Δύση\': αυτόματος τρόπος, ελεγχόμενο από τη θέση του ήλιου (προκαθορισμένο)
+\n\t* \'Ημέρα\': πάντα χρήση της λειτουργίας ημέρας
+\n\t* \'Νύχτα\': πάντα χρήση της λειτουργίας νύχτας
+\n\t* \'Αισθητήρας φωτός\': η εμφάνιση του χάρτη ελέγχεται από τον αισθητήρα φωτός της συσκευής σας (μόνο αν υπάρχει) "</string>	
 	<string name="tip_osm_improve">Βελτίωση Δεδομένων OSM</string>
 	<string name="tip_osm_improve_t">Ο OsmAnd χρησιμοποιεί χάρτες βασισμένους στα δεδομένα του Openstreetmap.org (OSM) και μπορεί να χρησιμοποιηθεί για τη βελτίωση της ποιότητας των δεδομένων OSM. Μπορείτε εύκολα να δημιουργήσετε και να αποστείλετε νέα Σημ. Ενδ. ή αναφορές σφαλμάτων με λίγα μόνο κλικ.
 		\n\nΓια το σκοπό αυτό χρειάζεται να ενεργοποιήσετε το πρόσθετο \'Επεξεργασία OSM\' από το \'Ρυθμίσεις\'→\'Πρόσθετα\', και μετά να εισάγετε τις πληροφορίες σύνδεσης για το OSM στο \'Ρυθμίσεις\'→\'Επεξεργασία OSM\'.
@@ -585,7 +583,7 @@
 	<string name="gpx_option_reverse_route">Αντιστροφή κατεύθυνσης GPX</string>
 	<string name="gpx_option_destination_point">Χρήση τρέχοντος προορισμού</string>
 	<string name="gpx_option_from_start_point">Πέρασμα κατά μήκος ολόκληρου του ίχνους</string>
-	<string name="switch_to_vector_map_to_see">Υπάρχουν διαθέσιμοι offline διανυσματικοί χάρτες για αυτή την τοποθεσία.\n\t\n\tΓια χρήση ενεργοποιήστε \'Μενού\'→  \'Επίπεδα χάρτη\' → \'Πηγή χάρτη…\' → \'Offline διανυσματικοί χάρτες\'.</string>
+	<string name="switch_to_vector_map_to_see">Υπάρχουν διαθέσιμοι offline διανυσματικοί χάρτες για αυτή την τοποθεσία.\n\t\n\tΓια χρήση ενεργοποιήστε \'Μενού\'→ \'Διαμόρφωση χάρτη\' → \'Πηγή χάρτη…\' → \'Offline διανυσματικοί χάρτες\'.</string>
 	<string name="choose_audio_stream">Έξοδος φωνητικής καθοδήγησης</string>
 	<string name="choose_audio_stream_descr">Επιλέξτε το κανάλι εκτέλεσης της φωνητικής καθοδήγησης (εξαρτώμενο από το σύστημα)</string>
 	<string name="voice_stream_voice_call">Ήχος κλήσης φωνής</string>
@@ -614,11 +612,10 @@
 		\n\nΜετά επιλέξτε τον τρόπο διαμοιρασμού της τοποθεσίας σας. Οι επιλογές είναι : E-Mail, SMS(κείμενο), ή απλά αντιγράψτε τις συντεταγμένες της τοποθεσίας στο πρόχειρο.
 	</string>
 	<string name="tip_favorites">Αγαπημένα Σημεία</string>
-	<string name="tip_favorites_t">Τα σημεία που χρησιμοποιούνται συχνά μπορούν να αποθηκευτούν ως Αγαπημένα, ως ακολούθως.
-		\n\nΣτο \'Χρήση τοποθεσίας\'του μενού περιβάλλοντος χάρτη για οποιοδήποτε σημείο, επιλέξτε \'Προσθήκη στα αγαπημένα\' και δώστε του κάποιο όνομα.
-		\n\nΜετά την αποθήκευση ενός Αγαπημένου, είναι προσβάσιμο μέσω του \'Μενού\' → \'Τα Μέρη μου\'. Πατώντας σε κάποια καταχώρηση της λίστας \'Αγαπημένα\' σας παρέχει επιλογές να το ορίσετε ως προορισμό, να το επεξεργαστείτε ή να το διαγράψετε.
-		\n\nΓια να εμφανιστούν όλα τα Αγαπημένα κατευθείαν στο χάρτη, στην οθόνη χάρτη ενεργοποιήστε το επίπεδο \'Αγαπημένα\' στο \'Μενού\' → \'Επίπεδα χάρτη\'.
-	</string>
+	<string name="tip_favorites_t">"Τα σημεία που χρησιμοποιούνται συχνά μπορούν να αποθηκευτούν ως Αγαπημένα, ως ακολούθως.
+\n\nΣτο \'Χρήση τοποθεσίας\'του μενού περιβάλλοντος χάρτη για οποιοδήποτε σημείο, επιλέξτε \'Προσθήκη στα αγαπημένα\' και δώστε του κάποιο όνομα.
+\n\nΜετά την αποθήκευση ενός Αγαπημένου, είναι προσβάσιμο μέσω του \'Μενού\' → \'Τα Μέρη μου\'. Πατώντας σε κάποια καταχώρηση της λίστας \'Αγαπημένα\' σας παρέχει επιλογές να το ορίσετε ως προορισμό, να το επεξεργαστείτε ή να το διαγράψετε.
+\n\nΓια να εμφανιστούν όλα τα Αγαπημένα κατευθείαν στο χάρτη, στην οθόνη χάρτη ενεργοποιήστε το επίπεδο \'Αγαπημένα\' στο \'Μενού\' → \'Διαμόρφωση χάρτη\'. "</string>
 	<string name="error_doing_search">Προέκυψε σφάλμα κατά την offline αναζήτηση</string>
 	<string name="search_offline_geo_error">Δεν ήταν δυνατή η ανάλυση της γεωγρ πρόθεσης \'%s\'</string>
 	<string name="search_osm_offline">Αναζήτηση γεωγραφικής τοποθεσίας</string>
@@ -626,10 +623,9 @@
 	<string name="preferred_locale_descr">Επιλέξτε γλώσσα εμφάνισης</string>
 	<string name="preferred_locale">Γλώσσα εμφάνισης</string>
 	<string name="tip_map_switch">Επιλογή Πηγής Χάρτη</string>
-	<string name="tip_map_switch_t_v2">Η πηγή χάρτη και οι στρώσεις χάρτη που εμφανίζονται αλλάζουν μέσω του \'Μενού\' → \'Επίπεδα χάρτη\'.
-		\n\nΚάτω από το \'Πηγή χάρτη…\' μπορείτε να επιλέξετε τη χρήση των εγκατεστημένων offline διανυσματικών χαρτών, προκαθορισμένων (online) πηγών πλακιδίων (ενεργοποιήστε το πρόσθετο \'Online χάρτες\' για αυτό), ή χάρτες που κατασκευάστηκαν χειροκίνητα χρησιμοποιώντας π.χ. το OsmAndMapCreator σε κάποιο PC.
-		\n\nΟ OsmAnd επίσης υποστηρίζει προσαρμόσιμες πηγές.
-	</string>
+	<string name="tip_map_switch_t_v2">"Η πηγή χάρτη και οι στρώσεις χάρτη που εμφανίζονται αλλάζουν μέσω του \'Μενού\' → \'Διαμόρφωση χάρτη\'.
+\n\nΚάτω από το \'Πηγή χάρτη…\' μπορείτε να επιλέξετε τη χρήση των εγκατεστημένων offline διανυσματικών χαρτών, προκαθορισμένων (online) πηγών πλακιδίων (ενεργοποιήστε το πρόσθετο \'Online χάρτες\' για αυτό), ή χάρτες που κατασκευάστηκαν χειροκίνητα χρησιμοποιώντας π.χ. το OsmAndMapCreator σε κάποιο PC.
+\n\nΟ OsmAnd επίσης υποστηρίζει προσαρμόσιμες πηγές. "</string>
 	<string name="tip_app_mode">Χρήση Προφίλ</string>
 	<string name="tip_app_mode_t_v2">Ο OsmAnd υποστηρίζει διαφορετικά (προσαρμόσιμα) προφίλ εφαρμογής για διαφορετικές περιπτώσεις χρήσης.
 		\n\nΜπορείτε να αλλάξετε τα προφίλ μέσω του κουμπιού προφίλ στην κάτω αριστερή γωνία της οθόνης χάρτη (εικονίδιο αυτοκίνητο, ποδήλατο, ή πεζός), ή κατά τη δημιουργία κάποιου δρομολογίου.
@@ -1377,7 +1373,7 @@
 	<string name="driving_region">Περιοχή Οδήγησης</string>
 	<string name="av_photo_play_sound_descr">Επιλέξτε εάν θα αναπαράγεται ήχος κατά τη λήψη φωτογραφίας</string>
 <string name="app_modes_choose">Προφίλ εφαρμογής</string>
-	<string name="map_widget_map_rendering">Επανασχεδιασμός χάρτη:</string>
+	<string name="map_widget_map_rendering">Σχεδιασμός χάρτη</string>
     <string name="app_mode_hiking">Πεζοπορία</string>
     <string name="app_mode_motorcycle">Μοτοσυκλέτα</string>
     <string name="app_mode_boat">Πλοίο</string>
@@ -1611,7 +1607,7 @@
     <string name="rendering_attr_showAccess_name">Εμφάνιση περιορισμών πρόσβασης</string>
     <string name="rendering_attr_showSurfaceGrade_name">Εμφάνιση ποιότητας των δρόμων</string>
     <string name="osmo_auth_error_short">Αποτυχία εξουσιοδότησης</string>
-    <string name="rendering_attr_coloredBuildings_name">Έγχρωμα κτίρια</string>
+    <string name="rendering_attr_coloredBuildings_name">Έγχρωμα κτίρια κατά τύπο</string>
     <string name="osmo_invite">Προσκαλέστε…</string>
     <string name="osmo_leave_confirmation_msg">Θέλετε να φύγετε από την ομάδα %1$s?</string>
     <string name="continue_navigation">Συνέχιση της Πλοήγησης</string>
@@ -1676,4 +1672,15 @@
     <string name="osmo_device_not_found">Η συσκευή δεν βρέθηκε</string>
     <string name="anonymous_user">Ανώνυμος χρήστης</string>
     <string name="logged_as">Συνδεδεμένος ως %1$s</string>
-	</resources>
+	<string name="wake_on_voice_never">Ποτέ</string>
+    <string name="select_impassable_road">Επιλογή στον χάρτη</string>
+    <string name="impassable_road">Αποφυγή δρόμων…</string>
+    <string name="rendering_category_hide">Απόκρυψη</string>
+    <string name="rendering_category_routes">Δρομολόγια</string>
+    <string name="rendering_category_details">Λεπτομέρειες</string>
+    <string name="rendering_category_others">Άλλα χαρακτηριστικά χάρτη</string>
+    <string name="map_widget_right">Δεξιός πίνακας</string>
+	<string name="map_widget_left">Αριστερός πίνακας</string>
+    <string name="layers_category_show">Εμφάνιση</string>
+	<string name="configure_map">Διαμόρφωση χάρτη</string>
+    </resources>

From 7c3c9a1118b18051db46c95a67eb57b17dc405d8 Mon Sep 17 00:00:00 2001
From: xmd5a2 <lornaderek@mail.ru>
Date: Wed, 12 Nov 2014 18:01:28 +0300
Subject: [PATCH 37/53] Update ru phrases

---
 OsmAnd/res/values-ru/phrases.xml | 365 ++++++++++++++++---------------
 OsmAnd/res/values/phrases.xml    |  11 +-
 2 files changed, 191 insertions(+), 185 deletions(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 85cd71cc9b..987be9a98b 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -194,138 +194,140 @@
 
 	<string name="poi_power_substation">Подстанция</string>
 	<string name="poi_power_transformer">Трансформатор</string>
-	<string name="poi_power_plant"></string>
-	<string name="poi_power_generator"></string>
+	<string name="poi_power_plant">Электростанция</string>
+	<string name="poi_power_generator">Генератор</string>
 
-	<string name="poi_post_office"></string>
-	<string name="poi_post_box"></string>
-	<string name="poi_telephone"></string>
-	<string name="poi_communication_tower"></string>
-	<string name="poi_telephone_exchange"></string>
+	<string name="poi_post_office">Почта</string>
+	<string name="poi_post_box">Почтовый ящик</string>
+	<string name="poi_telephone">Телефон</string>
+	<string name="poi_communication_tower">Вышка связи</string>
+	<string name="poi_telephone_exchange">АТС</string>
 
-	<string name="poi_recycling"></string>
-	<string name="poi_landfill"></string>
-	<string name="poi_waste_disposal"></string>
-	<string name="poi_waste_basket"></string>
+	<string name="poi_recycling">Переработка отходов</string>
+	<string name="poi_landfill">Свалка</string>
+	<string name="poi_waste_disposal">Мусорный контейнер</string>
+	<string name="poi_waste_basket">Урна для мусора</string>
 
-	<string name="poi_surveillance"></string>
-	<string name="poi_construction"></string>
-	<string name="poi_works"></string>
-	<string name="poi_mineshaft"></string>
-	<string name="poi_adit"></string>
-	<string name="poi_petroleum_well"></string>
-	<string name="poi_survey_point"></string>
-	<string name="poi_windmill"></string>
-	<string name="poi_quarry"></string>
-	<string name="poi_vineyard"></string>
-	<string name="poi_orchard"></string>
-	<string name="poi_salt_pond"></string>
+	<string name="poi_surveillance">Камера видеонаблюдения</string>
+	<string name="poi_construction">Стройка</string>
+	<string name="poi_works">Завод</string>
+	<string name="poi_mineshaft">Шахтный ствол</string>
+	<string name="poi_adit">Штольня</string>
+	<string name="poi_petroleum_well">Нефтяная скважина</string>
+	<string name="poi_survey_point">Триангуляционный знак</string>
+	<string name="poi_windmill">Ветряная мельница</string>
+	<string name="poi_quarry">Карьер</string>
+	<string name="poi_vineyard">Виноградник</string>
+	<string name="poi_orchard">Сад</string>
+	<string name="poi_salt_pond">Пруд для осаждения соли</string>
+	<string name="poi_cricket_nets">Сетка для крикета</string>
 
-	<string name="poi_driving_school"></string>
-	<string name="poi_school"></string>
-	<string name="poi_kindergarten"></string>
-	<string name="poi_college"></string>
-	<string name="poi_university"></string>
+	<string name="poi_driving_school">Автошкола</string>
+	<string name="poi_school">Школа</string>
+	<string name="poi_kindergarten">Детский сад</string>
+	<string name="poi_college">Колледж</string>
+	<string name="poi_university">Университет</string>
 
-	<string name="poi_social_facility"></string>
-	<string name="poi_courthouse"></string>
-	<string name="poi_prison"></string>
-	<string name="poi_register_office"></string>
-	<string name="poi_embassy"></string>
-	<string name="poi_government"></string>
-	<string name="poi_bailiff"></string>
-	<string name="poi_prosecutor"></string>
-	<string name="poi_pension_fund"></string>
-	<string name="poi_migration"></string>
-	<string name="poi_tax_inspection"></string>
+	<string name="poi_social_facility">Социальное учреждение</string>
+	<string name="poi_courthouse">Суд</string>
+	<string name="poi_prison">Тюрьма</string>
+	<string name="poi_register_office">ЗАГС</string>
+	<string name="poi_embassy">Посольство</string>
+	<string name="poi_government">Государственное учреждение</string>
+	<string name="poi_bailiff">Служба судебных приставов</string>
+	<string name="poi_prosecutor">Прокуратура</string>
+	<string name="poi_pension_fund">Пенсионый фонд</string>
+	<string name="poi_migration">Миграционная служба</string>
+	<string name="poi_tax_inspection">Налоговая</string>
 	<string name="poi_administrative_office">Административное учреждение</string>
-	<string name="poi_customs"></string>
+	<string name="poi_customs">Таможенный пункт</string>
 
-	<string name="poi_pharmacy"></string>
-	<string name="poi_hospital"></string>
-	<string name="poi_doctors"></string>
-	<string name="poi_clinic"></string>
-	<string name="poi_first_aid"></string>
-	<string name="poi_dentist"></string>
-	<string name="poi_nursing_home"></string>
-	<string name="poi_baby_hatch"></string>
-	<string name="poi_veterinary"></string>
-	<string name="poi_sanatorium"></string>
+	<string name="poi_pharmacy">Аптека</string>
+	<string name="poi_hospital">Больница</string>
+	<string name="poi_doctors">Врач</string>
+	<string name="poi_clinic">Поликлиника, клиника</string>
+	<string name="poi_first_aid">Первая помощь</string>
+	<string name="poi_dentist">Стоматология</string>
+	<string name="poi_nursing_home">Дом престарелых</string>
+	<string name="poi_baby_hatch">Бэби-бокс</string>
+	<string name="poi_veterinary">Ветеринарная лечебница</string>
+	<string name="poi_sanatorium">Санаторий</string>
 
-	<string name="poi_company"></string>
-	<string name="poi_insurance"></string>
-	<string name="poi_estate_agent"></string>
-	<string name="poi_lawyer"></string>
-	<string name="poi_telecommunication_office"></string>
-	<string name="poi_ngo"></string>
+	<string name="poi_company">Фирма</string>
+	<string name="poi_insurance">Страховая компания</string>
+	<string name="poi_estate_agent">Агентство недвижимости</string>
+	<string name="poi_lawyer">Юридические услуги</string>
+	<string name="poi_telecommunication_office">Телекоммуникационная компания</string>
+	<string name="poi_ngo">Общественная организация</string>
 	<string name="poi_town_hall">Администрация населенного пункта</string>
-	<string name="poi_employment_agency"></string>
-	<string name="poi_research_office"></string>
-	<string name="poi_it_office"></string>
-	<string name="poi_newspaper_office"></string>
-	<string name="poi_architect_office"></string>
-	<string name="poi_advertising_agency"></string>
-	<string name="poi_educational_institution"></string>
-	<string name="poi_studio"></string>
-	<string name="poi_bookmaker"></string>
+	<string name="poi_employment_agency">Биржа труда</string>
+	<string name="poi_research_office">Исследовательский центр</string>
+	<string name="poi_it_office">Информационные технологии</string>
+	<string name="poi_newspaper_office">Печатное издание</string>
+	<string name="poi_architect_office">Архитектура, офис</string>
+	<string name="poi_advertising_agency">Рекламное агентство</string>
+	<string name="poi_educational_institution">Образовательное учреждение (администрация)</string>
+	<string name="poi_studio">Студия звукозаписи, телестудия</string>
+	<string name="poi_bookmaker">Букмекерская контора</string>
 
-	<string name="poi_stadium"></string>
-	<string name="poi_sports_centre"></string>
-	<string name="poi_golf_course"></string>
-	<string name="poi_ice_rink"></string>
-	<string name="poi_pitch"></string>
-	<string name="poi_running_track"></string>
-	<string name="poi_bicycle_track"></string>
-	<string name="poi_horse_track"></string>
-	<string name="poi_raceway"></string>
-	<string name="poi_9pin"></string>
-	<string name="poi_10pin"></string>
-	<string name="poi_archery"></string>
-	<string name="poi_athletics"></string>
-	<string name="poi_australian_football"></string>
-	<string name="poi_baseball"></string>
-	<string name="poi_basketball"></string>
-	<string name="poi_beachvolleyball"></string>
-	<string name="poi_boules"></string>
-	<string name="poi_bowls"></string>
-	<string name="poi_canoe"></string>
-	<string name="poi_chess"></string>
-	<string name="poi_climbing"></string>
-	<string name="poi_cricket"></string>
-	<string name="poi_cricket_nets"></string>
-	<string name="poi_croquet"></string>
-	<string name="poi_cycling"></string>
-	<string name="poi_diving"></string>
-	<string name="poi_scuba_diving"></string>
-	<string name="poi_dog_racing"></string>
-	<string name="poi_equestrian"></string>
-	<string name="poi_football"></string>
-	<string name="poi_golf"></string>
-	<string name="poi_gymnastics"></string>
-	<string name="poi_hockey"></string>
-	<string name="poi_horse_racing"></string>
-	<string name="poi_ice_stock"></string>
-	<string name="poi_korfbal"></string>
-	<string name="poi_motor_sport"></string>
-	<string name="poi_multi_sport"></string>
-	<string name="poi_orienteering"></string>
-	<string name="poi_paddle_tennis"></string>
-	<string name="poi_paragliding"></string>
-	<string name="poi_pelota"></string>
-	<string name="poi_racquet"></string>
-	<string name="poi_rowing"></string>
-	<string name="poi_rugby"></string>
-	<string name="poi_shooting"></string>
-	<string name="poi_skating"></string>
-	<string name="poi_skateboard"></string>
-	<string name="poi_skiing"></string>
-	<string name="poi_soccer"></string>
-	<string name="poi_swimming"></string>
-	<string name="poi_table_tennis"></string>
-	<string name="poi_team_handball"></string>
-	<string name="poi_tennis"></string>
+	<string name="poi_stadium">Стадион</string>
+	<string name="poi_sports_centre">Спортивный центр</string>
+	<string name="poi_golf_course">Поле для гольфа</string>
+	<string name="poi_ice_rink">Каток</string>
+	<string name="poi_pitch">Спортивная площадка, поле, корт</string>
+	<string name="poi_running_track">Беговая дорожка</string>
+	<string name="poi_bicycle_track">Велотрек</string>
+	<string name="poi_horse_track">Ипподром</string>
+	<string name="poi_raceway">Гоночная/раллийная трасса</string>
+	<string name="poi_9pin">9-кегельный боулинг</string>
+	<string name="poi_10pin">10-кегельный боулинг (обычный)</string>
+	<string name="poi_archery">Стрельба из лука</string>
+	<string name="poi_athletics">Лёгкая атлетика</string>
+	<string name="poi_australian_football">Австралийский футбол</string>
+	<string name="poi_baseball">Бейсбол</string>
+	<string name="poi_basketball">Баскетбол</string>
+	<string name="poi_beachvolleyball">Пляжный волейбол</string>
+	<string name="poi_boules">Бул</string>
+	<string name="poi_bowls">Боулз</string>
+	<string name="poi_canoe">Плавание на байдарках и каяках</string>
+	<string name="poi_chess">Шахматы</string>
+	<string name="poi_climbing">Скалолазание</string>
+	<string name="poi_cricket">Крикет</string>
+	<string name="poi_croquet">Крокет</string>
+	<string name="poi_cycling">Велосипедный спорт</string>
+	<string name="poi_diving">Прыжки в воду</string>
+	<string name="poi_scuba_diving">Подводное плавание</string>
+	<string name="poi_dog_racing">Собачьи бега</string>
+	<string name="poi_equestrian">Верховая езда</string>
+	<string name="poi_golf">Гольф</string>
+	<string name="poi_gymnastics">Гимнастика</string>
+	<string name="poi_handball">Гандбол</string>
+	<string name="poi_hockey">Хоккей</string>
+	<string name="poi_horse_racing">Лошадиные скачки</string>
+	<string name="poi_ice_skating">Катание на коньках</string>
+	<string name="poi_ice_stock">Айсшток</string>
+	<string name="poi_korfbal">Корфбол</string>
+	<string name="poi_motor_sport">Автомотоспорт</string>
+	<string name="poi_multi_sport">Универсальная спортплощадка</string>
+	<string name="poi_orienteering">Спортивное ориентирование</string>
+	<string name="poi_paddle_tennis">Настольный теннис</string>
+	<string name="poi_paragliding">Парапланеризм</string>
+	<string name="poi_pelota">Пелота</string>
+	<string name="poi_racquet">Бадминтон, сквош</string>
+	<string name="poi_roller_skating">Катание на роликах</string>
+	<string name="poi_rowing">Академическая гребля</string>
+	<string name="poi_rugby_union">Рэгби-юнион</string>
+	<string name="poi_rugby_league">Рэгби-лиг</string>
+	<string name="poi_shooting">Стрельба</string>
+	<string name="poi_skating">Катание на роликах (коньках)</string>
+	<string name="poi_skateboard">Скейтборд</string>
+	<string name="poi_skiing">Лыжный спорт</string>
+	<string name="poi_soccer">Традиционный футбол</string>
+	<string name="poi_swimming">Плавание</string>
+	<string name="poi_table_tennis">Пинг-понг</string>
+	<string name="poi_tennis">Теннис</string>
 	<string name="poi_toboggan"></string>
-	<string name="poi_volleyball"></string>
+	<string name="poi_volleyball">Воллейбол</string>
 
 	<string name="poi_museum"></string>
 	<string name="poi_attraction"></string>
@@ -406,27 +408,27 @@
 	<string name="poi_club_tourism"></string>
 	<string name="poi_club_charity"></string>
 
-	<string name="poi_library"></string>
-	<string name="poi_arts_centre"></string>
-	<string name="poi_cinema"></string>
-	<string name="poi_casino"></string>
-	<string name="poi_community_centre"></string>
-	<string name="poi_social_centre"></string>
-	<string name="poi_theatre"></string>
-	<string name="poi_circus"></string>
-	<string name="poi_dance_floor"></string>
-	<string name="poi_nightclub"></string>
-	<string name="poi_stripclub"></string>
-	<string name="poi_beach_resort"></string>
-	<string name="poi_dog_park"></string>
-	<string name="poi_fishing_place"></string>
-	<string name="poi_hunting_stand"></string>
-	<string name="poi_marina"></string>
-	<string name="poi_miniature_golf"></string>
-	<string name="poi_playground"></string>
-	<string name="poi_swimming_pool"></string>
-	<string name="poi_water_park"></string>
-	<string name="poi_park"></string>
+	<string name="poi_library">Библиотека</string>
+	<string name="poi_arts_centre">Художественный центр</string>
+	<string name="poi_cinema">Кинотеатр</string>
+	<string name="poi_casino">Казино</string>
+	<string name="poi_community_centre">Общественный центр</string>
+	<string name="poi_social_centre">Общество, клуб</string>
+	<string name="poi_theatre">Театр, концертный зал</string>
+	<string name="poi_circus">Цирк</string>
+	<string name="poi_dance_floor">Танцплощадка</string>
+	<string name="poi_nightclub">Ночной клуб</string>
+	<string name="poi_stripclub">Стрипклуб</string>
+	<string name="poi_beach_resort">Пляжный комплекс</string>
+	<string name="poi_dog_park">Площадка для выгула собак</string>
+	<string name="poi_fishing_place">Место для рыбалки</string>
+	<string name="poi_hunting_stand">Охотничья вышка</string>
+	<string name="poi_marina">Пристань, яхт-клуб</string>
+	<string name="poi_miniature_golf">Мини-гольф</string>
+	<string name="poi_playground">Детская площадка</string>
+	<string name="poi_swimming_pool">Бассейн</string>
+	<string name="poi_water_park">Аквапарк</string>
+	<string name="poi_park">Парк</string>
 
 	<string name="poi_cafe"></string>
 	<string name="poi_biergarten"></string>
@@ -487,52 +489,52 @@
 	<string name="poi_watchmaker"></string>
 	<string name="poi_window_construction"></string>
 
-	<string name="poi_funeral_directors"></string>
-	<string name="poi_computer_craft"></string>
-	<string name="poi_beauty_salon"></string>
-	<string name="poi_beauty_salon_nails"></string>
-	<string name="poi_hairdresser"></string>
-	<string name="poi_massage"></string>
-	<string name="poi_tattoo"></string>
-	<string name="poi_dry_cleaning"></string>
-	<string name="poi_laundry"></string>
-	<string name="poi_car_rental"></string>
-	<string name="poi_car_sharing"></string>
-	<string name="poi_boat_sharing"></string>
-	<string name="poi_toilets"></string>
-	<string name="poi_sauna"></string>
-	<string name="poi_brothel"></string>
-	<string name="poi_mortuary"></string>
-	<string name="poi_crematorium"></string>
-	<string name="poi_internet_cafe"></string>
+	<string name="poi_funeral_directors">Ритуальные услуги</string>
+	<string name="poi_computer_craft">Сборка компьютеров</string>
+	<string name="poi_beauty_salon">Салон красоты</string>
+	<string name="poi_beauty_salon_nails">Маникюрный салон</string>
+	<string name="poi_hairdresser">Парикмахерская</string>
+	<string name="poi_massage">Массажный салон</string>
+	<string name="poi_tattoo">Тату салон</string>
+	<string name="poi_dry_cleaning">Химчистка</string>
+	<string name="poi_laundry">Прачечная</string>
+	<string name="poi_car_rental">Прокат автомобилей</string>
+	<string name="poi_car_sharing">Кратковременный прокат автомобилей</string>
+	<string name="poi_boat_sharing">Прокат лодок</string>
+	<string name="poi_toilets">Туалет</string>
+	<string name="poi_sauna">Сауна</string>
+	<string name="poi_brothel">Бордель</string>
+	<string name="poi_mortuary">Морг</string>
+	<string name="poi_crematorium">Крематорий</string>
+	<string name="poi_internet_cafe">Интернет-кафе</string>
 
-	<string name="poi_bank"></string>
-	<string name="poi_atm"></string>
-	<string name="poi_money_lender"></string>
+	<string name="poi_bank">Банк</string>
+	<string name="poi_atm">Банкомат</string>
+	<string name="poi_money_lender">Ростовщик</string>
 	<string name="poi_pawnbroker">Ломбард</string>
-	<string name="poi_currencyexchange"></string>
-	<string name="poi_accountant"></string>
-	<string name="poi_bitcoin_yes"></string>
+	<string name="poi_currencyexchange">Обмен валют</string>
+	<string name="poi_accountant">Бухгалтерские услуги</string>
+	<string name="poi_bitcoin_yes">Оплата bitcoin</string>
 
 	<string name="poi_cave_entrance">Вход в пещеру</string>
-	<string name="poi_peak"></string>
+	<string name="poi_peak">Горная вершина</string>
 	<string name="poi_saddle">Седловая точка (перевал)</string>
 	<string name="poi_volcano">Вулкан</string>
 	<string name="poi_crater">Кратер</string>
-	<string name="poi_sinkhole"></string>
-	<string name="poi_waterfall"></string>
-	<string name="poi_rapids"></string>
-	<string name="poi_stone"></string>
-	<string name="poi_cape"></string>
-	<string name="poi_beach"></string>
-	<string name="poi_bay"></string>
-	<string name="poi_fjord"></string>
-	<string name="poi_reef"></string>
-	<string name="poi_wetland"></string>
-	<string name="poi_nature_reserve"></string>
-	<string name="poi_strait"></string>
-	<string name="poi_island"></string>
-	<string name="poi_islet"></string>
+	<string name="poi_sinkhole">Карстовый провал</string>
+	<string name="poi_waterfall">Водопад</string>
+	<string name="poi_rapids">Пороги</string>
+	<string name="poi_stone">Отдельностоящий камень</string>
+	<string name="poi_cape">Мыс</string>
+	<string name="poi_beach">Пляж</string>
+	<string name="poi_bay">Залив, бухта</string>
+	<string name="poi_fjord">Фьорд</string>
+	<string name="poi_reef">Риф</string>
+	<string name="poi_wetland">Болото</string>
+	<string name="poi_nature_reserve">Заповедник</string>
+	<string name="poi_strait">Пролив</string>
+	<string name="poi_island">Остров</string>
+	<string name="poi_islet">Остров (небольшой)</string>
 
 	<string name="poi_seamark_anchorage"></string>
 	<string name="poi_seamark_anchor_berth"></string>
@@ -575,6 +577,7 @@
 	<string name="poi_seamark_topmark"></string>
 	<string name="poi_seamark_rock"></string>
 	<string name="poi_seamark_wreck"></string>
+
 	<string name="poi_military_airfield"></string>
 	<string name="poi_military_bunker"></string>
 	<string name="poi_military_barracks"></string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 2c9bad3d60..837ca6b5b0 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -220,6 +220,7 @@
 	<string name="poi_vineyard">Vineyard</string>
 	<string name="poi_orchard">Orchard</string>
 	<string name="poi_salt_pond">Salt pond</string>
+	<string name="poi_cricket_nets">Cricket nets</string>
 
 	<string name="poi_driving_school">Driving school</string>
 	<string name="poi_school">School</string>
@@ -292,18 +293,18 @@
 	<string name="poi_chess">Chess</string>
 	<string name="poi_climbing">Climbing</string>
 	<string name="poi_cricket">Cricket</string>
-	<string name="poi_cricket_nets">Cricket nets</string>
 	<string name="poi_croquet">Croquet</string>
 	<string name="poi_cycling">Cycling</string>
 	<string name="poi_diving">Diving</string>
 	<string name="poi_scuba_diving">Scuba diving</string>
 	<string name="poi_dog_racing">Dog racing</string>
 	<string name="poi_equestrian">Equestrian</string>
-	<string name="poi_football">Football</string>
 	<string name="poi_golf">Golf</string>
 	<string name="poi_gymnastics">Gymnastics</string>
+	<string name="poi_handball">Handball</string>
 	<string name="poi_hockey">Hockey</string>
 	<string name="poi_horse_racing">Horse racing</string>
+	<string name="poi_ice_skating">Ice skating</string>
 	<string name="poi_ice_stock">Ice stock</string>
 	<string name="poi_korfbal">Korfbal</string>
 	<string name="poi_motor_sport">Motor sport</string>
@@ -313,8 +314,10 @@
 	<string name="poi_paragliding">Paragliding</string>
 	<string name="poi_pelota">Pelota</string>
 	<string name="poi_racquet">Racquet</string>
+	<string name="poi_roller_skating">Roller skating</string>
 	<string name="poi_rowing">Rowing</string>
-	<string name="poi_rugby">Rugby</string>
+	<string name="poi_rugby_union">Rugby union</string>
+	<string name="poi_rugby_league">Rugby league</string>
 	<string name="poi_shooting">Shooting</string>
 	<string name="poi_skating">Skating</string>
 	<string name="poi_skateboard">Skateboard</string>
@@ -322,7 +325,6 @@
 	<string name="poi_soccer">Soccer</string>
 	<string name="poi_swimming">Swimming</string>
 	<string name="poi_table_tennis">Table tennis</string>
-	<string name="poi_team_handball">Team handball</string>
 	<string name="poi_tennis">Tennis</string>
 	<string name="poi_toboggan">Toboggan</string>
 	<string name="poi_volleyball">Volleyball</string>
@@ -575,6 +577,7 @@
 	<string name="poi_seamark_topmark">Topmark, seamark</string>
 	<string name="poi_seamark_rock">Rock, seamark</string>
 	<string name="poi_seamark_wreck">Wreck, seamark</string>
+
 	<string name="poi_military_airfield">Military airfield</string>
 	<string name="poi_military_bunker">Military bunker</string>
 	<string name="poi_military_barracks">Barracks</string>

From 8d41387de088d7907f776f51f4d9ee3134898e47 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Thu, 13 Nov 2014 21:12:25 +0100
Subject: [PATCH 38/53] Phrases.xml revised

---
 OsmAnd/res/values/phrases.xml | 140 +++++++++++++++++-----------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 837ca6b5b0..93ff8794b8 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1,95 +1,95 @@
 <?xml version="1.0" ?>
 <resources>
-	<string name="poi_bakery">Bakery shop</string>
-	<string name="poi_alcohol">Alcohol shop</string>
+	<string name="poi_bakery">Bakery</string>
+	<string name="poi_alcohol">liquor store</string>
 	<string name="poi_convenience">Convenience store</string>
 	<string name="poi_mall">Mall</string>
-	<string name="poi_beverages">Beverages shop</string>
-	<string name="poi_butcher">Butcher shop</string>
-	<string name="poi_deli">Fine foods shop</string>
-	<string name="poi_shop_farm">Farm produce shop</string>
-	<string name="poi_greengrocer">Greengrocer</string>
-	<string name="poi_seafood">Seafood shop</string>
-	<string name="poi_confectionery">Confectionery Shop</string>
-	<string name="poi_ice_cream">Ice cream</string>
+	<string name="poi_beverages">Beverage store</string>
+	<string name="poi_butcher">Meat market</string>
+	<string name="poi_deli">Deli</string>
+	<string name="poi_shop_farm">Farm shop</string>
+	<string name="poi_greengrocer">Greengrocery</string>
+	<string name="poi_seafood">Seafood store</string>
+	<string name="poi_confectionery">Confectionery</string>
+	<string name="poi_ice_cream">Ice cream parlor</string>
 	<string name="poi_supermarket">Supermarket</string>
 	<string name="poi_shop_tea">Tea shop</string>
 	<string name="poi_dairy">Dairy shop</string>
 	<string name="poi_vending_machine">Vending machine</string>
 
-	<string name="poi_bookshop">Book shop</string>
+	<string name="poi_bookshop">Bookstore</string>
 	<string name="poi_bicycle_shop">Bicycle shop</string>
 	<string name="poi_anime_shop">Anime shop</string>
-	<string name="poi_antiques_shop">Antiques shop</string>
+	<string name="poi_antiques_shop">Antiques store</string>
 	<string name="poi_art_shop">Art shop</string>
 	<string name="poi_baby_goods">Baby goods</string>
 	<string name="poi_bag_shop">Bag shop</string>
-	<string name="poi_bathroom_furnishing_shop">Bathroom furnishing shop</string>
-	<string name="poi_bed_shop">Bed shop</string>
-	<string name="poi_boutique">Boutique shop</string>
+	<string name="poi_bathroom_furnishing_shop">Bathroom furnishings</string>
+	<string name="poi_bed_shop">Bed room furnishings</string>
+	<string name="poi_boutique">Fashion boutique</string>
 	<string name="poi_carpet_shop">Carpet shop</string>
-	<string name="poi_chemist_shop">Chemist shop</string>
-	<string name="poi_clothes_shop">Clothes shop</string>
-	<string name="poi_children_clothes_shop">Children clothes shop</string>
-	<string name="poi_shoes">Shoes shop</string>
-	<string name="poi_computer_shop">Computer shop</string>
+	<string name="poi_chemist_shop">Drug store</string>
+	<string name="poi_clothes_shop">Apparel store</string>
+	<string name="poi_children_clothes_shop">Childrens apparel</string>
+	<string name="poi_shoes">Shoe store</string>
+	<string name="poi_computer_shop">Computer store</string>
 	<string name="poi_copyshop">Copy shop</string>
 	<string name="poi_curtain_shop">Curtain shop</string>
-	<string name="poi_fabric_shop">Fabric shop</string>
-	<string name="poi_bedding_shop">Bedding shop</string>
-	<string name="poi_dive_shop">Dive shop</string>
-	<string name="poi_doityourself_shop">Do-It-Yourself shop</string>
-	<string name="poi_erotic_shop">Sex shop</string>
-	<string name="poi_fishing_shop">Fishing shop</string>
-	<string name="poi_florist">Florist shop</string>
-	<string name="poi_frame_shop">Frame shop</string>
-	<string name="poi_furniture_shop">Furniture shop</string>
-	<string name="poi_garden_centre">Garden centre</string>
-	<string name="poi_gas_shop">Bottled gas shop</string>
-	<string name="poi_general_shop">General shop</string>
+	<string name="poi_fabric_shop">Drapery shop</string>
+	<string name="poi_bedding_shop">Bedding store</string>
+	<string name="poi_dive_shop">Diving equipment</string>
+	<string name="poi_doityourself_shop">Home improvement store</string>
+	<string name="poi_erotic_shop">Erotic shop</string>
+	<string name="poi_fishing_shop">Fishing tackle</string>
+	<string name="poi_florist">Flower shop</string>
+	<string name="poi_frame_shop">Picture frame shop</string>
+	<string name="poi_furniture_shop">Furniture store</string>
+	<string name="poi_garden_centre">Garden center</string>
+	<string name="poi_gas_shop">Liquid gas store</string>
+	<string name="poi_general_shop">General store</string>
 	<string name="poi_gift_shop">Gift shop</string>
-	<string name="poi_glaziery_shop">Glaziery shop</string>
-	<string name="poi_hardware_shop">Hardware shop</string>
-	<string name="poi_hearing_aids_shop">Hearing aids shop</string>
-	<string name="poi_herbalist">Herbalist shop</string>
-	<string name="poi_hifi_shop">HiFi shop</string>
-	<string name="poi_houseware_shop">Houseware shop</string>
-	<string name="poi_hunting_shop">Hunting shop</string>
-	<string name="poi_interior_decoration_shop">Interior decoration shop</string>
-	<string name="poi_jewelry_shop">Jewelry shop</string>
+	<string name="poi_glaziery_shop">Glaziery</string>
+	<string name="poi_hardware_shop">Hardware store</string>
+	<string name="poi_hearing_aids_shop">Hearing aids</string>
+	<string name="poi_herbalist">Herb store</string>
+	<string name="poi_hifi_shop">HiFi store</string>
+	<string name="poi_houseware_shop">Household supply store</string>
+	<string name="poi_hunting_shop">Hunting equipment</string>
+	<string name="poi_interior_decoration_shop">Interior decoration store</string>
+	<string name="poi_jewelry_shop">Jewelry store</string>
 	<string name="poi_kiosk">Kiosk</string>
-	<string name="poi_kitchen_shop">Kitchen shop</string>
-	<string name="poi_mobile_phone_shop">Mobile phone shop</string>
+	<string name="poi_kitchen_shop">Kitchenware</string>
+	<string name="poi_mobile_phone_shop">Cell phone store</string>
 	<string name="poi_motorcycle_shop">Motorcycle shop</string>
-	<string name="poi_musical_instrument_shop">Musical instrument shop</string>
-	<string name="poi_newsagent_shop">Newsagent shop</string>
-	<string name="poi_optician_shop">Optician shop</string>
-	<string name="poi_organic_shop">Organic store</string>
-	<string name="poi_outdoor_shop">Outdoor shop</string>
+	<string name="poi_musical_instrument_shop">Musical instruments</string>
+	<string name="poi_newsagent_shop">Newsagency</string>
+	<string name="poi_optician_shop">Optometrist</string>
+	<string name="poi_organic_shop">Organic food</string>
+	<string name="poi_outdoor_shop">Outdoor store</string>
 	<string name="poi_paint_shop">Paint shop</string>
 	<string name="poi_pet_shop">Pet shop</string>
-	<string name="poi_radiotechnics_shop">Radiotechnics shop</string>
-	<string name="poi_second_hand">Second hand shop</string>
+	<string name="poi_radiotechnics_shop">Radiotechnics store</string>
+	<string name="poi_second_hand">Second hand store</string>
 	<string name="poi_ship_chandler">Ship chandler</string>
-	<string name="poi_sports_shop">Sports shop</string>
+	<string name="poi_sports_shop">Sporting goods</string>
 	<string name="poi_stationery_shop">Stationery shop</string>
 	<string name="poi_tableware_shop">Tableware shop</string>
 	<string name="poi_ticket_shop">Ticket shop</string>
-	<string name="poi_tobacco_shop">Tobacco shop</string>
-	<string name="poi_toys_shop">Toys shop</string>
-	<string name="poi_trade_shop">Trade shop</string>
-	<string name="poi_vacuum_cleaner_shop">Vacuum cleaner shop</string>
+	<string name="poi_tobacco_shop">Tobacco store</string>
+	<string name="poi_toys_shop">Toys store</string>
+	<string name="poi_trade_shop">Trading post</string>
+	<string name="poi_vacuum_cleaner_shop">Vacuum cleaner store</string>
 	<string name="poi_variety_store">Variety store</string>
-	<string name="poi_video_shop">Video shop</string>
-	<string name="poi_window_blind_shop">Window blind shop</string>
+	<string name="poi_video_shop">Video store</string>
+	<string name="poi_window_blind_shop">Window blind store</string>
 	<string name="poi_department_store">Department store</string>
-	<string name="poi_electronics_shop">Electronics shop</string>
+	<string name="poi_electronics_shop">Electronics store</string>
 	<string name="poi_car_shop">Car shop</string>
-	<string name="poi_car_parts_shop">Car parts shop</string>
-	<string name="poi_atv_shop">Quad shop</string>
-	<string name="poi_cosmetics_shop">Cosmetics shop</string>
+	<string name="poi_car_parts_shop">Car parts</string>
+	<string name="poi_atv_shop">Quad store</string>
+	<string name="poi_cosmetics_shop">Cosmetics</string>
 	<string name="poi_marketplace">Marketplace</string>
-	<string name="poi_sewing_shop">Sewing shop</string>
+	<string name="poi_sewing_shop">Dry goods store</string>
 
 	<string name="poi_police">Police</string>
 	<string name="poi_fire_station">Fire station</string>
@@ -118,13 +118,13 @@
 	<string name="poi_traffic_calming_rumble_strip">Rumble strip</string>
 	<string name="poi_traffic_calming_table">Table</string>
 	<string name="poi_traffic_calming_choker">Choker</string>
-	<string name="poi_traffic_signals">Traffic signals</string>
+	<string name="poi_traffic_signals">Stop light</string>
 
 	<string name="poi_car_repair">Car repair</string>
-	<string name="poi_service_tyres">Tire</string>
+	<string name="poi_service_tyres">Tires</string>
 	<string name="poi_vehicle_inspection">Vehicle inspection</string>
 	<string name="poi_car_wash">Car wash</string>
-	<string name="poi_fuel">Petrol station</string>
+	<string name="poi_fuel">Gas station</string>
 	<string name="poi_charging_station">Charging station</string>
 	<string name="poi_vehicle_ramp">Vehicle ramp</string>
 	<string name="poi_compressed_air">Compressed air</string>
@@ -231,7 +231,7 @@
 	<string name="poi_social_facility">Social facility</string>
 	<string name="poi_courthouse">Courthouse</string>
 	<string name="poi_prison">Prison</string>
-	<string name="poi_register_office">Register office</string>
+	<string name="poi_register_office">Civil registry office</string>
 	<string name="poi_embassy">Embassy</string>
 	<string name="poi_government">Government</string>
 	<string name="poi_bailiff">Bailiff</string>
@@ -378,7 +378,7 @@
 	<string name="poi_picnic_site">Picnic site</string>
 	<string name="poi_spring">Spring</string>
 	<string name="poi_cemetery">Cemetery</string>
-	<string name="poi_grave_yard">Grave yard</string>
+	<string name="poi_grave_yard">Graveyard</string>
 	<string name="poi_shelter">Shelter</string>
 	<string name="poi_funicular">Funicular</string>
 	<string name="poi_resort">Resort</string>
@@ -388,7 +388,7 @@
 	<string name="poi_club_computer">Computer club</string>
 	<string name="poi_club_board_games">Board games club</string>
 	<string name="poi_club_motorcycle">Motorcycle club</string>
-	<string name="poi_club_sport">Sport club</string>
+	<string name="poi_club_sport">Sports club</string>
 	<string name="poi_club_game">Game club</string>
 	<string name="poi_club_automobile">Automobile club</string>
 	<string name="poi_club_chess">Chess club</string>
@@ -397,7 +397,7 @@
 	<string name="poi_club_fishing">Fishing club</string>
 	<string name="poi_club_veterans">Veterans club</string>
 	<string name="poi_club_linux">Linux club</string>
-	<string name="poi_club_theatre">Theatre club</string>
+	<string name="poi_club_theatre">Theater club</string>
 	<string name="poi_club_history">History club</string>
 	<string name="poi_club_music">Music club</string>
 	<string name="poi_club_ethnic">Ethnic club</string>
@@ -501,7 +501,7 @@
 	<string name="poi_car_rental">Car rental</string>
 	<string name="poi_car_sharing">Car sharing</string>
 	<string name="poi_boat_sharing">Boat sharing</string>
-	<string name="poi_toilets">Toilets</string>
+	<string name="poi_toilets">Restroom</string>
 	<string name="poi_sauna">Sauna</string>
 	<string name="poi_brothel">Brothel</string>
 	<string name="poi_mortuary">Mortuary</string>

From 9adba136e5d66326b5ae2054d4191cfbe13d6f7f Mon Sep 17 00:00:00 2001
From: stephan 75 <stephan.r@web.de>
Date: Thu, 13 Nov 2014 20:21:06 +0100
Subject: [PATCH 39/53] Translated using Weblate (German)

Currently translated at 99.9% (1558 of 1559 strings)
---
 OsmAnd/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 9cfa7b5965..1d93086acc 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1268,7 +1268,7 @@
 	<string name="bg_service_screen_lock_toast">Bildschirm gesperrt</string>
 	<string name="bg_service_interval">Aufwachintervall setzen:</string>
 	<string name="map_widget_day_night">Tag/Nacht-Modus</string>
-	<string name="map_widget_vector_attributes">Karten-Zusatzoptionen:</string>
+	<string name="map_widget_vector_attributes">Karten-Zusatzoptionen</string>
 	<string name="map_widget_renderer">Kartendarstellung</string>
 
 	<string name="layer_map_appearance">Anzeige konfigurieren</string>

From 3494a6f67dd93cb23d9ed58e7c5150b57bb12bc5 Mon Sep 17 00:00:00 2001
From: Federico <botticchio@gmail.com>
Date: Thu, 13 Nov 2014 21:28:03 +0100
Subject: [PATCH 40/53] Translated using Weblate (Italian)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-it/strings.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index eb596c57d3..2174e9c922 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1586,11 +1586,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="about_settings_descr">Informazioni versione, licenze, membri del progetto</string>
     <string name="tips_and_tricks">Aiuto</string>
     <string name="tip_map_styles">Stili mappa</string>
-	<string name="tip_map_styles_t">"OsmAnd supporta la visualizzazione delle mappe vettoriali in differenti stili mappa per adattarsi alle tue esigenze:
-\n\nDiversi stili mappa da quello bilanciato preimpostato, li trovi sotto \'Menu\' -&gt; \'Configura mappa\' -&gt; \'Stile Mappa\' scegli per esempio
-\n\t* Lo stile \'Touring view\': contiene le più dettagliate informazioni possibile per viaggiare e per visitare, incluse le ottimizzazioni per i guidatori professionali (strade contrasto maggiormente distinguibile), opzione per l\'escursionismo Alpino (scala SAC), itinerari ciclistici, simboli per escursionismo, etc.
-\n\t* \'Alto contrasto strade \' mostra le strade con una luminosità dei colori molto accentuata per le situazioni di cattiva illuminazione
-\n\t* \'Inverno e sci\' crea una vista del paesaggio invernale (coperto da neve), e visione globale delle piste da sci e degli impianti di risalita (in abbinata con \'World ski\' download mappa) "</string>
+	<string name="tip_map_styles_t">"OsmAnd supporta le mappe vettoriali offline con stili di visualizzazione differenti per adattarsi alle tue esigenze:
+\n\nOltre allo stile bilanciato preimpostato, sotto \'Menu\' → \'Configura la mappa\' → \'Stile della mappa\' puoi scegliere ad esempio
+\n\t* Lo stile \'Touring view\', che contiene le informazioni più dettagliate possibili per viaggiatori e turisti, incluse le ottimizzazioni per gli autisti professionisti (maggiore contrasto, strade distinguibili), opzioni per l\'escursionismo Alpino (scala SAC), itinerari ciclistici, simboli per escursionismo, ecc.\n\t* \'High contrast roads\' mostra le strade con colori molto accentuati per le situazioni con intensa luminosità ambientale
+\n\t* \'Winter and ski\' crea una vista da paesaggio invernale (coperto da neve) e mostra pendenze sciistiche e impianti di risalita (abbinata alle mappe scaricabili \'World ski\') "</string>
     <string name="base_world_map">Mappa mondiale di base</string>
 	
     

From b4dce32bd86f72bf3670a2e88417842636176ec9 Mon Sep 17 00:00:00 2001
From: Federico <botticchio@gmail.com>
Date: Thu, 13 Nov 2014 21:37:43 +0100
Subject: [PATCH 41/53] Translated using Weblate (Italian)

Currently translated at 100.0% (1559 of 1559 strings)

adapted to actual 1.9.2g italian strings
---
 OsmAnd/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 2174e9c922..c0c0dea2ef 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -66,7 +66,7 @@
   
   <string name="switch_to_raster_map_to_see">Nessuna mappa vettoriale è presente per questa posizione. Ne puoi scaricare una in Impostazioni (Gestisci i file mappe), o passa alle mappe online (abilita il plugin delle mappe online).</string>
   <string name="binary_map_download_success">"Download completato.
-\n\t\n\tPer usarle attivare \'Impostazioni\' → \'Configurazione delle mappe\' → \'Sorgenti mappe...\'\t\'Mappe vettoriali offline\'. "</string>
+\n\t\n\tPer usarle attivare \'Impostazioni\' → \'Gestisci i file delle mappe\' → \'Sorgenti mappe...\' → \'Mappe vettoriali offline\'. "</string>
   <string name="tip_day_night_mode">Modo giorno/notte</string>
   
   <string name="tip_osm_improve">Migliora i dati OSM</string>

From 7d3b124dfc24b5df8c3b1f628720585bc6d588d6 Mon Sep 17 00:00:00 2001
From: xmd5a2 <lornaderek@mail.ru>
Date: Fri, 14 Nov 2014 17:43:37 +0300
Subject: [PATCH 42/53] Update ru phrases

---
 OsmAnd/res/values-ru/phrases.xml | 100 +++++++++++++++----------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 987be9a98b..fcc0899030 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -329,59 +329,59 @@
 	<string name="poi_toboggan"></string>
 	<string name="poi_volleyball">Воллейбол</string>
 
-	<string name="poi_museum"></string>
-	<string name="poi_attraction"></string>
-	<string name="poi_memorial"></string>
-	<string name="poi_artwork"></string>
-	<string name="poi_archaeological_site"></string>
-	<string name="poi_battlefield"></string>
-	<string name="poi_boundary_stone"></string>
-	<string name="poi_castle"></string>
-	<string name="poi_city_gate"></string>
-	<string name="poi_fort"></string>
-	<string name="poi_fountain"></string>
-	<string name="poi_ruins_historic"></string>
-	<string name="poi_rune_stone"></string>
-	<string name="poi_wreck"></string>
-	<string name="poi_ship_historic"></string>
-	<string name="poi_mine_historic"></string>
-	<string name="poi_monument"></string>
-	<string name="poi_zoo"></string>
-	<string name="poi_theme_park"></string>
+	<string name="poi_museum">Музей</string>
+	<string name="poi_attraction">Достопримечательность</string>
+	<string name="poi_memorial">Памятник, мемориал</string>
+	<string name="poi_artwork">Произведение искусства</string>
+	<string name="poi_archaeological_site">Раскопки</string>
+	<string name="poi_battlefield">Поле битвы</string>
+	<string name="poi_boundary_stone">Межевой камень</string>
+	<string name="poi_castle">Замок</string>
+	<string name="poi_city_gate">Городские ворота</string>
+	<string name="poi_fort">Фортификационные сооружения</string>
+	<string name="poi_fountain">Фонтан</string>
+	<string name="poi_ruins_historic">Исторические руины</string>
+	<string name="poi_rune_stone">Рунический камень</string>
+	<string name="poi_wreck">Место кораблекрушения</string>
+	<string name="poi_ship_historic">Судно (музей)</string>
+	<string name="poi_mine_historic">Историческая шахта</string>
+	<string name="poi_monument">Монумент (памятник)</string>
+	<string name="poi_zoo">Зоопарк</string>
+	<string name="poi_theme_park">Парк развлечений</string>
 
-	<string name="poi_hotel"></string>
-	<string name="poi_guest_house"></string>
-	<string name="poi_hostel"></string>
-	<string name="poi_motel"></string>
-	<string name="poi_alpine_hut"></string>
-	<string name="poi_chalet"></string>
+	<string name="poi_hotel">Гостиница</string>
+	<string name="poi_guest_house">Гостевой дом</string>
+	<string name="poi_hostel">Хостел</string>
+	<string name="poi_motel">Мотель</string>
+	<string name="poi_alpine_hut">Горный приют</string>
+	<string name="poi_chalet">Шале</string>
 
-	<string name="poi_place_of_worship"></string>
-	<string name="poi_place_of_worship_christian"></string>
-	<string name="poi_place_of_worship_jewish"></string>
-	<string name="poi_place_of_worship_muslim"></string>
-	<string name="poi_place_of_worship_sikh"></string>
-	<string name="poi_place_of_worship_buddhist"></string>
-	<string name="poi_place_of_worship_hindu"></string>
-	<string name="poi_place_of_worship_shinto"></string>
-	<string name="poi_place_of_worship_taoist"></string>
-	<string name="poi_monastery"></string>
-	<string name="poi_historic_monastery"></string>
-	<string name="poi_wayside_cross"></string>
-	<string name="poi_wayside_shrine"></string>
-	<string name="poi_tourism_information"></string>
-	<string name="poi_clock"></string>
-	<string name="poi_travel_agent"></string>
-	<string name="poi_viewpoint"></string>
-	<string name="poi_camp_site"></string>
+	<string name="poi_place_of_worship">Место поклонения</string>
+	<string name="poi_place_of_worship_christian">Храм, церковь (часовня)</string>
+	<string name="poi_place_of_worship_jewish">Синагога</string>
+	<string name="poi_place_of_worship_muslim">Мечеть</string>
+	<string name="poi_place_of_worship_sikh">Место поклонения: сикхизм</string>
+	<string name="poi_place_of_worship_buddhist">Место поклонения: буддизм</string>
+	<string name="poi_place_of_worship_hindu">Место поклонения: индуизм</string>
+	<string name="poi_place_of_worship_shinto">Место поклонения: синтоизм</string>
+	<string name="poi_place_of_worship_taoist">Место поклонения: даосизм</string>
+	<string name="poi_monastery">Монастырь</string>
+	<string name="poi_historic_monastery">Исторический монастырь</string>
+	<string name="poi_wayside_cross">Придорожный крест</string>
+	<string name="poi_wayside_shrine">Придорожная святыня</string>
+	<string name="poi_tourism_information">Информационный стенд</string>
+	<string name="poi_clock">Часы</string>
+	<string name="poi_travel_agent">Турагенство</string>
+	<string name="poi_viewpoint">Место с хорошим видом</string>
+	<string name="poi_camp_site">Место для лагеря</string>
 	<string name="poi_caravan_site"></string>
-	<string name="poi_picnic_site"></string>
-	<string name="poi_spring"></string>
-	<string name="poi_cemetery"></string>
-	<string name="poi_grave_yard"></string>
-	<string name="poi_shelter"></string>
-	<string name="poi_funicular"></string>
-	<string name="poi_resort"></string>
+	<string name="poi_picnic_site">Место для пикника</string>
+	<string name="poi_spring">Родник</string>
+	<string name="poi_cemetery">Кладбище</string>
+	<string name="poi_grave_yard">Кладбище (небольшое)</string>
+	<string name="poi_shelter">Укрытие от непогоды</string>
+	<string name="poi_funicular">Фуникулёр</string>
+	<string name="poi_resort">Курорт</string>
 
 	<string name="poi_club_art"></string>
 	<string name="poi_club_astronomy"></string>

From f989ed049510b80fdb1244c1af40f700f1d8eb95 Mon Sep 17 00:00:00 2001
From: Federico <botticchio@gmail.com>
Date: Thu, 13 Nov 2014 22:02:51 +0100
Subject: [PATCH 43/53] Translated using Weblate (Italian)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-it/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index c0c0dea2ef..e4b08f886f 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -231,7 +231,7 @@
   <string name="gpx_option_reverse_route">Inverti direzione GPX</string>
   <string name="gpx_option_destination_point">Usa il punto di destinazione attuale</string>
   <string name="gpx_option_from_start_point">Percorri tutta la traccia</string>
-  <string name="switch_to_vector_map_to_see">Mappa vettoriale offline presente per quest\'area.\n\t\n\tPer usarla attivare \'Menu\'→\'Strati mappa\'→\'Fonte Mappa…\'→\'Mappe vettoriali offline\'.</string>
+  <string name="switch_to_vector_map_to_see">Mappa vettoriale offline presente per quest\'area.\n\t\n\tPer usarla attivare \'Menu\' → \'Configura la mappa\' → \'Sorgente mappa…\' → \'Mappe vettoriali offline\'.</string>
   <string name="choose_audio_stream">Canale d\'uscita della voce guida</string>
   <string name="choose_audio_stream_descr">Scegli il canale per la guida vocale (dipendente dal sistema)</string>
   <string name="voice_stream_voice_call">Audio chiamate vocali</string>
@@ -269,7 +269,7 @@
 		\n\nScegli poi un modo per condividere la tua posizione. Le opzioni sono: E-Mail, SMS o semplicemente copia le coordinate sugli appunti.
 	</string>
   <string name="tip_favorites">Punti Preferiti</string>
-  <string name="tip_favorites_t">"I punti usati di frequente possono essere salvati come Preferiti in questo modo:\n\nNel menu contestuale per ogni punto \'Utilizza posizione\' scegliere \'Aggiungi ai favoriti\' e quindi immettere un nome per esso.\n\nDopo il salvataggio, il punto preferito sarà accessibile nel \'Menu\'→\'I miei luoghi\'. Premendo su una qualsiasi voce della lista dei \'Preferiti\', appariranno le opzioni per impostarlo come destinazione, modificarlo o eliminarlo.\n\nPer visualizzare tutti i punti preferiti direttamente sulla mappa, attiva nella schermata della mappa il livello \'Preferiti\' dal menù \'Strati mappa\'. "</string>
+  <string name="tip_favorites_t">"I punti usati di frequente possono essere salvati come Preferiti in questo modo:\n\nPer qualsiasi punto, nel menu contestuale \'Utilizza la posizione…\' scegliere \'Aggiungi ai Preferiti\' e quindi immettere un nome.\n\nDopo il salvataggio, il punto sarà accessibile attraverso \'Menu\' → \'I miei luoghi\'. Premendo su una voce della lista dei \'Preferiti\', appariranno le opzioni per impostarlo come destinazione, modificarlo o eliminarlo.\n\nPer visualizzare tutti i punti preferiti direttamente sulla mappa, nella schermata della mappa attiva il livello \'Preferiti\' da \'Menu\' → \'Configura la mappa\'. "</string>
   <string name="create_poi_link_to_osm_doc">  <u>OSM Online</u> con immagini</string>
   <string name="error_doing_search">Errore nella ricerca offline</string>
   <string name="search_offline_geo_error">Impossibile leggere geo intent \'%s\'</string>

From 26c79092b350365de8be332367812a0d5a2a0c5c Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Fri, 14 Nov 2014 22:05:30 +0300
Subject: [PATCH 44/53] Update phrases

---
 OsmAnd/res/values-ru/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 987be9a98b..eafe9b9236 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -318,6 +318,7 @@
 	<string name="poi_rowing">Академическая гребля</string>
 	<string name="poi_rugby_union">Рэгби-юнион</string>
 	<string name="poi_rugby_league">Рэгби-лиг</string>
+	<string name="poi_sailing">Парусный спорт</string>
 	<string name="poi_shooting">Стрельба</string>
 	<string name="poi_skating">Катание на роликах (коньках)</string>
 	<string name="poi_skateboard">Скейтборд</string>

From 80b0cd281a75cd4f590773697178bc9ca6e74e7e Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Fri, 14 Nov 2014 22:34:49 +0300
Subject: [PATCH 45/53] Update ru phrases

---
 OsmAnd/res/values-ru/phrases.xml | 162 +++++++++++++++----------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 14532f40a7..51f54907f3 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -384,30 +384,30 @@
 	<string name="poi_funicular">Фуникулёр</string>
 	<string name="poi_resort">Курорт</string>
 
-	<string name="poi_club_art"></string>
-	<string name="poi_club_astronomy"></string>
-	<string name="poi_club_computer"></string>
-	<string name="poi_club_board_games"></string>
-	<string name="poi_club_motorcycle"></string>
-	<string name="poi_club_sport"></string>
-	<string name="poi_club_game"></string>
-	<string name="poi_club_automobile"></string>
-	<string name="poi_club_chess"></string>
-	<string name="poi_club_cinema"></string>
-	<string name="poi_club_fan"></string>
-	<string name="poi_club_fishing"></string>
-	<string name="poi_club_veterans"></string>
-	<string name="poi_club_linux"></string>
-	<string name="poi_club_theatre"></string>
-	<string name="poi_club_history"></string>
-	<string name="poi_club_music"></string>
-	<string name="poi_club_ethnic"></string>
-	<string name="poi_club_nature"></string>
-	<string name="poi_club_photography"></string>
-	<string name="poi_club_hunting"></string>
-	<string name="poi_club_shooting"></string>
-	<string name="poi_club_tourism"></string>
-	<string name="poi_club_charity"></string>
+	<string name="poi_club_art">Клуб любителей искусства</string>
+	<string name="poi_club_astronomy">Астрономический клуб</string>
+	<string name="poi_club_computer">Компьютерный клуб</string>
+	<string name="poi_club_board_games">Настольные игры</string>
+	<string name="poi_club_motorcycle">Мотоклуб</string>
+	<string name="poi_club_sport">Спортивный клуб</string>
+	<string name="poi_club_game">Игровой клуб</string>
+	<string name="poi_club_automobile">Автоклуб</string>
+	<string name="poi_club_chess">Шахматный клуб</string>
+	<string name="poi_club_cinema">Киноклуб</string>
+	<string name="poi_club_fan">Фанклуб</string>
+	<string name="poi_club_fishing">Клуб рыболовов</string>
+	<string name="poi_club_veterans">Клуб ветеранов</string>
+	<string name="poi_club_linux">Клуб любителей Linux</string>
+	<string name="poi_club_theatre">Театральный клуб</string>
+	<string name="poi_club_history">Исторический клуб</string>
+	<string name="poi_club_music">Музыкальный клуб</string>
+	<string name="poi_club_ethnic">Клуб этнической культуры</string>
+	<string name="poi_club_nature">Клуб натуралистов</string>
+	<string name="poi_club_photography">Фотоклуб</string>
+	<string name="poi_club_hunting">Клуб охотников</string>
+	<string name="poi_club_shooting">Оружейный клуб</string>
+	<string name="poi_club_tourism">Туристический клуб</string>
+	<string name="poi_club_charity">Благотворительский клуб</string>
 
 	<string name="poi_library">Библиотека</string>
 	<string name="poi_arts_centre">Художественный центр</string>
@@ -431,64 +431,64 @@
 	<string name="poi_water_park">Аквапарк</string>
 	<string name="poi_park">Парк</string>
 
-	<string name="poi_cafe"></string>
-	<string name="poi_biergarten"></string>
-	<string name="poi_restaurant"></string>
-	<string name="poi_fast_food"></string>
-	<string name="poi_bar"></string>
-	<string name="poi_pub"></string>
-	<string name="poi_food_court"></string>
-	<string name="poi_drinking_water"></string>
-	<string name="poi_barbecue"></string>
+	<string name="poi_cafe">Кафе</string>
+	<string name="poi_biergarten">Летнее кафе</string>
+	<string name="poi_restaurant">Ресторан</string>
+	<string name="poi_fast_food">Фастфуд (быстрое питание)</string>
+	<string name="poi_bar">Бар</string>
+	<string name="poi_pub">Паб</string>
+	<string name="poi_food_court">Ресторанный дворик</string>
+	<string name="poi_drinking_water">Питьевая вода</string>
+	<string name="poi_barbecue">Установка для барбекю</string>
 
-	<string name="poi_agricultural_engines_craft"></string>
-	<string name="poi_basket_maker"></string>
-	<string name="poi_beekeeper"></string>
-	<string name="poi_blacksmith"></string>
-	<string name="poi_brewery"></string>
-	<string name="poi_boatbuilder"></string>
-	<string name="poi_bookbinder"></string>
-	<string name="poi_carpenter"></string>
-	<string name="poi_carpet_layer"></string>
-	<string name="poi_caterer"></string>
-	<string name="poi_clockmaker"></string>
-	<string name="poi_dressmaker"></string>
-	<string name="poi_electrician"></string>
-	<string name="poi_gardener"></string>
-	<string name="poi_glaziery_craft"></string>
-	<string name="poi_handicraft"></string>
-	<string name="poi_hvac"></string>
-	<string name="poi_insulation_craft"></string>
-	<string name="poi_jeweller"></string>
-	<string name="poi_locksmith"></string>
-	<string name="poi_key_cutter"></string>
-	<string name="poi_metal_construction_craft"></string>
-	<string name="poi_optician"></string>
-	<string name="poi_painter"></string>
-	<string name="poi_parquet_layer"></string>
-	<string name="poi_photographer"></string>
-	<string name="poi_photographic_laboratory"></string>
-	<string name="poi_plasterer"></string>
-	<string name="poi_plumber"></string>
-	<string name="poi_pottery_craft"></string>
-	<string name="poi_rigger"></string>
-	<string name="poi_roofer"></string>
-	<string name="poi_saddler"></string>
-	<string name="poi_sailmaker"></string>
-	<string name="poi_sawmill"></string>
-	<string name="poi_scaffolder"></string>
-	<string name="poi_sculptor"></string>
-	<string name="poi_shoemaker"></string>
-	<string name="poi_stand_builder"></string>
-	<string name="poi_stonemason"></string>
-	<string name="poi_sun_protection_craft"></string>
-	<string name="poi_sweep"></string>
-	<string name="poi_tailor"></string>
-	<string name="poi_tiler"></string>
-	<string name="poi_tinsmith"></string>
-	<string name="poi_upholsterer"></string>
-	<string name="poi_watchmaker"></string>
-	<string name="poi_window_construction"></string>
+	<string name="poi_agricultural_engines_craft">Ремонт с/х техники</string>
+	<string name="poi_basket_maker">Плетение из лозы</string>
+	<string name="poi_beekeeper">Пасека</string>
+	<string name="poi_blacksmith">Кузница</string>
+	<string name="poi_brewery">Пивоварня</string>
+	<string name="poi_boatbuilder">Верфь</string>
+	<string name="poi_bookbinder">Переплётная мастерская</string>
+	<string name="poi_carpenter">Столярная мастерская</string>
+	<string name="poi_carpet_layer">Укладка ковров, ковролина</string>
+	<string name="poi_caterer">Кейтеринг</string>
+	<string name="poi_clockmaker">Часовая мастерская</string>
+	<string name="poi_dressmaker">Пошив, ремонт одежды</string>
+	<string name="poi_electrician">Электрик</string>
+	<string name="poi_gardener">Садовник, ландшафтный дизайнер</string>
+	<string name="poi_glaziery_craft">Стеклорезная мастерская</string>
+	<string name="poi_handicraft">Рукодельные штуки, украшения</string>
+	<string name="poi_hvac">Монтаж кондиционеров, систем вентиляции</string>
+	<string name="poi_insulation_craft">Услуги по утеплению помещений</string>
+	<string name="poi_jeweller">Ювелирная мастерская</string>
+	<string name="poi_locksmith">Слесарные работы</string>
+	<string name="poi_key_cutter">Изготовление ключей</string>
+	<string name="poi_metal_construction_craft">Металлоконструкции</string>
+	<string name="poi_optician">Изготовление, подгонка очков, линз</string>
+	<string name="poi_painter">Маляр</string>
+	<string name="poi_parquet_layer">Паркетные работы</string>
+	<string name="poi_photographer">Фотограф</string>
+	<string name="poi_photographic_laboratory">Фотолаборатория</string>
+	<string name="poi_plasterer">Штукатурные работы</string>
+	<string name="poi_plumber">Сантехник</string>
+	<string name="poi_pottery_craft">Гончарная мастерская</string>
+	<string name="poi_rigger">Оснастка для яхт, катеров</string>
+	<string name="poi_roofer">Кровельщик</string>
+	<string name="poi_saddler">Пошив и ремонт автокресел</string>
+	<string name="poi_sailmaker">Пошив и ремонт парусов</string>
+	<string name="poi_sawmill">Пилорама</string>
+	<string name="poi_scaffolder">Возведение строительных лесов</string>
+	<string name="poi_sculptor">Скульптор</string>
+	<string name="poi_shoemaker">Обувная мастерская</string>
+	<string name="poi_stand_builder">Изготовление выставочных стендов</string>
+	<string name="poi_stonemason">Камнерезная мастерская</string>
+	<string name="poi_sun_protection_craft">Изготовление навесов, жалюзи</string>
+	<string name="poi_sweep">Трубочист</string>
+	<string name="poi_tailor">Ателье</string>
+	<string name="poi_tiler">Плиточные работы</string>
+	<string name="poi_tinsmith">Жестянщик, лудильщик</string>
+	<string name="poi_upholsterer">Драпировщик, обивка мебели</string>
+	<string name="poi_watchmaker">Часовщик</string>
+	<string name="poi_window_construction">Изготовление окон</string>
 
 	<string name="poi_funeral_directors">Ритуальные услуги</string>
 	<string name="poi_computer_craft">Сборка компьютеров</string>

From 9b702883da0913523f4a2de599506d74e147d3c9 Mon Sep 17 00:00:00 2001
From: Stanimir <stanimir@taxi-bulgaria.com>
Date: Fri, 14 Nov 2014 18:53:52 +0100
Subject: [PATCH 46/53] Translated using Weblate (Bulgarian)

Currently translated at 85.8% (1339 of 1559 strings)
---
 OsmAnd/res/values-bg/strings.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index c61a946f02..117fc310e9 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -845,9 +845,8 @@ OsmAnd е с отворен код и активно да се развива. 
 		\n\t* \'По посоката на движение\' - Картата ще се завърта в зависимост от вашата посока на движение.
 		\n\t* \'По компаса\' - Картата ще бъде ориентирана по вградения компас.
 	</string>
-	<string name="binary_map_download_success">Успешно сваляне
-		\n\t\n\tЗа използване \'Меню\' -&gt; \'Настройки на екрана\' -&gt; \'Карти…\' -&gt; \'Offline vector maps\'.
-	</string>
+	<string name="binary_map_download_success">"Успешно сваляне
+\n\t\n\tЗа да използвате активирайте \'Меню\' → \'Настройки карта\' → \'Карта източник…\' → \'Offline векторни карти\'. "</string>
 	<string name="tip_day_night_mode">Дневен/нощен режим</string>
 	<string name="tip_day_night_mode_t_v2">Можете да променяте изгледа на картата от дневен (ярък) към нощен (тъмен). Тъмният изглед е подходящ за безопасно шофиране нощем.
 		\n\nПревключването между дневен и нощен изглед можете да направите в \'Меню\' -&gt; \'Настройки на екрана…\' -&gt;\'Дневен/нощен изглед\'.
@@ -1018,7 +1017,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="gpx_option_reverse_route">Обръщане посоката на GPX</string>
 	<string name="gpx_option_destination_point">Ползвай текущата крайна цел</string>
 	<string name="gpx_option_from_start_point">Преминахте по целия маршрут</string>
-	<string name="switch_to_vector_map_to_see">За този район има карта в офлайн режим.\n\t\n\tАктивирайте я от \'Меню\' -&gt; \'Настройки изглед\' -&gt; \'Карти…\' -&gt; \'Офлайн векторни карти\'.</string>
+	<string name="switch_to_vector_map_to_see">За този район има карта в офлайн режим.\n\t\n\tАктивирайте я от \'Меню\' → \'Настройки карта\' → \'Карта източник…\' → \'Офлайн векторни карти\'.</string>
 	<string name="choose_audio_stream">Канал за гласовите напътствия</string>
 	<string name="choose_audio_stream_descr">Избор на звуков канал за гласовите напътствия (зависи от настройките на Вашето устройство)</string>
 	<string name="voice_stream_voice_call">Канал за гласови данни (за предпочитане)</string>
@@ -1652,7 +1651,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="routing_attr_weight_description">Изберете максималната разрешена маса (тегло) на МПС</string>
     <string name="copying_osmand_files">Копиране файловете на OsmAnd</string>
     <string name="app_mode_truck">Камион</string>
-    <string name="rendering_attr_publicTransportMode_name">Автобусни и тролейбусни линии</string>
+    <string name="rendering_attr_publicTransportMode_name">Автобусни, тролейбусни, маршрутни линии</string>
 	<string name="record_plugin_name">Запис на Вашето пътуване</string>
     <string name="int_hour">ч.</string>
     <string name="duration">Продължителност</string>
@@ -1759,10 +1758,10 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="map_widget_left">Ляв панел</string>
     <string name="layers_category_show">Покажи</string>
 	<string name="configure_map">Настройка на картата</string>
-    <string name="rendering_attr_tramTrainRoutes_name">Трамваи и влакове</string>
+    <string name="rendering_attr_tramTrainRoutes_name">Трамвайни и влакови маршрути</string>
 	<string name="lock_screen_request_explanation">%1$s изисква това разрешение за да изключи екрана с цел пестене на енергия.</string>
     <string name="wake_on_voice">Включи екрана</string>
-    <string name="wake_on_voice_descr">Включи екрана, когато приближава завой</string>
+    <string name="wake_on_voice_descr">Включване на екрана на телефона, когато наближава завой</string>
     <string name="wake_on_voice_never">Никога</string>
     <string name="select_impassable_road">Избери на картата</string>
     <string name="impassable_road">Избягване на пътища…</string>
@@ -1771,4 +1770,9 @@ OsmAnd е с отворен код и активно да се развива. 
     <string name="rendering_attr_busRoutes_name">Автобусни линии</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Маршрути на влакове</string>
     <string name="rendering_attr_trolleybusRoutes_name">Тролейбусни линии</string>
+    <string name="tip_recent_changes_1_9_t">"Промени в версия 1.9: * Актуализирани карти със показване на пътната настилка, транспортни слоеве и туристически символи * Търсене POI по маршрута * Маркиране на пътя като непроходим за сесията * По лесно изтегляне и актуализиране на карти *  Получаване на визуално и аудио уведомление при приближаване до точката * Показване на маршрута и информация към него *  Поддръжка на пътни платна * Поддръжка на Android Wear * Много промени в потребителския интерфейс * Отделна настройка за големината на текста на картата * Специални аудио уведомления в случай че сте напуснали пътя * OsMo вход * Фикс в несъвместимоста на OsMo версията "</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Сподели пътя с такси</string>
+    <string name="search_radius_proximity">В близост до</string>
+    <string name="osmo_device_not_found">Устройството не е намерено</string>
+    <string name="osmo_no_connection_msg">OsMo услугата е недостъпна:\n- проверете връзката;\n- проверете настройките;\n- намерете ни в Twitter: https://twitter.com/OsMomobi</string>
     </resources>

From 2699df1c67dbccf9136b7fe8047e4be695185fa3 Mon Sep 17 00:00:00 2001
From: Yannis Gyftomitros <yannisg92@gmail.com>
Date: Fri, 14 Nov 2014 18:37:57 +0100
Subject: [PATCH 47/53] Translated using Weblate (Greek)

Currently translated at 93.3% (1455 of 1559 strings)
---
 OsmAnd/res/values-el/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 9836de5b8b..7dfdb12676 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1683,4 +1683,12 @@
 	<string name="map_widget_left">Αριστερός πίνακας</string>
     <string name="layers_category_show">Εμφάνιση</string>
 	<string name="configure_map">Διαμόρφωση χάρτη</string>
-    </resources>
+    <string name="rendering_attr_tramTrainRoutes_name">Δρομολόγια τραμ και τρένων</string>
+	<string name="rendering_attr_trainLightrailRoutes_name">Δρομολόγια τρένου</string>
+    <string name="rendering_attr_tramRoutes_name">Δρομολόγια τραμ</string>
+    <string name="rendering_attr_trolleybusRoutes_name">Δρομολόγια τρόλεϋ</string>
+    <string name="rendering_attr_busRoutes_name">Δρομολόγια λεωφορείων</string>
+    <string name="rendering_category_transport">Μεταφορές</string>
+    <string name="map_widget_top">Γραμμή κατάστασης</string>
+	<string name="speed_limit_exceed">Ανοχή ορίου ταχύτητας</string>
+	</resources>

From fa5c9fa4fdec9a7547929e53c39327aca12295a8 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Sat, 15 Nov 2014 01:02:37 +0300
Subject: [PATCH 48/53] Update ru phrases

---
 OsmAnd/res/values-ru/phrases.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 51f54907f3..83fcab1bc3 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -579,11 +579,11 @@
 	<string name="poi_seamark_rock"></string>
 	<string name="poi_seamark_wreck"></string>
 
-	<string name="poi_military_airfield"></string>
-	<string name="poi_military_bunker"></string>
-	<string name="poi_military_barracks"></string>
-	<string name="poi_military_danger_area"></string>
-	<string name="poi_military_range"></string>
-	<string name="poi_military_naval_base"></string>
-	<string name="poi_military_nuclear_explosion_site"></string>
+	<string name="poi_military_airfield">Военный аэродром</string>
+	<string name="poi_military_bunker">Военный бункер</string>
+	<string name="poi_military_barracks">Бараки</string>
+	<string name="poi_military_danger_area">Опасная зона</string>
+	<string name="poi_military_range">Военное стрельбище</string>
+	<string name="poi_military_naval_base">Военно-морская база</string>
+	<string name="poi_military_nuclear_explosion_site">Место ядерного взрыва</string>
 </resources>
\ No newline at end of file

From e767a3fad8e9da1ed075fb81d67866b3ecc562e3 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Sat, 15 Nov 2014 17:19:14 +0300
Subject: [PATCH 49/53] Update ru phrases

---
 OsmAnd/res/values-ru/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 83fcab1bc3..d8c296541f 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -28,6 +28,7 @@
 	<string name="poi_bed_shop">Спальные принадлежности</string>
 	<string name="poi_boutique">Бутик</string>
 	<string name="poi_carpet_shop">Магазин ковров</string>
+	<string name="poi_charity_shop">Благотворительный магазин</string>
 	<string name="poi_chemist_shop">Бытовая химия, косметика</string>
 	<string name="poi_clothes_shop">Одежда</string>
 	<string name="poi_children_clothes_shop">Детская одежда</string>

From 79879d5988820c1e677b63fd23560accefb1c3bd Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Sat, 15 Nov 2014 01:03:18 +0100
Subject: [PATCH 50/53] Translated using Weblate (Sardinian)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-sc/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 38061f4e18..a6406e5690 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -495,8 +495,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="auto_zoom_map">Zoom automàticu mapa</string>
 	<string name="snap_to_road_descr">Arrea sa positzione in subra de sas istradas durante su nàvigu</string>
 	<string name="snap_to_road">Arrea in subra de sas istradas</string>
-	<string name="interrupt_music_descr">Interrumpe sa mùsica pro faghere sos annuntzios</string>
-	<string name="interrupt_music">Interrumpe sa mùsica</string>
+	<string name="interrupt_music_descr">Firma sa mùsica pro fàghere sos annùntzios</string>
+	<string name="interrupt_music">Firma sa mùsica</string>
 	<string name="tip_recent_changes_0_8_2_t">"Mudas in sa 0.8.2:
 \n\t* Megiorau su calculu de sas àndalas
 \n\t* Widgets dinàmicos pro sas mapas

From 3bddefe44e413798ed227e04f73f8e3072076b6c Mon Sep 17 00:00:00 2001
From: Zahnstocher <openstreetmap.org@nurfuerspam.de>
Date: Sun, 16 Nov 2014 23:49:38 +0100
Subject: [PATCH 51/53] Only turn off the screen if map is shown (wake on
 voice)

---
 OsmAnd/src/net/osmand/plus/activities/MapActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 2b8184403d..cd3ba8bca1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -839,7 +839,7 @@ public class MapActivity extends AccessibleActivity implements
 		
 		if (mDevicePolicyManager != null && mDeviceAdmin != null) {
 			final Integer screenPowerSave = settings.WAKE_ON_VOICE_INT.get();
-			if (screenPowerSave > 0) {
+			if (screenPowerSave > 0 && settings.MAP_ACTIVITY_ENABLED.get()) {
 				if (mDevicePolicyManager.isAdminActive(mDeviceAdmin)) {
 					try {
 						mDevicePolicyManager.lockNow();

From 1a5387d805cf23874cea0edf96ce1831b8db7a9f Mon Sep 17 00:00:00 2001
From: 8c6311e901274f6baef2068792c8ab <ft-002@safe-mail.net>
Date: Sun, 16 Nov 2014 18:24:10 +0100
Subject: [PATCH 52/53] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 64.7% (1010 of 1559 strings)
---
 OsmAnd/res/values-nb/strings.xml | 196 ++++++++++++++++++++++++-------
 1 file changed, 152 insertions(+), 44 deletions(-)

diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 33081a48e0..8b16e412b8 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -42,8 +42,8 @@
 	<string name="auto_zoom_map">Auto-zoom kart</string>
 	<string name="snap_to_road_descr">Hold posisjon på veien under navigering</string>
 	<string name="snap_to_road">Hold på vei</string>
-	<string name="osmand_short_description_80_chars">OsmAnd er et navigeringsprogram for offline og online kart og som er åpen kildekode</string>
-	<string name="osmand_plus_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbasert OSM-kart</string>
+	<string name="osmand_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbaserte OSM-kart</string>
+	<string name="osmand_plus_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbaserte OSM-kart</string>
 	<string name="recalculate_route_to_your_location">Transportmodus:</string>
 	<string name="select_navigation_mode">Velg transportmåte</string>
 	<string name="day_night_info_description">Soloppgang: %1$s \nSolnedgang: %2$s</string>
@@ -88,7 +88,7 @@
 	<string name="show_traffic_warnings">Vis trafikkvarsler</string>
 	<string name="avoid_toll_roads">Unngå bomveier</string>
 	<string name="continue_follow_previous_route_auto">Forrige navigering var ikke ferdig. Fortsette å følge den? (%1$s sekunder)</string>
-	<string name="route_updated_loc_found">Ruten blir beregnet på nytt når sted blir funnet</string>
+	<string name="route_updated_loc_found">Rute blir beregnet når posisjon blir funnet</string>
 	<string name="osmand_parking_hours">Timer</string>
 	<string name="osmand_parking_minutes">Minutter</string>
 	<string name="osmand_parking_position_description_add_time">Bilen ble parkert her:</string>
@@ -110,22 +110,22 @@
 	<string name="download_link_and_local_description">Klikk her for å laste ned eller oppdatere offline-data. \nKlikk eksisterende element for å se flere detaljer, trykk og hold for å deaktivere eller slette. Gjeldende data på enheten (%1$s ledig):</string>
 	<string name="unknown_from_location">Startpunkt er ennå ikke bestemt</string>
 	<string name="unknown_location">Posisjon ennå ikke kjent</string>
-	<string name="local_indexes_cat_tile">Nettbaserte kart og kartfliser</string>
+	<string name="local_indexes_cat_tile">Nettbaserte- og flis-kart</string>
 	<string name="local_indexes_cat_map">Offline-kart (vektor)</string>
 	
 	<string name="index_settings_descr">Last ned og håndter offline-kart lagret på enheten</string>
 	<string name="map_online_plugin_is_not_installed">Aktiver programtillegg for nettbaserte kart for å velge ulike kartkilder</string>
-	<string name="map_online_data">Nettbaserte kart (fliser)</string>
-	<string name="map_online_data_descr">Bruk nettbaserte kart (laste ned og mellomlagre fliser på SD-kort)</string>
+	<string name="map_online_data">Nettbaserte- og flis-kart</string>
+	<string name="map_online_data_descr">Bruk nettbaserte kart (last ned og bufre fliser på SD-kort)</string>
 	<string name="online_map_settings">Nettbaserte kart</string>
 	<string name="online_map_settings_descr">Still inn nettbaserte eller hurtigbufrede flis-kartkilder</string>
 	<string name="map_settings">Kartinnstillinger</string>
 	<string name="map_settings_descr">Still inn kartvisningen</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Vektorkart vises trolig raskere. Fungerer kanskje ikke bra på enkelte enheter.</string>
-	<string name="native_rendering">Rask opptegning</string>
+	<string name="native_rendering">Intern opptegning</string>
 	<string name="show_ruler_level">Vis målestokk</string>
 	<string name="info_button">Info</string>
-	<string name="back_to_location">Tilbake til sted</string>
+	<string name="back_to_location">Tilbake til posisjon</string>
 	<string name="help">Hjelp</string>
 	<string name="show_details">Vis detaljer</string>
 	<string name="accessibility_extensions_descr">Tilgjengelighetsmoduler for gamle Android-versjoner</string>
@@ -204,7 +204,7 @@
 	<string name="index_name_asia">Asia</string>
 	<string name="index_name_oceania">Oseania</string>
 	<string name="index_name_other">Verdens- og emnekart</string>
-	<string name="index_name_wiki">Verdensomspennende Wikipedia</string>
+	<string name="index_name_wiki">Verdensomspennende Wikipedia-interessepunkter</string>
 	<string name="index_name_voice">Talepakker (opptak, begrenset funksjonalitet)</string>
 	<string name="index_name_tts_voice">Talepakker (TTS kunstig tale, foretrekk)</string>
 	<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
@@ -221,12 +221,11 @@
 	<string name="general_settings_descr">Still inn visning og generelle programinnstillinger</string>
 	<string name="global_app_settings">Globale programinnstillinger</string>
 	<string name="tip_rotation_switching">Kartorientering</string>
-	<string name="tip_rotation_switching_t_v2">\tDu kan velge hvordan kartvisningen roteres ved å gjentatte ganger klikke på kompassikonet.
-		\n\tValgene er:
-		\n\t\'Ingen rotasjon (nord er opp)\' - Kart vil ikke roteres. Nord vil alltid være opp
-		\n\t\'I bevegelsesretning\' - Kartorienteringen justeres kontinuerlig til bevegelsesretningen
-		\n\t\'Ifølge kompass\' - Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten
-	</string>
+	<string name="tip_rotation_switching_t_v2">"Du kan slå av/på om og hvordan kartvisningen roteres ved å gjentatte ganger klikke på kartskjermens kompassikon.
+\n\nValgene er:
+\n\t* \'Ingen rotasjon (nord er opp)\': Kart vil ikke roteres. Nord vil alltid være opp
+\n\t* \'I bevegelsesretning\': Kartorienteringen justeres kontinuerlig til bevegelsesretningen
+\n\t* \'Ifølge kompass\': Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten "</string>
 	<string name="binary_map_download_success">"Nedlasting vellykket.
 \n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'. "</string>
 	<string name="tip_day_night_mode">Dag/natt-modus</string>
@@ -253,12 +252,12 @@
 	<string name="file_with_name_already_exists">Fil med dette navnet finnes allerede.</string>
 	<string name="gpx_navigation">GPX-rute</string>
 	<string name="poi_query_by_name_matches_categories">Flere interessepunktkategorier funnet som samsvarer med søket:</string>
-	<string name="data_to_search_poi_not_available">Lokale data til å søke interessepunkter er ikke til stede.</string>
+	<string name="data_to_search_poi_not_available">Lokale data til å søke interessepunkter foreligger ikke.</string>
 	<string name="poi_filter_by_name">Søk på navn</string>
 	<string name="old_poi_file_should_be_deleted">Interessepunktfilen \'%1$s\' er overflødig og kan slettes.</string>
 	<string name="update_poi_file_not_found">Lokal fil for å opprettholde interessepunktendringer ikke funnet og kunne ikke opprettes.</string>
 	<string name="button_upgrade_osmandplus">Oppgrader OsmAnd+</string>
-	<string name="map_version_changed_info">Server inneholder kartfiler som ikke er kompatible med din nåværende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.</string>
+	<string name="map_version_changed_info">Server inneholder kartfiler som ikke er kompatible med din gjeldende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.</string>
 	<string name="local_index_mi_rename">Endre navn</string>
 	<string name="show_gpx_route">Vis på kart</string>
 	<string name="search_position_current_location_search">Søker posisjon…</string>
@@ -276,7 +275,7 @@
 	<string name="filename_input">Filnavn: </string>
 	<string name="file_with_name_already_exist">Fil med samme navn finnes allerede.</string>
 	<string name="default_buttons_save">Lagre</string>
-	<string name="menu_save_directions">Lagre rute</string>
+	<string name="menu_save_directions">Lagre anvisninger</string>
 	<string name="show_more_map_detail">Vis flere kartdetaljer</string>
 	<string name="favourites_delete_multiple_succesful">Favorittpunkt(er) vellykket slettet.</string>
 	<string name="favorite_delete_multiple">Du kommer til å slette %1$d favoritt(er) og %2$d favorittgruppe(r). Er du sikker?</string>
@@ -313,7 +312,7 @@
 	<string name="voice_not_specified">Ingen</string>
 	<string name="internet_connection_required_for_online_route">En nettbasert navigeringstjeneste er valgt, men ingen internett-tilkobling er tilgjengelig.</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 Android TTS(tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.</string>
+	<string name="tts_language_not_supported">Det valgte språket støttes ikke av den installerte Android TTS (tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.</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\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'.</string>
@@ -323,10 +322,10 @@
 \n\nI lokalmenyen \'Bruk posisjon\' for et punkt, velg alternativet \'Legg til i favoritter\' og skriv deretter inn et navn for den.
 \n\nEtter å ha lagret en favoritt er den tilgjengelig via \'Meny\' → \'Mine steder\'. Trykking på en oppføring i \'Favoritter\'-listen gir muligheter som å navigere til den, redigere eller slette den.
 \n\nFor å vise alle favorittpunkter direkte på kartet, aktiver på kartskjermen laget \'Favoritter\' i \'Meny\' → \'Still inn kart\'. "</string>
-	<string name="search_osm_offline">Søk adresse ved bruk av offline-kart</string>
+	<string name="search_osm_offline">Søk geografisk plassering</string>
 	<string name="system_locale">System</string>
 	<string name="preferred_locale_descr">Velg visningsspråk</string>
-	<string name="preferred_locale">Språk</string>
+	<string name="preferred_locale">Visningsspråk</string>
 	<string name="tip_map_switch">Velg en kartkilde</string>
 	<string name="tip_map_switch_t_v2">"Kartkilden og kartlag som vises endres via \'Meny\' → \'Still inn kart\'.
 \n\nUnder \'Kartkilde…\' kan du velge å bruke de forhåndslastede offline vektorkartene (standard, trengs også for offline navigering), eller forhåndsdefinerte (nettbaserte eller bufret offline) fliskilder (aktiver programtillegget for \'Nettbaserte kart\' under \'Innstillinger\' → \'Programtillegg\' for dette), eller kart manuelt opprettet ved bruk av f.eks. OsmAndMapCreator på en PC.
@@ -355,7 +354,7 @@
 \n\nEn markør-boks kan skjules igjen ved å trykke lenge på den. "</string>
 	<string name="tip_initial">Hjelp</string>
 	<string name="tip_initial_t">"OsmAnd er et navigeringsprogram med mange funksjoner.
-\n\tSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "</string>
+\n\nSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "</string>
 	<string name="next_button">Neste</string>
 	<string name="previous_button">Forrige</string>
 	<string name="unit_of_length_descr">Endre lengde- og hastighetsenhet</string>
@@ -404,7 +403,7 @@
 	<string name="daynight">Dag/natt-modus</string>
 	<string name="download_files_question">Laste ned {0} fil(er) ({1} MB)?</string>
 	<string name="items_were_selected">{0} element(er) valgt</string>
-	<string name="filter_existing_indexes">Filtrer nedlastede</string>
+	<string name="filter_existing_indexes">Nedlastet</string>
 	<string name="deselect_all">Fravelg alle</string>
 	<string name="select_all">Velg alle</string>
 	<string name="reload">Gjenoppfrisk</string>
@@ -414,7 +413,7 @@
 	<string name="context_menu_item_download_map">Last ned kart</string>
 	<string name="renderers">Vektor-opptegning</string>
 	<string name="renderers_descr">Velg utseende på opptegningen</string>
-	<string name="website">nettsted</string>
+	<string name="website">Nettsted</string>
 	<string name="phone">Telefon</string>
 	<string name="context_menu_item_search_transport">Søk transport</string>
 	<string name="transport_searching_transport">Transportresultater (ingen mål):</string>
@@ -494,8 +493,8 @@
 	<string name="searching">Søker…</string>
 	<string name="searching_address">Søker adresse…</string>
 	<string name="hint_search_online">Husnummer, gate, by</string>
-	<string name="search_offline_address">Offline</string>
-	<string name="search_online_address">Internett</string>
+	<string name="search_offline_address">Offline-søk</string>
+	<string name="search_online_address">Nettbasert søk</string>
 	<string name="max_level_download_tile">Maks. nettbasert zoom</string>
 	<string name="max_level_download_tile_descr">Velg maksimalt zoomnivå å laste ned for nettbaserte kartseksjoner</string>
 	<string name="route_general_information">Total distanse %1$s, reisetid %2$d t %3$d m.</string>
@@ -503,7 +502,7 @@
 	<string name="router_service">Navigeringstjeneste</string>
 	<string name="sd_dir_not_accessible">Lagringsmappe på SD-kortet ikke tilgjengelig</string>
 	<string name="download_question">Laste ned {0} - {1} ?</string>
-	<string name="download_question_exist">Offline-data for {0} finnes allerede ({1}). Vil du oppdatere det ({2}) ?</string>
+	<string name="download_question_exist">Offline-data for {0} finnes allerede ({1}). Vil du oppdatere ({2}) ?</string>
 	<string name="address">Adresse</string>
 	<string name="download_index_success">Nedlasting vellykket</string>
 	<string name="error_io_error">I/O feil oppstod</string>
@@ -537,7 +536,7 @@
 	<string name="show_osm_bugs">Vis OpenStreet-feil</string>
 	<string name="favourites_activity">Favoritter</string>
 	<string name="add_to_favourite">Legg til i favoritter</string>
-	<string name="use_english_names_descr">Bruk lokale eller engelske navn</string>
+	<string name="use_english_names_descr">Velg mellom lokale og engelske navn</string>
 	<string name="use_english_names">Bruk engelske navn i kartene</string>
 	<string name="app_settings">Programinnstillinger</string>
 	<string name="search_address">Søk adresse</string>
@@ -545,13 +544,13 @@
 	<string name="choose_street">Velg gate</string>
 	<string name="choose_city">Velg by</string>
 	<string name="ChooseCountry">Velg land</string>
-	<string name="show_view_angle">Vis synsretningen</string>
+	<string name="show_view_angle">Vis synsretning</string>
 	<string name="map_view_3d_descr">Aktiver 3D-visning av kartet</string>
 	<string name="map_view_3d">3D-kartvisning</string>
 	<string name="show_poi_over_map_description">Vis interessepunkt over kart (bruk sist valgte filter)</string>
 	<string name="show_poi_over_map">Vis interessepunkt</string>
 	<string name="map_tile_source_descr">Velg kilden til nettbaserte eller hurtigbufrede kartdeler</string>
-	<string name="map_tile_source">Flislegg kartkilde</string>
+	<string name="map_tile_source">Fliskartkilde</string>
 	<string name="map_source">Kartkilde</string>
 	<string name="use_internet">Bruk internett</string>
 	<string name="show_location">Vis sted</string>
@@ -640,7 +639,7 @@
     <string name="access_arrival_time">Ankomsttid</string>
     <string name="map_view">Kart</string>
     <string name="prefer_motorways">Foretrekk motorveier</string>
-	<string name="prefer_in_routing_title">Foretrekk …</string>
+	<string name="prefer_in_routing_title">Foretrekk…</string>
 	<string name="prefer_in_routing_descr">Foretrekk motorveier</string>
     <string name="max_speed_none">ingen</string>
     <string name="choose_osmand_theme_descr">Velg programtema</string>
@@ -654,13 +653,13 @@
 	<string name="osmodroid_mode_on">Stopp OsMoDroid</string>    
     <string name="osmodroid_mode_off">Start OsMoDroid</string>
     <string name="announce_gpx_waypoints">Meld om GPX-rutepunkter</string>
-    <string name="speak_title">Meddel…</string>
+    <string name="speak_title">Meld om…</string>
 	<string name="speak_descr">Still inn for å meddele gatenavn, trafikkvarsler (tvungne stopp, fartsdumper), fotoboksvarsler, fartsgrenser</string>
 	<string name="speak_street_names">Meddel gatenavn (TTS)</string>
-    <string name="speak_speed_limit">Meddel fartsgrense</string>
+    <string name="speak_speed_limit">Meld om fartsgrense</string>
     <string name="speak_cameras">Meld om fotobokser</string>
 	<string name="speak_traffic_warnings">Meld trafikkvarsler</string>
-    <string name="tip_recent_changes_1_5_t">"Endringer i 1.5:↵ →\n\t* Stemmevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for opplesning (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "</string>
+    <string name="tip_recent_changes_1_5_t">"Endringer i 1.5:↵ →\n\t* Talevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for talemeldinger (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "</string>
     <string name="osb_author_or_password_not_specified">Oppgi OSM brukernavn og passord i Innstillinger</string>
     <string name="clear_intermediate_points">Slett mellomliggende rutepunkter</string>
     <string name="keep_intermediate_points">Behold mellomliggende rutepunkter</string>
@@ -669,18 +668,18 @@
     <string name="context_menu_item_directions_from">Anvisninger fra</string>
     <string name="route_descr_map_location">Kart: </string>
     <string name="route_descr_lat_lon">Br %1$.3f, Le %2$.3f</string>
-    <string name="route_descr_current_location">Aktuell posisjon</string>
+    <string name="route_descr_current_location">Gjeldende posisjon</string>
     <string name="route_to">Til:</string>
     <string name="route_via">Via:</string>
     <string name="route_from">Fra:</string>
 	
 	
-	<string name="destination_point">Mål %1$s</string>
-    <string name="context_menu_item_destination_point">Velg som mål</string>
+	<string name="destination_point">Reisemål %1$s</string>
+    <string name="context_menu_item_destination_point">Sett som reisemål</string>
     <string name="please_select_address">Velg by eller gate først</string>
     <string name="search_street_in_neighborhood_cities">Søk etter gaten i nabobyer</string>
     <string name="tip_map_styles">Kartstiler</string>
-	<string name="about_version">Utgave:</string>
+	<string name="about_version">Versjon:</string>
     <string name="about_settings">Om</string>
     <string name="about_settings_descr">Versjonsinformasjon, lisenser, prosjektmedlemmer</string>
     <string name="tips_and_tricks">Hjelp</string>
@@ -692,7 +691,7 @@
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Velg eksisterende…</string>
     <string name="edit_tilesource_name">Navn</string>
-    <string name="maps_define_edit">Definer/rediger …</string>
+    <string name="maps_define_edit">Definer/rediger…</string>
 	<string name="route_is_too_long">OsmAnd offline ruteplanlegging kan ta veldig lang tid (eller ikke virke noen ganger) for punkter mere enn 200km fra hverandre. Man kan da legge til mellomliggende rutepunkter for bedre ytelse.</string>
 	<string name="auto_zoom_none">Ingen auto-zoom</string>
 	<string name="auto_zoom_close">Nært hold</string>
@@ -763,14 +762,14 @@
     <string name="lang_pt_br">Portugisisk (Brasil)</string>
     <string name="index_name_canada">Nord-Amerika - Canada</string>
     <string name="index_item_nation_addresses">adresser (hele landet)</string>
-	<string name="index_item_world_altitude_correction">Korreksjon av høyde (verden)</string>
-	<string name="index_item_world_seamarks">Sjømerkene(verden)</string>
-	<string name="index_item_world_bitcoin_payments">Bitcoinbetalinger (verden)</string>
+	<string name="index_item_world_altitude_correction">Høydekorrigering (verden)</string>
+	<string name="index_item_world_seamarks">Sjømerker (verden)</string>
+	<string name="index_item_world_bitcoin_payments">Bitcoin-betalinger (verden)</string>
 	<string name="index_item_world_basemap">Oversiktskart (verden)</string>
     <string name="index_item_world_ski">Skikart (verden)</string>
     <string name="lang_hr">Kroatisk</string>
     <string name="calculate_osmand_route_without_internet">Beregn OsmAnd rutesegment uten internett</string>
-    <string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd rute for første og siste rute segment</string>
+    <string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd-rute for første og siste rutesegment</string>
     <string name="osmo_settings_uuid">Unik enhets-id</string>
     <string name="osmo_settings_descr">Still inn overvåking og personlig overvåkingskanal</string>
     <string name="osmo_plugin_description"/>
@@ -946,4 +945,113 @@
 	<string name="navigation_intent_invalid">Ugyldig format: %s</string>
     <string name="hide_all_waypoints">Fjern alle</string>
 <string name="rendering_attr_shareTaxiRoutes_name">Samletaxi-ruter</string>
-    </resources>
+    <string name="continue_navigation">Fortsett navigering</string>
+    <string name="pause_navigation">Midlertidig stopp navigering</string>
+ 	<string name="rendering_attr_hideWoodScrubs_name">Skjul skog og kratt</string>
+    <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\nTrykk og hold for å se 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>
+	<string name="invalid_locations">Koordinater er ugyldige!</string>
+	<string name="go_back_to_osmand">Tilbake til OsmAnd-kart</string>
+	<string name="osb_comment_dialog_add_button">Legg til kommentar</string>
+	<string name="osb_comment_dialog_success">Kommentar ble vellykket lagt til</string>
+	<string name="no_buildings_found">Ingen bygninger funnet.</string>
+    <string name="loading_streets_buildings">Laster gater/bygninger…</string>
+	<string name="osmo_activity">OpenStreetMap-overvåking</string>
+    <string name="fav_point_dublicate_message">Favorittpunktnavn er endret til %1$s for å unngå dupliserte navn.</string>
+    <string name="gpx_selection_point">Punkt %1$s</string>
+    <string name="my_favorites">Mine favoritter</string>
+    <string name="osmo_center_location">Sentrer på skjermen</string>
+    <string name="color_red">rød</string>
+	<string name="color_pink">rosa</string>
+	<string name="color_orange">orange</string>
+	<string name="color_brown">brun</string>
+	<string name="color_yellow">gul</string>
+	<string name="color_lightblue">lyseblå</string>
+	<string name="color_blue">blå</string>
+	<string name="color_green">grønn</string>
+	
+    <string name="osmo_group_info">Info</string>
+    <string name="osmo_track_interval">Loggeintervall</string>
+	<string name="osmo_group_description">Beskrivelse</string>
+    <string name="use_points_as_intermediates">Beregn rute mellom punkter</string>
+    <string name="lang_sr">Serbisk</string>
+	<string name="lang_zh_CN">Forenklet kinesisk</string>
+	<string name="lang_zh_TW">Tradisjonell kinesisk</string>
+	<string name="keep_and_add_destination_point">Legg til som målpunkt</string>
+    <string name="select_gpx">Velg GPX …</string>
+    <string name="route_descr_select_on_map">Velg på kart…</string>
+    <string name="route_descr_favorite">Favoritt…</string>
+    <string name="route_preferences">Ruteinnstillinger</string>
+    <string name="route_info">Ruteinformasjon</string>
+    <string name="calculate_osmand_route_gpx">Beregn OsmAnd offline-rute</string>
+    <string name="app_mode_truck">Lastebil</string>
+    <string name="local_index_tile_data_name">Flisdata: %1$s</string>
+    <string name="edit_tilesource_elliptic_tile">Elliptisk mercator</string>
+    <string name="delete_point">Slett punkt</string>
+    <string name="plugin_distance_point_time">tid</string>
+    <string name="plugin_distance_point_hdop">presisjon</string>
+    <string name="plugin_distance_point_speed">fart</string>
+    <string name="plugin_distance_point_ele">høyde</string>
+    <string name="plugin_distance_point">Punkt</string>
+    <string name="default_buttons_do_not_show_again">Ikke vis igjen</string>
+    <string name="use_magnetic_sensor">Bruk magnetisk sensor</string>
+    <string name="files_limit">%1$d filer igjen</string>
+    <string name="cancel_navigation">Stopp navigering</string>
+    <string name="hno">Husnummer</string>
+    <string name="select_address_activity">Velg adresse</string>
+    <string name="favourites_list_activity">Velg favoritt</string>
+    <string name="local_indexes_cat_srtm">Kotedata</string>
+    <string name="recording_context_menu_show">Vis</string>
+    <string name="srtm_paid_version_title">Programtillegg for koter</string>
+    <string name="av_settings_descr">Still inn lyd og video</string>
+    <string name="av_settings">"Lyd/video-innstillinger "</string>
+    <string name="av_control_stop">Stopp</string>
+    <string name="osmand_srtm_short_description_80_chars">OsmAnd-programtillegg for offline koter</string>
+    <string name="map_widget_distancemeasurement">Avstandsmåling</string>
+    <string name="monitoring_control_stop">Stopp</string>
+    <string name="index_srtm_ele">Koter</string>
+    <string name="srtm_plugin_name">Programtillegg for koter</string>
+    <string name="download_select_map_types">Andre kart</string>
+    <string name="download_roads_only_item">Bare veier</string>
+    <string name="download_srtm_maps">Koter</string>
+    <string name="download_regular_maps">Vanlige kart</string>
+    <string name="download_roads_only_maps">Rene veikart</string>
+    <string name="osmodroid_plugin_name">OsMoDroid-programtillegg</string>
+	<string name="tip_altitude_offset">Høydekorrigering</string>
+	<string name="search_villages_and_postcodes">Søk landsbyer/postnummer</string>
+	<string name="rendering_attr_showRoadMaps_description">Velg når det skal vises rene veikart:</string>
+	<string name="rendering_attr_showRoadMaps_name">Rene veikart</string>
+    <string name="osmand_play_title_30_chars">OsmAnd kart &amp; navigering</string>
+	<string name="osmand_plus_play_title_30_chars">OsmAnd+ kart &amp; navigering</string>
+	<string name="map_widget_view_direction">Synsretning</string>
+	<string name="gpxup_private">Privat</string>
+	<string name="share_route_as_gpx">Del rute som GPX-fil</string>
+	<string name="modify_transparency">Endre gjennomsiktighet (0 - gjennomsiktig, 255 - ugjennomsiktig)</string>
+	<string name="extra_settings">Avanserte innstillinger</string>
+	<string name="select_plugin_to_activate">Trykk på et programtillegg for å aktivere eller deaktivere det. (Omstart av OsmAnd kan være nødvendig.)</string>
+	<string name="gpx_visibility_txt">Synlighet</string>
+	<string name="gpx_description_txt">Beskrivelse</string>
+	<string name="use_transparent_map_theme">Gjennomsiktig tema</string>
+	<string name="keep_informing_never">Aldri</string>
+    <string name="local_index_installed">Utgave</string>
+	<string name="local_index_mi_export">Eksporter</string>
+	<string name="gpx_option_destination_point">Bruk gjeldende mål</string>
+	<string name="tip_location_sharing">Del en posisjon</string>
+	<string name="error_doing_search">Feil oppstod i offline-søk</string>
+	<string name="send_location">Send posisjon</string>
+	<string name="amenity_type_administrative">Administrative</string>
+	<string name="import_save">Lagre</string>
+	<string name="layer_transport_route">Transportrute</string>
+	<string name="unzipping_file">Pakker ut fil…</string>
+	<string name="transport_Stop">Stoppested</string>
+	<string name="transport_stops">Stoppesteder</string>
+	<string name="downloading_file_new">Laster ned…</string>
+	<string name="loading_postcodes">Laster postnummer…</string>
+	<string name="close">Lukk</string>
+	<string name="loading_data">Laster data…</string>
+	</resources>

From 9399b30169a3fc303dd4efc5bfb0edc9c417e08a Mon Sep 17 00:00:00 2001
From: Ivan Vantu5z <vantu5z@mail.ru>
Date: Mon, 17 Nov 2014 07:21:00 +0100
Subject: [PATCH 53/53] Translated using Weblate (Russian)

Currently translated at 100.0% (1559 of 1559 strings)
---
 OsmAnd/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 8d20bad10b..4831e24774 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1771,7 +1771,7 @@
     <string name="traffic_warning_calming">Снизьте скорость</string>
     <string name="traffic_warning_speed_camera">Скоростной радар</string>
     <string name="traffic_warning">Ограничение скорости</string>
-	<string name="speed_limit_exceed_message">Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение</string>
+	<string name="speed_limit_exceed_message">Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение.</string>
 	<string name="speed_limit_exceed">Допустимое значение превышения скорости</string>
 	<string name="test_native_render">Тест нативной визуализации</string>
     <string name="fav_point_emoticons_message">Название избранной точки было изменено на %1$s для возможности сохранения строки со смайликом в файл.</string>