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

OsmAnd/res/layout/activity_livie_updates.xml

@@ -22,7 +22,6 @@
     <android.support.v4.view.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="match_parent"/>
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
 </LinearLayout>

OsmAnd/res/layout/dialog_live_updates_item_settings.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/dashboard_blue"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Flevoland"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="The Netherlands"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/color_white"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Update: 4 Dec 2015, 14:41"/>
+    </LinearLayout>
+
+    <GridLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_gravity="fill_horizontal"
+            android:text="Live update"/>
+        <Switch/>
+        <TextView
+            android:layout_width="0dp"
+            android:layout_gravity="fill_horizontal"
+            android:text="Only download over WiFi"
+            android:layout_row="2"
+            android:layout_column="0"/>
+        <Switch/>
+        <TextView
+            android:layout_width="0dp"
+            android:layout_gravity="fill_horizontal"
+            android:text="Live update"
+            android:layout_row="3"
+            android:layout_column="0"/>
+        <Spinner/>
+    </GridLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/color_white"/>
+</LinearLayout>

OsmAnd/res/layout/fragment_live_updates.xml

@@ -1,106 +1,7 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ListView android:id="@android:id/list"
-              xmlns:tools="http://schemas.android.com/tools"
+          xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
+          xmlns:tools="http://schemas.android.com/tools"
-              android:layout_height="match_parent"
+          android:layout_width="match_parent"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
+          android:layout_height="match_parent"
-              tools:context=".liveupdates.LiveUpdatesFragment">
+          android:orientation="vertical"
-
+          tools:context=".liveupdates.LiveUpdatesFragment"/>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <net.osmand.plus.widgets.TextViewEx
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/shared_string_on"
-            app:textAllCapsCompat="true"/>
-
-        <include
-            layout="@layout/check_item_rel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            />
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="14dp"
-        android:layout_marginRight="14dp"
-        android:layout_marginTop="14dp"
-        android:background="?attr/bg_card"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:minHeight="44dp"
-            android:layout_height="wrap_content"
-            android:gravity="center">
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:text="Subscription status"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_regular"/>
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:text="Work"
-                android:id="@+id/nameTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_medium"
-                tools:text="very very very long poi name"/>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:minHeight="44dp"
-            android:layout_height="wrap_content"
-            android:gravity="center">
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/amenityTagTextView"
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:text="@string/tag_poi_amenity"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_regular"/>
-
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="?attr/dashboard_divider"/>
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/amenityTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/default_desc_text_size"
-                app:typeface="@string/font_roboto_medium"
-                tools:text="landmark"/>
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>

OsmAnd/res/layout/live_updates_header.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <net.osmand.plus.widgets.TextViewEx
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/shared_string_on"
+            app:textAllCapsCompat="true"/>
+
+        <include
+            layout="@layout/check_item_rel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="14dp"
+        android:layout_marginRight="14dp"
+        android:layout_marginTop="14dp"
+        android:background="?attr/bg_card"
+        android:orientation="vertical"
+        tools:showIn="@layout/fragment_live_updates">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:minHeight="44dp">
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="120dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:text="Subscription status"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/default_desc_text_size"
+                app:typeface="@string/font_roboto_regular"/>
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginTop="4dp"
+                android:text="Work"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/default_desc_text_size"
+                app:typeface="@string/font_roboto_medium"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dashboard_divider"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:minHeight="44dp">
+
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="120dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:text="Support country"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/default_desc_text_size"
+                app:typeface="@string/font_roboto_regular"/>
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginTop="4dp"
+                android:text="Ukraine"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/default_desc_text_size"
+                app:typeface="@string/font_roboto_medium"/>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dashboard_divider"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:minHeight="44dp">
+
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="120dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:text="Last pay"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/default_desc_text_size"
+                app:typeface="@string/font_roboto_regular"/>
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginTop="4dp"
+                android:text="25 Nov 2015"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/default_desc_text_size"
+                app:typeface="@string/font_roboto_medium"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Available maps"/>
+
+</LinearLayout>

OsmAnd/res/values-be/strings.xml

@@ -1559,7 +1559,7 @@
     <string name="use_opengl_render_descr">Выкарыстоўваць апаратнае паскарэньне OpenGL (можа не працаваць на некаторых прыстасаваньнях)</string>
     <string name="everything_up_to_date">Усе файлы ў актуальным стане</string>
     <string name="no_internet_connection">Немагчыма cьцягнуць. Калі ласка, праверце ваша Інтэрнэт-злучэньне.</string>
-    <string name="download_tab_downloads">Усе cьцягваньні</string>
+    <string name="download_tab_downloads">Усё cьцягнутае</string>
     <string name="download_tab_updates">Абнаўленьні</string>
     <string name="download_tab_local">Лякальныя</string>
 	<string name="navigate_point_zone">Зона</string>

OsmAnd/res/values-bg/strings.xml

@@ -199,17 +199,17 @@
     <string name="map_widget_monitoring_services">Услуги за записи</string>
     <string name="no_route">Няма маршрут</string>
     <string name="delete_target_point">Премахни точката</string>
-    <string name="target_point">Междинна точка %1$s</string>
+    <string name="target_point">Междинна точка \'%1$s\'</string>
-    <string name="intermediate_point">Междинна точка %1$s</string>
+    <string name="intermediate_point">Междинна точка \'%1$s\'</string>
     <string name="context_menu_item_last_intermediate_point">Добави като последна междинна точка</string>
     <string name="context_menu_item_first_intermediate_point">Добави като първа междинна точка</string>
-    <string name="add_as_last_destination_point">Добави като крайна цел</string>
+    <string name="add_as_last_destination_point">Добави като последна междинна точка</string>
     <string name="add_as_first_destination_point">Добави като първа междинна точка</string>
-    <string name="replace_destination_point">Смяна на крайна цел</string>
+    <string name="replace_destination_point">Смяна на точка</string>
     <string name="new_destination_point_dialog">Вече сте задали крайна цел.</string>
     <string name="target_points">Междинни точки</string>
     <string name="intermediate_point_too_far">Междинна точка %1$s е твърде далеч от най-близкия път.</string>
-    <string name="arrived_at_intermediate_point">Пристигнахте в указаното място</string>
+    <string name="arrived_at_intermediate_point">Пристигнахте в междинна точка</string>
     <string name="context_menu_item_intermediate_point">Добави  като междинна точка</string>
     <string name="map_widget_intermediate_distance">Междинна точка</string>
     <string name="ending_point_too_far">Крайната цел е твърде далеч от най-близкия път.</string>
@@ -1301,7 +1301,7 @@
 
     <string name="show_zoom_buttons_navigation_descr">Показвай бутоните за мащаб по време на навигация</string>
     <string name="show_zoom_buttons_navigation">Показвай бутоните за мащаб</string>
-    <string name="select_destination_and_intermediate_points">Избор на междинни точки</string>
+    <string name="select_destination_and_intermediate_points">Изберете крайна цел</string>
     <string name="layer_amenity_label">Етикети на точките</string>
     <string name="loading_smth">Зареждане %1$s …</string>
     <string name="map_widget_plain_time">Текущо време</string>
@@ -1804,7 +1804,7 @@
     <string name="osm_edit_modified_poi">Модифицирани OSM POI</string>
     <string name="osm_edit_deleted_poi">Изтрити OSM POI</string>
     <string name="context_menu_item_open_note">Отвори OSM бележка</string>
-    <string name="please_specify_poi_type_only_from_list">"Моля, задайте правилния тип POI или пропуснете. "</string>
+    <string name="please_specify_poi_type_only_from_list">Моля, задайте правилния тип POI или пропуснете</string>
     <string name="access_from_map_description">Бутонът \'Меню\' стартира таблото за управление</string>
     <string name="access_from_map">Достъп от картата</string>
     <string name="show_on_start_description">Ако е изключено се стартира с екрана на картата</string>
@@ -1992,8 +1992,8 @@
 <string name="osmo_auto_send_locations_descr">Автоматично стартиране на тракер сесия и изпращане на данни</string>
     <string name="shared_string_near">Близо</string>
     <string name="shared_string_hide">Скрий</string>
-    <string name="av_video_quality_low">Най-ниска резолюция</string>
+    <string name="av_video_quality_low">Най-ниско качество</string>
-    <string name="av_video_quality_high">Най-висока резолюция</string>
+    <string name="av_video_quality_high">Най-високо качество</string>
     <string name="av_video_quality">Качество на видеото</string>
     <string name="av_video_quality_descr">Изберете качество на видеото</string>
     <string name="av_audio_format">Формат за аудио изход</string>
@@ -2006,4 +2006,5 @@
     <string name="local_index_description">Докоснете върху елемент за да видите повече информация, натиснете и задръжте за да деактивирате или да изтриете. Данни в устройството (%1$s свободни):</string>
 	<string name="number_of_rows_in_dash">Брой редове %1$s</string>
 	<string name="dashboard_or_drawer_description">Можете да управлявате приложението чрез гъвкаво табло или чрез статично меню. Вашият избор може да бъде променен по-късно.</string>
-</resources>
+<string name="rendering_attr_horseRoutes_name">Пътеки за конна езда</string>
+    </resources>

OsmAnd/res/values-ca/phrases.xml

@@ -2051,4 +2051,9 @@
 	<string name="poi_social_facility_workshop">Equipament social: taller</string>
 	<string name="poi_historic_aircraft">Avió històric</string>
 
+	<string name="poi_service_bicycle_pump_no">Inflat de rodes de bicicleta: no</string>
+	<string name="poi_service_bicycle_cleaning_yes">Neteja de bicicletes: sí</string>
+	<string name="poi_service_bicycle_cleaning_no">Neteja de bicicletes: no</string>
+	<string name="poi_wildlife_hide">Lloc d\'observació de fauna en llibertat</string>
+
 	</resources>

OsmAnd/res/values-cs/strings.xml

@@ -818,18 +818,18 @@
     <string name="poi_filter_restaurants">Restaurace</string>
     <string name="poi_filter_sightseeing">Pamětihodnosti</string>
     <string name="snap_to_road">Pohyb po silnicích</string>
-    <string name="intermediate_point_too_far">Bod %1$s je příliš daleko od nejbližší cesty.</string>
+    <string name="intermediate_point_too_far">Mezicíl %1$s je příliš daleko od nejbližší cesty.</string>
     <string name="arrived_at_intermediate_point">Dorazili jste do mezicíle</string>
-    <string name="context_menu_item_intermediate_point">Přidat mezicíl</string>
+    <string name="context_menu_item_intermediate_point">Přidat jako mezicíl</string>
     <string name="map_widget_intermediate_distance">Mezicíl</string>
     <string name="ending_point_too_far">Cíl je příliš daleko od nejbližší cesty.</string>
     <string name="add_tag">Přidat označení</string>
     <string name="btn_advanced_mode">Pokročilý režim…</string>
     <string name="poi_filter_emergency">Pohotovost</string>
-    <string name="context_menu_item_last_intermediate_point">Přidat jako poslední cíl</string>
+    <string name="context_menu_item_last_intermediate_point">Přidat jako poslední mezicíl</string>
-    <string name="context_menu_item_first_intermediate_point">Nastavit jako první cíl</string>
+    <string name="context_menu_item_first_intermediate_point">Nastavit jako první mezicíl</string>
-    <string name="add_as_last_destination_point">Přidat jako poslední cíl</string>
+    <string name="add_as_last_destination_point">Přidat jako poslední mezicíl</string>
-    <string name="add_as_first_destination_point">Přidat jako první cíl</string>
+    <string name="add_as_first_destination_point">Přidat jako první mezicíl</string>
     <string name="replace_destination_point">Nahradit cílový bod</string>
     <string name="new_destination_point_dialog">Cílový bod je již nastaven.</string>
     <string name="target_point">Cíl %1$s</string>
@@ -842,7 +842,7 @@
     <string name="map_widget_monitoring_services">Sledování polohy</string>
     <string name="no_route">Žádná cesta</string>
     <string name="delete_target_point">Smazat cíl</string>
-    <string name="intermediate_point">Mezicíl %1$s</string>
+    <string name="intermediate_point">Cíl %1$s</string>
     <string name="map_widget_show_destination_arrow">Zobrazit směr do cíle</string>
     <string name="enable_plugin_monitoring_services">Zapněte modul \"služba na pozadí\" pro záznam trasy a přímý přenos souřadnic (GPX logování, online sledování)</string>
     <string name="non_optimal_route_calculation">Počítat možná méně výhodnou trasu na dlouhé vzdálenosti</string>
@@ -916,7 +916,7 @@
     <string name="dropbox_plugin_description">Modul Dropbox umožňuje nahrávat trasy, audio a video poznámky do vašeho účtu Dropbox.</string>
     <string name="osmand_srtm_long_description_1000_chars">"Tento modul poskytuje zobrazení vrstevnic a vrstvy stínování kopců, které mohou být zobrazené na standardních OsmAnd mapách. Tato funkce je vhodná především pro atlety, turisty, chodce a vůbec všechny které zajímá profil terénu.\n\nCelosvětová výšková data (mezi 70 stupni severní šířky a 70 stupni jižní šířky) se zakládají na měřeních SRTM (Shuttle Radar Topography Mission) a ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), snímkovací přístroj na palubě satelitu Terra, vlajkového satelitu Systému pozorování Země NASA. ASTER je společným projektem NASA, japonského ministerstva hospodářství, obchodu a průmyslu (METI) a Japan Space Systems (J-spacesystems). "</string>
     <string name="stop_routing_confirm">Opravdu chcete zastavit navigaci?</string>
-    <string name="clear_dest_confirm">Opravdu chcete smazat cíl?</string>
+    <string name="clear_dest_confirm">Opravdu chcete smazat cíl (a mezicíle)?</string>
     <string name="recording_context_menu_show">Zobrazit</string>
     <string name="recording_photo_description">Foto %1$s %2$s</string>
     <string name="av_def_action_picture">Vyfotit</string>
@@ -993,11 +993,11 @@
     <string name="context_menu_item_destination_point">Nastavit jako cíl</string>
     <string name="please_select_address">Zvolte nejprve město nebo ulici</string>
     <string name="search_street_in_neighborhood_cities">Hledat ulice v okolních obcích</string>
-    <string name="intermediate_items_sort_return">Pořadí mezicílů bylo utříděno, aby měly optimální pořadí na cestě z aktuálního místa do místa určení .</string>
+    <string name="intermediate_items_sort_return">Pořadí mezicílů bylo utříděno, pro optimální pořadí na cestě z aktuálního místa do místa určení.</string>
     <string name="intermediate_items_sort_by_distance">Utřídit ode dveří ke dveřím</string>
     <string name="osb_author_or_password_not_specified">Prosím zadejte v Nastaveních uživatelské jméno a heslo pro vstup do OSM</string>
-    <string name="clear_intermediate_points">Smazat cíle</string>
+    <string name="clear_intermediate_points">Smazat mezicíle</string>
-    <string name="keep_intermediate_points">Zachovat cíle</string>
+    <string name="keep_intermediate_points">Zachovat mezicíle</string>
     <string name="route_descr_map_location">Mapa: </string>
     <string name="route_to">Do:</string>
     <string name="route_via">Přes:</string>
@@ -1016,7 +1016,7 @@
     <string name="av_camera_focus_continuous">Kamera ostří souvisle</string>
     <string name="av_photo_play_sound">Přehrát zvuk závěrky</string>
     <string name="av_photo_play_sound_descr">Zvolte zda při vyfotografování snímku má být přehrán zvuk závěrky</string>
-    <string name="new_directions_point_dialog">Cíle jsou již zvoleny.</string>
+    <string name="new_directions_point_dialog">Mezicíle jsou již nastaveny.</string>
     <string name="context_menu_item_directions_to">Navigovat sem</string>
     <string name="context_menu_item_directions_from">Navigovat odsud</string>
     <string name="announce_gpx_waypoints">GPX body</string>
@@ -1287,7 +1287,7 @@
     <string name="gpx_wpt">Bod na trase</string>
     <string name="selected_gpx_info_show">\n\nStiskněte a podržte pro zobrazení na mapě</string>
     <string name="save_as_favorites_points">Uložit jako skupinu oblíbených</string>
-    <string name="select_destination_and_intermediate_points">Vybrat body na trase</string>
+    <string name="select_destination_and_intermediate_points">Vybrat cíle</string>
     <string name="layer_amenity_label">Popisky bodů</string>
     <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> mapová klasifikace s obrázky</string>
     <string name="show_zoom_buttons_navigation_descr">Zobrazit tlačítka lupy během navigace</string>
@@ -1821,7 +1821,7 @@
     <string name="lang_als">Albánsky (Tosk)</string>
     <string name="read_more">Číst více</string>
     <string name="save_poi_without_poi_type_message">Opravdu chcete uložit bod POI bez uvedení typu?</string>
-    <string name="please_specify_poi_type_only_from_list">"Prosím zadejte správný typ POI nebo ho přeskočte. "</string>
+    <string name="please_specify_poi_type_only_from_list">Prosím zadejte správný typ POI nebo ho přeskočte</string>
     <string name="access_from_map_description">Tlačítko menu spustí domovskou obrazovku, ne menu</string>
     <string name="access_from_map">Přístup z mapy</string>
     <string name="copied_to_clipboard">Zkopírované do schránky</string>
@@ -1863,8 +1863,8 @@
 	<string name="no_address_determined">Adresa nebyla určena</string>
 	<string name="shared_string_near">Nedaleko</string>
     <string name="shared_string_hide">Skrýt</string>
-    <string name="av_video_quality_low">Nejnižší rozlišení</string>
+    <string name="av_video_quality_low">Nejnižší kvalita</string>
-    <string name="av_video_quality_high">Nejvyšší rozlišení</string>
+    <string name="av_video_quality_high">Nejvyšší kvalita</string>
     <string name="av_video_quality">Kvalita video výstupu</string>
     <string name="av_video_quality_descr">Vybrat kvalitu video výstupu</string>
     <string name="av_audio_format">Formát audio výstupu</string>

OsmAnd/res/values-es-rAR/strings.xml

@@ -1986,16 +1986,16 @@
     <string name="dashboard_or_drawer_description">Nueva opción para controlar principalmente la aplicación a través del panel de control flexible o un menú estático. Puedes cambiar esto luego, en los ajustes del panel.</string>
     <string name="access_from_map_description">El botón del menú, muestra el panel de control, en lugar del menú</string>
     <string name="access_from_map">Acceso desde el mapa</string>
-    <string name="please_specify_poi_type_only_from_list">"Especifique el tipo de PDI correcto u omítelo. "</string>
+    <string name="please_specify_poi_type_only_from_list">Indique el tipo de PDI correcto u omítelo</string>
     <string name="routing_attr_avoid_stairs_name">Evitar escaleras</string>
 	<string name="routing_attr_avoid_stairs_description">Evitar pasar por escaleras</string>
 	<string name="routing_attr_avoid_borders_name">Evitar cruces fronterizos</string>
 	<string name="shared_string_near">Cerca de</string>
     <string name="shared_string_hide">Ocultar</string>
-    <string name="av_video_quality_low">Baja resolución</string>
+    <string name="av_video_quality_low">Baja calidad</string>
-    <string name="av_video_quality_high">Alta resolución</string>
+    <string name="av_video_quality_high">Alta calidad</string>
     <string name="av_video_quality">Calidad del video</string>
-    <string name="av_video_quality_descr">Elige la calidad del video</string>
+    <string name="av_video_quality_descr">Elige la calidad de salida del video</string>
     <string name="av_audio_format">Formato de audio</string>
     <string name="av_audio_format_descr">Elige el formato del video</string>
     <string name="av_audio_bitrate">Bitrate del audio</string>

OsmAnd/res/values-es/strings.xml

@@ -1985,20 +1985,21 @@
     <string name="use_drawer_btn">Usar menú</string>
     <string name="access_from_map_description">El botón del menú, muestra el panel de control, en lugar del menú</string>
     <string name="access_from_map">Acceso desde el mapa</string>
-    <string name="please_specify_poi_type_only_from_list">"Especifique el tipo de PDI correcto u omítelo. "</string>
+    <string name="please_specify_poi_type_only_from_list">Indique el tipo de PDI correcto u omítelo</string>
     <string name="routing_attr_avoid_stairs_name">Evitar escaleras</string>
 	<string name="routing_attr_avoid_stairs_description">Evitar pasar por escaleras</string>
 	<string name="routing_attr_avoid_borders_name">Evitar cruces fronterizos</string>
 	<string name="shared_string_near">Cerca de</string>
     <string name="shared_string_hide">Ocultar</string>
-    <string name="av_video_quality_low">Baja resolución</string>
+    <string name="av_video_quality_low">Baja calidad</string>
-    <string name="av_video_quality_high">Alta resolución</string>
+    <string name="av_video_quality_high">Alta calidad</string>
     <string name="av_video_quality">Calidad del video</string>
-    <string name="av_video_quality_descr">Seleccionar calidad del vídeo</string>
+    <string name="av_video_quality_descr">Seleccione la calidad de salida del vídeo</string>
     <string name="av_audio_format">Formato del audio</string>
     <string name="av_audio_format_descr">Selecciones el formato de salida del audio</string>
     <string name="av_audio_bitrate">Bitrate del audio</string>
     <string name="av_audio_bitrate_descr">Seleccionar la tasa de bits del audio</string>
     <string name="no_address_found">Dirección indeterminada</string>
 	<string name="looking_up_address">Buscando dirección</string>
+    <string name="rendering_attr_horseRoutes_name">Rutas a caballo</string>
     </resources>

OsmAnd/res/values-it/strings.xml

@@ -1760,7 +1760,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="waypoint_visit_before">Visita prima</string>
     <string name="shared_string_collapse">Compatta</string>
     <string name="action_create">Azione crea</string>
-    <string name="action_modify">Azione modifica</string>
+    <string name="action_modify">Modificato</string>
     <string name="action_delete">Azione elimina</string>
     <string name="osm_edits">Modifiche OSM</string>
     <string name="osmand_parking_hour">h</string>
@@ -2078,9 +2078,21 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="use_dashboard_btn">Usa il pannello di controllo</string>
     <string name="use_drawer_btn">Utilizza menu</string>
     <string name="dashboard_or_drawer_title">Pannello di controllo o menù</string>
-    <string name="please_specify_poi_type_only_from_list">"Specifica il corretto tipo di PDI o salta questo passaggio "</string>
+    <string name="please_specify_poi_type_only_from_list">Specifica il corretto tipo di PDI o salta questo passaggio</string>
     <string name="routing_attr_avoid_stairs_name">Evita le scale</string>
 	<string name="routing_attr_avoid_stairs_description">Evita le scale</string>
 	<string name="release_2_2">" • Nuova interfaccia utente variabile in base al contesto per le località selezionate sulla mappa e negli altri schermi\n\n • La schermata della mappa è avviata direttamente se non è selezionato \"Mostra il pannello di controllo all\'avvio\"\n\n • Configura quali e come vengono visualizzate le voci nel pannello di controllo\n\n • Salta il pannello di controllo se preferisci i controlli dell\'app tipo menu\n\n • Per scaricare mappe, regioni è possibile selezionarle direttamente tappando sulla mappa mondiale\n\n • La ricerca di PDI ora supporta interrogazioni più specifiche POI\n\n • Migliorata la modifica di PDI e dati OSM\n\n • Struttura e interfaccia di download dei dati della mappa rivista\n\n e altro… "</string>
     <string name="dashboard_or_drawer_description">C\'è una nuova scelta per controllare l\'app attraverso il personalizzabile pannello di controllo o tramite il menu statico. La tua scelta può sempre essere cambiata nelle impostazioni del pannello di controllo.</string>
-</resources>
+<string name="shared_string_near">Vicino</string>
+    <string name="shared_string_hide">Nascondi</string>
+    <string name="av_video_quality_low">Qualità minima</string>
+    <string name="av_video_quality_high">Qualità massima</string>
+    <string name="av_video_quality">Qualità dell\'output video</string>
+    <string name="av_video_quality_descr">Scegli la qualità dell\'output video</string>
+    <string name="av_audio_format">Formato dell\'output audio</string>
+    <string name="av_audio_format_descr">Scegli il formato dell\'output audio</string>
+    <string name="av_audio_bitrate">Bitrate audio</string>
+    <string name="av_audio_bitrate_descr">Scegli il bitrate dell\'audio</string>
+    <string name="rendering_attr_horseRoutes_name">Percorsi a cavallo</string>
+    <string name="no_address_found">Nessun indirizzo trovato</string>
+    </resources>

OsmAnd/res/values-ku/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>    
+<?xml version='1.0' encoding='utf-8'?>
+<resources>    
 	
     <string name="local_indexes_cat_av">زانیاری دەنگ/ڤیدیۆ</string>
     <string name="stop_routing_confirm">دڵنیای له وەی که ئه ته وێت ناڤیگێشن راگریت</string>
@@ -16,4 +17,21 @@
     <string name="favourites_edit_dialog_title">Agahdarî En Qu Mın</string>
     <string name="shared_string_upload">Barkiri</string>
     <string name="go_to_map">Here Nexşe</string>
-    </resources>
+    <string name="shared_string_near">Nezik</string>
+    <string name="av_audio_format">Şekle Derketina Deng</string>
+    <string name="osb_comment_dialog_message">peyam</string>
+    <string name="osb_comment_dialog_author">Nave Nivîskar</string>
+    <string name="shared_string_location">Cih</string>
+    <string name="shared_string_qr_code">QR Qod</string>
+    <string name="map_downloaded">Nexş Hatte Daxistin</string>
+    <string name="shared_string_send">Bişîne</string>
+    <string name="regions">Herêman</string>
+    <string name="world_maps">Nexşa Cîhane</string>
+    <string name="traffic_warning_hazard">Tirs</string>
+    <string name="rendering_attr_horseRoutes_name">Riya Haspa</string>
+    <string name="shared_string_hide">Veşere</string>
+    <string name="contact_us">Ji me re binivîsin</string>
+    <string name="feedback">Gotine wa</string>
+    <string name="search_on_the_map_item">Lêgerîn Nexşa</string>
+    <string name="other_menu_group">Adin</string>
+    </resources>

OsmAnd/res/values-lt/strings.xml

@@ -2015,6 +2015,10 @@
     <string name="osm_save_offline">Išsaugoti įrenginyje</string>
     <string name="lang_nds">Vokiečių žemaičių</string>
     <string name="shared_string_hide">Slėpti</string>
-    <string name="av_video_quality_low">Žemiausia raiška</string>
+    <string name="av_video_quality_low">Žemiausia kokybė</string>
-    <string name="av_video_quality_high">Aukščiausia raiška</string>
+    <string name="av_video_quality_high">Aukščiausia kokybė</string>
+    <string name="no_address_found">Adresas nerastas</string>
+    <string name="av_audio_format">Garso formatas</string>
+    <string name="av_audio_format_descr">Pasirinkite garso formatą</string>
+    <string name="av_video_quality_descr">Pasirinkite vaizdo kokybę</string>
     </resources>

OsmAnd/res/values-nl/phrases.xml

@@ -7,7 +7,7 @@
 	<string name="poi_convenience">Supermarkt</string>
 	<string name="poi_mall">Winkelcentrum</string>
 	<string name="poi_beverages">Drankwinkel</string>
-	<string name="poi_butcher">Vleesmarkt</string>
+	<string name="poi_butcher">Slagerij</string>
 	<string name="poi_deli">Delicatessenwinkel</string>
 	<string name="poi_farm">Boerderijwinkel</string>
 	<string name="poi_greengrocer">Groentewinkel</string>
@@ -28,15 +28,15 @@
 	<string name="poi_baby_goods">Babywinkel</string>
 	<string name="poi_bag">Lederwaren</string>
 	<string name="poi_bathroom_furnishing">Sanitairwinkel</string>
-	<string name="poi_bed">Beddenwinkel</string>
+	<string name="poi_bed">Beddenspeciaalzaak</string>
-	<string name="poi_boutique">Modezaak</string>
+	<string name="poi_boutique">Modeboetiek</string>
 	<string name="poi_carpet">Tapijtwinkel</string>
 	<string name="poi_chemist">Drogisterij</string>
-	<string name="poi_clothes">Kledingwinkel</string>
+	<string name="poi_clothes">Kledingzaak</string>
 	<string name="poi_clothes_children">Kinderkledingwinkel</string>
 	<string name="poi_shoes">Schoenenwinkel</string>
 	<string name="poi_computer">Computerwinkel</string>
-	<string name="poi_copyshop">Kopieerzaak</string>
+	<string name="poi_copyshop">Kopieerwinkel</string>
 	<string name="poi_curtain">Gordijnwinkel</string>
 	<string name="poi_fabric">Stoffenwinkel</string>
 	<string name="poi_bedding">Beddenwinkel</string>
@@ -51,52 +51,52 @@
 	<string name="poi_hardware">IJzerhandel</string>
 	<string name="poi_hearing_aids">Hoorapparaten</string>
 	<string name="poi_fishing">Hengelsportzaak</string>
-	<string name="poi_frame">Fotolijstwinkel</string>
+	<string name="poi_frame">Lijstenmakerij</string>
 	<string name="poi_furniture">Meubelwinkel</string>
 	<string name="poi_general">Winkel in diverse goederen</string>
-	<string name="poi_herbalist">Kruidenierszaak</string>
+	<string name="poi_herbalist">Kruidenwinkel</string>
 	<string name="poi_hifi">Hi-Fi-winkel</string>
 	<string name="poi_houseware">Huishoudzaak</string>
 	<string name="poi_hunting">Jachtwinkel</string>
 	<string name="poi_interior_decoration">Interieurdecoratiewinkel</string>
 	<string name="poi_jewelry">Juwelier</string>
 	<string name="poi_kiosk">Kiosk</string>
-	<string name="poi_kitchen">Kookwinkel</string>
+	<string name="poi_kitchen">Keukenwinkel</string>
 	<string name="poi_mobile_phone">Mobiele telefoon-winkel</string>
-	<string name="poi_motorcycle">Motorwinkel</string>
+	<string name="poi_motorcycle">Motordealer</string>
 	<string name="poi_musical_instrument">Muziekinstrumentenwinkel</string>
-	<string name="poi_newsagent">Persagentschap</string>
+	<string name="poi_newsagent">Krantenkiosk</string>
 	<string name="poi_optician">Opticien</string>
 	<string name="poi_organic">Biologische voedingswinkel</string>
 	<string name="poi_outdoor">Buitensportwinkel</string>
 	<string name="poi_paint">Verfwinkel</string>
 	<string name="poi_pet">Dierenwinkel</string>
-	<string name="poi_radiotechnics">Radiotechnics-winkel</string>
+	<string name="poi_radiotechnics">Radiotechniek-winkel</string>
 	<string name="poi_second_hand">Tweedehandswinkel</string>
-	<string name="poi_ship_chandler">Scheepsbevoorrader</string>
+	<string name="poi_ship_chandler">Scheepsuitrusting</string>
 	<string name="poi_sports">Sportwinkel</string>
-	<string name="poi_stationery">Briefpapierwinkel</string>
+	<string name="poi_stationery">Kantoorboekwinkel</string>
-	<string name="poi_tableware">Servieswinkel</string>
+	<string name="poi_tableware">Serviesgoed</string>
 	<string name="poi_ticket">Ticketwinkel</string>
 	<string name="poi_tobacco">Tabakswinkel</string>
 	<string name="poi_toys">Speelgoedwinkel</string>
-	<string name="poi_trade">Handelspost</string>
+	<string name="poi_trade">Bouwmaterialen</string>
 	<string name="poi_vacuum_cleaner">Stofzuigerwinkel</string>
 	<string name="poi_variety_store">Bazaar</string>
 	<string name="poi_video">Videotheek</string>
 	<string name="poi_window_blind">Rolluikenwinkel</string>
 	<string name="poi_department_store">Warenhuis</string>
 	<string name="poi_electronics">Elektronica-winkel</string>
-	<string name="poi_car">Autohandelaar</string>
+	<string name="poi_car">Autodealer</string>
 	<string name="poi_car_parts">Auto-onderdelenwinkel</string>
 	<string name="poi_atv">Quad-winkel</string>
 	<string name="poi_cosmetics">Cosmeticazaak</string>
 	<string name="poi_marketplace">Marktplaats</string>
-	<string name="poi_sewing">Confectiewinkel</string>
+	<string name="poi_sewing">Naaiwinkel</string>
 
 	<string name="poi_police">Politie</string>
 	<string name="poi_fire_station">Brandweer</string>
-	<string name="poi_emergency_phone">Noodtelefoon</string>
+	<string name="poi_emergency_phone">Praatpaal</string>
 	<string name="poi_fire_hydrant">Brandkraan</string>
 	<string name="poi_fire_extinguisher">Brandblusapparaat</string>
 	<string name="poi_fire_flapper">Vuurzweep</string>
@@ -111,21 +111,21 @@
 	<string name="poi_mountain_pass">Bergpas</string>
 	<string name="poi_gate">Poort</string>
 	<string name="poi_city_wall">Stadsmuur</string>
-	<string name="poi_lift_gate">Liftpoort</string>
+	<string name="poi_lift_gate">Slagboom</string>
 	<string name="poi_toll_booth">Tolpoort</string>
 	<string name="poi_border_control">Grenscontrole</string>
 	<string name="poi_traffic_calming_bump">Verkeersdrempel</string>
 	<string name="poi_traffic_calming_hump">Snelheidsdrempel</string>
 	<string name="poi_traffic_calming_cushion">Rijbaankussen</string>
-	<string name="poi_traffic_signals">Stoplicht</string>
+	<string name="poi_traffic_signals">Verkeerslicht</string>
 
 	<string name="poi_fuel">Tankstation</string>
-	<string name="poi_parking">Parking</string>
+	<string name="poi_parking">Parkeerplaats</string>
-	<string name="poi_motorcycle_parking">Motorparking</string>
+	<string name="poi_motorcycle_parking">Motorparkeerplaats</string>
-	<string name="poi_parking_entrance">Parkingsingang</string>
+	<string name="poi_parking_entrance">Parkeerplaats-toegang</string>
 	<string name="poi_garages">Garages</string>
 
-	<string name="poi_public_transport_platform">Halte voor openbaar vervoer</string>
+	<string name="poi_public_transport_platform">Halte Openbaar Vervoer</string>
 	<string name="poi_public_transport_platform_bus">Bushalte</string>
 	<string name="poi_public_transport_platform_trolleybus">Trolleybushalte</string>
 	<string name="poi_bus_stop">Bushalte</string>
@@ -152,7 +152,7 @@
 	<string name="poi_bicycle_rental">Fietsverhuur</string>
 	<string name="poi_bicycle_parking">Fietsenstalling</string>
 
-	<string name="poi_aerialway_gondola">Gondola</string>
+	<string name="poi_aerialway_gondola">Gondelbaan</string>
 	<string name="poi_water_tower">Watertoren</string>
 	<string name="poi_dam">Dam</string>
 	<string name="poi_power_plant">Elektriciteitscentrale</string>
@@ -409,7 +409,7 @@
 	<string name="poi_compressed_air">Perslucht</string>
 	<string name="poi_aerialway_cable_car">Kabelbaan</string>
 	<string name="poi_aerialway_chair_lift">Stoeltjeslift</string>
-	<string name="poi_aerialway_t_bar">2 persoons- sleeplift</string>
+	<string name="poi_aerialway_t_bar">Sleeplift</string>
 	<string name="poi_aerialway_j_bar">1 persoons- sleeplift</string>
 	<string name="poi_aerialway_platter">schotel sleeplift</string>
 	<string name="poi_aerialway_mixed_lift">Gemengde lift</string>
@@ -542,7 +542,7 @@
 	<string name="poi_emergency">Nooddiensten</string>
 	<string name="poi_transportation">Vervoer</string>
 	<string name="poi_education">Onderwijs</string>
-	<string name="poi_administrative">Administratie</string>
+	<string name="poi_administrative">Lokaal Bestuur</string>
 	<string name="poi_healthcare">Gezondheidzorg</string>
 	<string name="poi_office">Kantoor</string>
 	<string name="poi_sport">Sport</string>
@@ -685,8 +685,8 @@
 		<string name="poi_public_transport">Openbaar vervoer</string>
 		<string name="poi_air_transport">Luchtvaart</string>
 		<string name="poi_water_transport">Vervoer over water</string>
-		<string name="poi_bicycle_transport">Transportfiets</string>
+		<string name="poi_bicycle_transport">Fietsvervoer</string>
-		<string name="poi_aerialway_transport">Vervoer door de lucht</string>
+		<string name="poi_aerialway_transport">Vervoer per kabelbaan</string>
 	<string name="poi_sightseeing">Toeristische attractie</string>
 		<string name="poi_accomodation">Overnachting</string>
 		<string name="poi_internet_access">Internet-toegang</string>
@@ -701,13 +701,13 @@
 	<string name="poi_fuel_hgv_diesel">Vrachtauto-diesel</string>
 	<string name="poi_fuel_biodiesel">Biodiesel</string>
 	<string name="poi_fuel_lpg">LPG</string>
-	<string name="poi_fuel_octane_80">Octaan 80</string>
+	<string name="poi_fuel_octane_80">Benzine octaan 80</string>
-	<string name="poi_fuel_octane_91">Octaan 91</string>
+	<string name="poi_fuel_octane_91">Benzine Octaan 91</string>
-	<string name="poi_fuel_octane_92">Octaan 92</string>
+	<string name="poi_fuel_octane_92">Benzine Octaan 92</string>
-	<string name="poi_fuel_octane_95">Octaan 95</string>
+	<string name="poi_fuel_octane_95">Benzine Euro95</string>
-	<string name="poi_fuel_octane_98">Octaan 98</string>
+	<string name="poi_fuel_octane_98">Benzine Super 98</string>
-	<string name="poi_fuel_octane_100">Octaan 100</string>
+	<string name="poi_fuel_octane_100">Benzine Superplus 100</string>
-	<string name="poi_fuel_cng">CNG</string>
+	<string name="poi_fuel_cng">CNG Aardgas</string>
 	<string name="poi_fuel_1_25">Mengsmering 1:25</string>
 	<string name="poi_fuel_1_50">Mengsmering 1:50</string>
 	<string name="poi_fuel_ethanol">Ethanol</string>
@@ -715,7 +715,7 @@
 	<string name="poi_fuel_e10">E10</string>
 	<string name="poi_fuel_e20">E20</string>
 	<string name="poi_fuel_e85">E85</string>
-	<string name="poi_fuel_biogas">E85</string>
+	<string name="poi_fuel_biogas">Biogas</string>
 	<string name="poi_fuel_lh2">Vloeibare waterstof</string>
 	<string name="poi_fuel_electricity">Elektriciteit</string>
 	<string name="poi_junction">Kruising</string>
@@ -766,4 +766,41 @@
 
 	<string name="poi_piste_playground">Speeltuin</string>
 	<string name="poi_personal_transport">Persoonlijk vervoer</string>
-		</resources>
+		<string name="poi_node_networks">Wandel/fiets knooppunten</string>
+		<string name="poi_hiking_routes">Wandelroutes</string>
+		<string name="poi_traffic_enforcement">Verkeerscontrole</string>
+	<string name="poi_transport_construction">Vervoer in aanleg</string>
+		<string name="poi_building_type_pyramid">Soort gebouw: Piramide</string>
+
+<string name="poi_power">Energie</string>
+		<string name="poi_trash_disposal">Afvalverzamelpunt</string>
+		<string name="poi_landuse">Landgebruik</string>
+	<string name="poi_cheese">Kaaswinkel</string>
+	<string name="poi_chocolate">Chocoladewinkel</string>
+	<string name="poi_coffee">Koffiespeciaalzaak</string>
+	<string name="poi_pastry">Patisserie</string>
+	<string name="poi_camera">Fotoapparatuur</string>
+	<string name="poi_candles">Kaarsenwinkel</string>
+	<string name="poi_doors">Deuren</string>
+	<string name="poi_fashion">Modezaak</string>
+	<string name="poi_free_flying">Freeflying-toebehoren</string>
+	<string name="poi_furnace">Verwarmingsinstallatie</string>
+	<string name="poi_garden_furniture">Tuinmeubelen</string>
+	<string name="poi_leather">Lederwarenzaak</string>
+	<string name="poi_music">Muziekwinkel</string>
+	<string name="poi_scuba_diving_shop">Duiktoebehoren</string>
+	<string name="poi_tyres">Autobanden</string>
+	<string name="poi_energy">Energie</string>
+	<string name="poi_watches">Horloges</string>
+	<string name="poi_swimming_pool_shop">Zwembadtoebehoren</string>
+	<string name="poi_model">Modelbouw</string>
+	<string name="poi_trophy">Prijzenwinkel</string>
+	<string name="poi_video_games">Video-games</string>
+	<string name="poi_pyrotechnics">Vuurwerkwinkel</string>
+	<string name="poi_weapons">Wapenwinkel</string>
+	<string name="poi_perfumery">Parfumerie</string>
+
+	<string name="poi_ford_stepping_stones">Stapstenen</string>
+	<string name="poi_traffic_calming_island">Verkeerseiland</string>
+	<string name="poi_fuel_svo">Biobrandstof</string>
+	</resources>

OsmAnd/res/values-nl/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
   
   <string name="layer_map_appearance">Configureer scherm</string>
   <string name="show_lanes">Toon rijstroken</string>
@@ -959,7 +960,7 @@
 <string name="poi_filter_restaurants">Restaurants</string>
 <string name="poi_filter_sightseeing">Bezienswaardigheden</string>
 
-    <string name="context_menu_item_last_intermediate_point">Zet als laatste routepunt</string>
+    <string name="context_menu_item_last_intermediate_point">Toevoegen als laatste routepunt</string>
     <string name="context_menu_item_first_intermediate_point">Zet als eerste routepunt</string>
     <string name="add_as_last_destination_point">Voeg toe als laatste routepunt</string>
     <string name="add_as_first_destination_point">Voeg toe als eerste routepunt</string>
@@ -1397,8 +1398,8 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="routing_attr_avoid_ferries_description">Vermijd veerboten</string>
 	<string name="routing_attr_avoid_motorway_name">Vermijd autowegen</string>
 	<string name="routing_attr_avoid_motorway_description">Vermijd autowegen</string>
-	<string name="routing_attr_weight_description">Geef het gewicht van het voertuig voor de routeplanning</string>
+	<string name="routing_attr_weight_description">Geef het gewicht dat minimaal toegestaan moet zijn op de route</string>
-    <string name="routing_attr_weight_name">Gewicht voertuig</string>
+    <string name="routing_attr_weight_name">Gewicht van het voertuig</string>
 	<string name="select_gpx">GPX-bestand kiezen…</string>
     <string name="route_descr_select_destination">Bestemming kiezen</string>
     <string name="route_preferences">Route-voorkeuren</string>
@@ -1634,7 +1635,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="lang_sw">Swahili</string>
     <string name="lang_he">Hebreeuws</string>
     <string name="forward">Vooruit</string>
-    <string name="home">Overzicht</string>
+    <string name="home">Dashboard</string>
     <string name="live_monitoring_m_descr">Stuur tracking-data naar een webservice als een GPX-track wordt gemaakt.</string>
 	<string name="live_monitoring_m">Online tracking (GPX vereist)</string>
     <string name="live_monitoring_start">Start online tracking</string>
@@ -1682,7 +1683,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     
     <string name="waypoints">Routepunt(en)</string>
     <string name="targets">Bestemming(en)</string>
-    <string name="way_alarms">Filemeldingen</string>
+    <string name="way_alarms">Meldingen onderweg</string>
     <string name="speak_favorites">Favorieten in de buurt</string>
     <string name="speak_poi">Interessepunt in de buurt</string>
     <string name="shared_string_all">Alle</string>
@@ -1705,7 +1706,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="traffic_warning_stop">Stopbord</string>
     <string name="traffic_warning_calming">Verkeersdrempel</string>
     <string name="traffic_warning_speed_camera">Snelheidscontrole</string>
-    <string name="traffic_warning">Filemelding</string>
+    <string name="traffic_warning">Meldingen onderweg</string>
 	<string name="local_index_description">Tik om details te bekijken; houd ingedrukt om uit te schakelen of te verwijderen. Huidige gegevens op het toestel (%1$s beschikbaar):</string>
 	<string name="text_size_descr">De grootte van tekst op de kaart instellen.</string>
     <string name="text_size">Tekstgrootte</string>
@@ -1716,7 +1717,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="fav_point_emoticons_message">Favoriet bewaard als %1s omdat vreemde tekens niet opgeslagen kunnen worden in een bestand.</string>
     <string name="print_route">Route afdrukken</string>
     <string name="speed_limit_exceed">Te hoge snelheid melden bij…</string>
-	<string name="speed_limit_exceed_message">Hoeveel de maximumsnelheid mag worden overschreden voordat een melding volgt.</string>
+	<string name="speed_limit_exceed_message">Kies hoeveel de maximumsnelheid mag worden overschreden voordat een melding volgt.</string>
 	<string name="rendering_category_transport">Openbaar vervoer</string>
     <string name="rendering_category_others">Overige kaart attributen</string>
     <string name="map_widget_appearance_rem">Resterende onderdelen</string>
@@ -1932,7 +1933,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="shared_string_my_location">Mijn positie</string>
 	<string name="shared_string_my_favorites">Mijn Favorieten</string>
 	<string name="shared_string_my_tracks">Mijn Routes</string>
-	<string name="shared_string_currently_recording_track">Opnemen van route</string>
+	<string name="shared_string_currently_recording_track">Huidige route opnemen</string>
 	<string name="local_osm_changes_upload_all_confirm">Je gaat %1$d wijzigingen ophalen. Weet je dat zeker?</string>
     <string name="confirmation_to_clear_history">Wil je de geschiedenis verwijderen?</string>
     <string name="osmand_parking_overdue">overschreden</string>
@@ -1976,14 +1977,14 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="index_name_netherlands">Europa - Nederland</string>
 	
 	<string name="routing_attr_avoid_borders_description">Vermijd het oversteken van landsgrenzen</string>
-	<string name="routing_attr_height_name">Hoogtelimiet</string>
+	<string name="routing_attr_height_name">Hoogte van het voertuig</string>
-	<string name="routing_attr_height_description">Geef de massa van het voertuig dat toegestaan moet zijn op de routes</string>
+	<string name="routing_attr_height_description">Geef de hoogte die minimaal toegestaan moet zijn op de route</string>
     <string name="use_fast_recalculation">Slim opnieuw berekenen van routes</string>
 	<string name="use_fast_recalculation_desc">Herbereken alleen het begin van de route voor lange trajecten</string>
 <string name="osm_edit_context_menu_delete">Verwijder OSM-wijziging</string>
     <string name="rendering_value_disabled_name">Uitgeschakeld</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Gekleurd naar afstandscategorie</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Kleuren naar afstandscategorie</string>
-    <string name="rendering_value_walkingRoutesOSMC_name">Gekleurd volgens OSMC</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Kleuring volgens OSMC</string>
     <string name="osmo_share_my_location">Deel mijn positie</string>
     <string name="shared_string_logoff">Uitloggen</string>
     <string name="gps_network_not_enabled">Locatiedienst is niet ingeschakeld. Wil je ze aanzetten?</string>
@@ -2075,8 +2076,8 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="srtm_plugin_disabled">Hoogtelijnen uitgeschakeld</string>
     <string name="favorite_category_add_new">Categorie toevoegen</string>
     <string name="favorite_category_select">Kies categorie</string>
-    <string name="default_speed_system_descr">Systeem om snelheid te meten</string>
+    <string name="default_speed_system_descr">Eenheid voor de snelheid instellen</string>
-    <string name="default_speed_system">Snelheidsmeting</string>
+    <string name="default_speed_system">Snelheid weergeven in ...</string>
     <string name="nm">nm</string>
     <string name="si_nm">Zeemijlen</string>
     <string name="si_kmh">Kilometer per uur</string>
@@ -2123,7 +2124,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="favourites_context_menu_add">Favoriet toevoegen</string>
 	<string name="poi_action_delete">wissen</string>
 	<string name="dahboard_options_dialog_title">Configureer dashboard</string>
-	<string name="show_on_start">Bij start tonen</string>
+	<string name="show_on_start">Na opstarten tonen</string>
 	<string name="shared_string_card_was_hidden">Kaart was verborgen</string>
 	<string name="shared_string_undo">Ongedaan maken</string>
 	<string name="shared_string_skip">Overslaan</string>
@@ -2218,7 +2219,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     
     <string name="dashboard_or_drawer_description">Kies tussen het flexibele dashboard of een vast menu. Dit is altijd te wijzigen via de dashboard-instellingen.</string>
     <string name="copied_to_clipboard">Gekopieerd naar klembord</string>
-    <string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Mogelijkheid menu te grbuiken in plaats van het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer… "</string>
+    <string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Mogelijkheid menu te gebruiken in plaats van het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer… "</string>
     <string name="shared_string_commit">Verstuur</string>
 	
     <string name="context_menu_item_delete_waypoint">GPX routepunt wissen?</string>
@@ -2234,12 +2235,25 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="poi_context_menu_modify_osm_change">Verander OSM-wijziging</string>
     
     <string name="dashboard_or_drawer_title">Kies tussen dashboard of menu</string>
-    <string name="please_specify_poi_type_only_from_list">"Geef een correct type POI of sla dit over. "</string>
+    <string name="please_specify_poi_type_only_from_list">Geef het juiste type-POI of sla dit over</string>
-    <string name="access_from_map_description">Menu-knop toont dashboard in plaats van menu</string>
+    <string name="access_from_map_description">Menu-knop opent dashboard in plaats van menu</string>
-    <string name="access_from_map">Toegang vanaf kaart</string>
+    <string name="access_from_map">Openen vanaf de kaart</string>
     <string name="use_dashboard_btn">Gebruik dashboard</string>
     <string name="use_drawer_btn">Gebruik menu</string>
     <string name="routing_attr_avoid_stairs_name">Vermijd trappen</string>
 	<string name="routing_attr_avoid_stairs_description">Vermijd trappen</string>
 	<string name="routing_attr_avoid_borders_name">Vermijd grensovergangen</string>
-	</resources>
+	<string name="shared_string_near">Nabij</string>
+    <string name="no_address_found">Geen adres gevonden</string>
+    <string name="shared_string_hide">Verbergen</string>
+    <string name="av_video_quality_low">Laagste kwaliteit</string>
+    <string name="av_video_quality_high">Hoogste kwaliteit</string>
+    <string name="av_video_quality">Video kwaliteit</string>
+    <string name="av_video_quality_descr">Kies video-kwaliteit</string>
+    <string name="av_audio_format">Audio uitvoer-formaat</string>
+    <string name="av_audio_format_descr">Kies audio uitvoer-formaat</string>
+    <string name="av_audio_bitrate">Audio bitrate</string>
+    <string name="av_audio_bitrate_descr">Kies audio bitrate</string>
+    <string name="looking_up_address">Adres wordt gezocht</string>
+    <string name="rendering_attr_horseRoutes_name">Ruiterroutes</string>
+    </resources>

OsmAnd/res/values-pl/strings.xml

@@ -1037,7 +1037,7 @@
     <string name="recording_description">Nagranie %1$s %3$s %2$s</string>
     <string name="recording_default_name">Nagranie</string>
     <string name="shared_string_control_stop">Stop</string>
-    <string name="shared_string_control_start">Start</string>
+    <string name="shared_string_control_start">Nagr</string>
     <string name="map_widget_av_notes">Notatki audio/video</string>
     <string name="osmand_srtm_short_description_80_chars">Wtyczka OsmAnd do rysowania poziomic offline</string>
     
@@ -1056,7 +1056,7 @@
     <string name="recording_photo_description">Zdjęcie %1$s %2$s</string>
     <string name="av_def_action_picture">Zrób zdjęcie</string>
     <string name="recording_context_menu_precord">Zrób zdjęcie</string>
-    <string name="stop_routing_confirm">Czy na pewno chcesz zatrzymać nawigację?</string>
+    <string name="stop_routing_confirm">Zatrzymać nawigację?</string>
     <string name="clear_dest_confirm">Usunąć cel podróży (oraz punkty trasy)?</string>
     <string name="precise_routing_mode">Precyzyjne trasy (alpha)</string>
     <string name="precise_routing_mode_descr">Włącz obliczanie precyzyjnych tras w nawigacji. Funkcja dość powolna, nadal jest ograniczona odległością.</string>
@@ -1131,7 +1131,7 @@
     <string name="shared_string_do_not_show_again">Nie pokazuj ponownie</string>
     <string name="distance_measurement_start_editing">Rozpocznij edycję</string>
     <string name="distance_measurement_finish_editing">Zakończ edycję</string>
-    <string name="distance_measurement_finish_subtrack">Rozpocznij nową podścieżkę</string>
+    <string name="distance_measurement_finish_subtrack">Rozpocznij nową podrzędną ścieżkę</string>
     <string name="distance_measurement_clear_route">Wyczyść punkty</string>
     
     <string name="distance_measurement_load_gpx">Otwórz plik GPX</string>
@@ -2117,7 +2117,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="use_drawer_btn">Używaj menu</string>
     <string name="dashboard_or_drawer_description">To jest nowy wybór podstawowej kontroli aplikacja za pomocą konfigurowalnego panelu lub statycznego menu. Wybór zawsze można zmienić w ustawieniach panelu.</string>
     <string name="osm_save_offline">Zapisz lokalnie</string>
-    <string name="please_specify_poi_type_only_from_list">"Proszę określić rodzaj POI lub pominąć go. "</string>
+    <string name="please_specify_poi_type_only_from_list">Proszę określić rodzaj POI lub pominąć go.</string>
     <string name="osm_edit_modified_poi">Zmodyfikowano POI OSM</string>
     <string name="osm_edit_deleted_poi">Usunięto POI OSM</string>
     <string name="osm_edit_reopened_note">Otwarto ponownie notatkę OSM</string>
@@ -2137,8 +2137,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="rendering_attr_roadStyle_description">Styl drogowy</string>
     <string name="poi_context_menu_modify_osm_change">Modyfikacja zmian OSM</string>
     <string name="dashboard_or_drawer_title">Kokpit lub menu</string>
-    <string name="av_video_quality_low">Najniższa rozdzielczość</string>
+    <string name="av_video_quality_low">Najniższa jakość</string>
-    <string name="av_video_quality_high">Najwyższa rozdzielczość</string>
+    <string name="av_video_quality_high">Najwyższa jakość</string>
     <string name="av_video_quality">Jakość video</string>
     <string name="av_video_quality_descr">Proszę wybrać jakość wyjściowego nagrania video</string>
     <string name="av_audio_format">Format dźwięku</string>

OsmAnd/res/values-ru/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
 
+    <string name="rendering_attr_horseRoutes_name">Конные маршруты</string>
     <string name="av_video_quality_low">Низкое качество</string>
     <string name="av_video_quality_high">Высокое качество</string>
     <string name="av_video_quality">Качество видео</string>

OsmAnd/res/values-sk/strings.xml

@@ -1932,7 +1932,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="access_from_map">Prístup z mapy</string>
     <string name="use_dashboard_btn">Použiť úvodný panel</string>
     <string name="use_drawer_btn">Použiť menu</string>
-    <string name="please_specify_poi_type_only_from_list">"Prosím zadajte správny typ POI alebo ho preskočte. "</string>
+    <string name="please_specify_poi_type_only_from_list">Prosím zadajte správny typ POI alebo ho preskočte</string>
     <string name="routing_attr_avoid_stairs_name">Vyhnúť sa schodom</string>
 	<string name="routing_attr_avoid_stairs_description">Vyhnúť sa schodom</string>
 	<string name="routing_attr_avoid_borders_name">Vyhnúť sa hraničným priechodom</string>
@@ -1940,8 +1940,8 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="color_purple">fialová</string>
 	<string name="shared_string_near">Blízko</string>
     <string name="shared_string_hide">Skryť</string>
-    <string name="av_video_quality_low">Najnižšie rozlíšenie</string>
+    <string name="av_video_quality_low">Najnižšia kvalita</string>
-    <string name="av_video_quality_high">Najvyššie rozlíšenie</string>
+    <string name="av_video_quality_high">Najvyššia kvalita</string>
     <string name="av_video_quality">Kvalita videovýstupu</string>
     <string name="av_video_quality_descr">Zvoľte kvalitu videa</string>
     <string name="av_audio_format">Formát zvukového výstupu</string>
@@ -1950,4 +1950,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="av_audio_bitrate_descr">Zvoľte bitovú rýchlosť zvuku</string>
     <string name="no_address_found">Nenašla sa adresa</string>
 	<string name="looking_up_address">Hľadá sa adresa</string>
+    <string name="rendering_attr_horseRoutes_name">Trasy pre kone</string>
     </resources>

OsmAnd/res/values-sv/strings.xml

@@ -533,18 +533,18 @@
     <string name="use_osmand_routing_service_descr">Använd OsmAnd offline navigering gäller endast rutter &gt;20 km (experimentell)</string>
     <string name="specified_dir_doesnt_exist">Kan inte hitta den angivna mappen.</string>
 
-    <string name="context_menu_item_last_intermediate_point">Lägg till som sista waypoint</string>
+    <string name="context_menu_item_last_intermediate_point">Lägg till som sista mellanliggande destination</string>
-    <string name="context_menu_item_first_intermediate_point">Lägg till som första waypoint</string>
+    <string name="context_menu_item_first_intermediate_point">Lägg till som första mellanliggande destination</string>
-    <string name="add_as_last_destination_point">Lägg till som sista waypoint</string>
+    <string name="add_as_last_destination_point">Lägg till som sista mellanliggande destination</string>
-    <string name="add_as_first_destination_point">Lägg till som första waypoint</string>
+    <string name="add_as_first_destination_point">Lägg till som första mellanliggande destination</string>
     <string name="replace_destination_point">Byt destination</string>
     <string name="new_destination_point_dialog">Du har redan en angiven destination.</string>
-    <string name="target_point">Waypoint %1$s</string>
+    <string name="target_point">Destination %1$s</string>
-    <string name="target_points">Waypoints</string>
+    <string name="target_points">Destinationer</string>
-    <string name="intermediate_point_too_far">Waypointen %1$s för långt från närmaste väg.</string>
+    <string name="intermediate_point_too_far">Den mellanliggande destinationen %1$s ligger för långt från närmaste väg.</string>
-    <string name="arrived_at_intermediate_point">Du har anlänt till din waypoint</string>
+    <string name="arrived_at_intermediate_point">Du har anlänt till din mellanliggande destination</string>
-    <string name="context_menu_item_intermediate_point">Lägg till som waypoint</string>
+    <string name="context_menu_item_intermediate_point">Lägg till som mellanliggande destination</string>
-    <string name="map_widget_intermediate_distance">Waypoint</string>
+    <string name="map_widget_intermediate_distance">Mellanliggande destination</string>
     <string name="ending_point_too_far">Slutpunkten för långt från närmaste väg.</string>
     <string name="add_tag">Lägg till tagg</string>
     <string name="btn_advanced_mode">Avancerat läge…</string>
@@ -868,7 +868,7 @@
 
     <string name="local_indexes_cat_av">Audio-/videodata</string>
     <string name="stop_routing_confirm">Är det säkert att du vill avbryta navigeringen?</string>
-    <string name="clear_dest_confirm">Är det säkert att du vill ta bort din destinationspunkt (samt waypoints)?</string>
+    <string name="clear_dest_confirm">Är det säkert att du vill ta bort din destinationspunkt (samt mellanliggande destinationer)?</string>
     <string name="recording_context_menu_show">Visa</string>
     <string name="recording_photo_description">Foto %1$s %2$s</string>
     <string name="recording_context_menu_precord">Ta ett foto</string>
@@ -893,8 +893,8 @@
     <string name="recording_error">Ett fel uppstod under inspelningen </string>
     <string name="recording_camera_not_available">Ingen kamera tillgänglig</string>
     <string name="srtm_plugin_description">"Denna modul erbjuder överlägg med höjdkurvor som kan visas i kombination med OsmAnds standardkartor. Denna funktion kommer att uppskattas av idrottsmän, vandrare och alla som är intresserade av höjdskillnander i landskapet.\n\nDessa globala data (mellan 70 grader norr och 70 grader syd) baseras på mätningar av SRTM (Shuttle Radar Topography Mission) och ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), ett bildinstrument ombord Terra, flaggskeppet i NASA:s Earth Observing System. ASTER är ett samprojekt mellan NASA, Japans Ministry of Economy, Trade and Industry (METI), and Japan Space Systems (J-spacesystems). "</string>
-    <string name="delete_target_point">Ta bort waypoint</string>
+    <string name="delete_target_point">Ta bort destination</string>
-    <string name="intermediate_point">Waypoint %1$s</string>
+    <string name="intermediate_point">Destination %1$s</string>
     <string name="poi_filter_nominatim">Online Nominatim</string>
     <string name="local_index_descr_title">Hantera kartfiler</string>
     <string name="incomplete_locale">ofullständig</string>
@@ -1035,7 +1035,7 @@
     <string name="wait_current_task_finished">Vänta tills aktuell uppgift är slutförd</string>
 
     <string name="search_street_in_neighborhood_cities">Sök gator i grannstäder</string>
-    <string name="intermediate_items_sort_return">Mellanliggande waypoints ordnade för att optimera deras ordning från aktuell position till destinationen.</string>
+    <string name="intermediate_items_sort_return">Mellanliggande mål ordnade för att optimera deras ordning från aktuell position till destinationen.</string>
     <string name="intermediate_items_sort_by_distance">Sortera dörr-till-dörr</string>
     <string name="local_osm_changes_backup_failed">Säkerhetskopieringen av OSM-ändringar misslyckades</string>
     <string name="local_osm_changes_backup">Säkerhetskopiera som OSM-förändring</string>
@@ -1068,9 +1068,9 @@
     <string name="plugin_distance_point_hdop">noggrannhet</string>
 
     <string name="osb_author_or_password_not_specified">Ange OSM-användare och -lösenord i inställningarna</string>
-    <string name="clear_intermediate_points">Ta bort mellanliggande punkter</string>
+    <string name="clear_intermediate_points">Ta bort mellanliggande mål</string>
-    <string name="keep_intermediate_points">Behåll mellanliggande punkter</string>
+    <string name="keep_intermediate_points">Behåll mellanliggande destinationer</string>
-    <string name="new_directions_point_dialog">Du har redan angivit mellanliggande punkter.</string>
+    <string name="new_directions_point_dialog">Du har redan angivit mellanliggande mål.</string>
     <string name="context_menu_item_directions_to">Vägvisning till</string>
     <string name="context_menu_item_directions_from">Vägvisning från</string>
     <string name="route_descr_map_location">Karta: </string>
@@ -1128,7 +1128,7 @@
 
 
     <string name="map_magnifier">Kartförstoring</string>
-    <string name="route_is_too_long">OsmAnd offline-ruttning kan ta väldigt lång tid (eller ibland inte fungera alls) för punkter mer än 200 km från varandra. Lägg till en eller flera mellanliggande waypoints för bättre prestanda.</string>
+    <string name="route_is_too_long">OsmAnd offline-ruttning kan ta väldigt lång tid (eller ibland inte fungera alls) för punkter mer än 200 km från varandra. Lägg till en eller flera mellanliggande mål för bättre prestanda.</string>
     <string name="auto_zoom_none">Ingen auto-zoom</string>
     <string name="auto_zoom_close">Nära</string>
     <string name="auto_zoom_far">Medelavstånd</string>
@@ -1365,7 +1365,7 @@
     <string name="gpx_selection_track">%1$s \nSpår %2$s</string>
 
     <string name="save_as_favorites_points">Spara som grupp med favoriter</string>
-    <string name="select_destination_and_intermediate_points">Välj waypoints</string>
+    <string name="select_destination_and_intermediate_points">Välj destinationer</string>
     <string name="layer_amenity_label">Namn på punkter</string>
     <string name="show_zoom_buttons_navigation_descr">Visa zoom-knappar under navigering</string>
     <string name="show_zoom_buttons_navigation">Visa zoom-knappar</string>
@@ -1462,7 +1462,7 @@
     <string name="download_additional_maps">Ladda ner kartor som saknas %1$s (%2$d MB)?</string>
 
     <string name="waypoints">Waypoints</string>
-    <string name="targets">Mål</string>
+    <string name="targets">Destinationer</string>
     <string name="way_alarms">Trafikskyltar</string>
     <string name="speak_favorites">Närbelägna favoriter</string>
     <string name="speak_poi">Närbelägna intresssepunkter</string>
@@ -1560,7 +1560,7 @@
     <string name="navigate_point_zone">Zon</string>
     <string name="navigate_point_northing">Nordlig (y-koord.)</string>
     <string name="navigate_point_easting">Östlig (x-koord.)</string>
-    <string name="download_tab_downloads">Alla kartor</string>
+    <string name="download_tab_downloads">Alla kartor etc</string>
     <string name="download_tab_updates">Uppdateringar</string>
     <string name="download_tab_local">Hämtat</string>
     <string name="route_descr_destination">Destination</string>
@@ -2029,4 +2029,5 @@
     <string name="av_audio_bitrate_descr">Välj ljudsamplingshastighet</string>
     <string name="no_address_found">Ingen adress angiven</string>
 	<string name="looking_up_address">Slår upp adressen</string>
+    <string name="rendering_attr_horseRoutes_name">Hästleder</string>
     </resources>

OsmAnd/res/values/colors.xml

@@ -132,10 +132,10 @@
 	<!-- Map colors, layers, special purpose consistency colors -->
 	<color name="pos_heading">#320000FF</color>
 	<!-- color name="pos_heading_night">#880000FF</color -->
-	<color name="pos_heading_night">#88ff8800</color>
+	<color name="pos_heading_night">#88536dfe</color>
 	<color name="pos_area">#280000FF</color>
 	<!-- color name="pos_area_night">#660000FF</color -->
-	<color name="pos_area_night">#66ff8800</color>
+	<color name="pos_area_night">#66536dfe</color>
 	<color name="pos_around">#707CDC</color>  <!-- family blue similar to above -->
 
 	<color name="gpx_track">#B4B319FF</color>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,7 @@
          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="rendering_attr_horseRoutes_name">Horse routes</string>
     <string name="no_address_found">No address determined</string>
     <string name="shared_string_near">Near</string>
     <string name="shared_string_hide">Hide</string>
@@ -605,7 +606,7 @@
     <string name="show_zoom_buttons_navigation_descr">Show zoom buttons during navigation</string>
     <string name="show_zoom_buttons_navigation">Show zoom buttons</string>
     <string name="save_as_favorites_points">Save as group of favorites</string>
-    <string name="select_destination_and_intermediate_points">Select waypoints</string>
+    <string name="select_destination_and_intermediate_points">Select destinations</string>
     <string name="layer_amenity_label">Point labels</string>
     <string name="loading_smth">Loading %1$s…</string>
     <string name="map_widget_plain_time">Current time</string>
@@ -819,7 +820,7 @@
     <string name="animate_routing_route_not_calculated">Please calculate the route first</string>
     <string name="animate_routing_route">Simulate using calculated route </string>
     <string name="animate_routing_gpx">Simulate using GPX track</string>
-    <string name="route_is_too_long">OsmAnd offline routing may take very long (or sometimes not work) for points more than 200km apart. You may want to add intermediate waypoints for better performance.</string>
+    <string name="route_is_too_long">OsmAnd offline routing may take very long (or sometimes not work) for points more than 200km apart. You may want to add intermediate destinations for better performance.</string>
     <string name="auto_zoom_none">No auto zoom</string>
     <string name="auto_zoom_close">To close-up</string>
     <string name="auto_zoom_far">To mid-range</string>
@@ -859,9 +860,9 @@
     <string name="speak_cameras">Speed cameras</string>
     <string name="speak_traffic_warnings">Traffic warnings</string>
     <string name="osb_author_or_password_not_specified">Please specify OSM user and password in Settings</string>
-    <string name="clear_intermediate_points">Clear intermediate points</string>
+    <string name="clear_intermediate_points">Clear intermediate destinations</string>
-    <string name="keep_intermediate_points">Keep intermediate points</string>
+    <string name="keep_intermediate_points">Keep intermediate destinations</string>
-    <string name="new_directions_point_dialog">You already have intermediate points set.</string>
+    <string name="new_directions_point_dialog">You already have intermediate destinations set.</string>
     <string name="context_menu_item_directions_to">Directions to</string>
     <string name="context_menu_item_directions_from">Directions from</string>
     <string name="route_descr_map_location">Map: </string>
@@ -879,7 +880,7 @@
     <string name="context_menu_item_destination_point">Set as destination</string>
     <string name="please_select_address">Select city or street first</string>
     <string name="search_street_in_neighborhood_cities">Search street in neighborhood cities</string>
-    <string name="intermediate_items_sort_return">Intermediate waypoints resorted to optimize their order on the way from current location to the destination.</string>
+    <string name="intermediate_items_sort_return">Intermediate destinations resorted to optimize their order on the way from current location to the destination.</string>
     <string name="intermediate_items_sort_by_distance">Sort door-to-door</string>
     <string name="local_osm_changes_backup_successful">OSM change file successfully generated %1$s</string>
     <string name="local_osm_changes_backup_failed">Backup OSM changes failed</string>
@@ -942,7 +943,7 @@
     <string name="local_indexes_cat_srtm">Contour lines</string>
     <string name="local_indexes_cat_av">Audio/Video data</string>
     <string name="stop_routing_confirm">Are you sure you want to stop the navigation?</string>
-    <string name="clear_dest_confirm">Are you sure you want to clear your destination point (and waypoints)?</string>
+    <string name="clear_dest_confirm">Are you sure you want to clear your destination ppint (and intermediate destinations)?</string>
     <string name="precise_routing_mode_descr">Enable to calculate precise routes without glitches. Still distance-limited and slow.</string>
     <string name="precise_routing_mode">Precise routing (alpha)</string>
     <string name="recording_context_menu_show">Show</string>
@@ -1019,21 +1020,21 @@
     <string name="gps_not_available">Please enable GPS in the settings</string>
     <string name="map_widget_monitoring_services">Logging services</string>
     <string name="no_route">No route</string>
-    <string name="delete_target_point">Remove waypoint</string>
+    <string name="delete_target_point">Remove destination</string>
-    <string name="target_point">Waypoint %1$s</string>
+    <string name="target_point">Destination %1$s</string>
-    <string name="intermediate_point">Waypoint %1$s</string>
+    <string name="intermediate_point">Destination %1$s</string>
-    <string name="context_menu_item_last_intermediate_point">Add as last waypoint</string>
+    <string name="context_menu_item_last_intermediate_point">Add as last intermediate destination</string>
-    <string name="context_menu_item_first_intermediate_point">Add as first waypoint</string>
+    <string name="context_menu_item_first_intermediate_point">Add as first intermediate destination</string>
-    <string name="add_as_last_destination_point">Add as last waypoint</string>
+    <string name="add_as_last_destination_point">Add as last intermediate destination</string>
-    <string name="add_as_first_destination_point">Add as first waypoint</string>
+    <string name="add_as_first_destination_point">Add as first intermediate destination</string>
 
     <string name="replace_destination_point">Replace destination point</string>
     <string name="new_destination_point_dialog">You already have the destination point set.</string>
-    <string name="target_points">Waypoints</string>
+    <string name="target_points">Destinations</string>
-    <string name="intermediate_point_too_far">Waypoint %1$s too far from nearest road.</string>
+    <string name="intermediate_point_too_far">Intermediate destination %1$s is too far from the nearest road.</string>
-    <string name="arrived_at_intermediate_point">You have arrived at your waypoint</string>
+    <string name="arrived_at_intermediate_point">You have arrived at your intermediate destination</string>
-    <string name="context_menu_item_intermediate_point">Add as waypoint</string>
+    <string name="context_menu_item_intermediate_point">Add as intermediate destination</string>
-    <string name="map_widget_intermediate_distance">Waypoint</string>
+    <string name="map_widget_intermediate_distance">Intermediate destination</string>
     <string name="ending_point_too_far">Ending point too far from nearest road.</string>
     <string name="add_tag">Add Tag</string>
     <string name="btn_advanced_mode">Advanced Mode…</string>
@@ -1094,7 +1095,7 @@ Navigation
  - Works online (fast) or offline (no roaming charges when you are abroad)
  - Turn-by-turn voice guidance (recorded and synthesized voices)
  - Optional lane guidance, street name display, and estimated time of arrival
- - Supports intermediate points on your itinerary
+ - Supports intermediate destinations on your itinerary
  - Automatic re-routing whenever you deviate from the route
  - Search for places by address, by type (e.g.: restaurant, hotel, gas station, museum), or by geographical coordinates
 
@@ -1190,7 +1191,7 @@ Navigation
  - Works online (fast) or offline (no roaming charges when you are abroad)
  - Turn-by-turn voice guidance (recorded and synthesized voices)
  - Optional lane guidance, street name display, and estimated time of arrival
- - Supports intermediate points on your itinerary
+ - Supports intermediate destinations on your itinerary
  - Automatic re-routing whenever you deviate from the route
  - Search for places by address, by type (e.g.: restaurant, hotel, gas station, museum), or by geographical coordinates
 

OsmAnd/src/net/osmand/plus/LiveUpdates/LiveUpdatesFragment.java

@@ -1,19 +1,34 @@
 package net.osmand.plus.liveupdates;
 
 
+import android.app.Dialog;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
 
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.ActionBarProgressActivity;
+import net.osmand.plus.activities.LocalIndexHelper;
+import net.osmand.plus.activities.LocalIndexInfo;
+import net.osmand.plus.activities.OsmandActionBarActivity;
+import net.osmand.plus.download.ui.AbstractLoadLocalIndexTask;
+
+import java.util.Comparator;
+import java.util.List;
 
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link LiveUpdatesFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
 public class LiveUpdatesFragment extends Fragment {
 	public static final String TITILE = "Live Updates";
 
@@ -25,7 +40,130 @@ public class LiveUpdatesFragment extends Fragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 							 Bundle savedInstanceState) {
-		return inflater.inflate(R.layout.fragment_live_updates, container, false);
+		View view = inflater.inflate(R.layout.fragment_live_updates, container, false);
+		ListView listView = (ListView) view.findViewById(android.R.id.list);
+		View header = inflater.inflate(R.layout.live_updates_header, listView, false);
+		listView.addHeaderView(header);
+		LiveUpdatesAdapter adapter = new LiveUpdatesAdapter(this);
+		listView.setAdapter(adapter);
+		new LoadLocalIndexTask(adapter, (ActionBarProgressActivity) getActivity()).execute();
+		return view;
 	}
 
+	private OsmandActionBarActivity getMyActivity() {
+		return (OsmandActionBarActivity) getActivity();
+	}
+
+	private static class LiveUpdatesAdapter extends ArrayAdapter<LocalIndexInfo> {
+		final LiveUpdatesFragment fragment;
+		public LiveUpdatesAdapter(LiveUpdatesFragment fragment) {
+			super(fragment.getActivity(), R.layout.local_index_list_item, R.id.nameTextView);
+			this.fragment = fragment;
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			View view = convertView;
+			if (view == null) {
+				LayoutInflater inflater = LayoutInflater.from(getContext());
+				view = inflater.inflate(R.layout.local_index_list_item, parent, false);
+				view.setTag(new LocalFullMapsViewHolder(view, fragment));
+			}
+			LocalFullMapsViewHolder viewHolder = (LocalFullMapsViewHolder) view.getTag();
+			viewHolder.bindLocalIndexInfo(getItem(position));
+			return view;
+		}
+	}
+
+	private static class LocalFullMapsViewHolder {
+		private final ImageView icon;
+		private final TextView nameTextView;
+		private final TextView descriptionTextView;
+		private final ImageButton options;
+		private final LiveUpdatesFragment fragment;
+
+		private LocalFullMapsViewHolder(View view, LiveUpdatesFragment context) {
+			icon = (ImageView) view.findViewById(R.id.icon);
+			nameTextView = (TextView) view.findViewById(R.id.nameTextView);
+			descriptionTextView = (TextView) view.findViewById(R.id.descriptionTextView);
+			options = (ImageButton) view.findViewById(R.id.options);
+			this.fragment = context;
+		}
+
+		public void bindLocalIndexInfo(LocalIndexInfo item) {
+			nameTextView.setText(item.getName());
+			descriptionTextView.setText(item.getDescription());
+			OsmandApplication context = fragment.getMyActivity().getMyApplication();
+			icon.setImageDrawable(context.getIconsCache().getContentIcon(R.drawable.ic_map));
+			options.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					final FragmentManager fragmentManager = fragment.getChildFragmentManager();
+					new SettingsDialogFragment().show(fragmentManager, "settings");
+				}
+			});
+		}
+	}
+
+	public static class LoadLocalIndexTask
+			extends AsyncTask<Void, LocalIndexInfo, List<LocalIndexInfo>>
+			implements AbstractLoadLocalIndexTask {
+
+		private List<LocalIndexInfo> result;
+		private ArrayAdapter<LocalIndexInfo> adapter;
+		private ActionBarProgressActivity activity;
+
+		public LoadLocalIndexTask(ArrayAdapter<LocalIndexInfo> adapter,
+								  ActionBarProgressActivity activity) {
+			this.adapter = adapter;
+			this.activity = activity;
+		}
+
+		@Override
+		protected List<LocalIndexInfo> doInBackground(Void... params) {
+			LocalIndexHelper helper = new LocalIndexHelper(activity.getMyApplication());
+			return helper.getLocalIndexData(this);
+		}
+
+		@Override
+		public void loadFile(LocalIndexInfo... loaded) {
+			publishProgress(loaded);
+		}
+
+		@Override
+		protected void onProgressUpdate(LocalIndexInfo... values) {
+			for (LocalIndexInfo localIndexInfo : values) {
+				if (localIndexInfo.getType() == LocalIndexHelper.LocalIndexType.MAP_DATA) {
+					adapter.add(localIndexInfo);
+				}
+			}
+			adapter.notifyDataSetChanged();
+		}
+
+		@Override
+		protected void onPostExecute(List<LocalIndexInfo> result) {
+			this.result = result;
+			adapter.sort(new Comparator<LocalIndexInfo>() {
+				@Override
+				public int compare(@NonNull LocalIndexInfo lhs, @NonNull LocalIndexInfo rhs) {
+					return lhs.getName().compareTo(rhs.getName());
+				}
+			});
+		}
+	}
+
+	public static class SettingsDialogFragment extends DialogFragment {
+		@NonNull
+		@Override
+		public Dialog onCreateDialog(Bundle savedInstanceState) {
+			AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+			View view = LayoutInflater.from(getActivity())
+					.inflate(R.layout.dialog_live_updates_item_settings, null);
+			builder.setView(view)
+					.setPositiveButton("SAVE", null)
+					.setNegativeButton("CANCEL", null)
+					.setNeutralButton("UPDATE NOW", null);
+			return builder.create();
+		}
+	}
 }

OsmAnd/src/net/osmand/plus/LiveUpdates/LivieUpdatesActivity.java

@@ -8,9 +8,9 @@ import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 
 import net.osmand.plus.R;
-import net.osmand.plus.activities.OsmandActionBarActivity;
+import net.osmand.plus.activities.ActionBarProgressActivity;
 
-public class LivieUpdatesActivity extends OsmandActionBarActivity {
+public class LivieUpdatesActivity extends ActionBarProgressActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -30,7 +30,7 @@ public class LivieUpdatesActivity extends OsmandActionBarActivity {
 
 	public static class MyAdapter extends FragmentPagerAdapter {
 		private final Fragment[] fragments = new Fragment[]{new LiveUpdatesFragment()};
-		private final String[] titles = new String[] {LiveUpdatesFragment.TITILE};
+		private final String[] titles = new String[]{LiveUpdatesFragment.TITILE};
 
 		public MyAdapter(FragmentManager fm) {
 			super(fm);

OsmAnd/src/net/osmand/plus/activities/ActionBarProgressActivity.java

@@ -7,10 +7,6 @@ import android.widget.ProgressBar;
 
 import net.osmand.plus.R;
 
-/**
- * Created by Denis
- * on 23.01.15.
- */
 public class ActionBarProgressActivity extends OsmandActionBarActivity {
 
 	@Override

OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java

@@ -12,7 +12,7 @@ import net.osmand.map.TileSourceManager;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.SQLiteTileSource;
-import net.osmand.plus.download.ui.LocalIndexesFragment.LoadLocalIndexTask;
+import net.osmand.plus.download.ui.AbstractLoadLocalIndexTask;
 import net.osmand.plus.voice.MediaCommandPlayerImpl;
 import net.osmand.plus.voice.TTSCommandPlayerImpl;
 
@@ -90,7 +90,7 @@ public class LocalIndexHelper {
 	}
 
 
-	public List<LocalIndexInfo> getLocalIndexData(LoadLocalIndexTask loadTask){
+	public List<LocalIndexInfo> getLocalIndexData(AbstractLoadLocalIndexTask loadTask){
 		Map<String, String> loadedMaps = app.getResourceManager().getIndexFileNames();
 		List<LocalIndexInfo> result = new ArrayList<>();
 		
@@ -105,9 +105,16 @@ public class LocalIndexHelper {
 		
 		return result;
 	}
-	
 
-	private void loadVoiceData(File voiceDir, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
+	public List<LocalIndexInfo> getLocalFullMaps(AbstractLoadLocalIndexTask loadTask) {
+		Map<String, String> loadedMaps = app.getResourceManager().getIndexFileNames();
+		List<LocalIndexInfo> result = new ArrayList<>();
+		loadObfData(app.getAppPath(IndexConstants.MAPS_PATH), result, false, loadTask, loadedMaps);
+
+		return result;
+	}
+
+	private void loadVoiceData(File voiceDir, List<LocalIndexInfo> result, boolean backup, AbstractLoadLocalIndexTask loadTask) {
 		if (voiceDir.canRead()) {
 			//First list TTS files, they are preferred
 			for (File voiceF : listFilesSorted(voiceDir)) {
@@ -139,7 +146,7 @@ public class LocalIndexHelper {
 		}
 	}
 	
-	private void loadTilesData(File tilesPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
+	private void loadTilesData(File tilesPath, List<LocalIndexInfo> result, boolean backup, AbstractLoadLocalIndexTask loadTask) {
 		if (tilesPath.canRead()) {
 			for (File tileFile : listFilesSorted(tilesPath)) {
 				if (tileFile.isFile() && tileFile.getName().endsWith(SQLiteTileSource.EXT)) {
@@ -171,7 +178,7 @@ public class LocalIndexHelper {
 	}
 
 	
-	private void loadSrtmData(File mapPath, List<LocalIndexInfo> result, LoadLocalIndexTask loadTask) {
+	private void loadSrtmData(File mapPath, List<LocalIndexInfo> result, AbstractLoadLocalIndexTask loadTask) {
 		if (mapPath.canRead()) {
 			for (File mapFile : listFilesSorted(mapPath)) {
 				if (mapFile.isFile() && mapFile.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
@@ -184,7 +191,7 @@ public class LocalIndexHelper {
 		}
 	}
 	
-	private void loadWikiData(File mapPath, List<LocalIndexInfo> result, LoadLocalIndexTask loadTask) {
+	private void loadWikiData(File mapPath, List<LocalIndexInfo> result, AbstractLoadLocalIndexTask loadTask) {
 		if (mapPath.canRead()) {
 			for (File mapFile : listFilesSorted(mapPath)) {
 				if (mapFile.isFile() && mapFile.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
@@ -197,7 +204,7 @@ public class LocalIndexHelper {
 		}
 	}
 	
-	private void loadObfData(File mapPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask, Map<String, String> loadedMaps) {
+	private void loadObfData(File mapPath, List<LocalIndexInfo> result, boolean backup, AbstractLoadLocalIndexTask loadTask, Map<String, String> loadedMaps) {
 		if (mapPath.canRead()) {
 			for (File mapFile : listFilesSorted(mapPath)) {
 				if (mapFile.isFile() && mapFile.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {

OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java

@@ -565,7 +565,7 @@ public class MapActivityActions implements DialogProvider {
 						return true;
 					}
 				}).reg();
-		optionsMenuHelper.item(R.string.target_points).iconColor(R.drawable.ic_action_flage_dark)
+		optionsMenuHelper.item(R.string.waypoints).iconColor(R.drawable.ic_action_flage_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {

OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java

@@ -50,4 +50,8 @@ public class OsmandActionBarActivity extends AppCompatActivity {
 			setupHomeButton();
 		}
     }
+
+	public OsmandApplication getMyApplication() {
+		return (OsmandApplication) getApplication();
+	}
 }

OsmAnd/src/net/osmand/plus/dialogs/ProgressDialogFragment.java

@@ -0,0 +1,80 @@
+package net.osmand.plus.dialogs;
+
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+
+import net.osmand.plus.ProgressImplementation;
+
+/**
+ * Created by GaidamakUA on 12/7/15.
+ */
+public class ProgressDialogFragment extends DialogFragment {
+	public static final String TAG = "progress";
+	private static final String TITLE_ID = "title_id";
+	private static final String MESSAGE_ID = "message_id";
+	private static final String STYLE = "style";
+	private int mMax;
+	private int accumulatedDelta;
+	private DialogInterface.OnDismissListener onDismissListener;
+
+	@NonNull
+	@Override
+	public Dialog onCreateDialog(Bundle savedInstanceState) {
+		Bundle args = getArguments();
+		int titleId = args.getInt(TITLE_ID);
+		int messageId = args.getInt(MESSAGE_ID);
+		int style = args.getInt(STYLE);
+		final ProgressDialog dialog = ProgressImplementation.createProgressDialog(getActivity(),
+				getString(titleId), getString(messageId),
+				style).getDialog();
+
+		dialog.setIndeterminate(false);
+		dialog.setMax(mMax);
+		dialog.setProgress(0);
+		return dialog;
+	}
+
+	public void setMax(final int max) {
+		mMax = max;
+		if (getDialog() != null) {
+			getProgressDialog().setMax(mMax);
+		}
+	}
+
+	public void incrementProgressBy(int delta) {
+		if (getDialog() == null) {
+			accumulatedDelta += delta;
+		} else {
+			getProgressDialog().incrementProgressBy(delta + accumulatedDelta);
+		}
+	}
+
+	private ProgressDialog getProgressDialog() {
+		return (ProgressDialog) getDialog();
+	}
+
+	@Override
+	public void onDismiss(DialogInterface dialog) {
+		if (onDismissListener != null) {
+			onDismissListener.onDismiss(dialog);
+		}
+	}
+
+	public void setOnDismissListener(DialogInterface.OnDismissListener onDismissListener) {
+		this.onDismissListener = onDismissListener;
+	}
+
+	public static ProgressDialogFragment createInstance(int titleId, int messageId, int style) {
+		ProgressDialogFragment fragment = new ProgressDialogFragment();
+		Bundle args = new Bundle();
+		args.putInt(TITLE_ID, titleId);
+		args.putInt(MESSAGE_ID, messageId);
+		args.putInt(STYLE, style);
+		fragment.setArguments(args);
+		return fragment;
+	}
+}

OsmAnd/src/net/osmand/plus/download/DownloadActivity.java

@@ -208,10 +208,6 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
 		return localIndexInfos;
 	}
 
-	public OsmandApplication getMyApplication() {
-		return (OsmandApplication) getApplication();
-	}
-
 	@Override
 	public void onPause() {
 		super.onPause();

OsmAnd/src/net/osmand/plus/download/ui/AbstractLoadLocalIndexTask.java

@@ -0,0 +1,7 @@
+package net.osmand.plus.download.ui;
+
+import net.osmand.plus.activities.LocalIndexInfo;
+
+public interface AbstractLoadLocalIndexTask {
+	void loadFile(LocalIndexInfo... loaded);
+}

OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java

@@ -161,7 +161,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 		if(current == null || current.getStatus() == AsyncTask.Status.FINISHED ||
 				current.isCancelled() || current.getResult() != null) {
 			asyncLoader = new LoadLocalIndexTask();
-			asyncLoader.execute(getActivity());
+			asyncLoader.execute();
 		}
 	}
 
@@ -277,16 +277,18 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 	}
 
 
-	public class LoadLocalIndexTask extends AsyncTask<Activity, LocalIndexInfo, List<LocalIndexInfo>> {
+	public class LoadLocalIndexTask extends AsyncTask<Void, LocalIndexInfo, List<LocalIndexInfo>>
+			implements AbstractLoadLocalIndexTask {
 
 		private List<LocalIndexInfo> result;
 
 		@Override
-		protected List<LocalIndexInfo> doInBackground(Activity... params) {
+		protected List<LocalIndexInfo> doInBackground(Void... params) {
 			LocalIndexHelper helper = new LocalIndexHelper(getMyApplication());
 			return helper.getLocalIndexData(this);
 		}
 
+		@Override
 		public void loadFile(LocalIndexInfo... loaded) {
 			publishProgress(loaded);
 		}
@@ -888,7 +890,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 			LocalIndexInfoViewHolder viewHolder;
 			if (convertView == null) {
 				LayoutInflater inflater = LayoutInflater.from(ctx);
-				convertView = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
+				convertView = inflater.inflate(R.layout.local_index_list_item, parent, false);
 				viewHolder = new LocalIndexInfoViewHolder(convertView);
 				convertView.setTag(viewHolder);
 			} else {
@@ -918,9 +920,6 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 			if (group.getSubfolder() != null) {
 				name.append(" ").append(group.getSubfolder());
 			}
-			if (group.isBackupedData()) {
-				ctx.getString(R.string.local_indexes_cat_backup);
-			}
 			TextView nameView = ((TextView) v.findViewById(R.id.section_name));
 			TextView sizeView = ((TextView) v.findViewById(R.id.section_description));
 			List<LocalIndexInfo> list = data.get(group);

OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java

@@ -14,12 +14,12 @@ import android.widget.TextView;
 
 import net.osmand.data.PointDescription;
 import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.ProgressImplementation;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashBaseFragment;
 import net.osmand.plus.dashboard.DashboardOnMap;
 import net.osmand.plus.dashboard.tools.DashFragmentData;
+import net.osmand.plus.dialogs.ProgressDialogFragment;
 import net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment;
 
 import java.util.ArrayList;
@@ -153,15 +153,14 @@ public class DashOsmEditsFragment extends DashBaseFragment
 
 	public void showProgressDialog(OsmPoint[] points, boolean closeChangeSet) {
 		OsmPoint[] toUpload = points;
-		ProgressDialog dialog = ProgressImplementation.createProgressDialog(getActivity(),
+		ProgressDialogFragment dialog = ProgressDialogFragment.createInstance(R.string.uploading,
-				getString(R.string.uploading), getString(R.string.local_openstreetmap_uploading),
+				R.string.local_openstreetmap_uploading, ProgressDialog.STYLE_HORIZONTAL);
-				ProgressDialog.STYLE_HORIZONTAL).getDialog();
 		OsmEditsUploadListener listener = new OsmEditsUploadListenerHelper(getActivity(),
 				getString(R.string.local_openstreetmap_were_uploaded)) {
 			@Override
 			public void uploadUpdated(OsmPoint point) {
 				super.uploadUpdated(point);
-				if (!DashOsmEditsFragment.this.isDetached()) {
+				if (DashOsmEditsFragment.this.isAdded()) {
 					onOpenDash();
 				}
 			}
@@ -169,15 +168,15 @@ public class DashOsmEditsFragment extends DashBaseFragment
 			@Override
 			public void uploadEnded(Map<OsmPoint, String> loadErrorsMap) {
 				super.uploadEnded(loadErrorsMap);
-				if (!DashOsmEditsFragment.this.isDetached()) {
+				if (DashOsmEditsFragment.this.isAdded()) {
 					onOpenDash();
 				}
 			}
 		};
+		dialog.show(getChildFragmentManager(), ProgressDialogFragment.TAG);
 		UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask(dialog,
 				listener, plugin, toUpload.length, closeChangeSet);
 		uploadTask.execute(toUpload);
-		dialog.show();
 	}
 
 	private void getOsmPoints(ArrayList<OsmPoint> dataPoints) {

OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java

@@ -8,9 +8,9 @@ import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.ProgressImplementation;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.dialogs.ProgressDialogFragment;
 import net.osmand.plus.mapcontextmenu.MenuController;
 import net.osmand.plus.osmedit.OsmPoint.Action;
 import net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment;
@@ -26,7 +26,7 @@ public class EditPOIMenuController extends MenuController {
 	private String pointTypeStr;
 	private ProgressDialogPoiUploader poiUploader;
 
-	public EditPOIMenuController(OsmandApplication app, MapActivity mapActivity, PointDescription pointDescription, OsmPoint osmPoint) {
+	public EditPOIMenuController(OsmandApplication app, final MapActivity mapActivity, PointDescription pointDescription, OsmPoint osmPoint) {
 		super(new EditPOIMenuBuilder(app, osmPoint), pointDescription, mapActivity);
 		this.osmPoint = osmPoint;
 		plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
@@ -34,11 +34,10 @@ public class EditPOIMenuController extends MenuController {
 		poiUploader = new ProgressDialogPoiUploader() {
 			@Override
 			public void showProgressDialog(OsmPoint[] points, boolean closeChangeSet) {
-				ProgressDialog dialog = ProgressImplementation.createProgressDialog(
+				ProgressDialogFragment dialog = ProgressDialogFragment.createInstance(
-						getMapActivity(),
+						R.string.uploading,
-						getMapActivity().getString(R.string.uploading),
+						R.string.local_openstreetmap_uploading,
-						getMapActivity().getString(R.string.local_openstreetmap_uploading),
+						ProgressDialog.STYLE_HORIZONTAL);
-						ProgressDialog.STYLE_HORIZONTAL).getDialog();
 				OsmEditsUploadListener listener = new OsmEditsUploadListenerHelper(getMapActivity(),
 						getMapActivity().getString(R.string.local_openstreetmap_were_uploaded)) {
 					@Override
@@ -52,11 +51,10 @@ public class EditPOIMenuController extends MenuController {
 						}
 					}
 				};
+				dialog.show(mapActivity.getSupportFragmentManager(), ProgressDialogFragment.TAG);
 				UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask(
 						dialog, listener, plugin, points.length, closeChangeSet);
 				uploadTask.execute(points);
-
-				dialog.show();
 			}
 		};
 

OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java

@@ -27,19 +27,20 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import net.osmand.access.AccessibleToast;
 import net.osmand.data.PointDescription;
 import net.osmand.osm.edit.Node;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.ProgressImplementation;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.ActionBarProgressActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.OsmAndListFragment;
 import net.osmand.plus.activities.OsmandActionBarActivity;
 import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.dialogs.ProgressDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.osmedit.OsmPoint.Action;
@@ -527,11 +528,10 @@ public class OsmEditsFragment extends OsmAndListFragment
 	}
 
 	public void showProgressDialog(OsmPoint[] points, boolean closeChangeSet) {
-		ProgressDialog dialog = ProgressImplementation.createProgressDialog(
+		ProgressDialogFragment dialog = ProgressDialogFragment.createInstance(
-				getActivity(),
+				R.string.uploading,
-				getString(R.string.uploading),
+				R.string.local_openstreetmap_uploading,
-				getString(R.string.local_openstreetmap_uploading),
+				ProgressDialog.STYLE_HORIZONTAL);
-				ProgressDialog.STYLE_HORIZONTAL).getDialog();
 		OsmEditsUploadListener listener = new OsmEditsUploadListenerHelper(getActivity(),
 				getString(R.string.local_openstreetmap_were_uploaded)) {
 			@Override
@@ -545,11 +545,10 @@ public class OsmEditsFragment extends OsmAndListFragment
 				listAdapter.notifyDataSetChanged();
 			}
 		};
+		dialog.show(getActivity().getSupportFragmentManager(), ProgressDialogFragment.TAG);
 		UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask(
 				dialog, listener, plugin, points.length, closeChangeSet);
 		uploadTask.execute(points);
-
-		dialog.show();
 	}
 
 

OsmAnd/src/net/osmand/plus/osmedit/OsmEditsUploadListenerHelper.java

@@ -27,8 +27,8 @@ import net.osmand.access.AccessibleToast;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.ProgressImplementation;
 import net.osmand.plus.R;
+import net.osmand.plus.dialogs.ProgressDialogFragment;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -85,16 +85,14 @@ public class OsmEditsUploadListenerHelper implements OsmEditsUploadListener {
 				activity.getResources().getString(R.string.local_openstreetmap_were_uploaded));
 
 		Resources resources = activity.getResources();
-		ProgressDialog dialog = ProgressImplementation.createProgressDialog(
+		ProgressDialogFragment dialog = ProgressDialogFragment.createInstance(
-				activity,
+				R.string.uploading,
-				resources.getString(R.string.uploading),
+				R.string.local_openstreetmap_uploading,
-				resources.getString(R.string.local_openstreetmap_uploading),
+				ProgressDialog.STYLE_HORIZONTAL);
-				ProgressDialog.STYLE_HORIZONTAL).getDialog();
+		dialog.show(activity.getSupportFragmentManager(), ProgressDialogFragment.TAG);
 		UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask(
 				dialog, helper, plugin, toUpload.length, false);
 		uploadTask.execute(toUpload);
-
-		dialog.show();
 	}
 
 	public static final class UploadingErrorDialogFragment extends DialogFragment {

OsmAnd/src/net/osmand/plus/osmedit/UploadOpenstreetmapPointAsyncTask.java

@@ -1,11 +1,11 @@
 package net.osmand.plus.osmedit;
 
-import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 
 import net.osmand.osm.edit.EntityInfo;
 import net.osmand.osm.edit.Node;
+import net.osmand.plus.dialogs.ProgressDialogFragment;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +14,7 @@ import java.util.Map;
  */
 public class UploadOpenstreetmapPointAsyncTask
 		extends AsyncTask<OsmPoint, OsmPoint, Map<OsmPoint, String>> {
-	private ProgressDialog progress;
+	private ProgressDialogFragment progress;
 	private OpenstreetmapRemoteUtil remotepoi;
 	private OsmBugsRemoteUtil remotebug;
 	private int listSize = 0;
@@ -23,7 +23,7 @@ public class UploadOpenstreetmapPointAsyncTask
 	private OsmEditingPlugin plugin;
 	private final boolean closeChangeSet;
 
-	public UploadOpenstreetmapPointAsyncTask(ProgressDialog progress,
+	public UploadOpenstreetmapPointAsyncTask(ProgressDialogFragment progress,
 											 OsmEditsUploadListener listener,
 											 OsmEditingPlugin plugin,
 											 int listSize,
@@ -81,20 +81,18 @@ public class UploadOpenstreetmapPointAsyncTask
 	protected void onPreExecute() {
 		interruptUploading = false;
 
-		progress.setOnCancelListener(new DialogInterface.OnCancelListener() {
+		progress.setOnDismissListener(new DialogInterface.OnDismissListener() {
 			@Override
-			public void onCancel(DialogInterface dialog) {
+			public void onDismiss(DialogInterface dialog) {
 				UploadOpenstreetmapPointAsyncTask.this.setInterruptUploading(true);
 			}
 		});
-		progress.setIndeterminate(false);
 		progress.setMax(listSize);
-		progress.setProgress(0);
 	}
 
 	@Override
 	protected void onPostExecute(Map<OsmPoint, String> loadErrorsMap) {
-		if (progress.isShowing()) {
+		if (progress != null) {
 			progress.dismiss();
 		}
 		listener.uploadEnded(loadErrorsMap);
@@ -108,9 +106,10 @@ public class UploadOpenstreetmapPointAsyncTask
 	protected void onProgressUpdate(OsmPoint... points) {
 		for (OsmPoint p : points) {
 			listener.uploadUpdated(p);
-			progress.incrementProgressBy(1);
+			if (progress != null) {
+				progress.incrementProgressBy(1);
+			}
 		}
 	}
-
 }