Update raster maps

2013-08-10 17:44:27 +02:00 · 2013-08-10 17:44:27 +02:00 · af053235dd
commit af053235dd
parent eb4480f8e1
41 changed files with 156 additions and 184 deletions
--- a/OsmAnd-java/src/net/osmand/map/ITileSource.java
+++ b/OsmAnd-java/src/net/osmand/map/ITileSource.java
@ -23,4 +23,6 @@ public interface ITileSource {
 	
 	public int getExpirationTimeMillis();
 	
+	public int getExpirationTimeMinutes();
+	
 }
--- a/OsmAnd-java/src/net/osmand/map/TileSourceManager.java
+++ b/OsmAnd-java/src/net/osmand/map/TileSourceManager.java
@ -119,7 +119,10 @@ public class TileSourceManager {
 		}
 		
 		public int getExpirationTimeMinutes() {
-			return expirationTimeMillis;
+			if(expirationTimeMillis < 0) {
+				return -1;
+			}
+			return expirationTimeMillis / (60  * 1000);
 		}
 		
 		public int getExpirationTimeMillis() {
@ -274,7 +277,7 @@ public class TileSourceManager {
 			properties.put("ellipsoid", tm.isEllipticYTile() + "");
 		}
 		if (tm.getExpirationTimeMinutes() != -1) {
-			properties.put("expirationTimeMinutes", tm.getExpirationTimeMinutes() + "");
+			properties.put("expiration_time_minutes", tm.getExpirationTimeMinutes() + "");
 		}
 		if (override || !metainfo.exists()) {
 			BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(metainfo)));
@ -458,7 +461,7 @@ public class TileSourceManager {
 		int maxZoom = parseInt(attributes, "max_zoom", 18);
 		int minZoom = parseInt(attributes, "min_zoom", 5);
 		int tileSize = parseInt(attributes, "tile_size", 256);
-		int expirationTime = parseInt(attributes, "expirationTimeMinutes", -1);
+		int expirationTime = parseInt(attributes, "expiration_time_minutes", -1);
 		String ext = attributes.get("ext") == null ? ".jpg" : attributes.get("ext");
 		int bitDensity = parseInt(attributes, "img_density", 16);
 		int avgTileSize = parseInt(attributes, "avg_img_size", 18000);
@ -467,7 +470,7 @@ public class TileSourceManager {
 			ellipsoid = true;
 		}
 		TileSourceTemplate templ = new TileSourceTemplate(name, urlTemplate, ext, maxZoom, minZoom, tileSize, bitDensity, avgTileSize);
-		if(expirationTime > 0) {
+		if(expirationTime >= 0) {
 			templ.setExpirationTimeMinutes(expirationTime);
 		}
 		templ.setEllipticYTile(ellipsoid);
@ -486,7 +489,7 @@ public class TileSourceManager {
 		String ext = attributes.get("ext") == null ? ".jpg" : attributes.get("ext");
 		int bitDensity = parseInt(attributes, "img_density", 16);
 		int avgTileSize = parseInt(attributes, "avg_img_size", 18000);
-		int expirationTime = parseInt(attributes, "expirationTimeMinutes", -1);
+		int expirationTime = parseInt(attributes, "expiration_time_minutes", -1);
 		boolean ellipsoid = false;
 		if (Boolean.parseBoolean(attributes.get("ellipsoid"))) {
 			ellipsoid = true;
--- a/OsmAnd/res/layout/editing_tile_source.xml
+++ b/OsmAnd/res/layout/editing_tile_source.xml
@ -24,8 +24,7 @@

                <EditText
                    android:id="@+id/Name"
-                    android:layout_width="250dp"
-        			android:minWidth="250dp"
+                    android:layout_width="180dp"
                    android:layout_height="wrap_content"
                    android:layout_marginLeft="5dp"
                    android:layout_marginRight="5dp"
@ -62,8 +61,7 @@

                <EditText
                    android:id="@+id/URLToLoad"
-                    android:layout_width="250dp"
-        			android:minWidth="250dp"
+                    android:layout_width="180dp"
                    android:layout_height="wrap_content"
                    android:lines="5"
    				android:minLines="2"
@ -81,8 +79,7 @@

                <EditText
                    android:id="@+id/MinZoom"
-                    android:layout_width="250dp"
-        			android:minWidth="250dp"
+                    android:layout_width="180dp"
                    android:layout_height="wrap_content"
                    android:text="" >
                </EditText>
@ -98,8 +95,7 @@

                <EditText
                    android:id="@+id/MaxZoom"
-                    android:layout_width="250dp"
-        			android:minWidth="250dp"
+                    android:layout_width="180dp"
                    android:layout_height="wrap_content"
                    android:text="" >
                </EditText>
@ -116,8 +112,7 @@

                <EditText
                    android:id="@+id/ExpirationTime"
-                    android:layout_width="250dp"
-        			android:minWidth="250dp"
+                    android:layout_width="180dp"
                    android:layout_height="wrap_content"
                    android:text="" >
                </EditText>
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="route_updated_loc_found">Roete sal herbereken word wanneer die ligging bepaal is</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="route_updated_loc_found">Roete sal herbereken word wanneer die ligging bepaal is</string>
  <string name="osmand_parking_hours">Ure</string>
  <string name="osmand_parking_minutes">Minute</string>
  <string name="osmand_parking_position_description_add_time">Die motor was geparkeer om:</string>
@ -347,7 +346,7 @@
  <string name="local_index_mi_delete">Verwyder</string>
  <string name="local_index_mi_reload">Herlaai van sd kaart</string>
  <string name="local_index_download">Aflaai</string>
-  <string name="local_index_tile_data">Teël inligting: %1$s\nMinimum vergroting: %2$d\nMaksimum vergroting: %3$d\nNuut: %4$s\nVergrotings afgelaai: %5$s</string>
+  
  <string name="local_index_poi_data">Interessante plek inligting</string>
  <string name="local_index_address_data">Adres inligting</string>
  <string name="local_index_transport_data">Vervoer inligting</string>
@ -1250,7 +1249,7 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
 	<string name="av_photo_play_sound">Speel geluid wanneer foto geneem word</string>
 	<string name="av_photo_play_sound_descr">Kies of geluid gespeel sal word wanneer foto geneem word</string>

-	<string name="speak_warnings_descr">Verstel verkeer waarskuwings (geforseerde stoppe, spoedbulte), spoedkamera waarskuwings, spoedbeperkings</string>
+	
    <string name="speak_speed_limit">Kondig spoedbeperking aan</string>
    <string name="speak_cameras">Kondig spoedkameras aan</string>
 	<string name="speak_traffic_warnings">Kondig verkeerswaarskuwings aan</string>
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="local_index_gpx_timespan">\nДыяпазон часу: %1$d:%2$02d:%3$02d</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="local_index_gpx_timespan">\nДыяпазон часу: %1$d:%2$02d:%3$02d</string>
 	<string name="local_index_gpx_timemoving">\nЧас руху: %1$d:%2$02d:%3$02d</string>
 	<string name="app_mode_default">Мапа</string>
 	<string name="settings_preset">Прадвызначаны</string>
@ -957,7 +956,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="local_index_mi_delete">Выдаліць</string>
 	<string name="local_index_mi_reload">Reload from sdcard</string>
 	<string name="local_index_download">Зладаваць</string>
-	<string name="local_index_tile_data">Tile data: %1$s \nMinimum zoom: %2$d\nMaximum zoom: %3$d\nDownloadable: %4$s \nZooms downloaded: %5$s</string>
+	
 	<string name="local_index_poi_data">Зьвесткі цікавосткаў</string>
 	<string name="local_index_address_data">Address data</string>
 	<string name="local_index_transport_data">Transportation data</string>
@ -1496,4 +1495,4 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="default_buttons_selectall">Select All</string>
 	<string name="email">email</string>
 <string name="index_settings">Data management</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="tip_recent_changes_1_5_t">Промени в 1.5:
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_1_5_t">Промени в 1.5:
 	\n\t* Гласови предупреждения за пътни ограничения и камери
 	\n\t* HD икони
 	\n\t* Много промени в потребителския интерфейс
@ -18,7 +17,7 @@
    <string name="route_via">През:</string>
    <string name="route_from">От:</string>
    
-	<string name="speak_warnings_descr">Настройване на предупреждения за трафика (Задължителни стопове, легнали полицаи), камери и ограничения за скорост</string>
+	
    <string name="speak_speed_limit">Обявяване на ограничения за скоростта</string>
    <string name="speak_cameras">Обявяване на камери за скорост</string>
 	<string name="speak_traffic_warnings">Обявяване на предупреждения за трафика</string>
@ -982,7 +981,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="local_index_mi_delete">Изтриване</string>
 	<string name="local_index_mi_reload">Презареди от SD-картата</string>
 	<string name="local_index_download">Сваляне</string>
-	<string name="local_index_tile_data">Картни плочки: %1$s \nМинимален мащаб: %2$d\nМаксимален мащаб: %3$d\nСвалими: %4$s \nСвалени мащаби: %5$s</string>
+	
 	<string name="local_index_poi_data">Данни за POI</string>
 	<string name="local_index_address_data">Данни за адреси</string>
 	<string name="local_index_transport_data">Данни за транспорт</string>
@ -1547,4 +1546,4 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="driving_region_canada">Канада</string>
 	<string name="driving_region_europe_asia">Европа и Азия</string>
 	<string name="driving_region_uk">Великобритания, Индия, Австралия и други</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
 <string name="map_widget_fluorescent">Rutes amb fluorescència</string>
 <string name="map_widget_show_ruler">Mostra el regle</string>
 <string name="map_widget_transparent">Aparença amb transparència</string>
@ -387,9 +386,7 @@
 <string name="local_index_gpx_info_show">\n\nPremeu i manteniu per veure les opcions</string>
 <string name="local_index_gpx_info_elevation">\nAltitud mitjana: %1$s\nAltitud mínima: %2$s\nAltitud màxima: %3$s\nAscensió: %4$s\nDescensió: %5$s</string>
 <string name="local_index_no_items_to_do">No hi ha ítems per %1$s</string>
-<string name="local_index_tile_data">Dades de tessel·les: %1$s
-\nNivell de zomm mínim: %2$d\nNivell de zoom màxim: %3$d\nEs pot baixar: %4$s
-\nNivells de zoom baixats: %5$s</string>
+
 <string name="voice_not_use">No l\'utilitzis</string>
 <string name="voice_not_specified">Cap</string>
 <string name="internet_connection_required_for_online_route">S\'ha seleccionat un servei de navegació en línia però no hi ha cap connexió a internet disponible.</string>
@ -1246,4 +1243,4 @@
 	<string name="av_camera_focus_auto">Enfocament automàtic</string>
 	<string name="osb_comment_dialog_error">Error: no s\'ha afegit el comentari</string>
 	<string name="osb_author_dialog_password">Contrasenya de l\'OSM (opcional)</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Offline data), nebo se přepněte na online mapy.</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Offline data), nebo se přepněte na online mapy.</string>
  <string name="tip_recent_changes_0_7_2_t">"Změny ve verzi 0.7.2 :
 \n\t- Native rendering pro všechna zařízení
 \n\t- Offline editace POI
@ -275,9 +274,7 @@
  <string name="local_index_mi_delete">Smazat</string>
  <string name="local_index_mi_reload">Znovu nahrát z SD karty</string>
  <string name="local_index_download">Stáhnout</string>
-  <string name="local_index_tile_data">Zdroj map. dat: %1$s
-\nMinimální zvětšení : %2$d\nMaximální zvětšení : %3$d\nStahovatelné : %4$s
-\nStažené zvětšení : %5$s</string>
+  
  <string name="local_index_poi_data">Data POI</string>
  <string name="local_index_address_data">Addresy</string>
  <string name="local_index_transport_data">Doprava</string>
@ -1272,7 +1269,7 @@
    <string name="route_via">Přes:</string>
    <string name="route_from">Z:</string>
    
-	<string name="speak_warnings_descr">Nastavit hlášení dopravních upozornění (nucené zastavení, retardéry), radarů, rychlostních omezení</string>
+	
    <string name="speak_speed_limit">Hlásit rychlostní omezení</string>
    <string name="speak_cameras">Hlásit radary</string>
 	<string name="speak_traffic_warnings">Hlásit dopravní upozornění</string>
@ -1303,4 +1300,4 @@
 	<string name="driving_region_canada">Kanada</string>
 	<string name="driving_region_europe_asia">Evropa a Asie</string>
 	<string name="driving_region_uk">Británie, Indie, Austrálie a ostatní</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
    <string name="av_def_action_video">Optag video</string>
    <string name="av_def_action_audio">Optag audio</string>
    <string name="av_widget_action_descr">Vælg standard modulhandling</string>
@ -889,11 +888,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="local_index_mi_delete">Slet</string>
 	<string name="local_index_mi_reload">Genindlæs fra SD-kort</string>
 	<string name="local_index_download">Hent</string>
-	<string name="local_index_tile_data">Delkort data: %1$s
-\nMinimum zoom: %2$d
-\nMaksimum zoom: %3$d
-\nKan hentes: %4$s
-\nZooms hentet: %5$s</string>
+	
 	<string name="local_index_address_data">Adressedata</string>
 	<string name="local_index_transport_data">Transportdata</string>
 	<string name="local_index_map_data">Kortdata</string>
@ -1542,7 +1537,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="speak_cameras">Meddel om fotofælder</string>
 	<string name="speak_speed_limit">Meddel om hastighedsgrænse</string>
    
-	<string name="speak_warnings_descr">Konfigurer trafikadvarsler (tvungne stop, vejbump), advarsler om fotofælder, hastighedsgrænser</string>
+	
    <string name="route_descr_map_location">Kort: </string>
    <string name="route_to">Til:</string>
    <string name="route_via">Via:</string>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="local_index_gpx_timespan">\nZeitspanne: %1$d:%2$02d:%3$02d</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="local_index_gpx_timespan">\nZeitspanne: %1$d:%2$02d:%3$02d</string>
 	<string name="local_index_gpx_timemoving">\nZeit in Bewegung: %1$d:%2$02d:%3$02d</string>
 	<string name="context_menu_item_destination_point">Als Ziel wählen</string>
 	<string name="layer_hillshade">Relief Overlay</string>
@ -458,7 +457,7 @@
 	<string name="local_index_mi_delete">Löschen</string>
 	<string name="local_index_mi_reload">Liste aktualisieren</string>
 	<string name="local_index_download">Herunterladen</string>
-	<string name="local_index_tile_data">Kacheldaten: %1$s \nMinimale Vergrößerung: %2$d\nMaximale Vergrößerung: %3$d\nHerunterladbar: %4$s \nHeruntegeladene Vergrößerungen: %5$s</string>
+	
 	<string name="local_index_poi_data">POI-Daten</string>
 	<string name="local_index_address_data">Adress-Daten</string>
 	<string name="local_index_transport_data">ÖPNV-Daten</string>
@ -1328,7 +1327,7 @@
 	<string name="av_camera_focus_continuous">Die Kamera kontinuierlich scharf stellen</string>
 	<string name="av_photo_play_sound">Ton bei Auslösung abspielen</string>
 	<string name="av_photo_play_sound_descr">Auswählen, ob beim Aufnehmen eines Fotos ein Ton abgespielt werden soll</string>
-	<string name="speak_warnings_descr">Verkehrs-Warnungen (Stop-Schilder, Bodenwellen), Blitzer, Geschwindigkeitsbegrenzungen konfigurieren</string>
+	
    <string name="speak_speed_limit">Höchstgeschwindigkeit ansagen</string>
    <string name="speak_cameras">Blitzer ansagen</string>
 	<string name="speak_traffic_warnings">Verkehrsmeldungen ansagen</string>
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="btn_add_tag">Προσθήκη Ετικέτας</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="btn_add_tag">Προσθήκη Ετικέτας</string>
    <string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
    <string name="poi_filter_parking">Στάθμευση</string>
    <string name="poi_filter_emergency">Επείγοντα</string>
@ -521,9 +520,7 @@
 	<string name="local_index_mi_delete">Διαγραφή</string>
 	<string name="local_index_mi_reload">Επαναφόρτωση από την sdcard</string>
 	<string name="local_index_download">Λήψη</string>
-	<string name="local_index_tile_data">Δεδομένα πλακιδίων: %1$s
-\nΕλάχιστη κλίμακα : %2$d\nΜέγιστη κλίμακα : %3$d\nΜπορούν να ληφθούν : %4$s
-\nΛηφθέντες κλίμακες : %5$s</string>
+	
 	<string name="local_index_poi_data">Δεδομένα ΣΕ</string>
 	<string name="local_index_address_data">Δεδομένα διευθύνσεων</string>
 	<string name="local_index_transport_data">Δεδομένα μεταφορών</string>
@ -1279,7 +1276,7 @@
    <string name="route_via">Μέσω:</string>
    <string name="route_from">Από:</string>
    
-	<string name="speak_warnings_descr">Διαμόρφωση προειδοποιήσεων κυκλοφορίας (αναγκαστικές στάσεις, σαμαράκια), προειδοποιήσεις καμερών ταχύτητας, ορίων ταχύτητας</string>
+	
    <string name="speak_speed_limit">Εκφώνηση ορίου ταχύτητας</string>
    <string name="speak_cameras">Εκφώνηση καμερών ταχύτητας</string>
 	<string name="speak_traffic_warnings">Εκφώνηση προειδοποιήσεων κυκλοφορίας</string>
@ -1316,4 +1313,4 @@
 	<string name="driving_region_canada">Καναδάς</string>
 	<string name="driving_region_europe_asia">Ευρώπη &amp; Ασία</string>
 	<string name="driving_region_uk">ΗΒ, Ινδία, Αυστραλία, Κύπρος κλπ</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="live_monitoring_mode_off">Iniciar\n seguimiento en directo</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="live_monitoring_mode_off">Iniciar\n seguimiento en directo</string>
  <string name="live_monitoring_mode_on">Parar\n seguimiento en directo</string>
  <string name="layer_map_appearance">Configura pantalla</string>
  <string name="show_lanes">Mostrar carriles</string>
@ -188,7 +187,7 @@
  <string name="local_index_mi_delete">Borrar</string>
  <string name="local_index_mi_reload">Recargar desde la tarjeta SD</string>
  <string name="local_index_download">Descargar</string>
-  <string name="local_index_tile_data">Datos de teselas: %1$s \nZoom mínimo: %2$d\nZoom máximo: %3$d\nDescargable: %4$s \nZooms descargados: %5$s</string>
+  
  <string name="local_index_poi_data">Datos de PDI</string>
  <string name="local_index_address_data">Datos de direcciones</string>
  <string name="local_index_transport_data">Datos de transporte</string>
@ -1303,7 +1302,7 @@ La lista de países incluídos (¡básicamente todo el mundo!): Afganistán, Alb
    <string name="route_via">Vía:</string>
    <string name="route_from">Desde:</string>
    
-	<string name="speak_warnings_descr">Configurar alertas de tráfico (paradas forzosas, reductores de velocidad), radares, límitaciones de velocidad</string>
+	
    <string name="speak_speed_limit">Anunciar límites de velocidad</string>
    <string name="speak_cameras">Anunciar radares</string>
 	<string name="speak_traffic_warnings">Anunciar avisos de tráfico</string>
@ -1328,4 +1327,4 @@ La lista de países incluídos (¡básicamente todo el mundo!): Afganistán, Alb
    <string name="context_menu_item_directions_to">Indicaciones a</string>
    <string name="route_descr_map_location">Mapa: </string>
    <string name="route_to">Hacia:</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="local_osm_changes_backup_failed">پشتیبان گیری از تغییرات OSM ناموفق بود</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="local_osm_changes_backup_failed">پشتیبان گیری از تغییرات OSM ناموفق بود</string>
    <string name="plugin_distance_point_time">زمان</string>
    <string name="plugin_distance_point_hdop">دقت</string>
    <string name="plugin_distance_point_speed">سرعت</string>
@ -857,7 +856,7 @@
 	<string name="show_osm_bugs_descr">نشان دادن OpenStreetBugs بر روی نقشه</string>
 	<string name="show_osm_bugs">نشان دادن OpenStreetBugs</string>
 	
-	<string name="speak_warnings_descr">پیکربندی هشدارهای ترافیک (توقف اجباری، سرعت گیر)، هشدار دوربین سرعت سنج، محدودیت سرعت</string>
+	
    <string name="speak_speed_limit">اعلام سرعت مجاز</string>
    <string name="speak_cameras">اعلام دوربین سرعت سنج</string>
 	<string name="speak_traffic_warnings">اعلام هشدارهای ترافیکی</string>
@ -1424,7 +1423,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
 	<string name="local_index_items_restored">%1$d مورد از %2$d با موفقیت فعال شد.</string>
 	<string name="local_index_no_items_to_do">هیچ موردی برای %1$s وجود ندارد</string>
 	<string name="local_index_action_do">شما در حال %1$s %2$s مورد هستید. ادامه میدهید؟</string>
-	<string name="local_index_tile_data">داده ها: %1$s \nحداقل زوم: %2$d\nحداکثر زوم: %3$d\nدانلود: %4$s \nدانلود زوم: %5$s</string>
+	
 	<string name="trace_rendering">ارائه اطلاعات اشکال زدایی</string>
 	<string name="trace_rendering_descr">نمایش عملکرد رندرینگ</string>
 	<string name="tip_recent_changes_0_6_6_t">تغییرات نسخه: 0.6.6
@ -1531,4 +1530,4 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
 	<string name="driving_region_canada">کانادا</string>
 	<string name="driving_region_europe_asia">اروپا و آسیا</string>
 	<string name="driving_region_uk">انگلستان، هند، استرالیا و سایر کشورها</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="no_route">Ei reittiä</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="no_route">Ei reittiä</string>
 	<string name="delete_target_point">Poista välietappi</string>
 	<string name="target_point">Välietappi %1$s</string>
    <string name="intermediate_point">Välietappi %1$s</string>
@ -680,4 +679,4 @@
    <string name="gpx_saved_sucessfully">GPX tiedosto tallennettin onnistuneesti: {0}</string>
    <string name="default_buttons_do_not_show_again">Älä näytä enää uudestaan</string>
    <string name="distance_measurement_start_editing">Aloita muokkaus</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="offline_edition">Modifications hors ligne</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="offline_edition">Modifications hors ligne</string>
  <string name="offline_edition_descr">Toujours utiliser l\'édition hors ligne</string>
  <string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :
 \n\t- Modification hors ligne des PI
@ -201,9 +200,7 @@
  <string name="local_index_mi_delete">Supprimer</string>
  <string name="local_index_mi_reload">Recharger depuis la carte SD</string>
  <string name="local_index_download">Télécharger</string>
-  <string name="local_index_tile_data">Cartes tuiles: %1$s
-\nZoom minimum : %2$d\nZoom maximum : %3$d\nTéléchargeable : %4$s
-\nZooms téléchargés : %5$s</string>
+  
  <string name="local_index_poi_data">Données PI</string>
  <string name="local_index_address_data">Données adresses</string>
  <string name="local_index_transport_data">Données des transports</string>
@ -1308,4 +1305,4 @@
    <string name="please_select_address">Sélectionner d\'abord une ville ou une rue</string>
    <string name="context_menu_item_destination_point">Définir comme destination</string>
    <string name="speak_street_names">Annoncer les noms de rues (TTS)</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@ -525,9 +525,7 @@
 	<string name="local_index_mi_delete">מחיקה</string>
 	<string name="local_index_mi_reload">טעינה מחדש מכרטיס ה־SD</string>
 	<string name="local_index_download">הורדה</string>
-	<string name="local_index_tile_data">נתוני האריח: %1$s
-\nתקריב מזערי : %2$d\nתקריב מרבי : %3$d\nניתנות להורדה : %4$s
-\nרמות תקריב שהתקבלו : %5$s</string>
+	
 	<string name="local_index_poi_data">נתוני נ״ע</string>
 	<string name="local_index_address_data">נתוני כתובת</string>
 	<string name="local_index_transport_data">נתוני תעבורה</string>
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@ -759,9 +759,7 @@
 	<string name="local_index_address_data">Podaci o adresama</string>
 	<string name="local_index_transport_data">Podaci javnoga prijevoza</string>
 	<string name="local_index_download">Preuzimanje...</string>
-	<string name="local_index_tile_data">Izvor podataka: %1$s
-\nMinimalni zoom: %2$d\nMaximalni zoom: %3$d\nMoguće je preuzeti: %4$s
-\nZooms preuzet: %5$s</string>
+	
 	<string name="local_index_mi_backup">Isključi</string>
 	<string name="local_index_mi_restore">Uključi</string>
 	<string name="local_index_mi_delete">Izbriši</string>
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
 \n\t- Natív renderelő minden eszközre
 \n\t- Offline POI szerkesztés
 \n\t- Akadálymentesítés 
@ -243,7 +242,7 @@
  <string name="local_index_mi_delete">Törlés</string>
  <string name="local_index_mi_reload">Újratöltés SD kártyáról</string>
  <string name="local_index_download">Letöltés</string>
-  <string name="local_index_tile_data">Csempe adat: %1$s \nMinimális nagyítás : %2$d\nMaximális nagyítás : %3$d\nLetöltendő : %4$s \nNagyítások letöltve : %5$s</string>
+  
  <string name="local_index_poi_data">POI adat</string>
  <string name="local_index_address_data">Cím adat</string>
  <string name="local_index_transport_data">Közlekedési eszköz adat</string>
@ -1272,7 +1271,7 @@
    <string name="route_via">Át:</string>
    <string name="route_from">Innen:</string>
    
-	<string name="speak_warnings_descr">Közlekedési figyelmeztetések (stop, fekvőrendőr), traffipax, sebességhatár</string>
+	
    <string name="speak_speed_limit">Sebességhatár bemondása</string>
    <string name="speak_cameras">Traffipax bemondása</string>
 	<string name="speak_traffic_warnings">Közlekedési figyelmeztetések bemondása</string>
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
  <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
  <string name="offline_edition">Modifiche offline</string>
  <string name="offline_edition_descr">Usa sempre la modifica offline</string>
@ -187,9 +186,7 @@
  <string name="local_index_mi_delete">Elimina</string>
  <string name="local_index_mi_reload">Ricarica dalla scheda SD</string>
  <string name="local_index_download">Download</string>
-  <string name="local_index_tile_data">Dati anteprime: %1$s
-\nZoom minimo: %2$d\nZoom massimo: %3$d\nScaricabile: %4$s
-\nZoom scaricati: %5$s</string>
+  
  <string name="local_index_poi_data">Dati PDI</string>
  <string name="local_index_address_data">Dati indirizzi</string>
  <string name="local_index_transport_data">Dati trasporti</string>
@ -1322,7 +1319,7 @@
 	<string name="av_photo_play_sound_descr">Quando scatto una foto riproduci il suono</string>
 <string name="local_index_gpx_timespan">\nTempo trascorso: %1$d:%2$02d:%3$02d</string>
 	
-	<string name="speak_warnings_descr">Configura gli avvisi del traffico (fermate forzate, dossi rallentatori) avvisi autovelox, limiti di velocità</string>
+	
    <string name="speak_speed_limit">Annuncia limiti di velocità</string>
    <string name="speak_cameras">Annuncia autovelox</string>
 	<string name="speak_traffic_warnings">Annuncia avvisi di traffico</string>
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@ -290,7 +290,7 @@
  <string name="local_index_mi_delete">წაშლა</string>
  <string name="local_index_mi_reload">განახლება SDCard-დან</string>
  <string name="local_index_download">ჩამოტვირთვა…</string>
-  <string name="local_index_tile_data">ნაწილოვანი მონაცემები: %1$s \nმინიმალური გადიდება : %2$d\nმაქსიმალური გადიდება : %3$d\nგადმოსაწერი : %4$s \nგადმოწერილი : %5$s</string>
+  
  <string name="local_index_poi_data">POI მონაცემები</string>
  <string name="local_index_address_data">მისამართის მონაცემები</string>
  <string name="local_index_transport_data">ტრანსპორტის მონაცემები</string>
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@ -291,7 +291,7 @@
 	<string name="local_index_mi_delete">삭제</string>
 	<string name="local_index_mi_reload">재보충</string>
 	<string name="local_index_download">다운로드…</string>
-	<string name="local_index_tile_data">타일 데이터: %1$s \n최소 줌 : %2$d\n최대 줌 : %3$d\n다운로드 : %4$s \n다운로드된 줌 : %5$s</string>
+	
 	<string name="local_index_poi_data">POI 데이터</string>
 	<string name="local_index_address_data">주소 데이터</string>
 	<string name="local_index_transport_data">대중교통 데이터</string>
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
  <string name="shared_location">Bendrinta vieta</string>
  <string name="osmand_parking_warning">Dėmesio</string>
@ -393,7 +393,7 @@
  <string name="local_index_mi_delete">Ištrinti</string>
  <string name="local_index_mi_reload">Atnaujinti iš SD kortelės</string>
  <string name="local_index_download">Parsiųst</string>
-  <string name="local_index_tile_data">Duomenų: %1$s \nMažiausias dydis : %2$d\nDidžiausias dydis : %3$d\nParsiunčiama : %4$s \nParsiųsti dydžiai : %5$s</string>
+  
  <string name="local_index_poi_data">LV duomenys</string>
  <string name="local_index_address_data">Adresų duomenys</string>
  <string name="local_index_transport_data">Transporto duomenys</string>
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@ -246,7 +246,7 @@
  <string name="local_index_mi_delete">Dzēst</string>
  <string name="local_index_mi_reload">Nolasīt no sd kartes</string>
  <string name="local_index_download">Lejupielādes…</string>
-  <string name="local_index_tile_data">Bilžu dati: %1$s \nMinimālais palielinājums : %2$d\nMaksimālais palielinājums : %3$d\nLejuplādējams : %4$s \nLejuplādēti palielinājumi : %5$s</string>
+  
  <string name="local_index_poi_data">POI dati</string>
  <string name="local_index_address_data">Adresees dati</string>
  <string name="local_index_transport_data">Transporta dati</string>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<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>
@ -302,7 +301,7 @@
 	<string name="local_index_mi_delete">Slett</string>
 	<string name="local_index_mi_reload">Last på nytt fra sd-kort</string>
 	<string name="local_index_download">Last ned</string>
-	<string name="local_index_tile_data">Flisdata: %1$s \nMinimum zoom: %2$d\nMaksimum zoom: %3$d\nNedlastbar: %4$s \nZoom nedlastet: %5$s</string>
+	
 	<string name="local_index_poi_data">Interessepunkt-data</string>
 	<string name="local_index_address_data">Adressedata</string>
 	<string name="local_index_transport_data">Transportdata</string>
@ -691,4 +690,4 @@
    <string name="context_menu_item_destination_point">Velg som mål</string>
    <string name="please_select_address">Velg by eller gate først</string>
    <string name="search_street_in_neighborhood_cities">Søk etter gaten i nabobyer</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="live_monitoring_mode_off">Start\n online tracking</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="live_monitoring_mode_off">Start\n online tracking</string>
  <string name="live_monitoring_mode_on">Stop\n online tracking</string>
  <string name="layer_map_appearance">Configureer scherm</string>
  <string name="show_lanes">Toon rijstroken</string>
@ -285,9 +284,7 @@
  <string name="local_index_mi_delete">Verwijder</string>
  <string name="local_index_mi_reload">Verversen van SD-kaart</string>
  <string name="local_index_download">Download</string>
-  <string name="local_index_tile_data">Kaartsegmentgegevens: %1$s
-\nMinimum zoom : %2$d\nMaximum zoom : %3$d\nTe downloaden : %4$s
-\nZooms gedownloaded : %5$s</string>
+  
  <string name="local_index_poi_data">Interessepunt-gegevens</string>
  <string name="local_index_address_data">Adresgegevens</string>
  <string name="local_index_transport_data">OV-gegevens</string>
@ -1493,7 +1490,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="av_camera_focus_continuous">Voortdurend blijven scherpstellen</string>
 	<string name="av_photo_play_sound_descr">Kies of er een geluid wordt afgespeeld tijdens het nemen van foto\'s</string>

-	<string name="speak_warnings_descr">Gesproken waarschuwingen bij stopsignalen, verkeersdrempels, snelheidscamera\'s, snelheidsbeperkingen instellen</string>
+	
    <string name="speak_speed_limit">Meld snelheidsbeperking</string>
    <string name="speak_cameras">Meld snelheidscamera\'s</string>
 	<string name="speak_traffic_warnings">Meld verkeerswaarschuwingen</string>
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="tip_select_destination_point">Uzyskiwanie informacji o trasie</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_select_destination_point">Uzyskiwanie informacji o trasie</string>
  <string name="tip_select_destination_point_t">"\tTrasę przejazdu do wybranego punktu możesz zobaczyć bezpośrednio na mapie (menu kontekstowe, następnie \'Trasa\'), podczas wyszukiwania lub po długim naciśnięciu na wpis z listy ulubionych punktów.
 \n\tPunkt docelowy oznaczony jest pomarańczową flagą na mapie. OsmAnd wyświetla odległość i kierunek do niej (pomarańczowy trójkąt). "</string>
  <string name="tip_recent_changes_0_6_9_t">"Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki "</string>
@ -95,7 +94,7 @@
  <string name="local_index_mi_delete">Skasuj</string>
  <string name="local_index_mi_reload">Odśwież</string>
  <string name="local_index_download">Pobierz</string>
-  <string name="local_index_tile_data">Dane kafelkowe: %1$s \nMinimalny zoom: %2$d\nMaksymalny zoom: %3$d\nMożliwe do pobrania: %4$s \nPobrano poziomy: %5$s</string>
+  
  <string name="local_index_poi_data">Dane POI</string>
  <string name="local_index_address_data">Dane adresowe</string>
  <string name="local_index_transport_data">Dane transportu publicznego</string>
@ -128,8 +127,8 @@
  <string name="tip_rotation_switching">Orientacja mapy</string>
  
  <string name="switch_to_raster_map_to_see">Obecna pozycja nie ma pokrycia w zainstalowanych mapach offline. Możesz pobrać nową w Ustawieniach lub przełączyć się na mapy online.</string>
-  <string name="switch_to_vector_map_to_see">Dla tej lokalizacji dostępna jest wektorowa mapa offline. \n\t\n\tAby użyć wybierz 'Menu' -&gt; 'Warstwy mapy' -&gt; 'Źródło mapy…' -&gt; 'Wektorowe mapy offline'.</string>
-  <string name="binary_map_download_success">Pobieranie zakończone.\n\t\n\tAby użyć aktywuj 'Menu' -&gt; 'Warstwy mapy' -&gt; 'Źródło mapy…' -&gt; 'Wektorowe mapy offline'.</string>
+  <string name="switch_to_vector_map_to_see">Dla tej lokalizacji dostępna jest wektorowa mapa offline. \n\t\n\tAby użyć wybierz \'Menu\' -&gt; \'Warstwy mapy\' -&gt; \'Źródło mapy…\' -&gt; \'Wektorowe mapy offline\'.</string>
+  <string name="binary_map_download_success">Pobieranie zakończone.\n\t\n\tAby użyć aktywuj \'Menu\' -&gt; \'Warstwy mapy\' -&gt; \'Źródło mapy…\' -&gt; \'Wektorowe mapy offline\'.</string>
  <string name="choose_audio_stream">Wyjście głosu nawigatora</string>
  <string name="choose_audio_stream_descr">Wybierz kanał do odtwarzania głosu nawigatora (zależne od możliwości systemu)</string>
  <string name="voice_stream_voice_call">Kanał głosowy</string>
@ -1300,7 +1299,7 @@
    <string name="route_via">Przez:</string>
    <string name="route_from">Z:</string>
    
-	<string name="speak_warnings_descr">Konfiguruj ostrzeżenia o ruchu (przymusowe przystanki, progi zwalniające), fotoradarach, ograniczeniach prędkości</string>
+	
    <string name="speak_speed_limit">Ograniczenia prędkości</string>
    <string name="speak_cameras">Fotoradary</string>
 	<string name="speak_traffic_warnings">Ostrzeżenia o ruchu</string>
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="amenity_type_administrative">Administrativo</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="amenity_type_administrative">Administrativo</string>
  <string name="amenity_type_barrier">Barreira</string>
  <string name="amenity_type_education">Educação</string>
  <string name="amenity_type_emergency">Emergência</string>
@ -703,7 +702,7 @@
  <string name="local_index_mi_delete">Apagar</string>
  <string name="local_index_mi_reload">Refresh</string>
  <string name="local_index_download">Download</string>
-  <string name="local_index_tile_data">Tile data: %1$s \nMinimum zoom : %2$d\nMaximum zoom : %3$d\nDownloadable : %4$s \nZooms downloaded : %5$s</string>
+  
  <string name="local_index_poi_data">Dados POI</string>
  <string name="local_index_address_data">Dados de Endereço</string>
  <string name="local_index_transport_data">Transport data</string>
@ -1292,4 +1291,4 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="av_photo_play_sound">Emita som ao tirar foto</string>
 	<string name="av_photo_play_sound_descr">Escolha se emitir som quando tirar fotos</string>
 <string name="driving_region_canada">Canadá</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@ -553,9 +553,7 @@
 	<string name="local_index_mi_delete">Ștergeți</string>
 	<string name="local_index_mi_reload">Reîncărcați de pe cardul SD</string>
 	<string name="local_index_download">Descărcați…</string>
-	<string name="local_index_tile_data">Porțiuni de hartă raster: %1$s
-\nZoom minim: %2$d\nzoom maxim: %3$d\nDescărcabile: %4$s
-\nNiveluri de zoom descărcate: %5$s</string>
+	
 	<string name="local_index_poi_data">Date despre POI</string>
 	<string name="local_index_address_data">Date despre Adrese</string>
 	<string name="local_index_transport_data">Date despre transport</string>
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="srtm_plugin_description">Этот плагин позволяет загружать линии высот (Загрузка данных -&gt; Меню -&gt; "Другие карты") для использование в оффлайн режиме.</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="srtm_plugin_description">Этот плагин позволяет загружать линии высот (Загрузка данных -&gt; Меню -&gt; "Другие карты") для использование в оффлайн режиме.</string>
    <string name="srtm_paid_version_msg">Рассмотрите пожалуйста покупку плагина \"Линии высот\" на Market, чтобы поддержать последующую разработку.</string>
    <string name="srtm_paid_version_title">Линии высот</string>
    <string name="av_def_action_video">Запись видео</string>
@ -270,9 +269,7 @@
  <string name="local_index_mi_delete">Удалить</string>
  <string name="local_index_mi_reload">Перечитать с SD-накопителя</string>
  <string name="local_index_download">Загрузить</string>
-  <string name="local_index_tile_data">Тайловые данные: %1$s
-\nМинимальный уровень: %2$d Максимальный уровень: %3$d Загружаемый: %4$s
-\nУровни загружены: %5$s</string>
+  
  <string name="local_index_poi_data">POI</string>
  <string name="local_index_address_data">Адрес</string>
  <string name="local_index_transport_data">Транспорт</string>
@ -1266,4 +1263,4 @@
 	<string name="context_menu_item_directions_to">Маршрут к</string>
    <string name="context_menu_item_directions_from">Маршрут от</string>
    <string name="driving_region_canada">Канада</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="recording_context_menu_show">Zobraziť</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="recording_context_menu_show">Zobraziť</string>
  <string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
  <string name="av_def_action_picture">Zachytiť fotografiu</string>
  <string name="recording_context_menu_precord">Zachytiť fotografiu</string>
@ -365,9 +364,7 @@
  <string name="local_index_mi_delete">Vymazať</string>
  <string name="local_index_mi_reload">Znovu načítať z karty SD</string>
  <string name="local_index_download">Stiahnuť</string>
-  <string name="local_index_tile_data">Údaje dlaždíc : %1$s
-\nNajmenší zoom : %2$d\nNajväčší zoom : %3$d\nStiahnuteľné : %4$s
-\nStiahnuté zoomy : %5$s</string>
+  
  <string name="local_index_poi_data">POI údaje</string>
  <string name="local_index_address_data">Adresné údaje</string>
  <string name="local_index_transport_data">Dopravné údaje</string>
@ -1282,9 +1279,9 @@
    <string name="route_to">Kam:</string>
    <string name="route_via">Cez:</string>
    <string name="route_from">Odkiaľ:</string>
-    <string name="speak_warnings_title">Ohlasovať varovania…</string>
-	<string name="speak_warnings_descr">Konfigurácia dopravných varovaní (vynútené zastavenie, spomaľovače), upozornenie pred radarom, rýchlostné obmedzenia</string>
+    
+	
    <string name="speak_speed_limit">Ohlásiť obmedzenie rýchlosti</string>
    <string name="speak_cameras">Ohlásiť radary</string>
 	<string name="speak_traffic_warnings">Ohlásiť dopravné varovania</string>
-	</resources>
+	</resources>
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="search_button">Išči</string>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="search_button">Išči</string>
 	<string name="search_activity">Išči</string>
 	<string name="settings_Button">Nastavitve</string>
 	<string name="favorites_Button">Priljubljene</string>
@ -548,7 +547,7 @@
 	<string name="local_index_transport_data">Podatki javnih prevozov</string>
 	<string name="local_index_address_data">Podatki naslovov</string>
 	<string name="local_index_poi_data">Podatki POI</string>
-	<string name="local_index_tile_data">Vir podatkov: %1$s\nMinimalna povečava: %2$d\nMaximalna povečava: %3$d\nMožno prenesti: %4$s\nprenešene povečave: %5$s</string>
+	
 	<string name="local_indexes_cat_gpx">GPX podatki</string>
 	<string name="local_indexes_cat_poi">Podatki POI</string>
 	<string name="local_index_gpx_info">Poti: %1$d\nVseh točk: %2$d\nVmesnih točk: %3$d\nDolžina: %4$s\nČas začetka: %5$tF, %5$tR\nČas konca: %6$tF, %6$tR</string>
@ -1458,7 +1457,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="av_photo_play_sound">Predvajaj zvok pri slikanju</string>
 	<string name="av_photo_play_sound_descr">Izberite ali naj se predvaja zvok ob fotografiranju</string>

-	<string name="speak_warnings_descr">Nastavitev za prometna opozorila (prisilna ustavitev, ležeči policaji), opozorila merilnikov hitrosti, omejitve hitrosti</string>
+	
    <string name="speak_speed_limit">Napovej omejitve hitrosti</string>
    <string name="speak_cameras">Napovej hitrostne kamere</string>
 	<string name="speak_traffic_warnings">Napovej prometna opozorila</string>
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<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>
@ -459,9 +458,7 @@ Aktuella data på enheten (%1$s ledigt):</string>
 <string name="local_index_mi_delete">Ta bort</string>
 <string name="local_index_mi_reload">Ladda om från SD-kort</string>
 <string name="local_index_download">Ladda ner</string>
-<string name="local_index_tile_data">Tile-data: %1$s
-\nMinimal zoom: %2$d\nMaximal zoom: %3$d\nNedladdningsbar: %4$s
-\nNedladdade zoom: %5$s</string>
+
 <string name="local_index_poi_data">POI-data</string>
 <string name="local_index_address_data">Adressdata</string>
 <string name="local_index_transport_data">Transportdata</string>
@ -1166,7 +1163,7 @@ Aktuella data på enheten (%1$s ledigt):</string>
    <string name="destination_point">Destination %1$s</string>
    <string name="context_menu_item_destination_point">Ange som destination</string>
    
-	<string name="speak_warnings_descr">Konfigurera trafikvarningar (fartbulor etc), varningar för fartkameror, hastighetsbegränsningar</string>
+	
    <string name="speak_speed_limit">Meddela vid hastighetsbegränsningar</string>
    <string name="speak_cameras">Meddela vid fartkameror</string>
 	<string name="speak_traffic_warnings">Meddela vid trafikvarningar</string>
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="close_changeset">Değişiklik listesini kapat</string>
 	<string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner uygulaması kurulu değil. Uygulama marketinde aramak ister misiniz?</string>
 	<string name="rendering_attr_roadColors_description">Yol renk şemasını seç:</string>
@ -146,7 +146,7 @@
    <string name="recording_playing">Belirtilen kayıttan bir ses çalınıyor.\n%1$s</string>
    <string name="recording_open_external_player">Harici oynatıcı aç</string>
    <string name="recording_delete_confirm">Bu kaydı kaldırmak istiyor musunuz?</string>
-    <string name="tip_recent_changes_1_1_0_t">1.1.0'daki değişiklikler:
+    <string name="tip_recent_changes_1_1_0_t">1.1.0\'daki değişiklikler:
 \n\t* Uzaklık hesap eklentisi
 \n\t* Ses/video notları eklentisi
 \n\t* Çevreleme çizgileri eklentisi
@ -160,7 +160,7 @@
    <string name="layer_recordings">Kayıt katmanı</string>
    <string name="recording_can_not_be_played">Kayıt oynatılamaz</string>
    <string name="recording_context_menu_delete">Kayıt sil</string>
-    <string name="recording_description">Kayıt %3$'nın %1$s %2$s</string>
+    <string name="recording_description">Kayıt %3$\'nın %1$s %2$s</string>
    <string name="recording_default_name">kayıt</string>
    <string name="av_control_stop">durdur</string>
    <string name="av_control_start">başlat</string>
@ -795,8 +795,8 @@
 	<string name="driving_region_canada">Kanada</string>
 	<string name="driving_region_europe_asia">Avrupa ve Asya</string>
 	<string name="driving_region_uk">Birleşik Krallık, Hindistan, Avustralya ve Diğerleri</string>
-	<string name="osmodroid_mode_on">OsMoDroid'i Durdur</string>    
-    <string name="osmodroid_mode_off">OsMoDroid'i Başlat</string>
+	<string name="osmodroid_mode_on">OsMoDroid\'i Durdur</string>    
+    <string name="osmodroid_mode_off">OsMoDroid\'i Başlat</string>
    <string name="speak_title">Duyuru…</string>
 	<string name="speak_descr">Sokak isimleri, trafik uyarıları (mecburi duruşlar, tümsekler), hız kamerası uyarıları, hız sınırları bildirimlerini ayarla</string>
 	<string name="speak_street_names">Sokak isimlerini bildir</string>
@ -833,7 +833,7 @@
    <string name="distance_measurement_finish_subtrack">Yeni bir alt yola başla</string>
    <string name="distance_measurement_clear_route">Tüm mevkileri temizle</string>
    <string name="distance_measurement_save_gpx">GPX olarak kaydet</string>
-    <string name="distance_measurement_load_gpx">Varolan GPX'i aç</string>
+    <string name="distance_measurement_load_gpx">Varolan GPX\'i aç</string>
    <string name="wait_current_task_finished">Mevcut görev bitene kadar bekleyin lütfen</string>
    <string name="use_kalman_filter_compass_descr">Pusula sapmalarından korunmak için Kalman filtresi kullan</string>
    <string name="use_kalman_filter_compass">Kalman filtresi kullan</string>
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="tip_recent_changes_0_8_1_t">Зміни в 0.8.1:
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_0_8_1_t">Зміни в 0.8.1:
 		\n\t* Більш точні маршрути (трохи повільніше)
 		\n\t* Розумний і швидкий перерахунок маршруту
 		\n\t* Вказання напрямку руху по смугам
@ -338,7 +337,7 @@
  <string name="local_index_mi_delete">Вилучити</string>
  <string name="local_index_mi_reload">Оновити з SD-картки</string>
  <string name="local_index_download">Завантажити</string>
-  <string name="local_index_tile_data">Дані мапи: %1$s \nМінімальний масштаб: %2$d\nМаксимальний масштаб: %3$d\nЗавантажуваний: %4$s\nЗавантажені рівні: %5$s</string>
+  
  <string name="local_index_poi_data">POI дані</string>
  <string name="local_index_address_data">Адреси</string>
  <string name="local_index_transport_data">Траснпорт</string>
@ -1489,7 +1488,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="av_photo_play_sound_descr">Під час фотографування відтворювати звук</string>
 <string name="osmand_net_previously_installed">У вас встановлена попередня версія OsmAnd. Всі локальні дані підтримуються новою версією. Але збережені точки потрібно експортувати з попередньої версії і імпортувати в нову.</string>
 	
-	<string name="speak_warnings_descr">Налаштуйте попередження про перешкоди на шляху (примусові зупинки, лежачі поліцейські), про камери фіксації швидкости, обмеження швикодсті</string>
+	
    <string name="speak_speed_limit">Попереджати про обмеження швидкості</string>
    <string name="speak_cameras">Попереджати про камери фіксації швидкості</string>
 	<string name="speak_traffic_warnings">Попереджати про перешкоди на шляху</string>
@ -1561,4 +1560,4 @@ OsmAnd має відкриті сирці і активно розвиваєть
 		\n\t- Оновлення інтерфейсу та велика кількість виправлених помилок
 	</string>
 	<string name="map_widget_fps_info">FPS-інфо</string>
-	</resources>
+</resources>
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@ -88,7 +88,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
 	<string name="local_index_mi_delete">Xóa</string>
 	<string name="local_index_mi_reload">Làm tươi</string>
 	<string name="local_index_download">Tải xuống…</string>
-	<string name="local_index_tile_data">Dữ liệu Tile: %1$s \nZoom nhỏ nhất : %2$d\nZoom lớn nhất : %3$d\nCó thể tải về được : %4$s \nZooms được tải về : %5$s</string>
+	
 	<string name="local_index_poi_data">dữ liệu POI</string>
 	<string name="local_index_address_data">dữ liệu Địa chỉ</string>
 	<string name="local_index_transport_data">Dữ liệu giao thông</string>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<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>
@ -495,7 +494,7 @@
 	<string name="local_index_mi_delete">刪除</string>
 	<string name="local_index_mi_reload">由 SD 卡重新載入</string>
 	<string name="local_index_download">下載</string>
-	<string name="local_index_tile_data">地圖圖磚：%1$s\n最小階數：%2$d\n最大階數：%3$d\n可下載階數：4$s\n已下載階數：%5$s</string>
+	
 	<string name="local_index_poi_data">興趣點資料</string>
 	<string name="local_index_address_data">地址資料</string>
 	<string name="local_index_transport_data">交通設施資料</string>
@ -1519,7 +1518,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告
    <string name="route_via">經過：</string>
    <string name="route_from">從：</string>
    
-	<string name="speak_warnings_descr">組態交通流量警示（強制停止，減速丘），測速照相警告，速限</string>
+	
    <string name="speak_speed_limit">通報速限</string>
    <string name="speak_cameras">通報測速照相</string>
 	<string name="speak_traffic_warnings">通報交通流量警示</string>
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@ -9,6 +9,12 @@
         3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
    PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
    -->
+    <string name="local_index_tile_data_zooms">Zooms downloaded: %1$s</string>
+    <string name="local_index_tile_data_expire">Expire (minutes): %1$s</string>
+    <string name="local_index_tile_data_downloadable">Downloadable: %1$s</string>
+    <string name="local_index_tile_data_maxzoom">Maximum zoom: %1$s</string>
+    <string name="local_index_tile_data_minzoom">Minimum zoom: %1$s</string>
+    <string name="local_index_tile_data_name">Tile data: %1$s</string>
    <string name="edit_tilesource_successfully">Tilesource %1$s is successfully saved</string>
    <string name="edit_tilesource_elliptic_tile">Elliptic mercator</string>
    <string name="edit_tilesource_maxzoom">Max zoom</string>
@ -1010,7 +1016,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="local_index_mi_delete">Delete</string>
 	<string name="local_index_mi_reload">Reload from sdcard</string>
 	<string name="local_index_download">Download</string>
-	<string name="local_index_tile_data">Tile data: %1$s \nMinimum zoom: %2$d\nMaximum zoom: %3$d\nDownloadable: %4$s \nZooms downloaded: %5$s</string>
 	<string name="local_index_poi_data">POI data</string>
 	<string name="local_index_address_data">Address data</string>
 	<string name="local_index_transport_data">Transportation data</string>
--- a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
+++ b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
@ -414,6 +414,11 @@ public class SQLiteTileSource implements ITileSource {
 		return -1;
 	}

+	@Override
+	public int getExpirationTimeMinutes() {
+		return -1;
+	}
+
 }


--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
@ -22,6 +22,7 @@ import net.osmand.binary.BinaryMapIndexReader.MapRoot;
 import net.osmand.binary.BinaryMapPoiReaderAdapter.PoiRegion;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
 import net.osmand.binary.BinaryMapTransportReaderAdapter.TransportIndex;
+import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.plus.GPXUtilities;
@ -80,33 +81,31 @@ public class LocalIndexHelper {
 		} else if(info.getType() == LocalIndexType.TTS_VOICE_DATA){
 			info.setDescription(getInstalledDate(f));
 		} else if(info.getType() == LocalIndexType.TILES_DATA){
+			Set<Integer> zooms = new TreeSet<Integer>();
+			ITileSource template ;
 			if(f.isDirectory() && TileSourceManager.isTileSourceMetaInfoExist(f)){
-				TileSourceTemplate template = TileSourceManager.createTileSourceTemplate(new File(info.getPathToData()));
-				Set<Integer> zooms = new TreeSet<Integer>();
+				template = TileSourceManager.createTileSourceTemplate(new File(info.getPathToData()));
 				for(String s : f.list()){
 					try {
 						zooms.add(Integer.parseInt(s));
 					} catch (NumberFormatException e) {
 					}
 				}
-				
-				String descr = app.getString(R.string.local_index_tile_data, 
-					template.getName(), template.getMinimumZoomSupported(), template.getMaximumZoomSupported(),
-					template.getUrlTemplate() != null, zooms.toString());
-				info.setDescription(descr);
 			} else if(f.isFile() && f.getName().endsWith(SQLiteTileSource.EXT)){
-				SQLiteTileSource template = new SQLiteTileSource(app, f, TileSourceManager.getKnownSourceTemplates());
-//				Set<Integer> zooms = new TreeSet<Integer>();
-//				for(int i=1; i<22; i++){
-//					if(template.exists(i)){
-//						zooms.add(i);
-//					}
-//				}
-				String descr = app.getString(R.string.local_index_tile_data, 
-						template.getName(), template.getMinimumZoomSupported(), template.getMaximumZoomSupported(),
-						template.couldBeDownloadedFromInternet(), "");
-				info.setDescription(descr);
+				template = new SQLiteTileSource(app, f, TileSourceManager.getKnownSourceTemplates());
+			} else {
+				return;
 			}
+			String descr = "";
+			descr += app.getString(R.string.local_index_tile_data_name, template.getName());
+			descr += "\n" + app.getString(R.string.local_index_tile_data_minzoom, template.getMinimumZoomSupported());
+			descr += "\n" + app.getString(R.string.local_index_tile_data_maxzoom, template.getMaximumZoomSupported());
+			descr += "\n" + app.getString(R.string.local_index_tile_data_downloadable, template.couldBeDownloadedFromInternet());
+			if(template.getExpirationTimeMinutes() >= 0) {
+				descr += "\n" + app.getString(R.string.local_index_tile_data_expire, template.getExpirationTimeMinutes());
+			}
+			descr += "\n" + app.getString(R.string.local_index_tile_data_zooms, zooms.toString());
+			info.setDescription(descr);
 		} else {
 			OsmandPlugin.onUpdateLocalIndexDescription(info);
 		}
--- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
@ -330,7 +330,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 		t.execute(new Void[0]);
 	}

-	public static void defineNewEditLayer(final MapActivity activity, final ResultMatcher<TileSourceTemplate> resultMatcher) {
+	public static void defineNewEditLayer(final Activity activity, final ResultMatcher<TileSourceTemplate> resultMatcher) {
 		final OsmandApplication app = (OsmandApplication) activity.getApplication();
 		final OsmandSettings settings = app.getSettings();
 		final Map<String, String> entriesMap = settings.getTileSourceEntries(false);
@ -363,7 +363,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 			@Override
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 				if (position > 0) {
-					File f = activity.getMyApplication().getAppPath(IndexConstants.TILES_INDEX_DIR + templates.get(position));
+					File f = ((OsmandApplication) activity.getApplication()).getAppPath(IndexConstants.TILES_INDEX_DIR + templates.get(position));
 					TileSourceTemplate template = TileSourceManager.createTileSourceTemplate(f);
 					if (template != null) {
 						result[0] = template.copy();
--- a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
@ -22,6 +22,7 @@ public class SettingsRasterMapsActivity extends SettingsBaseActivity {
 	private ListPreference overlayPreference;
 	private ListPreference underlayPreference;
 	public static final String MORE_VALUE = "MORE_VALUE";
+	public static final String DEFINE_EDIT = "DEFINE_EDIT";
 	
 	@Override
    public void onCreate(Bundle savedInstanceState) {
@ -155,6 +156,9 @@ public class SettingsRasterMapsActivity extends SettingsBaseActivity {
 		}
 		entries[ki] = getMyApplication().getString(R.string.install_more);
 		values[ki] = MORE_VALUE;
+		ki++;
+		entries[ki] = getMyApplication().getString(R.string.maps_define_edit);
+		values[ki] = DEFINE_EDIT;
 		fill(tileSourcePreference, entries, values, value);
 	}
 	
@ -183,6 +187,17 @@ public class SettingsRasterMapsActivity extends SettingsBaseActivity {
 								return true;
 							}
 						});
+					} else if(DEFINE_EDIT.equals(newValue)){
+						OsmandRasterMapsPlugin.defineNewEditLayer(SettingsRasterMapsActivity.this, new ResultMatcher<TileSourceTemplate>() {
+							@Override
+							public boolean isCancelled() { return false;}
+
+							@Override
+							public boolean publish(TileSourceTemplate object) {
+								updateTileSourceSummary();
+								return true;
+							}
+						});
 					} else if(preference == tileSourcePreference){
 						settings.MAP_TILE_SOURCES.set((String) newValue);
 						updateTileSourceSummary();