From a15b1317c17e170132d22b3a0a900a9d05ae96dc Mon Sep 17 00:00:00 2001
From: njohnston <nickjohnstonsky@gmail.com>
Date: Tue, 21 Mar 2017 21:21:22 +0000
Subject: [PATCH] Minor string fixes and improvements, plus extra strings for
 en-rGB

---
 OsmAnd/res/values-en-rGB/phrases.xml | 3 +++
 OsmAnd/res/values-en-rGB/strings.xml | 8 +++++++-
 OsmAnd/res/values/phrases.xml        | 6 +++---
 OsmAnd/res/values/strings.xml        | 4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/values-en-rGB/phrases.xml b/OsmAnd/res/values-en-rGB/phrases.xml
index e433642c88..8f4b37ada4 100644
--- a/OsmAnd/res/values-en-rGB/phrases.xml
+++ b/OsmAnd/res/values-en-rGB/phrases.xml
@@ -156,4 +156,7 @@
 	<string name="poi_shoes_type">Type</string>
 	<string name="poi_fire_hydrant_type">Type</string>
 	<string name="poi_fire_hydrant_position">Position</string>
+	<string name="poi_outdoor_seating_sidewalk">Outdoor seating: pavement</string>
+	<string name="poi_cuisine_savory_pancakes">Savoury pancakes</string>
+	<string name="poi_toilets">Toilet</string>
 	</resources>
diff --git a/OsmAnd/res/values-en-rGB/strings.xml b/OsmAnd/res/values-en-rGB/strings.xml
index 784f703a81..c90fc81f0d 100644
--- a/OsmAnd/res/values-en-rGB/strings.xml
+++ b/OsmAnd/res/values-en-rGB/strings.xml
@@ -45,6 +45,7 @@
 	<string name="favourites_context_menu_delete">Delete favourite</string>
 	<string name="favourites_remove_dialog_msg">Delete favourite point \'%s\'?</string>
 	<string name="favourites_remove_dialog_success">Favourite point {0} was successfully deleted.</string>
+	<string name="replace_favorite_confirmation">Are you sure you want to replace favourite %1$s?</string>
 	<string name="osmo_center_location">Centre on the screen</string>
 	<string name="always_center_position_on_map">Display position always in centre</string>
 	<string name="choose_auto_follow_route">Auto-centre map view</string>
@@ -55,4 +56,9 @@
 	<string name="search_near_map">Search near current map centre</string>
 	<string name="position_on_map_center">Centre</string>
 	<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
-</resources>
\ No newline at end of file
+	<string name="rendering_attr_contourColorScheme_name">Contour lines colour scheme</string>
+	<string name="quick_action_add_destination_desc">Tapping the action button will add a destination at the screen centre location.</string>
+	<string name="quick_action_replace_destination_desc">Tapping the action button will replace the destination with the screen centre location.</string>
+	<string name="quick_action_add_first_intermediate_desc">Tapping the action button will add a first intermediate point at the screen centre location.</string>
+	<string name="analyze_on_map">Analyse on map</string>
+</resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 800085a722..02ade3cd53 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1363,7 +1363,7 @@
 	<string name="poi_trees_coca">Coca</string>
 	<string name="poi_trees_kiwi">Kiwi</string>
 	<string name="poi_trees_meadow_orchard">Meadow orchard</string>
-	<string name="poi_trees_nectorine">Nectorine</string>
+	<string name="poi_trees_nectorine">Nectarine</string>
 	<string name="poi_trees_mango">Mango</string>
 	<string name="poi_trees_rubber">Rubber</string>
 	<string name="poi_trees_date">Date</string>
@@ -1862,7 +1862,7 @@
 	<string name="poi_memorial_column">Column</string>
 	<string name="poi_memorial_stupa">Stupa</string>
 	<string name="poi_memorial_prasat">Prasat</string>
-	<string name="poi_memorial_fassade_decoration">Fassade decoration</string>
+	<string name="poi_memorial_fassade_decoration">Facade decoration</string>
 
 	<string name="poi_inscription">Inscription</string>
 	<string name="poi_historic_quarry">Historic quarry</string>
@@ -3271,7 +3271,7 @@
 	<string name="poi_cuisine_czech">Czech</string>
 	<string name="poi_cuisine_cuban">Cuban</string>
 	<string name="poi_cuisine_british">British</string>
-	<string name="poi_cuisine_latin_american">Latin american</string>
+	<string name="poi_cuisine_latin_american">Latin American</string>
 	<string name="poi_cuisine_nepalese">Nepalese</string>
 	<string name="poi_cuisine_mongolian">Mongolian</string>
 	<string name="poi_cuisine_middle_eastern">Middle eastern</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index abd27e8241..430550ef41 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="quick_action_replace_destination">Replace destination</string>
     <string name="quick_action_add_first_intermediate">Add first intermediate</string>
     <string name="quick_action_add_destination_desc">Tapping the action button will add a destination at the screen center location.</string>
-    <string name="quick_action_replace_destination_desc">Tapping the action button will replace location of the destination with the screen center location.</string>
+    <string name="quick_action_replace_destination_desc">Tapping the action button will replace the destination with the screen center location.</string>
     <string name="quick_action_add_first_intermediate_desc">Tapping the action button will add a first intermediate point at the screen center location.</string>
     <string name="no_overlay">No overlay</string>
     <string name="no_underlay">No underlay</string>
@@ -41,7 +41,7 @@
     <string name="do_not_show_startup_messages">Do not show messages at startup</string>
     <string name="do_not_show_startup_messages_desc">It displays app discounts &amp; special local events messages</string>
     <string name="parking_options">Parking options</string>
-    <string name="full_version_thanks">Thank you for purchasing full version of OsmAnd!</string>
+    <string name="full_version_thanks">Thank you for purchasing the full version of OsmAnd!</string>
     <string name="routing_attr_relief_smoothness_factor_hills_name">Hills</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Plains</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">More plains</string>