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

OsmAnd/res/values-cs/strings.xml

@@ -1841,8 +1841,8 @@ s často kladenými otázkami.</string>
 <string name="edit_group">Upravit skupinu</string>
     <string name="nautical_maps_missing">Pro zobrazování námořních map je třeba stáhnout speciální mapu</string>
 	<string name="world_ski_missing">Pro zobrazování lyžařských map je třeba stáhnout speciální mapu</string>
-    <string name="plugin_ski_name">Lyžařské mapy</string>
-    <string name="plugin_nautical_name">Námořní mapy</string>
+    <string name="plugin_ski_name">Lyžařský mapový pohled</string>
+    <string name="plugin_nautical_name">Námořní mapový pohled</string>
     <string name="share_note">Sdílet poznámku</string>
 	<string name="rename_recording">Přejmenovat záznam</string>
 	<string name="notes">Poznámky</string>
@@ -1855,4 +1855,11 @@ s často kladenými otázkami.</string>
 	<string name="video">Video</string>
 	<string name="photo">Fotografie</string>
 	<string name="watch">Zobrazit</string>
+	<string name="selected_tracks">Vybrané</string>
+	<string name="showed_on_map">Zobrazené na mapě</string>
+	<string name="rename_failed">Přejmenování selhalo.</string>
+	<string name="currently_recording_track">Právě zaznamenávaná trasa</string>
+	<string name="back_to_map">Zpět na mapu</string>
+	<string name="plugin_touringview_name">Cestovní mapový pohled (Touring view)</string>
+	<string name="rendering_attr_pisteGrooming_name">Úprava sjezdovky</string>
     </resources>

OsmAnd/res/values-es/strings.xml

@@ -912,7 +912,7 @@
   <string name="osmand_parking_am">AM</string>
   <string name="osmand_parking_position_name">Punto de aparcamiento</string>
   <string name="osmand_parking_plugin_description">Extra adicional (descarga aparte) que permite guardar la ubicación de tu automóvil aparcado.</string>
-  <string name="osmand_parking_plugin_name">Posición de aparcamiento (plugin externo)</string>
+  <string name="osmand_parking_plugin_name">Posición de aparcamiento</string>
   <string name="context_menu_item_add_parking_point">Marcar como posición de aparcamiento</string>
   <string name="context_menu_item_delete_parking_point">Eliminar un marcador de aparcamiento</string>
   <string name="starting_point_too_far">Punto de inicio demasiado lejos de la carretera más cercana.</string>
@@ -1074,7 +1074,7 @@
 	<string name="index_srtm_parts">piezas</string>
     <string name="index_srtm_ele">Curvas de nivel</string>
     <string name="srtm_plugin_description">Extra adicional (descarga aparte) que permite descargar curvas de nivel y relieve sombreado (\'Opciones\' → \'Gestionar mapas\' → \'Descargar\' → Seleccionar el tipo de mapa deseado). Estos se pueden mostrar en combinación con los mapas sin conexión OsmAnd.</string>
-    <string name="srtm_plugin_name">Contornos de nivel (plugin externo)</string>
+    <string name="srtm_plugin_name">Contornos de nivel</string>
     <string name="download_select_map_types">Otros mapas</string>
     <string name="download_srtm_maps">Curvas de nivel</string>
     
@@ -1957,5 +1957,5 @@
 	<string name="rename_failed">Falló el renombrado.</string>
 	<string name="currently_recording_track">Actualmente registrando traza</string>
 	<string name="back_to_map">Volver al mapa</string>
-	<string name="selected_tracks">Seleccionado(s)</string>
+	<string name="selected_tracks">Seleccionada(s)</string>
 	</resources>

OsmAnd/res/values-fr/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <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 :
@@ -1964,4 +1964,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="back_to_map">Retour à la carte</string>
 	<string name="turn_off_all">Tout éteindre</string>
 	<string name="showed_on_map">Affiché sur la carte</string>
+	<string name="selected_tracks">Sélectionné</string>
 	</resources>

OsmAnd/res/values-it/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <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>
@@ -2116,4 +2116,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="showed_on_map">Visualizzato sulla mappa</string>
 	<string name="days_behind">giorni fa</string>
 	<string name="currently_recording_track">Traccia attualmente in registrazione</string>
+<string name="selected_tracks">Selezionato</string>
 	</resources>

OsmAnd/res/values-ko/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
 	
 	<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
@@ -2179,4 +2179,5 @@
 	<string name="rename_failed">이름 바꾸기 실패 했습니다.</string>
 	<string name="currently_recording_track">현재 기록중인 트랙</string>
 	<string name="back_to_map">지도로 돌아가기</string>
+	<string name="selected_tracks">선탹</string>
 	</resources>

OsmAnd/src/net/osmand/plus/helpers/FileNameTranslationHelper.java

@@ -208,7 +208,7 @@ public class FileNameTranslationHelper {
 			return ctx.getString(R.string.index_item_world_basemap);
 		} else if (basename.equals("world_bitcoin_payments")) {
 			return ctx.getString(R.string.index_item_world_bitcoin_payments);
-		} else if (basename.equals("world_basemap_seamarks")) {
+		} else if (basename.equals("world_seamarks_basemap")) {
 			return ctx.getString(R.string.index_item_world_seamarks);
 		}
 		return null;