From 881d88ef406d2f8cb09692a5aa4f881119f69d27 Mon Sep 17 00:00:00 2001
From: "Olga.shcherb" <Olga.shcherb@e29c36b1-1cfa-d876-8d93-3434fc2bb7b8>
Date: Wed, 16 Jun 2010 11:01:19 +0000
Subject: [PATCH] translation into russian change settings layout

git-svn-id: https://osmand.googlecode.com/svn/trunk@166 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
---
 OsmAnd/res/layout-port/menu.xml               |  10 +-
 OsmAnd/res/values-ru-rRU/strings.xml          |  88 +++++++
 OsmAnd/res/values/strings.xml                 |   6 +
 OsmAnd/res/xml/settings_pref.xml              |   4 +-
 OsmAnd/src/com/osmand/OsmandSettings.java     | 238 ++++++++++--------
 .../osmand/activities/SettingsActivity.java   |   8 +-
 6 files changed, 233 insertions(+), 121 deletions(-)
 create mode 100644 OsmAnd/res/values-ru-rRU/strings.xml

diff --git a/OsmAnd/res/layout-port/menu.xml b/OsmAnd/res/layout-port/menu.xml
index df54b9602d..06dfe77598 100644
--- a/OsmAnd/res/layout-port/menu.xml
+++ b/OsmAnd/res/layout-port/menu.xml
@@ -14,9 +14,8 @@
 					android:background="@drawable/btn_orange"
 					android:textColor="#FFFFFF"
 					android:textStyle="bold"
-					android:layout_width="140dip"
 					android:layout_height="90dip"
-					android:drawableLeft="@drawable/map"/>
+					android:drawableLeft="@drawable/map" android:layout_width="150dip"/>
 					
 			<Button 
 					android:id="@+id/SearchButton"
@@ -24,9 +23,8 @@
 					android:background="@drawable/btn_orange"
 					android:textColor="#FFFFFF"
 					android:textStyle="bold"
-					android:layout_width="140dip"
 					android:layout_height="90dip"
-					android:drawableLeft="@drawable/find"/>	
+					android:drawableLeft="@drawable/find" android:layout_width="150dip"/>	
 		</TableRow>
 		<TableRow>
 			<Button 
@@ -35,7 +33,7 @@
 					android:background="@drawable/btn_orange"
 					android:textColor="#FFFFFF"
 					android:textStyle="bold"
-					android:layout_width="140dip"
+					android:layout_width="150dip"
 					android:layout_height="90dip"
 					android:drawableLeft="@drawable/favorites"/>
 			<Button 
@@ -44,7 +42,7 @@
 					android:background="@drawable/btn_orange"
 					android:textColor="#FFFFFF"
 					android:textStyle="bold"
-					android:layout_width="140dip"
+					android:layout_width="150dip"
 					android:layout_height="90dip"
 					android:drawableLeft="@drawable/settings"/>
 		</TableRow>
diff --git a/OsmAnd/res/values-ru-rRU/strings.xml b/OsmAnd/res/values-ru-rRU/strings.xml
new file mode 100644
index 0000000000..5807c4ab78
--- /dev/null
+++ b/OsmAnd/res/values-ru-rRU/strings.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="osm_settings_descr">Упраление слоем open street bugs, установка osm логина </string>
+    <string name="monitor_preferences_descr">Включение мониторинга, установка интервала сохранения</string>
+    <string name="search_settings_descr">Настройка параметров поиска</string>
+    <string name="map_preferences_descr">Настройка источника, параметров карты, доступа в Интернет</string>
+    <string name="search_settings">Поиск</string>
+    <string name="osm_settings">Osm</string>
+    <string name="auto_zoom_map_descr">Автоматически измемять масштаб карты при изменении скорости</string>
+    <string name="auto_zoom_map">Масштаб</string>
+    <string name="additional_settings">Дополнительные настройки</string>
+    <string name="settings_preset_descr">Выбор режима работы приложения</string>
+    <string name="settings_preset">Режим работы</string>
+    <string name="settings">Настройки</string>
+    <string name="save_current_track_descr">Сохранить текущий путь на SD</string>
+    <string name="save_current_track">Сохранить путь</string>
+    <string name="save_track_interval_descr">Указать интервал между сохранениями пути</string>
+    <string name="save_track_interval">Интервал сохранения</string>
+    <string name="monitor_preferences">Мониторинг</string>
+    <string name="save_track_to_gpx_descrp">Сохранять путь в gpx формате в папку track</string>
+    <string name="save_track_to_gpx">Мониторить</string>
+    <string name="navigate_to">Перейти к</string>
+    <string name="update_tile">Обновить карту</string>
+    <string name="reload_tile">Обновить часть карты</string>
+    <string name="user_name_descr">Указать имя пользователя для работы с OSM</string>
+    <string name="user_name">Имя пользователя</string>
+    <string name="mark_point">Цель</string>
+    <string name="show_osm_bugs_descr">Показывать слой Open Street Bugs</string>
+    <string name="show_osm_bugs">Open Street Bugs</string>
+    <string name="favourites_activity">Список избранных точек</string>
+    <string name="add_to_favourite">Добавить к избранным</string>
+    <string name="use_english_names_descr">Использовать местные или английские названия</string>
+    <string name="use_english_names">Английские названия</string>
+    <string name="app_settings">Настройки приложения</string>
+    <string name="search_address">Искать адрес</string>
+    <string name="choose_building">Выберите здание</string>
+    <string name="choose_street">Выберите улицу</string>
+    <string name="choose_city">Выберите город</string>
+    <string name="ChooseCountry">Выберите страну</string>
+    <string name="position_on_map_descr">Установить расположение текущей позиции на карте</string>
+    <string name="position_on_map">Текущая позиция</string>
+    <string name="map_specify_point">Перейти к точке</string>
+    <string name="show_view_angle_descr">Показывать угол обзора в соответствии с компасом</string>
+    <string name="show_view_angle">Угол обзора</string>
+    <string name="stop_navigation">Снять отметку</string>
+    <string name="navigate_to_point">Отметить точку</string>
+    <string name="map_view_3d_descr">Вклюсить 3D вид для карты</string>
+    <string name="map_view_3d">3D вид</string>
+    <string name="rotate_map_to_bearing_descr">Вращать карту при изменении направления движения</string>
+    <string name="rotate_map_to_bearing">Вращать карту</string>
+    <string name="show_poi_over_map_description">Показывать слой POI</string>
+    <string name="show_poi_over_map">POI</string>
+    <string name="map_tile_source_descr">Загружать недостающие части карты из:</string>
+    <string name="map_tile_source">Источник данных</string>
+    <string name="map_source">Источник карты</string>
+    <string name="use_internet">Интернет</string>
+    <string name="show_location">Показать место</string>
+    <string name="map_preferences">Карта</string>
+    <string name="settings_activity">Настройки</string>
+    <string name="show_gps_coordinates_text">Показать gps координаты на карте</string>
+    <string name="use_internet_to_download_tile">Использовать Интернет для загрузки недостающих частей карты</string>
+    <string name="hello">Hello World, StartActivity!</string>
+    <string name="app_name">OsmAnd</string>
+
+<string name="exit_Button">Выход</string>
+<string name="map_Button">Карта</string>
+<string name="settings_Button">Настройки</string>
+<string name="favorites_Button">Избранное</string>
+<string name="search_button">Поиск</string>
+<color name="menu_background">#FF9030</color>
+<string name="search_activity">Поиск</string>
+<color name="color_white">#FFFFFF</color>
+<color name="color_red">#FF0000</color>
+<string name="searchpoi_activity">Choose poi</string>
+<string name="search_POI_level_btn">Find more</string>
+<string name="incremental_search_city">Search city incrementally. In order to find villages input more than 3 first symbols.</string>
+<string name="incremental_search_street">Search street incrementally</string>
+<string name="incremental_search_building">Search building incrementally</string>
+<string name="choose_available_region">Choose region</string>
+<string name="choose_intersected_street">Choose intersected street</string>
+<string name="Closest_Amenities">Closest amenities</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>
+<string name="position_on_map_center">В центре</string>
+<string name="position_on_map_bottom">Внизу</string>
+</resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index eb79359680..5b3a6a2ae1 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -79,4 +79,10 @@
 <string name="choose_available_region">Choose region</string>
 <string name="choose_intersected_street">Choose intersected street</string>
 <string name="Closest_Amenities">Closest amenities</string>
+<string name="app_mode_default">Default</string>
+<string name="app_mode_car">Car</string>
+<string name="app_mode_bicycle">Bicycle</string>
+<string name="app_mode_pedestrian">Pedestrian</string>
+<string name="position_on_map_center">Center</string>
+<string name="position_on_map_bottom">Bottom</string>
 </resources>
diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index 0b7e89e3c5..83d8b6e121 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -7,11 +7,11 @@
 
 <PreferenceScreen android:title="@string/map_preferences" android:summary="@string/map_preferences_descr">
 <CheckBoxPreference android:key="use_internet_to_download_tiles" android:title="@string/use_internet" android:summary="@string/use_internet_to_download_tile"></CheckBoxPreference>
-<CheckBoxPreference android:key="show_poi_over_map" android:title="@string/show_poi_over_map" android:summary="@string/show_poi_over_map_description"></CheckBoxPreference>
 <ListPreference android:title="@string/map_tile_source" android:summary="@string/map_tile_source_descr" android:key="map_tile_sources"></ListPreference>
+<CheckBoxPreference android:key="show_poi_over_map" android:title="@string/show_poi_over_map" android:summary="@string/show_poi_over_map_description"></CheckBoxPreference>
 <CheckBoxPreference android:title="@string/auto_zoom_map" android:summary="@string/auto_zoom_map_descr" android:key="auto_zoom_map"></CheckBoxPreference>
-<CheckBoxPreference android:key="rotate_map_to_bearing" android:title="@string/rotate_map_to_bearing" android:summary="@string/rotate_map_to_bearing_descr"></CheckBoxPreference>
 <CheckBoxPreference android:key="show_view_angle" android:title="@string/show_view_angle" android:summary="@string/show_view_angle_descr"></CheckBoxPreference>
+<CheckBoxPreference android:key="rotate_map_to_bearing" android:title="@string/rotate_map_to_bearing" android:summary="@string/rotate_map_to_bearing_descr"></CheckBoxPreference>
 <ListPreference android:key="position_on_map" android:title="@string/position_on_map" android:summary="@string/position_on_map_descr"></ListPreference>
 </PreferenceScreen>
 
diff --git a/OsmAnd/src/com/osmand/OsmandSettings.java b/OsmAnd/src/com/osmand/OsmandSettings.java
index 1bc7b08f54..030785b7eb 100644
--- a/OsmAnd/src/com/osmand/OsmandSettings.java
+++ b/OsmAnd/src/com/osmand/OsmandSettings.java
@@ -12,57 +12,66 @@ import com.osmand.map.TileSourceManager.TileSourceTemplate;
 import com.osmand.osm.LatLon;
 
 public class OsmandSettings {
-	
+
 	public enum ApplicationMode {
-		DEFAULT("Default"),
-		CAR("Car"),
-		BICYCLE("Bicycle"),
-		PEDESTRIAN("Pedestrian");
-		
-		private final String name;
-		ApplicationMode(String name){
-			this.name = name;
+		/*
+		 * DEFAULT("Default"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian");
+		 */
+
+		DEFAULT(R.string.app_mode_default), 
+		CAR(R.string.app_mode_car), 
+		BICYCLE(R.string.app_mode_bicycle), 
+		PEDESTRIAN(R.string.app_mode_pedestrian);
+
+		private final int key;
+
+		ApplicationMode(int key) {
+			this.key = key;
 		}
-		@Override
-		public String toString() {
-			return name;
+		public static String toHumanString(ApplicationMode m, Context ctx){
+			return ctx.getResources().getString(m.key);
 		}
+
 	}
-	
+
 	// These settings are stored in SharedPreferences
 	public static final String SHARED_PREFERENCES_NAME = "com.osmand.settings";
-	
+
 	public static final int CENTER_CONSTANT = 0;
 	public static final int BOTTOM_CONSTANT = 1;
 
-	// this value string is synchronized with settings_pref.xml preference name	
+	// this value string is synchronized with settings_pref.xml preference name
 	public static final String USE_INTERNET_TO_DOWNLOAD_TILES = "use_internet_to_download_tiles";
-	public static boolean isUsingInternetToDownloadTiles(Context ctx){
+
+	public static boolean isUsingInternetToDownloadTiles(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(USE_INTERNET_TO_DOWNLOAD_TILES, true);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SHOW_POI_OVER_MAP = "show_poi_over_map";
-	public static boolean isShowingPoiOverMap(Context ctx){
+
+	public static boolean isShowingPoiOverMap(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(SHOW_POI_OVER_MAP, false);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String USER_NAME = "user_name";
-	public static String getUserName(Context ctx){
+
+	public static String getUserName(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getString(USER_NAME, "NoName");
 	}
-	
-	public static boolean setUserName(Context ctx, String name){
+
+	public static boolean setUserName(Context ctx, String name) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().putString(USER_NAME, name).commit();
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String APPLICATION_MODE = "application_mode";
+
 	public static ApplicationMode getApplicationMode(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		String s = prefs.getString(APPLICATION_MODE, ApplicationMode.DEFAULT.name());
@@ -72,105 +81,113 @@ public class OsmandSettings {
 			return ApplicationMode.DEFAULT;
 		}
 	}
-	
-	public static boolean setApplicationMode(Context ctx, ApplicationMode p){
+
+	public static boolean setApplicationMode(Context ctx, ApplicationMode p) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().putString(APPLICATION_MODE, p.name()).commit();
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SAVE_CURRENT_TRACK = "save_current_track";
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SAVE_TRACK_TO_GPX = "save_track_to_gpx";
-	public static boolean isSavingTrackToGpx(Context ctx){
+
+	public static boolean isSavingTrackToGpx(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(SAVE_TRACK_TO_GPX, false);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SAVE_TRACK_INTERVAL = "save_track_interval";
-	public static int getSavingTrackInterval(Context ctx){
+
+	public static int getSavingTrackInterval(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getInt(SAVE_TRACK_INTERVAL, 5);
 	}
-	
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SHOW_OSM_BUGS = "show_osm_bugs";
-	public static boolean isShowingOsmBugs(Context ctx){
+
+	public static boolean isShowingOsmBugs(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(SHOW_OSM_BUGS, false);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SHOW_VIEW_ANGLE = "show_view_angle";
-	public static boolean isShowingViewAngle(Context ctx){
+
+	public static boolean isShowingViewAngle(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(SHOW_VIEW_ANGLE, true);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String AUTO_ZOOM_MAP = "auto_zoom_map";
-	public static boolean isAutoZoomEnabled(Context ctx){
+
+	public static boolean isAutoZoomEnabled(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(AUTO_ZOOM_MAP, false);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String ROTATE_MAP_TO_BEARING = "rotate_map_to_bearing";
-	public static boolean isRotateMapToBearing(Context ctx){
+
+	public static boolean isRotateMapToBearing(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(ROTATE_MAP_TO_BEARING, false);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String POSITION_ON_MAP = "position_on_map";
-	public static int getPositionOnMap(Context ctx){
+
+	public static int getPositionOnMap(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getInt(POSITION_ON_MAP, CENTER_CONSTANT);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String MAP_VIEW_3D = "map_view_3d";
-	public static boolean isMapView3D(Context ctx){
+
+	public static boolean isMapView3D(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(MAP_VIEW_3D, false);
 	}
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String USE_ENGLISH_NAMES = "use_english_names";
-	public static boolean usingEnglishNames(Context ctx){
+
+	public static boolean usingEnglishNames(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(USE_ENGLISH_NAMES, false);
 	}
-	
-	public static boolean setUseEnglishNames(Context ctx, boolean useEnglishNames){
+
+	public static boolean setUseEnglishNames(Context ctx, boolean useEnglishNames) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().putBoolean(USE_ENGLISH_NAMES, useEnglishNames).commit();
 	}
-	
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String MAP_TILE_SOURCES = "map_tile_sources";
-	public static ITileSource getMapTileSource(Context ctx){
+
+	public static ITileSource getMapTileSource(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		String tileName = prefs.getString(MAP_TILE_SOURCES, null);
-		if(tileName != null){
+		if (tileName != null) {
 			List<TileSourceTemplate> list = TileSourceManager.getKnownSourceTemplates();
-			for(TileSourceTemplate l : list){
-				if(l.getName().equals(tileName)){
+			for (TileSourceTemplate l : list) {
+				if (l.getName().equals(tileName)) {
 					return l;
 				}
 			}
 		}
 		return TileSourceManager.getMapnikSource();
 	}
-	
-	public static String getMapTileSourceName(Context ctx){
+
+	public static String getMapTileSourceName(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		String tileName = prefs.getString(MAP_TILE_SOURCES, null);
-		if(tileName != null){
+		if (tileName != null) {
 			return tileName;
 		}
 		return TileSourceManager.getMapnikSource().getName();
@@ -181,14 +198,15 @@ public class OsmandSettings {
 	public static final String LAST_KNOWN_MAP_LON = "last_known_map_lon";
 	public static final String IS_MAP_SYNC_TO_GPS_LOCATION = "is_map_sync_to_gps_location";
 	public static final String LAST_KNOWN_MAP_ZOOM = "last_known_map_zoom";
-	public static LatLon getLastKnownMapLocation(Context ctx){
+
+	public static LatLon getLastKnownMapLocation(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		float lat = prefs.getFloat(LAST_KNOWN_MAP_LAT, 0);
 		float lon = prefs.getFloat(LAST_KNOWN_MAP_LON, 0);
 		return new LatLon(lat, lon);
 	}
-	
-	public static void setMapLocationToShow(Context ctx, double latitude, double longitude){
+
+	public static void setMapLocationToShow(Context ctx, double latitude, double longitude) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		Editor edit = prefs.edit();
 		edit.putFloat(LAST_KNOWN_MAP_LAT, (float) latitude);
@@ -196,151 +214,151 @@ public class OsmandSettings {
 		edit.putBoolean(IS_MAP_SYNC_TO_GPS_LOCATION, false);
 		edit.commit();
 	}
-	
-	// Do not use that method if you want to show point on map. Use setMapLocationToShow 
-	public static void setLastKnownMapLocation(Context ctx, double latitude, double longitude){
+
+	// Do not use that method if you want to show point on map. Use setMapLocationToShow
+	public static void setLastKnownMapLocation(Context ctx, double latitude, double longitude) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		Editor edit = prefs.edit();
 		edit.putFloat(LAST_KNOWN_MAP_LAT, (float) latitude);
 		edit.putFloat(LAST_KNOWN_MAP_LON, (float) longitude);
 		edit.commit();
 	}
-	
-	public static boolean setSyncMapToGpsLocation(Context ctx, boolean value){
+
+	public static boolean setSyncMapToGpsLocation(Context ctx, boolean value) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().putBoolean(IS_MAP_SYNC_TO_GPS_LOCATION, value).commit();
 	}
-	public static boolean isMapSyncToGpsLocation(Context ctx){
+
+	public static boolean isMapSyncToGpsLocation(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getBoolean(IS_MAP_SYNC_TO_GPS_LOCATION, true);
 	}
-	
-	public static int getLastKnownMapZoom(Context ctx){
+
+	public static int getLastKnownMapZoom(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getInt(LAST_KNOWN_MAP_ZOOM, 3);
 	}
-	
-	public static void setLastKnownMapZoom(Context ctx, int zoom){
+
+	public static void setLastKnownMapZoom(Context ctx, int zoom) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		Editor edit = prefs.edit();
 		edit.putInt(LAST_KNOWN_MAP_ZOOM, zoom);
 		edit.commit();
 	}
-	
-	
+
 	public final static String POINT_NAVIGATE_LAT = "point_navigate_lat";
 	public final static String POINT_NAVIGATE_LON = "point_navigate_lon";
-	
-	public static LatLon getPointToNavigate(Context ctx){
+
+	public static LatLon getPointToNavigate(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		float lat = prefs.getFloat(POINT_NAVIGATE_LAT, 0);
 		float lon = prefs.getFloat(POINT_NAVIGATE_LON, 0);
-		if(lat == 0 && lon == 0){
+		if (lat == 0 && lon == 0) {
 			return null;
 		}
 		return new LatLon(lat, lon);
 	}
-	
-	public static boolean clearPointToNavigate(Context ctx){
+
+	public static boolean clearPointToNavigate(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().remove(POINT_NAVIGATE_LAT).remove(POINT_NAVIGATE_LON).commit();
 	}
-	
-	public static boolean setPointToNavigate(Context ctx, double latitude, double longitude){
+
+	public static boolean setPointToNavigate(Context ctx, double latitude, double longitude) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().putFloat(POINT_NAVIGATE_LAT, (float) latitude).putFloat(POINT_NAVIGATE_LON, (float) longitude).commit();
 	}
-	
+
 	public static final String LAST_SEARCHED_REGION = "last_searched_region";
 	public static final String LAST_SEARCHED_CITY = "last_searched_city";
 	public static final String LAST_SEARCHED_STREET = "last_searched_street";
 	public static final String LAST_SEARCHED_BUILDING = "last_searched_building";
 	public static final String LAST_SEARCHED_INTERSECTED_STREET = "last_searched_intersected_street";
-	
-	public static String getLastSearchedRegion(Context ctx){
+
+	public static String getLastSearchedRegion(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getString(LAST_SEARCHED_REGION, "");
 	}
-	
+
 	public static boolean setLastSearchedRegion(Context ctx, String region) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
-		Editor edit = prefs.edit().putString(LAST_SEARCHED_REGION, region).putLong(LAST_SEARCHED_CITY, -1).
-							putString(LAST_SEARCHED_STREET,"").putString(LAST_SEARCHED_BUILDING, "");
+		Editor edit = prefs.edit().putString(LAST_SEARCHED_REGION, region).putLong(LAST_SEARCHED_CITY, -1).putString(LAST_SEARCHED_STREET,
+				"").putString(LAST_SEARCHED_BUILDING, "");
 		if (prefs.contains(LAST_SEARCHED_INTERSECTED_STREET)) {
 			edit.putString(LAST_SEARCHED_INTERSECTED_STREET, "");
 		}
 		return edit.commit();
 	}
 
-	public static Long getLastSearchedCity(Context ctx){
+	public static Long getLastSearchedCity(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getLong(LAST_SEARCHED_CITY, -1);
 	}
-	
-	public static boolean setLastSearchedCity(Context ctx, Long cityId){
+
+	public static boolean setLastSearchedCity(Context ctx, Long cityId) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
-		Editor edit = prefs.edit().putLong(LAST_SEARCHED_CITY, cityId).putString(LAST_SEARCHED_STREET, "").
-							putString(LAST_SEARCHED_BUILDING, "");
-		if(prefs.contains(LAST_SEARCHED_INTERSECTED_STREET)){
+		Editor edit = prefs.edit().putLong(LAST_SEARCHED_CITY, cityId).putString(LAST_SEARCHED_STREET, "").putString(
+				LAST_SEARCHED_BUILDING, "");
+		if (prefs.contains(LAST_SEARCHED_INTERSECTED_STREET)) {
 			edit.putString(LAST_SEARCHED_INTERSECTED_STREET, "");
 		}
 		return edit.commit();
 	}
 
-	public static String getLastSearchedStreet(Context ctx){
+	public static String getLastSearchedStreet(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getString(LAST_SEARCHED_STREET, "");
 	}
-	
-	public static boolean setLastSearchedStreet(Context ctx, String street){
+
+	public static boolean setLastSearchedStreet(Context ctx, String street) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		Editor edit = prefs.edit().putString(LAST_SEARCHED_STREET, street).putString(LAST_SEARCHED_BUILDING, "");
-		if(prefs.contains(LAST_SEARCHED_INTERSECTED_STREET)){
+		if (prefs.contains(LAST_SEARCHED_INTERSECTED_STREET)) {
 			edit.putString(LAST_SEARCHED_INTERSECTED_STREET, "");
 		}
 		return edit.commit();
 	}
-	
-	public static String getLastSearchedBuilding(Context ctx){
+
+	public static String getLastSearchedBuilding(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.getString(LAST_SEARCHED_BUILDING, "");
 	}
-	
-	public static boolean setLastSearchedBuilding(Context ctx, String building){
+
+	public static boolean setLastSearchedBuilding(Context ctx, String building) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().putString(LAST_SEARCHED_BUILDING, building).remove(LAST_SEARCHED_INTERSECTED_STREET).commit();
 	}
-	
-	
-	public static String getLastSearchedIntersectedStreet(Context ctx){
+
+	public static String getLastSearchedIntersectedStreet(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
-		if(!prefs.contains(LAST_SEARCHED_INTERSECTED_STREET)){
+		if (!prefs.contains(LAST_SEARCHED_INTERSECTED_STREET)) {
 			return null;
 		}
 		return prefs.getString(LAST_SEARCHED_INTERSECTED_STREET, "");
 	}
-	
-	public static boolean setLastSearchedIntersectedStreet(Context ctx, String street){
+
+	public static boolean setLastSearchedIntersectedStreet(Context ctx, String street) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().putString(LAST_SEARCHED_INTERSECTED_STREET, street).commit();
 	}
-	
-	public static boolean removeLastSearchedIntersectedStreet(Context ctx){
+
+	public static boolean removeLastSearchedIntersectedStreet(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().remove(LAST_SEARCHED_INTERSECTED_STREET).commit();
 	}
 
 	public static final String SELECTED_POI_FILTER_FOR_MAP = "selected_poi_filter_for_map";
-	public static boolean setPoiFilterForMap(Context ctx, String filterId){
+
+	public static boolean setPoiFilterForMap(Context ctx, String filterId) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		return prefs.edit().putString(SELECTED_POI_FILTER_FOR_MAP, filterId).commit();
 	}
-	
-	public static PoiFilter getPoiFilterForMap(Context ctx){
+
+	public static PoiFilter getPoiFilterForMap(Context ctx) {
 		SharedPreferences prefs = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_WORLD_READABLE);
 		String filterId = prefs.getString(SELECTED_POI_FILTER_FOR_MAP, null);
 		PoiFilter filter = PoiFiltersHelper.getFilterById(ctx, filterId);
-		if(filter != null){
+		if (filter != null) {
 			return filter;
 		}
 		return new PoiFilter(null);
diff --git a/OsmAnd/src/com/osmand/activities/SettingsActivity.java b/OsmAnd/src/com/osmand/activities/SettingsActivity.java
index e3f6d9d0f4..4ae755a4de 100644
--- a/OsmAnd/src/com/osmand/activities/SettingsActivity.java
+++ b/OsmAnd/src/com/osmand/activities/SettingsActivity.java
@@ -5,6 +5,7 @@ import java.util.List;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
@@ -76,7 +77,6 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 		tileSourcePreference =(ListPreference) screen.findPreference(OsmandSettings.MAP_TILE_SOURCES);
 		tileSourcePreference.setOnPreferenceChangeListener(this);
 		
-		
     }
     
     @Override
@@ -94,7 +94,9 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 		saveTrackToGpx.setChecked(OsmandSettings.isSavingTrackToGpx(this));
 		useEnglishNames.setChecked(OsmandSettings.usingEnglishNames(this));
 		autoZoom.setChecked(OsmandSettings.isAutoZoomEnabled(this));
-		String[] e = new String[] { "Center", "Bottom" };
+		Resources resources = this.getResources();
+		String[] e = new String[] {resources.getString(R.string.position_on_map_center), 
+				resources.getString(R.string.position_on_map_bottom)};
 		positionOnMap.setEntryValues(e);
 		positionOnMap.setEntries(e);
 		positionOnMap.setValueIndex(OsmandSettings.getPositionOnMap(this));
@@ -108,7 +110,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 		String[] values = new String[presets.length];
 		String[] valueEntries = new String[presets.length];
 		for(int i=0; i<presets.length; i++){
-			values[i] = presets[i].toString();
+			values[i] = ApplicationMode.toHumanString(presets[i], this);
 			valueEntries[i] = presets[i].name();
 		}
 		applicationMode.setEntries(values);