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

OsmAnd/res/values-it/strings.xml

@@ -1211,7 +1211,7 @@
     <string name="recording_can_not_be_played">La registrazione non può essere riprodotta</string>
     <string name="recording_context_menu_delete">Elimina la registrazione</string>
     <string name="recording_context_menu_play">Riproduci</string>
-    <string name="recording_description">Registrazione %1$s %2$s di %3$s</string>
+    <string name="recording_description">Registrazione %1$s %3$s %2$s</string>
     <string name="recording_default_name">registrazione</string>
     <string name="av_control_stop">Ferma</string>
     <string name="av_control_start">Avvia</string>
@@ -1225,7 +1225,7 @@
     <string name="recording_context_menu_show">Visualizza</string>
     <string name="av_def_action_picture">Scatta una foto</string>
     <string name="recording_context_menu_precord">Scatta una foto</string>
-    <string name="recording_photo_description">Foto %1$s a %2$s</string>
+    <string name="recording_photo_description">Foto %1$s %2$s</string>
     <string name="stop_routing_confirm">Sei sicuro di voler fermare la navigazione?</string>
     <string name="clear_dest_confirm">Sei sicuro di voler eliminare la tua destinazione (e i punti intermedi)?</string>
     <string name="precise_routing_mode_descr">Abilita per calcolare percorsi precisi senza intoppi. È lento e limitato in distanza.</string>

OsmAnd/res/values-nl/phrases.xml

@@ -474,4 +474,53 @@
 	<string name="poi_handball">Handbal</string>
 	<string name="poi_horse_racing">Paardenrennen</string>
 	<string name="poi_ice_skating">Ijsschaatsen</string>
+	<string name="poi_telephone_exchange">Telefooncentrale</string>
+
+	<string name="poi_waste_disposal">Afvalverwerking</string>
+	<string name="poi_waste_basket">Prullenbak</string>
+
+	<string name="poi_adit">Horizontale mijnschacht</string>
+	<string name="poi_survey_point">Landmeetpunt</string>
+	<string name="poi_quarry">Groeve</string>
+	<string name="poi_cricket_nets">Cricket-netten</string>
+
+	<string name="poi_social_facility">Sociale voorziening</string>
+	<string name="poi_register_office">Burgerlijke stand</string>
+	<string name="poi_bailiff">Baljuw</string>
+	<string name="poi_prosecutor">Aanklager</string>
+	<string name="poi_pension_fund">Pensioenfonds</string>
+	<string name="poi_migration">Migratie</string>
+	<string name="poi_tax_inspection">Belastingsinspectie</string>
+	<string name="poi_administrative_office">Administratief kantoor</string>
+	<string name="poi_speech_therapist">Logopedist</string>
+	<string name="poi_healthcare_yes">Medische voorziening</string>
+
+	<string name="poi_telecommunication_office">Telecommunicatiekantoor</string>
+	<string name="poi_employment_agency">Arbeidsbureau</string>
+	<string name="poi_it_office">IT-kantoor</string>
+	<string name="poi_newspaper_office">Krantenkantoor</string>
+	<string name="poi_pitch">Sportveld</string>
+	<string name="poi_leisure_track">Circuit</string>
+	<string name="poi_horse_track">Paardenrenbaan</string>
+	<string name="poi_raceway">Racecircuit</string>
+	<string name="poi_9pin">Kegelen</string>
+	<string name="poi_10pin">Bowlen</string>
+	<string name="poi_power_generator">Stroomgenerator</string>
+
+	<string name="poi_american_football">American football</string>
+	<string name="poi_australian_football">Australian football</string>
+	<string name="poi_base">Basejumpen</string>
+	<string name="poi_baseball">Honkbal</string>
+	<string name="poi_beachvolleyball">Beachvolleybal</string>
+	<string name="poi_bmx_sport">BMX</string>
+	<string name="poi_boules">Petanque</string>
+	<string name="poi_bowls">Bowls</string>
+	<string name="poi_canadian_football">Canadian football</string>
+	<string name="poi_canoe">Kano</string>
+	<string name="poi_croquet">Croquet</string>
+	<string name="poi_scuba_diving">Duiksport</string>
+	<string name="poi_equestrian">Paardrijden</string>
+	<string name="poi_hockey">Hockey</string>
+	<string name="poi_ice_stock">IJsstokschieten</string>
+	<string name="poi_korfbal">Korfbal</string>
 	</resources>

OsmAnd/res/values-nl/strings.xml

@@ -516,7 +516,7 @@
   <string name="transport_searching_transport">Openbaar vervoer-resultaten (geen bestemming):</string>
   <string name="transport_searching_route">Openbaar vervoer-resultaten ({0} naar bestemming):</string>
   <string name="transport_search_none">geen</string>
-  <string name="transport_search_again">Opnieuw OV zoeken</string>
+  <string name="transport_search_again">Opnieuw openbaar vervoer zoeken</string>
   <string name="map_index">Kaart</string>
   <string name="voice">Opgenomen stem</string>
   <string name="no_vector_map_loaded">Geen vectorkaarten geladen</string>
@@ -525,7 +525,7 @@
   <string name="layer_gpx_layer">GPX-track…</string>
   <string name="error_reading_gpx">Fout bij het lezen van GPX-gegevens</string>
   <string name="vector_data">Offline vectorkaarten</string>
-  <string name="transport_context_menu">Zoek vervoer op halte</string>
+  <string name="transport_context_menu">Zoek openbaar vervoer op halte</string>
   <string name="point_on_map">Locatie:\n Lat %1$.5f\n Lon %2$.5f</string>
   <string name="osb_bug_name">Bug</string>
   <string name="poi_context_menu_modify">Wijzig interessepunt</string>
@@ -547,7 +547,7 @@
   <string name="none_region_found">Geen offline-gegevens voor regio gevonden op de SD kaart. Download regio\'s van het internet.</string>
   <string name="poi_namefinder_query_empty">Type een zoekwoord om een interessepunt te vinden</string>
   <string name="any_poi">Alle</string>
-  <string name="layer_transport_route">OV-verbindingen</string>
+  <string name="layer_transport_route">Openbaar vervoer-verbindingen</string>
   <string name="thanks_yandex_traffic">Met dank aan Yandex voor de verkeersinformatie.</string>
   <string name="layer_yandex_traffic">Yandex Traffic</string>
   <string name="layer_route">Route</string>
@@ -1202,7 +1202,7 @@
     <string name="recording_can_not_be_played">Opname kan niet worden afgespeeld</string>
     <string name="recording_context_menu_delete">Wis opname</string>
     <string name="recording_context_menu_play">Afspelen</string>
-    <string name="recording_description">Opname %1$s %2$s van %3$s</string>
+    <string name="recording_description">Opname %1$s %3$s %2$s</string>
     <string name="recording_default_name">opname</string>
     <string name="av_control_stop">Stop</string>
     <string name="av_control_start">Start</string>
@@ -1226,7 +1226,7 @@
     <string name="dropbox_plugin_description">De Dropbox-plugin kan tracks en audio/video-notities synchroniseren met je Dropbox-account.</string>
     <string name="dropbox_plugin_name">Dropbox-plugin</string>
     <string name="recording_context_menu_show">Toon</string>
-    <string name="recording_photo_description">Foto %1$s van %2$s</string>
+    <string name="recording_photo_description">Foto %1$s %2$s</string>
     <string name="av_def_action_picture">Neem een foto</string>
     <string name="recording_context_menu_precord">Neem een foto</string>
     <string name="stop_routing_confirm">Navigatie stoppen?</string>

OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java

@@ -9,6 +9,7 @@ import net.osmand.data.City;
 import net.osmand.data.LatLon;
 import net.osmand.data.Street;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation;
 import net.osmand.plus.resources.RegionAddressRepository;
@@ -21,6 +22,7 @@ public class SearchBuildingByNameActivity extends SearchByNameAbstractActivity<B
 	private RegionAddressRepository region;
 	private City city;
 	private Street street;
+	private OsmandSettings osmandSettings;
 	
 	@Override
 	protected Comparator<? super Building> createComparator() {
@@ -33,7 +35,15 @@ public class SearchBuildingByNameActivity extends SearchByNameAbstractActivity<B
 			}
 		};
 	}
-	
+
+	@Override
+	protected void reset() {
+		//osmandSettings.setLastSearchedIntersectedStreet("", null);
+		//osmandSettings.setLastSearchedBuilding("", null);
+		//osmandSettings.setLastSearchedPoint(null);
+		super.reset();
+	}
+
 	@Override
 	public AsyncTask<Object, ?, ?> getInitializeTask() {
 		return new AsyncTask<Object, Void, List<Building>>(){

OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java

@@ -13,6 +13,7 @@ import net.osmand.data.City.CityType;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.resources.RegionAddressRepository;
 import net.osmand.util.MapUtils;
@@ -29,7 +30,19 @@ public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City>
 	private RegionAddressRepository region;
 	private int searchVillagesMode = -1;
 	private Button searchVillages;
-	
+	private OsmandSettings osmandSettings;
+
+	@Override
+	protected void reset() {
+		searchVillagesMode = -1;
+		//osmandSettings.setLastSearchedPostcode("", null);
+		//osmandSettings.setLastSearchedCity(0L, "", null);
+		//osmandSettings.setLastSearchedStreet("", null);
+		//osmandSettings.setLastSearchedIntersectedStreet("", null);
+		//osmandSettings.setLastSearchedBuilding("", null);
+		//osmandSettings.setLastSearchedPoint(null);
+		super.reset();
+	}
 
 	@Override
 	protected void addFooterViews() {

OsmAnd/src/net/osmand/plus/activities/search/SearchRegionByNameActivity.java

@@ -7,6 +7,7 @@ import java.util.Comparator;
 import net.osmand.access.AccessibleToast;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.resources.RegionAddressRepository;
 import android.app.Activity;
@@ -15,7 +16,8 @@ import android.widget.Toast;
 
 
 public class SearchRegionByNameActivity extends SearchByNameAbstractActivity<RegionAddressRepository> {
-	
+	private OsmandSettings osmandSettings;
+
 	@Override
 	protected Comparator<? super RegionAddressRepository> createComparator() {
 		return new Comparator<RegionAddressRepository>() {
@@ -27,7 +29,19 @@ public class SearchRegionByNameActivity extends SearchByNameAbstractActivity<Reg
 			}
 		};
 	}
-	
+
+	@Override
+	protected void reset() {
+		//osmandSettings.setLastSearchedRegion("", null);
+		//osmandSettings.setLastSearchedPostcode("", null);
+		//osmandSettings.setLastSearchedCity(0L, "", null);
+		//osmandSettings.setLastSearchedStreet("", null);
+		//osmandSettings.setLastSearchedIntersectedStreet("", null);
+		//osmandSettings.setLastSearchedBuilding("", null);
+		//osmandSettings.setLastSearchedPoint(null);
+		super.reset();
+	}
+
 	@Override
 	protected LatLon getLocation(RegionAddressRepository item) {
 		return item.getEstimatedRegionCenter();

OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java

@@ -7,6 +7,7 @@ import net.osmand.data.City;
 import net.osmand.data.MapObject.MapObjectComparator;
 import net.osmand.data.Street;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation;
 import net.osmand.plus.resources.RegionAddressRepository;
@@ -17,12 +18,22 @@ public class SearchStreet2ByNameActivity extends SearchByNameAbstractActivity<St
 	private RegionAddressRepository region;
 	private City cityOrPostcode;
 	private Street street1;
-	
+	private OsmandSettings osmandSettings;
+
 	@Override
 	protected Comparator<? super Street> createComparator() {
 		return new MapObjectComparator(getMyApplication().getSettings().usingEnglishNames());
 	}
-	
+
+	@Override
+	protected void reset() {
+		//osmandSettings.setLastSearchedStreet("", null);
+		//osmandSettings.setLastSearchedIntersectedStreet("", null);
+		//osmandSettings.setLastSearchedBuilding("", null);
+		//osmandSettings.setLastSearchedPoint(null);
+		super.reset();
+	}
+
 	@Override
 	public AsyncTask<Object, ?, ?> getInitializeTask() {
 		return new AsyncTask<Object, Void, List<Street>>(){

OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java

@@ -15,6 +15,7 @@ import net.osmand.data.MapObject.MapObjectComparator;
 import net.osmand.data.Street;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.search.SearchAddressFragment.AddressInformation;
 import net.osmand.plus.resources.RegionAddressRepository;
@@ -33,7 +34,8 @@ public class SearchStreetByNameActivity extends SearchByNameAbstractActivity<Str
 	private City city;
 	private Button searchAllStrets;
 	private int searchWithCity = -1; // -1 - default, 0 - filter city, 1 - deep search
-	
+	private OsmandSettings osmandSettings;
+
 	@Override
 	protected Comparator<? super Street> createComparator() {
 		return new MapObjectComparator(getMyApplication().getSettings().usingEnglishNames()) {
@@ -48,13 +50,16 @@ public class SearchStreetByNameActivity extends SearchByNameAbstractActivity<Str
 			}
 		};
 	}
-	
+
 	@Override
 	protected void reset() {
 		searchWithCity = -1;
+		//osmandSettings.setLastSearchedStreet("", null);
+		//osmandSettings.setLastSearchedIntersectedStreet("", null);
+		//osmandSettings.setLastSearchedBuilding("", null);
+		//osmandSettings.setLastSearchedPoint(null);
 		super.reset();
 	}
-	
 
 	@Override
 	protected void addFooterViews() {