From 3f2b31a5905e01cf568dca58aba3ba8e886a1720 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Mon, 9 Mar 2015 09:33:58 +0100
Subject: [PATCH 1/2] shared_string_add_to_favorites (3)

---
 OsmAnd/res/values-nb/strings.xml     | 4 +---
 OsmAnd/res/values-ru/strings.xml     | 4 +---
 OsmAnd/res/values-sv/strings.xml     | 9 +--------
 OsmAnd/res/values-zh-rTW/strings.xml | 4 +---
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 88ebea8826..892af8aa9c 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -1,4 +1,4 @@
-<?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" standalone="no"?><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>
@@ -532,8 +532,6 @@
 	<string name="mark_point">Mål</string>
 	<string name="show_osm_bugs_descr">Vis OpenStreet-feil på kart</string>
 	<string name="show_osm_bugs">Vis OpenStreet-feil</string>
-	
-	<string name="shared_string_add_to_favorites">Legg til i favoritter</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>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 35a1762bc2..31be1b5929 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string>
     <string name="osmo_use_https">Использовать HTTPS</string>
@@ -743,8 +743,6 @@
   <string name="mark_point">Точка</string>
   <string name="show_osm_bugs_descr">Показывать слой OSM Bugs на карте</string>
   <string name="show_osm_bugs">Показывать OSM Bugs</string>
-  
-  <string name="shared_string_add_to_favorites">Добавить в Избранное</string>
   <string name="use_english_names_descr">Использовать английские названия вместо местных</string>
   <string name="use_english_names">Использовать английские названия</string>
   <string name="app_settings">Настройки приложения</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 277949b27d..559456136d 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
 <string name="ChooseCountry">Välj land</string>
 <string name="choose_city">Välj stad</string>
 <string name="choose_building">Välj byggnad</string>
@@ -1050,8 +1050,6 @@
 	<string name="mark_point">Mål</string>
 	<string name="show_osm_bugs_descr">Visa OpenStreetBuggar på kartan</string>
 	<string name="show_osm_bugs">Visa OpenStreetBuggar</string>
-	
-	<string name="shared_string_add_to_favorites">Lägg till i favoriter</string>
 	<string name="use_english_names_descr">Välj mellan inhemska och engelska namn på kartorna</string>
 	<string name="use_english_names">Namn på engelska</string>
 	<string name="app_settings">Appinställningar</string>
@@ -1064,15 +1062,10 @@
 	<string name="map_tile_source">Källa för kartbitar</string>
 	<string name="map_source">Kartkälla</string>
 	<string name="show_location">Visa plats</string>
-	
-	
 	<string name="show_gps_coordinates_text">Visa GPS-koordinater på kartan</string>
 	<string name="use_internet_to_download_tile">Använd Internet för att hämta kartrutor som saknas</string>
 	<string name="app_description">Navigationsapp</string>
 	<string name="shared_string_exit">Avsluta</string>
-	
-	
-	
 	<string name="search_button">Sök</string>
 	<string name="search_activity">Sök</string>
 	<string name="searchpoi_activity">Välj intressepunkt</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 93c0cad627..821f4fe932 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
 	<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
     <string name="map_widget_show_destination_arrow">顯示目的地方向</string>
     <string name="enable_plugin_monitoring_services">啟用追蹤外掛元件，使用位置日誌服務(GPX 記錄，線上追蹤查詢)</string>
@@ -871,8 +871,6 @@
 	<string name="mark_point">目的地</string>
 	<string name="show_osm_bugs_descr">在地圖上顯示 OpenStreet 的錯誤</string>
 	<string name="show_osm_bugs">顯示 OpenStreet 的錯誤</string>
-	
-	<string name="shared_string_add_to_favorites">加到我的最愛</string>
 	<string name="use_english_names_descr">在本地語言或英語名稱之間選擇</string>
 	<string name="use_english_names">在地圖上使用英文名稱</string>
 	<string name="app_settings">應用程式設定</string>

From 226e04b866ae5619eb7dbe90aae56c3d521b63a8 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 9 Mar 2015 09:38:02 +0100
Subject: [PATCH 2/2] Fix compilation

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

diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java
index b3dfda2f91..d3d1835066 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java
@@ -43,7 +43,7 @@ public class DashRecentsFragment extends DashLocationFragment {
 		Typeface typeface = FontCache.getRobotoMedium(getActivity());
 		((TextView) view.findViewById(R.id.fav_text)).setTypeface(typeface);
 		((TextView) view.findViewById(R.id.fav_text)).setText(Algorithms
-				.capitalizeFirstLetterAndLowercase(getString(R.shared_string_history)));
+				.capitalizeFirstLetterAndLowercase(getString(R.string.shared_string_history)));
 		((Button) view.findViewById(R.id.show_all)).setTypeface(typeface);
 
 		(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {