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

OsmAnd-java/src/net/osmand/map/WorldRegion.java

@@ -21,6 +21,9 @@ public class WorldRegion implements Serializable {
 	public static final String SOUTH_AMERICA_REGION_ID = "southamerica";
 	protected static final String WORLD = "world";
 
+	// Just a string constant
+	public static final String UNITED_KINGDOM_REGION_ID = "gb_europe";
+
 	// Hierarchy
 	protected WorldRegion superregion;
 	protected List<WorldRegion> subregions;

OsmAnd/res/values-bg/phrases.xml

@@ -142,7 +142,7 @@
 	<string name="poi_mobile_phone">Магазин за мобилни телефони</string>
 	<string name="poi_motorcycle">Магазин за мотоциклети</string>
 	<string name="poi_musical_instrument">Музикални инструменти</string>
-	<string name="poi_newsagent">Информационна агенция</string>
+	<string name="poi_newsagent">Будка за вестници</string>
 	<string name="poi_optician">Очен лекар</string>
 	<string name="poi_tableware">Магазин за кухненски съдове</string>
 	<string name="poi_trade">Търговски пункт</string>
@@ -258,7 +258,7 @@
 	<string name="poi_recycling_plastic_bottles">Пластмасови бутилки</string>
 	<string name="poi_recycling_waste">Отпадък (черни пликове)</string>
 	<string name="poi_recycling_plastic_packaging">Пластмасови опаковки</string>
-	<string name="poi_recycling_newspaper">Вестник</string>
+	<string name="poi_recycling_newspaper">Хартия</string>
 	<string name="poi_recycling_magazines">Списания</string>
 	<string name="poi_recycling_paper_packaging">Хартиени опаковки</string>
 	<string name="poi_recycling_wood">Дърво</string>
@@ -403,4 +403,17 @@
 	<string name="poi_sculptor">Скулптор</string>
 
 	<string name="poi_square">Площад</string>
+	<string name="poi_townhall">Община</string>
+	<string name="poi_employment_agency">Служба по заетостта</string>
+	<string name="poi_it">ИТ офис</string>
+	<string name="poi_advertising_agency">Рекламна агенция</string>
+	<string name="poi_studio">Студио</string>
+	<string name="poi_bookmaker">Букмейкър</string>
+	<string name="poi_association">Асоциация</string>
+	<string name="poi_financial">Финансов офис</string>
+	<string name="poi_political_party">Клуб на политическа партия</string>
+	<string name="poi_notary">Нотариус</string>
+	<string name="poi_foundation">Фондация</string>
+	<string name="poi_tax_advisor">Данъчен съветник</string>
+
 	</resources>

OsmAnd/res/values-ca/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
 
     <string name="show_warnings_title">Mostra els missatges d\'avís…</string>
     <string name="map_widget_fluorescent">Rutes amb fluorescència</string>
@@ -1906,4 +1907,15 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="weekly">Cada setmana</string>
     <string name="morning">Matí</string>
     <string name="Night">Nit</string>
+<string name="switch_start_finish">Intercanvi entre punts origen i destinació</string>
+    <string name="rendering_attr_hideIcons_name">Amaga les icones dels PDI</string>
+    <string name="item_deleted">Element suprimit</string>
+    <string name="n_items_deleted">elements suprimits</string>
+    <string name="shared_string_undo_all">DESFÉS-HO TOT</string>
+    <string name="shared_string_type">Tipus</string>
+    <string name="starting_point">Punt d\'inici</string>
+    <string name="select_month_and_country">Seleccioneu el mes i el país</string>
+    <string name="number_of_contributors">Nombre de col·laboradors</string>
+    <string name="number_of_edits">Nombre d\'edicions</string>
+    <string name="reports_for">Informe per:</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -2227,7 +2227,7 @@
     <string name="shared_string_undo_all">FORTRYD ALLE</string>
     <string name="rendering_attr_hideIcons_name">Skjul IP ikoner</string>
     <string name="switch_start_finish">Byt om på startpunkt og destination</string>
-    <string name="number_of_contributors">Antallet af bidragydere</string>
+    <string name="number_of_contributors">Antal bidragydere</string>
     <string name="number_of_edits">Antal redigeringer</string>
     <string name="reports_for">Rapport for:</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -47,7 +47,7 @@
 	<string name="poi_bakery">Bäckerei</string>
 	<string name="poi_bank">Bank</string>
 	<string name="poi_bar">Bar</string>
-	<string name="poi_barbecue">Barbecue</string>
+	<string name="poi_barbecue">Grillplatz</string>
 	<string name="poi_baseball">Baseball</string>
 	<string name="poi_craft_basket_maker">Korbflechter</string>
 	<string name="poi_basketball">Basketball</string>
@@ -126,26 +126,26 @@
 	<string name="poi_club_astronomy">Sternkundeverein</string>
 	<string name="poi_club_automobile">Automobilklub</string>
 	<string name="poi_club_board_games">Brettspielverein</string>
-	<string name="poi_club_charity">Wohltätigkeitsklub</string>
+	<string name="poi_club_charity">Wohlfahrtsverein</string>
-	<string name="poi_club_chess">Schachklub</string>
+	<string name="poi_club_chess">Schachverein</string>
 	<string name="poi_club_cinema">Kino</string>
 	<string name="poi_club_computer">Computer-Klub</string>
 	<string name="poi_club_ethnic">Folklore</string>
 	<string name="poi_club_fan">Fanklub</string>
-	<string name="poi_club_fishing">Fischklub</string>
+	<string name="poi_club_fishing">Fischereiverein</string>
 	<string name="poi_club_game">Spielklub</string>
 	<string name="poi_club_history">Geschichtsklub</string>
-	<string name="poi_club_hunting">Jagdtverein</string>
+	<string name="poi_club_hunting">Jagdverein</string>
-	<string name="poi_club_linux">Linux Klub</string>
+	<string name="poi_club_linux">Linux-Verein</string>
-	<string name="poi_club_motorcycle">Motorrad</string>
+	<string name="poi_club_motorcycle">Motorradverein</string>
-	<string name="poi_club_music">Musikladen</string>
+	<string name="poi_club_music">Musikverein</string>
 	<string name="poi_club_nature">Naturverein</string>
 	<string name="poi_club_photography">Fotographieklub</string>
-	<string name="poi_club_shooting">Sportschießen</string>
+	<string name="poi_club_shooting">Schützenverein</string>
 	<string name="poi_club_sport">Sportverein</string>
-	<string name="poi_club_theatre">Theaterklub</string>
+	<string name="poi_club_theatre">Theaterverein</string>
 	<string name="poi_club_tourism">Tourismusverein</string>
-	<string name="poi_club_veterans">Veteranenklub</string>
+	<string name="poi_club_veterans">Veteranenverein</string>
 	<string name="poi_college">Hochschule</string>
 	<string name="poi_communication_tower">Kommunikationsturm</string>
 	<string name="poi_community_centre">Gemeindezentrum</string>
@@ -240,7 +240,7 @@
 	<string name="poi_hamlet">Weiler</string>
 	<string name="poi_handball">Handball</string>
 	<string name="poi_craft_handicraft">Kunsthandwerk</string>
-	<string name="poi_hardware">Eisenhandlung</string>
+	<string name="poi_hardware">Eisenwarenhandlung</string>
 	<string name="poi_healthcare_alternative">Alternativmedizin</string>
 	<string name="poi_healthcare_centre">Gesundheitszentrum</string>
 	<string name="poi_healthcare_rehabilitation">Rehabilitation</string>
@@ -258,14 +258,14 @@
 	<string name="poi_hot_spring">Heiße Quellen</string>
 	<string name="poi_hotel">Hotel</string>
 	<string name="poi_houseware">Haushaltsgeräteladen</string>
-	<string name="poi_hunting">Jagdtausrüstung</string>
+	<string name="poi_hunting">Jagdausrüstung</string>
 	<string name="poi_hunting_stand">Jägerstand</string>
 	<string name="poi_craft_hvac">Heizung, Lüftung und Klimatisierung</string>
 	<string name="poi_ice_cream">Eisdiele</string>
 	<string name="poi_ice_rink">Eislaufbahn</string>
 	<string name="poi_ice_skating">Eislaufen</string>
 	<string name="poi_ice_stock">Eisstockschießen</string>
-	<string name="poi_craft_insulation">Schutz</string>
+	<string name="poi_craft_insulation">Gebäudedämmung</string>
 	<string name="poi_insurance">Versicherung</string>
 	<string name="poi_interior_decoration">Innenausstatter</string>
 	<string name="poi_internet_cafe">Internet Cafe</string>
@@ -322,9 +322,9 @@
 	<string name="poi_mountain_pass">Passstraße</string>
 	<string name="poi_sport_multi">Multi-Sport</string>
 	<string name="poi_museum">Museum</string>
-	<string name="poi_musical_instrument">Musikgeschäft</string>
+	<string name="poi_musical_instrument">Musikinstrumentegeschäft</string>
 	<string name="poi_nature_reserve">Naturschutzgebiet</string>
-	<string name="poi_neighbourhood">Wohngegend</string>
+	<string name="poi_neighbourhood">Nachbarschaft</string>
 	<string name="poi_newsagent">Nachrichtenagentur</string>
 	<string name="poi_newspaper">Zeitungsbüro</string>
 	<string name="poi_ngo">NGO</string>
@@ -347,7 +347,7 @@
 	<string name="poi_park">Park</string>
 	<string name="poi_parking">Parkplatz</string>
 	<string name="poi_parking_entrance">Parkeinfahrt</string>
-	<string name="poi_craft_parquet_layer">Parkettläger</string>
+	<string name="poi_craft_parquet_layer">Parkettleger</string>
 	<string name="poi_pawnbroker">Pfandleiher</string>
 	<string name="poi_peak">Berggipfel</string>
 	<string name="poi_pelota">Pelota</string>
@@ -404,7 +404,7 @@
 	<string name="poi_recycling">Abfallverwertung</string>
 	<string name="poi_reef">Riff</string>
 	<string name="poi_register_office">Standesamt</string>
-	<string name="poi_research">Forschungszentrum</string>
+	<string name="poi_research">Forschungseinrichtung</string>
 	<string name="poi_resort">Urlaubsort</string>
 	<string name="poi_restaurant">Restaurant</string>
 	<string name="poi_ridge">Bergrücken</string>
@@ -498,14 +498,14 @@
 	<string name="poi_sports">Sportartikel</string>
 	<string name="poi_spring">Quelle</string>
 	<string name="poi_stadium">Stadion</string>
-	<string name="poi_craft_stand_builder">Baumeister</string>
+	<string name="poi_craft_stand_builder">Messebauer</string>
 	<string name="poi_standpipe">Brunnen</string>
 	<string name="poi_stationery">Bürobedarf</string>
 	<string name="poi_stone">Auffallender Stein</string>
 	<string name="poi_craft_stonemason">Steinmetz</string>
 	<string name="poi_strait">Straße</string>
 	<string name="poi_stream">Bach</string>
-	<string name="poi_stripclub">Stripclub</string>
+	<string name="poi_stripclub">Striplokal</string>
 	<string name="poi_studio">Studio</string>
 	<string name="poi_suburb">Stadtteil</string>
 	<string name="poi_subway_entrance">U-Bahnhofeingang</string>
@@ -749,7 +749,7 @@
 	<string name="poi_fee_yes">Gebühr</string>
 
 	<string name="poi_brand">Marke</string>
-	<string name="poi_maxweight">Maximalgewicht</string>
+	<string name="poi_maxweight">Höchstgewicht</string>
 	<string name="poi_operator">Betreiber</string>
 	<string name="poi_disused">Eingestellt</string>
 
@@ -1104,7 +1104,7 @@
 	<string name="poi_genus">Gattung</string>
 	<string name="poi_trees_olive">Olivenbaum</string>
 	<string name="poi_trees_apple">Apfelbaum</string>
-	<string name="poi_trees_oil">Palmölbaum</string>
+	<string name="poi_trees_oil">Ölpalmen</string>
 	<string name="poi_trees_orange">Orangenbaum</string>
 	<string name="poi_trees_almond">Mandel</string>
 	<string name="poi_trees_banana">Banane</string>
@@ -1181,7 +1181,7 @@
 	<string name="poi_icao">ICAO Code</string>
 	<string name="poi_faa">FAA Code</string>
 	
-	<string name="poi_width">Weite</string>
+	<string name="poi_width">Breite</string>
 
 	<string name="poi_architect_name">Architekt</string>
 
@@ -1203,17 +1203,17 @@
 	<string name="poi_fuel_100ll">100LL Kraftstoff</string>
 	<string name="poi_fuel_autogas">Autogas</string>
 	<string name="poi_fuel_jeta1">Flugzeug A-1 Kraftstoff</string>
-	<string name="poi_fuel_adblue">AdBlue Kraftstoff</string>
+	<string name="poi_fuel_adblue">AdBlue (Harnstoff)</string>
 
 	<string name="poi_fuel_wood">Kraftstoff: Holz</string>
 	<string name="poi_street_lamp">Strassenlaterne</string>
 
-	<string name="poi_clothes_women">Frauenkleidung</string>
+	<string name="poi_clothes_women">Damenbekleidung</string>
 	<string name="poi_clothes_underwear">Unterwäsche</string>
-	<string name="poi_clothes_men">Herrenkleidung</string>
+	<string name="poi_clothes_men">Herrenbekleidung</string>
-	<string name="poi_clothes_wedding">Hochzeitskleidung</string>
+	<string name="poi_clothes_wedding">Hochzeitsbekleidung</string>
-	<string name="poi_clothes_sports">Sportkleidung</string>
+	<string name="poi_clothes_sports">Sportbekleidung</string>
-	<string name="poi_clothes_babies">Kinderkleidung</string>
+	<string name="poi_clothes_babies">Babybekleidung</string>
 	<string name="poi_clothes_workwear">Arbeitskleidung</string>
 	<string name="poi_clothes_hats">Hüte</string>
 	<string name="poi_clothes_leather">Leder</string>
@@ -1222,7 +1222,7 @@
 	<string name="poi_clothes_suits">Anzüge</string>
 	<string name="poi_clothes_oversize">Übergrößen</string>
 	<string name="poi_clothes_schoolwear">Schulkleidung</string>
-	<string name="poi_clothes_swimwear">Schwimmkleidung</string>
+	<string name="poi_clothes_swimwear">Bademode</string>
 	<string name="poi_clothes_socks">Socken</string>
 	<string name="poi_clothes_dance">Tanzkleidung</string>
 	<string name="poi_clothes_military">Militärkleidung</string>
@@ -1316,7 +1316,7 @@
 
 	<string name="poi_historic_railway_station">Historische Eisenbahnstation</string>
 
-	<string name="poi_club_sailing">Segelclub</string>
+	<string name="poi_club_sailing">Segelverein</string>
 	<string name="poi_historic_railway">Historische Eisenbahn</string>
 
 	<string name="poi_artist_name">Künstler</string>
@@ -1387,7 +1387,7 @@
 	<string name="poi_information_wildlife">Informationspunkt: Wildleben</string>
 	<string name="poi_information_history">Informationspunkt: Historie</string>
 	<string name="poi_information_sign">Schild</string>
-	<string name="poi_information_audioguide">Audioerklärung</string>
+	<string name="poi_information_audioguide">Sprachführer</string>
 	<string name="poi_information_bicyclemap">Fahrradkarte</string>
 	<string name="poi_board_type_plants">Informationspunkt: Pflanzen</string>
 	<string name="poi_board_type_geology">Informationspunkt: geologisch</string>
@@ -1607,7 +1607,7 @@
 
 	<string name="poi_historic_farm">Historischer Bauernhof</string>
 	<string name="poi_club_freemasonry">Freimaurerloge</string>
-	<string name="poi_club_scout">Scout-Club</string>
+	<string name="poi_club_scout">Pfadfinderverein</string>
 
 	<string name="poi_historic_threshing_floor">Historische Tenne</string>
 	<string name="poi_historic_gallows">Historischer Galgen</string>
@@ -1735,7 +1735,7 @@
 	<string name="poi_toll_hgv_yes">LKW Maut</string>
 	<string name="poi_tactile_paving_yes">Mit Blindenleitsystem</string>
 	<string name="poi_tactile_paving_no">Ohne Blindenleitsystem</string>
-	<string name="poi_traffic_signals_sound_walk">Ton signalisiert sicheres weitergehen</string>
+	<string name="poi_traffic_signals_sound_walk">Mit akustischem Freigabesignal</string>
 
 	<string name="poi_services">Raststätte</string>
 	<string name="poi_railway_level_crossing">Bahnübergang</string>
@@ -2046,7 +2046,7 @@
 	<string name="poi_memorial_prasat">Prasat</string>
 
 	<string name="poi_resource_barite">Baryt</string>
-	<string name="poi_wetland_string_bog">Springmoor</string>
+	<string name="poi_wetland_string_bog">Strangmoor</string>
 	<string name="poi_artwork_type_sculpture">Kunstart: Skulptur</string>
 	<string name="poi_artwork_type_statue">Kunstart: Statue</string>
 	<string name="poi_artwork_type_mural">Kunstart: Wandgemälde</string>
@@ -2097,7 +2097,7 @@
 	<string name="poi_bridge_structure_log">Brückenaufbau: Baumstamm</string>
 	<string name="poi_bridge_type_movable">Brückentyp: bewegliche</string>
 	<string name="poi_bridge_movable_bascule">Beweglicher Brückentyp: Klapbrücke</string>
-	<string name="poi_bridge_movable_swing">Beweglicher Brückentyp: Schwingbar</string>
+	<string name="poi_bridge_movable_swing">Beweglicher Brückentyp: schwenkbar</string>
 	<string name="poi_bridge_movable_lift">Beweglicher Brückentyp: Hochklappbar</string>
 	<string name="poi_bridge_movable_drawbridge">Beweglicher Brückentyp: Zugbrücke</string>
 	<string name="poi_bridge_movable_submersible">Beweglicher Brückentyp: Tauchbrücke</string>
@@ -2111,7 +2111,7 @@
 	<string name="poi_surface_paved">Oberfläche: befestigte</string>
 	<string name="poi_surface_asphalt">Oberfläche: Asphalt</string>
 	<string name="poi_surface_concrete">Oberfläche: Beton</string>
-	<string name="poi_surface_sett">Oberfläche: Bau</string>
+	<string name="poi_surface_sett">Oberfläche: Pflasterstein (behauen)</string>
 	<string name="poi_surface_cobblestone">Oberfläche: Kopfsteinpflaster</string>
 	<string name="poi_surface_paving_stones">Oberfläche: Pflastersteine</string>
 	<string name="poi_surface_pebblestone">Oberfläche: Kiesel</string>
@@ -2161,8 +2161,8 @@
 	<string name="poi_service_bicycle_cleaning_no">Fahrradreinigung: Nein</string>
 	<string name="poi_service_bicycle_chaintool_yes">FFahrradwerkzeugkette: Ja</string>
 	<string name="poi_service_bicycle_chaintool_no">Fahrradwerkzeugkette: Nein</string>
-	<string name="poi_service_bicycle_second_hand_yes">Einzelhandel mit Second-Hand-Fahrräder: Ja</string>
+	<string name="poi_service_bicycle_second_hand_yes">Verkauf von Gebrauchtfahrräder: Ja</string>
-	<string name="poi_service_bicycle_second_hand_no">Einzelhandel mit Second-Hand-Fahrräder: Nein</string>
+	<string name="poi_service_bicycle_second_hand_no">Verkauf von Gebrauchtfahrrädern: Nein</string>
 
 	<string name="poi_wildlife_hide">Wildbeobachtungsplatz</string>
 
@@ -2251,13 +2251,13 @@
 	<string name="poi_surveillance_outdoor">Überwachung: Außen</string>
 	<string name="poi_surveillance_public">Überwachung: offentlich</string>
 
-	<string name="poi_clothes_denim">Bekleidung aus Jeansstoff</string>
+	<string name="poi_clothes_denim">Jeansbekleidung</string>
 	<string name="poi_clothes_fur">Pelz</string>
-	<string name="poi_clothes_maternity">Schwangerschaftkleidung</string>
+	<string name="poi_clothes_maternity">Umstandsmode</string>
 	<string name="poi_clothes_vintage">Historische Bekleidung</string>
 	<string name="poi_clothes_shirts">Hemden</string>
 	<string name="poi_historic_manor">Historischer Gutshof</string>
-	<string name="poi_castle_type_stately">Burgtyp: stattlich</string>
+	<string name="poi_castle_type_stately">Burgtyp: Schloss</string>
 	<string name="poi_castle_type_defensive">Burgtyp: Verteidigung</string>
 	<string name="poi_castle_type_fortress">Burgtyp: Festung</string>
 	<string name="poi_castle_type_palace">Burgtyp: Palast</string>
@@ -2550,4 +2550,25 @@
 	<string name="poi_lacrosse">Lacrosse</string>
 	<string name="poi_official_name">Offizieller Name</string>
 
+<string name="poi_seamark_dyke">Seezeichen Deich</string>
+	<string name="poi_dolphin">Dalbe</string>
+
+	<string name="poi_forestry_compartment">Wegweiser: Forstfach</string>
+	<string name="poi_forestry_allotment">Wegweiser: Forstwirtschaft Zuteilung</string>
+	<string name="poi_inscription_n">Inschrift: N</string>
+	<string name="poi_inscription_nw">Inschrift: NW</string>
+	<string name="poi_inscription_w">Inschrift: W</string>
+	<string name="poi_inscription_sw">Inschrift: SW</string>
+	<string name="poi_inscription_s">Inschrift: S</string>
+	<string name="poi_inscription_se">Inschrift: SO</string>
+	<string name="poi_inscription_e">Inschrift: O</string>
+	<string name="poi_inscription_ne">Inschrift: NO</string>
+
+	<string name="poi_construction_yes">Im Bau</string>
+	<string name="poi_atm_yes">Geldautomat: Ja</string>
+	<string name="poi_atm_no">Geldautomat: Nein</string>
+
+	<string name="poi_firepit">Feuergrube</string>
+	<string name="poi_street_cabinet">Verteilerkasten</string>
+
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -1021,7 +1021,7 @@
 	<string name="av_settings_descr">Konfigurieren von Audio- und Video-Einstellungen</string>
 	<string name="shared_string_control_stop">Stopp</string>
 	<string name="av_settings">Audio/Video-Einstellungen</string>
-	<string name="shared_string_control_start">Starte</string>
+	<string name="shared_string_control_start">Starten</string>
 	<string name="av_def_action_picture">Foto aufnehmen</string>
 	<string name="av_use_external_camera_descr">Externe Systemkamera für Fotoaufnahmen verwenden</string>
 	<string name="av_use_external_camera">Systemkamera</string>
@@ -1204,7 +1204,7 @@
 	<string name="routing_attr_short_way_description">Kürzeste Strecke benutzen</string>
 	<string name="routing_attr_avoid_toll_name">Mautstraßen vermeiden</string>
 	<string name="routing_attr_avoid_toll_description">Mautstraßen vermeiden</string>
-	<string name="routing_attr_avoid_unpaved_name">Unbefestigte Wege meiden</string>
+	<string name="routing_attr_avoid_unpaved_name">Unbefestigte Wege vermeiden</string>
 	<string name="routing_attr_avoid_unpaved_description">Unbefestigte Wege meiden</string>
 	<string name="routing_attr_avoid_ferries_name">Fähren vermeiden</string>
 	<string name="routing_attr_avoid_ferries_description">Fähren vermeiden</string>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -2614,4 +2614,7 @@
 	<string name="poi_atm_yes">Con cajero automático</string>
 	<string name="poi_atm_no">Sin cajero automático</string>
 
+<string name="poi_firepit">Lugar para fogata</string>
+	<string name="poi_street_cabinet">Gabinete exterior</string>
+
 </resources>

OsmAnd/res/values-es-rAR/strings.xml

@@ -730,7 +730,7 @@
     <string name="dropbox_plugin_name">Complemento Dropbox</string>
     <string name="intermediate_points_change_order">Cambiar orden</string>
     <string name="srtm_paid_version_msg">Considere la compra del complemento de curvas de nivel en la Tienda para apoyar desarrollos adicionales.</string>
-    <string name="av_def_action_choose">Elige a petición</string>
+    <string name="av_def_action_choose">Elegir a petición</string>
     <string name="av_def_action_video">Grabar video</string>
     <string name="av_def_action_audio">Grabar audio</string>
     <string name="av_widget_action_descr">Elige la acción predeterminada</string>
@@ -808,7 +808,7 @@
     <string name="intermediate_point_too_far">Destino intermedio, %1$s demasiado lejos del camino.</string>
     <string name="arrived_at_intermediate_point">Llegó a su destino intermedio</string>
     <string name="context_menu_item_intermediate_point">Añadir como destino intermedio</string>
-    <string name="map_widget_intermediate_distance">destino intermedio</string>
+    <string name="map_widget_intermediate_distance">Destino intermedio</string>
     <string name="ending_point_too_far">Punto final demasiado lejos del camino más cercano.</string>
     <string name="add_tag">Añadir Etiqueta</string>
     <string name="btn_advanced_mode">Modo Avanzado…</string>

OsmAnd/res/values-fr/phrases.xml

@@ -1569,7 +1569,7 @@
 	<string name="poi_microbrewery_yes">Micro brasserie</string>
 	<string name="poi_microbrewery_no">Pas de micro brasserie</string>
 
-	<string name="poi_takeaway_no">Sur place</string>
+	<string name="poi_takeaway_no">Sur place uniquement</string>
 	<string name="poi_outdoor_seating_yes">Terrasse</string>
 	<string name="poi_outdoor_seating_no">Pas de terrasse</string>
 	<string name="poi_car_wash_no">Lavage auto : non</string>
@@ -1872,7 +1872,7 @@
 	<string name="poi_content_manure">Contenu : fumier</string>
 	<string name="poi_nudism_permissive">Nudisme autorisé</string>
 
-	<string name="poi_construction_yes">En cours de construction</string>
+	<string name="poi_construction_yes">En construction</string>
 	<string name="poi_dolphin">Duc-d’Albe</string>
 
 	<string name="poi_official_name">Nom officiel</string>
@@ -1884,13 +1884,13 @@
 	<string name="poi_karting">Karting</string>
 	<string name="poi_fitness">Remise en forme</string>
 
-	<string name="poi_water_heater_yes">Chauffe-eau : Oui</string>
+	<string name="poi_water_heater_yes">Chauffe-eau : oui</string>
 	<string name="poi_water_heater_no">Chauffe-eau : non</string>
 
 	<string name="poi_parking_surface">Type : surface</string>
 	<string name="poi_historic_civilization_prehistoric">Civilisation : préhistorique</string>
 	<string name="poi_historic_civilization_roman">Civilisation : romaine</string>
-	<string name="poi_historic_civilization_ancient_egyptian">Civilisation : ancienne égypte (jusqu\'en 332 av. J.-C.)</string>
+	<string name="poi_historic_civilization_ancient_egyptian">Civilisation : Égypte antique (jusqu\'en 332 av. J.-C.)</string>
 	<string name="poi_historic_civilization_greek_egyptian">Civilisations : grecque égyptienne (332 av. J.C. – 30 av. J.C.)</string>
 	<string name="poi_animal_training">Formation animale</string>
 	<string name="poi_animal_training_dog">Dressage de chiens</string>
@@ -1908,4 +1908,42 @@
 	<string name="poi_product_charcoal">Produit : charbon</string>
 	<string name="poi_tomb_war_grave">Type : tombe de guerre</string>
 	<string name="poi_surface_paving_stones">Surface : pavés</string>
+	<string name="poi_trade_plumbing">Fournitures de plomberie</string>
+	<string name="poi_trade_wood">Fournitures de bois</string>
+	<string name="poi_bicycle_parking_anchors">Ancres pour vélo</string>
+	<string name="poi_bicycle_parking_stands">Râtelier pour vélo</string>
+	<string name="poi_information_terminal">Terminal d\'information</string>
+	<string name="poi_information_tactile_map">Carte tactile</string>
+	<string name="poi_board_type_notice">Tableau d\'affichage</string>
+	<string name="poi_fireplace_yes">Cheminée</string>
+	<string name="poi_fireplace_no">Aucune cheminée</string>
+
+	<string name="poi_smoking_yes">Permission de fumer</string>
+	<string name="poi_smoking_separated">Permission de fumer dans une chambre séparée</string>
+	<string name="poi_smoking_isolated">Permission de fumer dans une pièce isolée</string>
+	<string name="poi_traffic_signals_sound_yes">Avec son</string>
+	<string name="poi_traffic_signals_sound_no">Sans son</string>
+	<string name="poi_grassland">Prairie</string>
+	<string name="poi_farmland">Terres agricoles</string>
+	<string name="poi_payment_cryptocurrencies_no">Cryptomonnaies non acceptées</string>
+	<string name="poi_payment_others_yes">Autres modes de paiement acceptés</string>
+	<string name="poi_payment_others_no">Autres modes de paiement non acceptés</string>
+	<string name="poi_trees_persimmon">Plaqueminier</string>
+	<string name="poi_trees_coca">Coca</string>
+	<string name="poi_trees_nectorine">Pêcher</string>
+	<string name="poi_trees_pomegranate">Grenadier</string>
+
+	<string name="poi_animal_shelter">Refuge pour animaux</string>
+	<string name="poi_watering_place">Abreuvoir</string>
+	<string name="poi_animal_boarding">Pension animale</string>
+	<string name="poi_fuel_wood">Combustible : bois</string>
+	<string name="poi_fuel_charcoal">Combustible : charbon de bois</string>
+	<string name="poi_fuel_coal">Combustible : charbon</string>
+
+	<string name="poi_crop_corn">Cultures : maïs</string>
+	<string name="poi_crop_soy">Culture : soja</string>
+	<string name="poi_crop_hop">Culture : houblon</string>
+	<string name="poi_crop_cranberry">Culture : canneberge</string>
+	<string name="poi_social_facility_food_bank">Service social: Banque alimentaire</string>
+	<string name="poi_historic_civilization_ancient_greek">Civilisation : Grèce antique</string>
 	</resources>

OsmAnd/res/values-ru/phrases.xml

@@ -2590,4 +2590,8 @@
 	<string name="poi_firepit">Место для разведения огня</string>
 	<string name="poi_street_cabinet">Распределительный шкаф</string>
 
+	<string name="poi_fair_trade_yes">Справедливая торговля (Fairtrade): есть</string>
+	<string name="poi_fair_trade_no">Справедливая торговля (Fairtrade): no</string>
+	<string name="poi_fair_trade_only">Только товары с маркировкой Справедливой торговли (Fairtrade)</string>
+
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
 
-    <string name="rendering_attr_hideIcons_name">Скрыть значки</string>
+    <string name="rendering_attr_hideIcons_name">Скрыть значки POI</string>
     <string name="rendering_attr_horseRoutes_name">Конные маршруты</string>
     <string name="av_video_quality_low">Низкое качество</string>
     <string name="av_video_quality_high">Высокое качество</string>
@@ -1812,8 +1813,8 @@
     <string name="file_size_in_mb">%.1f МБ</string>
     <string name="update_all">Обновить все (%1$s МБ)</string>
     <string name="free_downloads_used">Использовано бесплатных загрузок</string>
-    <string name="free_downloads_used_description">Вы можете посмотреть сколько бесплатных загрузок вы использовали</string>
+    <string name="free_downloads_used_description">Отображать сколько бесплатных загрузок использовано</string>
-    <string name="share_geo">гео:</string>
+    <string name="share_geo"/>
     <string name="share_menu_location">Поделиться местоположением</string>
     <string name="shared_string_send">Отправить</string>
     <string name="application_dir_description">Выберите, где вы хотите сохранить файлы карт.</string>
@@ -1886,4 +1887,12 @@
     <string name="select_month_and_country">Выберите месяц и страну</string>
 <string name="poi_dialog_reopen">Открыть повторно</string>
     <string name="impassable_road_desc">Выберите дороги, которых следует избегать при навигации</string>
+    <string name="shared_string_undo_all">ОТМЕНИТЬ ВСЁ</string>
+    <string name="shared_string_type">Тип</string>
+    <string name="share_osm_edits_subject">OSM правки отправлены через OsmAnd</string>
+    <string name="update_time">Время обновления</string>
+    <string name="number_of_contributors">Количество участников</string>
+    <string name="number_of_edits">Количество правок</string>
+    <string name="Night">Ночь</string>
+    <string name="morning">Утро</string>
     </resources>

OsmAnd/res/values/phrases.xml

@@ -2587,4 +2587,8 @@
 	<string name="poi_firepit">Firepit</string>
 	<string name="poi_street_cabinet">Street cabinet</string>
 
+	<string name="poi_fair_trade_yes">Fair trade: yes</string>
+	<string name="poi_fair_trade_no">Fair trade: no</string>
+	<string name="poi_fair_trade_only">Only fair trade products</string>
+
 </resources>

OsmAnd/src/net/osmand/plus/TargetPointsHelper.java

@@ -1,8 +1,7 @@
 package net.osmand.plus;
 
 
-import java.util.ArrayList;
+import android.content.Context;
-import java.util.List;
 
 import net.osmand.Location;
 import net.osmand.StateChangedListener;
@@ -11,9 +10,10 @@ import net.osmand.data.LocationPoint;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.activities.MapActivity;
 import net.osmand.util.MapUtils;
-import android.content.Context;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class TargetPointsHelper {
 
@@ -188,7 +188,7 @@ public class TargetPointsHelper {
 		pointToStart = null;
 		intermediatePoints.clear();
 		readFromSettings(settings);
-		updateRouteAndReferesh(updateRoute);
+		updateRouteAndRefresh(updateRoute);
 	}
 
 	/**
@@ -200,7 +200,7 @@ public class TargetPointsHelper {
 				pointToNavigate.pointDescription);
 		pointToNavigate.intermediate = false;
 		settings.deleteIntermediatePoint(index);
-		updateRouteAndReferesh(updateRoute);
+		updateRouteAndRefresh(updateRoute);
 	}
 
 	public void removeWayPoint(boolean updateRoute, int index){
@@ -223,10 +223,10 @@ public class TargetPointsHelper {
 				tp.index = ind++;
 			}
 		}
-		updateRouteAndReferesh(updateRoute);
+		updateRouteAndRefresh(updateRoute);
 	}
 
-	public void updateRouteAndReferesh(boolean updateRoute) {
+	public void updateRouteAndRefresh(boolean updateRoute) {
 		if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() ||
 				routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode())) {
 			updateRoutingHelper();
@@ -285,13 +285,13 @@ public class TargetPointsHelper {
 		settings.clearIntermediatePoints();
 		intermediatePoints.clear();
 		readFromSettings(settings);
-		updateRouteAndReferesh(updateRoute);
+		updateRouteAndRefresh(updateRoute);
 	}
 
 	public void clearStartPoint(boolean updateRoute) {
 		settings.clearPointToStart();
 		readFromSettings(settings);
-		updateRouteAndReferesh(updateRoute);
+		updateRouteAndRefresh(updateRoute);
 	}
 
 
@@ -312,7 +312,7 @@ public class TargetPointsHelper {
 			settings.clearIntermediatePoints();
 		}
 		readFromSettings(settings);
-		updateRouteAndReferesh(updateRoute);
+		updateRouteAndRefresh(updateRoute);
 	}
 
 
@@ -360,7 +360,7 @@ public class TargetPointsHelper {
 			settings.clearIntermediatePoints();
 		}
 		readFromSettings(settings);
-		updateRouteAndReferesh(updateRoute);
+		updateRouteAndRefresh(updateRoute);
 	}
 
 	public void setStartPoint(LatLon startPoint, boolean updateRoute, PointDescription name) {
@@ -370,7 +370,7 @@ public class TargetPointsHelper {
 			settings.clearPointToStart();
 		}
 		readFromSettings(settings);
-		updateRouteAndReferesh(updateRoute);
+		updateRouteAndRefresh(updateRoute);
 	}
 
 	public boolean checkPointToNavigate(){

OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java

@@ -437,7 +437,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 						new PointDescription(PointDescription.POINT_TYPE_FAVORITE, fp.getName()));		
 			}
 			if(getMyApplication().getRoutingHelper().isRouteCalculated()) {
-				targetPointsHelper.updateRouteAndReferesh(true);
+				targetPointsHelper.updateRouteAndRefresh(true);
 			}
 			IntermediatePointsDialog.openIntermediatePointsDialog(getActivity(), getMyApplication(), true);
 			//MapActivity.launchMapActivityMoveToTop(getActivity());

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -457,7 +457,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
 		if (routingHelper.isFollowingMode()
 				&& (!Algorithms.objectEquals(targets.getPointToNavigate().point, routingHelper.getFinalLocation()) || !Algorithms
 				.objectEquals(targets.getIntermediatePointsLatLonNavigation(), routingHelper.getIntermediatePoints()))) {
-			targets.updateRouteAndReferesh(true);
+			targets.updateRouteAndRefresh(true);
 		}
 		app.getLocationProvider().resumeAllUpdates();
 

OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java

@@ -422,7 +422,7 @@ public class MapActivityActions implements DialogProvider {
 		// then set gpx
 		setGPXRouteParams(gpxFile);
 		// then update start and destination point  
-		targets.updateRouteAndReferesh(true);
+		targets.updateRouteAndRefresh(true);
 
 		mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
 		mapActivity.getMapView().refreshMap(true);

OsmAnd/src/net/osmand/plus/base/BaseOsmAndFragment.java

@@ -10,10 +10,8 @@ import android.widget.ImageView;
 
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.activities.OsmandActionBarActivity;
 
-/**
- * Created by GaidamakUA on 1/12/16.
- */
 public class BaseOsmAndFragment extends Fragment {
 	private IconsCache iconsCache;
 
@@ -21,6 +19,10 @@ public class BaseOsmAndFragment extends Fragment {
 		return (OsmandApplication) getActivity().getApplication();
 	}
 
+	protected OsmandActionBarActivity getMyActivity() {
+		return (OsmandActionBarActivity) getActivity();
+	}
+
 	protected IconsCache getIconsCache() {
 		if (iconsCache == null) {
 			iconsCache = getMyApplication().getIconsCache();

OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java

@@ -171,7 +171,7 @@ public class FailSafeFuntions {
 		app.getTargetPointsHelper().setStartPoint(null, false, null);
 		app.getSettings().FOLLOW_THE_ROUTE.set(true);
 		routingHelper.setFollowingMode(true);
-		app.getTargetPointsHelper().updateRouteAndReferesh(true);
+		app.getTargetPointsHelper().updateRouteAndRefresh(true);
 		app.initVoiceCommandPlayer(ma);
 		if(ma.getDashboard().isVisible()) {
 			ma.getDashboard().hideDashboard();

OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java

@@ -1200,7 +1200,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 					}
 					getMyApplication().getTargetPointsHelper().reorderAllTargetPoints(allTargets, false);
 					newRouteIsCalculated(false, new ValueHolder<Boolean>());
-					getMyApplication().getTargetPointsHelper().updateRouteAndReferesh(true);
+					getMyApplication().getTargetPointsHelper().updateRouteAndRefresh(true);
 
 					if (swipeDismissListener != null) {
 						swipeDismissListener.setEnabled(true);

OsmAnd/src/net/osmand/plus/download/DownloadResourceGroup.java

@@ -1,18 +1,19 @@
 package net.osmand.plus.download;
 
-import java.util.ArrayList;
+import android.annotation.SuppressLint;
-import java.util.Collections;
+import android.content.Context;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
 
 import net.osmand.OsmAndCollator;
 import net.osmand.map.OsmandRegions;
 import net.osmand.map.WorldRegion;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import android.annotation.SuppressLint;
+
-import android.content.Context;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
 
 @SuppressLint("DefaultLocale")
 public class DownloadResourceGroup {
@@ -333,4 +334,7 @@ public class DownloadResourceGroup {
 		return parentGroup.getUniqueId() + "#" + id;
 	}
 
+	public String getId() {
+		return id;
+	}
 }

OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java

@@ -12,7 +12,9 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import net.osmand.map.WorldRegion;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.OsmandActionBarActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
 import net.osmand.plus.liveupdates.network.GetJsonAsyncTask;
 import net.osmand.plus.liveupdates.network.Protocol;
@@ -20,6 +22,9 @@ import net.osmand.plus.liveupdates.network.Protocol;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import java.util.Locale;
 
 /**
@@ -32,7 +37,8 @@ import java.util.Locale;
  */
 public class ReportsFragment extends BaseOsmAndFragment {
 	public static final String TITLE = "Report";
-	public static final String TOTAL_CHANGES_BY_MONTH_URL = "http://builder.osmand.net/reports/total_changes_by_month.php?month=";
+	public static final String TOTAL_CHANGES_BY_MONTH_URL_PATTERN = "http://download.osmand.net/" +
+			"reports/query_report.php?report=total_changes_by_month&month=%s&region=%s";
 
 	private TextView contributorsTextView;
 	private TextView editsTextView;
@@ -40,6 +46,7 @@ public class ReportsFragment extends BaseOsmAndFragment {
 	private Spinner montReportsSpinner;
 	private Spinner regionReportsSpinner;
 	private MonthsForReportsAdapter monthsForReportsAdapter;
+	private RegionsForReportsAdapter regionsForReportsAdapter;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -50,9 +57,7 @@ public class ReportsFragment extends BaseOsmAndFragment {
 		montReportsSpinner.setAdapter(monthsForReportsAdapter);
 
 		regionReportsSpinner = (Spinner) view.findViewById(R.id.regionReportsSpinner);
-		ArrayAdapter<String> regionsForReportsAdapter =
+		regionsForReportsAdapter = new RegionsForReportsAdapter(getMyActivity());
-				new ArrayAdapter<String>(getActivity(), R.layout.reports_for_spinner_item,
-						android.R.id.text1, new String[]{"Worldwide"});
 		regionsForReportsAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 		regionReportsSpinner.setAdapter(regionsForReportsAdapter);
 
@@ -82,10 +87,12 @@ public class ReportsFragment extends BaseOsmAndFragment {
 		return view;
 	}
 
-	private void requestAndUpdateUi() {
+	public void requestAndUpdateUi() {
 		int monthItemPosition = montReportsSpinner.getSelectedItemPosition();
 		String monthUrlString = monthsForReportsAdapter.getQueryString(monthItemPosition);
-		String regionUrlString = regionReportsSpinner.getSelectedItem().toString();
+		int regionItemPosition = regionReportsSpinner.getSelectedItemPosition();
+		String regionUrlString = regionsForReportsAdapter.getQueryString(regionItemPosition);
+		regionUrlString = regionUrlString == null ? "" : regionUrlString;
 		GetJsonAsyncTask.OnResponseListener<Protocol.TotalChangesByMonthResponse> onResponseListener =
 				new GetJsonAsyncTask.OnResponseListener<Protocol.TotalChangesByMonthResponse>() {
 					@Override
@@ -106,7 +113,8 @@ public class ReportsFragment extends BaseOsmAndFragment {
 		GetJsonAsyncTask<Protocol.TotalChangesByMonthResponse> totalChangesByMontAsyncTask =
 				new GetJsonAsyncTask<>(Protocol.TotalChangesByMonthResponse.class);
 		totalChangesByMontAsyncTask.setOnResponseListener(onResponseListener);
-		totalChangesByMontAsyncTask.execute(TOTAL_CHANGES_BY_MONTH_URL + monthUrlString);
+		String finalUrl = String.format(TOTAL_CHANGES_BY_MONTH_URL_PATTERN, monthUrlString, regionUrlString);
+		totalChangesByMontAsyncTask.execute(finalUrl);
 	}
 
 	private static class MonthsForReportsAdapter extends ArrayAdapter<String> {
@@ -121,13 +129,13 @@ public class ReportsFragment extends BaseOsmAndFragment {
 			Calendar startDate = Calendar.getInstance();
 			startDate.set(Calendar.MONTH, Calendar.JUNE);
 			startDate.set(Calendar.YEAR, 2015);
+			startDate.set(Calendar.DAY_OF_MONTH, 1);
+			startDate.set(Calendar.HOUR_OF_DAY, 0);
 			Calendar endDate = Calendar.getInstance();
-			endDate.set(Calendar.DAY_OF_MONTH, endDate.getActualMaximum(Calendar.DAY_OF_MONTH));
-			endDate.set(Calendar.HOUR_OF_DAY, endDate.getActualMaximum(Calendar.HOUR_OF_DAY));
 			while (startDate.before(endDate)) {
-				queryString.add(queryFormat.format(startDate.getTime()));
+				queryString.add(queryFormat.format(endDate.getTime()));
-				add(humanFormat.format(startDate.getTime()));
+				add(humanFormat.format(endDate.getTime()));
-				startDate.add(Calendar.MONTH, 1);
+				endDate.add(Calendar.MONTH, -1);
 			}
 			setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 		}
@@ -137,4 +145,74 @@ public class ReportsFragment extends BaseOsmAndFragment {
 		}
 	}
 
+	private static class RegionsForReportsAdapter extends ArrayAdapter<String> {
+		ArrayList<String> queryRegionNames = new ArrayList<>();
+
+		public RegionsForReportsAdapter(final OsmandActionBarActivity context) {
+			super(context, R.layout.reports_for_spinner_item, android.R.id.text1);
+
+			final WorldRegion root = context.getMyApplication().getRegions().getWorldRegion();
+			ArrayList<WorldRegion> groups = new ArrayList<>();
+			groups.add(root);
+			processGroup(root, groups, context);
+			Collections.sort(groups, new Comparator<WorldRegion>() {
+				@Override
+				public int compare(WorldRegion lhs, WorldRegion rhs) {
+					if (lhs == root) {
+						return -1;
+					}
+					if (rhs == root) {
+						return 1;
+					}
+					return getHumanReadableName(lhs).compareTo(getHumanReadableName(rhs));
+				}
+			});
+			for (WorldRegion group : groups) {
+				String name = getHumanReadableName(group);
+				add(name);
+				queryRegionNames.add(group.getRegionDownloadName());
+			}
+		}
+
+		private static String getHumanReadableName(WorldRegion group) {
+			String name;
+			if(group.getLevel() > 2 || (group.getLevel() == 2
+					&& group.getSuperregion().getRegionId().equals(WorldRegion.RUSSIA_REGION_ID))) {
+				WorldRegion parent = group.getSuperregion();
+				WorldRegion parentsParent = group.getSuperregion().getSuperregion();
+				if(group.getLevel() == 3) {
+					if(parentsParent.getRegionId().equals(WorldRegion.RUSSIA_REGION_ID)) {
+						name = parentsParent.getLocaleName() + " " + group.getLocaleName();
+					} else if (!parent.getRegionId().equals(WorldRegion.UNITED_KINGDOM_REGION_ID)) {
+						name = parent.getLocaleName() + " " + group.getLocaleName();
+					} else {
+						name = group.getLocaleName();
+					}
+				} else {
+					name = parent.getLocaleName() + " " + group.getLocaleName();
+				}
+			} else {
+				name = group.getLocaleName();
+			}
+			return name;
+		}
+
+		public String getQueryString(int position) {
+			return queryRegionNames.get(position);
+		}
+
+		private static void processGroup(WorldRegion group,
+										 List<WorldRegion> nameList,
+										 Context context) {
+			if (group.isRegionMapDownload()) {
+				nameList.add(group);
+			}
+
+			if (group.getSubregions() != null) {
+				for (WorldRegion g : group.getSubregions()) {
+					processGroup(g, nameList, context);
+				}
+			}
+		}
+	}
 }

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java

@@ -47,6 +47,6 @@ public class ImpassibleRoadsMenuController extends MenuController {
 
 	@Override
 	public Drawable getLeftIcon() {
-		return getMapActivity().getResources().getDrawable(R.drawable.ic_action_road_works_dark);
+		return getMapActivity().getResources().getDrawable(R.drawable.map_pin_avoid_road);
 	}
 }

OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java

@@ -477,7 +477,7 @@ public class RoutePreferencesMenu {
 						update = true;
 					}
 					if (update) {
-						tg.updateRouteAndReferesh(true);
+						tg.updateRouteAndRefresh(true);
 					}
 				}
 			} else if (gpxParam.id == R.string.gpx_option_calculate_first_last_segment) {
@@ -575,7 +575,7 @@ public class RoutePreferencesMenu {
 			@Override
 			public boolean processResult(GPXUtilities.GPXFile[] result) {
 				mapActivity.getMapActions().setGPXRouteParams(result[0]);
-				app.getTargetPointsHelper().updateRouteAndReferesh(true);
+				app.getTargetPointsHelper().updateRouteAndRefresh(true);
 				updateSpinnerItems(gpxSpinner);
 				updateParameters();
 				mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();

OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java

@@ -397,7 +397,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 	}
 
 	private static String getPrefix(OsmPoint osmPoint) {
-		return (osmPoint.getGroup() == OsmPoint.Group.POI ? "POI " : "Bug ") + " id: " + osmPoint.getId();
+		return (osmPoint.getGroup() == OsmPoint.Group.POI ? "POI " : "Bug ") + " id: " + osmPoint.getId() + " ";
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/views/ImpassableRoadsLayer.java

@@ -34,7 +34,7 @@ public class ImpassableRoadsLayer extends OsmandMapLayer implements ContextMenuL
 	@Override
 	public void initLayer(OsmandMapTileView view) {
 		this.view = view;
-		roadWorkIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.ic_action_road_works_dark);
+		roadWorkIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_pin_avoid_road);
 		paint = new Paint();
 	}
 
@@ -51,7 +51,7 @@ public class ImpassableRoadsLayer extends OsmandMapLayer implements ContextMenuL
 				float x = tileBox.getPixXFromLatLon(location.getLatitude(), location.getLongitude());
 				float y = tileBox.getPixYFromLatLon(location.getLatitude(), location.getLongitude());
 				float left = x - roadWorkIcon.getWidth() / 2;
-				float top = y - roadWorkIcon.getHeight() / 2;
+				float top = y - roadWorkIcon.getHeight();
 				canvas.drawBitmap(roadWorkIcon, left, top, paint);
 			}
 		}