diff --git a/OsmAnd/res/layout/update_index_list_item.xml b/OsmAnd/res/layout/update_index_list_item.xml
new file mode 100644
index 0000000000..6d7ad49bcf
--- /dev/null
+++ b/OsmAnd/res/layout/update_index_list_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:paddingTop="1dp"
+			  android:paddingBottom="1dp"
+			  android:paddingRight="8dp">
+
+	<CheckBox android:id="@+id/check_download_item"
+			  android:layout_width="wrap_content"
+			  android:layout_height="match_parent"
+			  android:gravity="center_vertical"
+			  android:focusable="false"/>
+
+	<TextView android:layout_width="0dp"
+			  android:layout_height="match_parent"
+			  android:id="@+id/download_item"
+			  android:gravity="center_vertical"
+			  android:maxLines="7"
+			  android:layout_weight="1"
+			  style="@style/ListText.Small"/>
+
+	<TextView android:layout_width="wrap_content"
+			  android:layout_height="match_parent"
+			  android:id="@+id/download_descr"
+			  android:layout_marginLeft="3dp"
+			  android:gravity="right|center_vertical"
+			  style="@style/ListText.Small"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index ea3bafae79..1e0c22459f 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -137,7 +137,7 @@
 	<string name="poi_filter_for_tourists">For turister</string>
 	<string name="poi_filter_fuel">Brændstof</string>
 	<string name="show_warnings_title">Vis alarmer…</string>
-	<string name="show_warnings_descr">Konfigurer trafikadvarsler (fartgrænser, tvungne stop, vejbump), fotofældeadvarsler og vognbane oplysninger</string>
+	<string name="show_warnings_descr">Konfigurer trafikadvarsler (fartgrænser, tvungne stop, vejbump), fartkameraadvarsler og vognbane oplysninger</string>
 	<string name="use_compass_navigation_descr">Brug kompasset, når ingen retning er registret</string>
 	<string name="use_compass_navigation">Kompas</string>
 	<string name="avoid_motorway">Undgå motorveje</string>
@@ -1523,7 +1523,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="av_photo_play_sound_descr">Spil lyd når foto tages</string>
 <string name="av_photo_play_sound">Kameralyd</string>
 	<string name="speak_traffic_warnings">Trafikadvarsler</string>
-	<string name="speak_cameras">Fotofælder</string>
+	<string name="speak_cameras">Fartkameraer</string>
 	<string name="speak_speed_limit">Hastighedsgrænse</string>
     
 	
@@ -1532,13 +1532,11 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
     <string name="route_via">Via:</string>
     <string name="route_from">Fra:</string>
     <string name="osb_author_dialog_password">OSM kodeord (valgfrit)</string>
-	<string name="tip_recent_changes_1_5_t">Ændringer i 1.5:
-\n * Stemmeadvarsler om hastighedsbegrænsninger og fotofælder
-\n * Flere stemmeprompt muligheder(gadenavne meddelt)
+	<string name="tip_recent_changes_1_5_t">"Ændringer i 1.5:
+\n * Stemmeadvarsler om hastighedsbegrænsninger og Fartkameraer\n * Flere stemmeprompt muligheder(gadenavne meddelt)
 \n * Kortikoner i højopløsning
 \n * Masser af brugergrænseflade ændringer
-\n * Fejlrettelser i afstandsvisning, GPX analyse, rutepunkt håndtering, planlægnings modul, overførelse til OSM, https håndtering
-    </string>
+\n * Fejlrettelser i afstandsvisning, GPX analyse, rutepunkt håndtering, planlægnings modul, overførelse til OSM, https håndtering "</string>
     <string name="osb_author_or_password_not_specified">Angiv OSM bruger og adgangskode i \'Indstillinger\'</string>
     <string name="clear_intermediate_points">Slet mellemliggende punkter</string>
     <string name="keep_intermediate_points">Behold mellemliggende punkter</string>
@@ -1546,7 +1544,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
     <string name="context_menu_item_directions_to">Kørselsvejledning til</string>
     <string name="context_menu_item_directions_from">Kørselsvejledning fra</string>
     <string name="speak_title">Meddel…</string>
-	<string name="speak_descr">Konfigurer til at meddele gadenavne, trafikadvarsler (tvungne stop, vejbump), fotofældeadvarsler, hastighedsbegrænsninger</string>
+	<string name="speak_descr">Konfigurer til at meddele gadenavne, trafikadvarsler (tvungne stop, vejbump), fartkameraadvarsler, hastighedsbegrænsninger</string>
 	<string name="speak_street_names">Gadenavne (TTS)</string>
     <string name="announce_gpx_waypoints">GPX-rutepunkter</string>
     <string name="osmodroid_mode_off">Start OsMoDroid</string>
@@ -1983,10 +1981,10 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="save_global_track_interval">Generelt logningsinterval</string>
 	<string name="traffic_warning_speed_limit">Hastighedsgrænse</string>
     <string name="traffic_warning_border_control">Grænsekontrol</string>
-    <string name="traffic_warning_payment">Betalingsveje</string>
+    <string name="traffic_warning_payment">Betalingsanlæg</string>
     <string name="traffic_warning_stop">Stopskilt</string>
-    <string name="traffic_warning_calming">Hastighedsnedsættende</string>
-    <string name="traffic_warning_speed_camera">Fotofælde</string>
+    <string name="traffic_warning_calming">Trafikdæmpning</string>
+    <string name="traffic_warning_speed_camera">Fartkamera</string>
     <string name="traffic_warning">Trafikadvarsel</string>
-	<string name="local_index_description">Klik på et eksisterende element for at se flere detaljer, tryk på og hold nede for at deaktivere eller slette. Aktuelle data på enhed (%1$s fri):</string>
+	<string name="local_index_description">Klik på et eksisterende element for at se flere detaljer, langt tryk for at deaktivere eller slette. Aktuelle data på enhed (%1$s ledig):</string>
 	</resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 79a42333df..44999d3a6e 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
 	<string name="traffic_warning_border_control">Grenzkontrolle</string>
@@ -1975,4 +1975,5 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="way_alarms">Verkehrswarnungen</string>
     <string name="record_plugin_description">Speichern Sie Ihre Tracks mit einem Klick. Zeigt die Einstellung, wie Strecken aufgezeichnet werden – in lokale GPX-Dateien oder online via Web-Service.</string>
     <string name="route_descr_destination"/>
-    </resources>
+    <string name="local_index_description">Antippen eines Elements um mehr Details zu erfahren, Tippen und Halten zum Deaktivieren oder Löschen des Elements. Aktuell auf dem Gerät vorhandene Daten (%1$s frei):</string>
+	</resources>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 1c1d776fd9..ff5c665884 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1666,4 +1666,9 @@
 	<string name="save_track_interval_globally">Διάστημα καταγραφής</string>
 	<string name="rendering_attr_publicTransportMode_name">Λειτουργία δημόσιων μεταφορών</string>
 	<string name="confirm_every_run">Πάντα ερώτηση</string>
-	</resources>
+	<string name="traffic_warning_speed_limit">Όριο ταχύτητας</string>
+    <string name="traffic_warning_border_control">Συνοριακός έλεγχος</string>
+    <string name="traffic_warning_payment">Διόδια</string>
+    <string name="traffic_warning_stop">Πινακίδα stop</string>
+    <string name="traffic_warning_speed_camera">Κάμερα ταχύτητας</string>
+    </resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index e5929a73de..bc09305c62 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1869,4 +1869,12 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
 	<string name="confirm_every_run">Preguntar siempre</string>
 	<string name="save_global_track_interval_descr">Elegir intervalo de guardado para la grabación de trazas general (habilitar mediante el widget de guardado GPX en el mapa)</string>
 	<string name="save_global_track_interval">Intervalo de guardado general</string>
+	<string name="traffic_warning_speed_limit">Límite de velocidad</string>
+    <string name="traffic_warning_border_control">Control fronterizo</string>
+    <string name="traffic_warning_payment">Cabina de peaje</string>
+    <string name="traffic_warning_stop">Señal de stop</string>
+    <string name="traffic_warning_speed_camera">Radar de velocidad</string>
+    <string name="local_index_description">Pulsa cualquier objeto para ver más detalles, mantén pulsado para desactivar o borrar. Datos en el dispositivo actualmente (%1$s libre):</string>
+	<string name="traffic_warning_calming">Reductores de velocidad</string>
+    <string name="traffic_warning">Alerta de tráfico</string>
 	</resources>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index be0c7d2e03..2645060244 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -1246,4 +1246,49 @@
     <string name="osmo_follow">Prati</string>
     <string name="osmo_sign_in">Prijavite se</string>
     <string name="osmo_create_groups_confirm">Kako bi stvorili grupu morate biti registrirani Osmo korisnik.</string>
+    <string name="traffic_warning_speed_limit">Ograničenje brzine</string>
+    <string name="traffic_warning_border_control">Granična kontrola</string>
+    <string name="traffic_warning_payment">Naplata cestarine</string>
+    <string name="traffic_warning_stop">Znak STOP</string>
+    <string name="traffic_warning_calming">Ležeći policajci</string>
+    <string name="traffic_warning_speed_camera">Mjerenje brzine</string>
+    <string name="traffic_warning">Upozorenja u prometu</string>
+	<string name="stop_navigation_service">Prekini</string>
+	<string name="rendering_attr_publicTransportMode_name">Javni prijevoz</string>
+	<string name="monitoring_settings_descr">Konfigurirajte kako zabilježiti vaše putovanje</string>
+    <string name="waypoints">Međutočke</string>
+    <string name="rendering_attr_subwayMode_name">Podzemna željeznica</string>
+ 	<string name="osmo_auth_error_short">Autorizacija nije uspjela</string>
+    <string name="osmo_auto_connect">Automatsko povezivanje</string>
+    <string name="gpx_wpt">Međutočke</string>
+    <string name="gpx_info_subtracks">"Pod tragovi: %1$s "</string>
+	<string name="gpx_info_waypoints">"Međutočke: %1$s "</string>
+	<string name="gpx_info_end_time">"Završetak puta: %1$tF, %1$tT "</string>
+	<string name="gpx_selection_route_points">%1$s
+\nTočke rute %2$s</string>
+    <string name="gpx_selection_points">%1$s
+\nTočke</string>
+    <string name="osmo_connect_to_my_nickname">Moj nadimak</string>
+    <string name="osmo_user_name">Korisnik</string>
+	<string name="color_red">crvena</string>
+	<string name="color_pink">roza</string>
+	<string name="color_orange">narančasta</string>
+	<string name="color_brown">smeđa</string>
+	<string name="color_yellow">žuta</string>
+	<string name="color_lightblue">svijetloplava</string>
+	<string name="color_blue">plava</string>
+	<string name="color_green">zelena</string>
+	
+    <string name="osmo_edit_color">Boja prikaza</string>
+    <string name="osmo_expire_group">Istječe u</string>
+    <string name="osmo_group_description">Opis</string>
+    <string name="osmo_group_policy">Politika</string>
+    <string name="osmo_connect_to_device_tracker_id">ID Tracker</string>
+    <string name="osmo_connect_to_device_name">Korisničko ime</string>
+    <string name="osmo_connect_to_group_id">ID grupe</string>
+    <string name="osmo_group_name">Naziv grupe</string>
+    <string name="osmo_create_group">Stvori grupu</string>
+    <string name="hours_ago">sati prije</string>
+    <string name="minutes_ago">minuta prije</string>
+    <string name="seconds_ago">sekunda prije</string>
     </resources>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 4f0a322325..e543fd4579 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1760,4 +1760,11 @@
 	<string name="save_track_to_gpx_globally_descr">A pozíció GPX fájlba naplózása ki- és bekapcsolható a térkép GPX rögzítés gombjával</string>
 	<string name="save_track_interval_globally">Rögzítési időköz</string>
 	<string name="rendering_attr_publicTransportMode_name">Tömegközlekedési mód</string>
+	<string name="traffic_warning_speed_limit">Sebességhatár</string>
+    <string name="traffic_warning_border_control">Határellenőrzés</string>
+    <string name="traffic_warning_payment">Fizetőkapu</string>
+    <string name="traffic_warning_stop">Stop tábla</string>
+    <string name="traffic_warning_calming">Forgalomcsillapító</string>
+    <string name="traffic_warning_speed_camera">Traffipax</string>
+    <string name="traffic_warning">Forgalmi figyelmeztetés</string>
 	</resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 5166224ae5..1598f1bdbd 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1983,4 +1983,10 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="save_global_track_interval">Intervallo generale di registrazione</string>
 	<string name="traffic_warning_speed_limit">Limite di velocità</string>
     <string name="traffic_warning_payment">Casello</string>
-    </resources>
+    <string name="traffic_warning_border_control">Controllo doganale</string>
+    <string name="traffic_warning_stop">Segnale di stop</string>
+    <string name="traffic_warning_calming">Moderazione del traffico</string>
+    <string name="traffic_warning_speed_camera">Autovelox</string>
+    <string name="traffic_warning">Avviso di traffico</string>
+	<string name="local_index_description">Clicca su un oggetto per visualizzare maggiori dettagli, tieni premuto per disattivarlo o cancellarlo. Dati attualmente nel dispositivo (%1$s free):</string>
+	</resources>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 65a4f9b7f0..e9b540a02f 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -117,9 +117,9 @@ Eメール, SMS(テキスト), あるいはクリップボードに位置座標
 \n\tマップコンテキストメニューには地点(位置)に関する
 全ての操作があります。</string>
 
-     <string name="tip_initial">ヒントとテクニック</string>
+     <string name="tip_initial">ヘルプ</string>
      <string name="tip_initial_t">"OsmAndは多くの機能を持つナビゲーションアプリです。
-\n基礎的な使い方のヒントやテクニックをマップ画面の\'メニュー\'→\'ヒント\'から参照することが出来ます。 "</string>
+\n基礎的な使い方のヒントやテクニックをマップ画面の\'メニュー\'→\'ヘルプ\'から参照することが出来ます。 "</string>
      <string name="next_button">次へ</string>
      <string name="previous_button">前へ</string>
 
@@ -217,7 +217,7 @@ OsmAnd バージョンがインストールされています。全てのオフ
      <string name="voice_is_not_available_msg">音声案内は利用できません。
 設定で適切な音声データパッケージを選んでダウンロードしてください。</string>
      <string name="voice_is_not_available_title">音声案内が選択されていません</string>
-     <string name="trace_rendering_descr">レンダリング能力を表示</string>
+     <string name="trace_rendering_descr">マップ操作時に速度やオブジェクト数等のレンダリング能力を表示します</string>
  <string name="trace_rendering">レンダリング速度を表示</string>
      <string name="daynight_mode_day">日中</string>
      <string name="daynight_mode_night">夜間</string>
@@ -683,7 +683,7 @@ POIの更新は利用できません</string>
     <string name="about_version">バージョン：</string>
     <string name="about_settings">About</string>
     <string name="about_settings_descr">バージョン情報、ライセンス、プロジェクトメンバー</string>
-    <string name="tips_and_tricks">ヒント</string>
+    <string name="tips_and_tricks">ヘルプ</string>
     <string name="tip_recent_changes_1_6_t">1.6での変更点:
 	\n\t* フルHDデバイスのサポート
 	\n\t* 完全に透明な背景のサポート
@@ -776,8 +776,8 @@ POIの更新は利用できません</string>
     <string name="use_kalman_filter_compass_descr">電子コンパスの誤差を改善するためにカルマンフィルタを使用</string>
     <string name="use_kalman_filter_compass">カルマンフィルタを使用</string>
     <string name="access_mark_final_location_first">アクセシビリティモード:最初に目的地を選択して下さい</string> 
-    <string name="use_magnetic_sensor_descr">回転センサーの代わりに磁力センサーの値をコンパスの値として利用する</string>
-    <string name="use_magnetic_sensor">磁力センサーを利用</string>
+    <string name="use_magnetic_sensor_descr">回転センサーの代わりに磁気センサーの値をコンパスの値として使用する</string>
+    <string name="use_magnetic_sensor">磁気センサーを使用</string>
     <string name="other_location">その他</string>
     <string name="files_limit">%1$d ファイルが残っています</string>
     <string name="available_downloads_left">%1$d のファイルがダウンロード可能です</string>
@@ -994,8 +994,7 @@ POIの更新は利用できません</string>
 	<string name="select_animate_speedup">ルートシミュレーションの速度を選択</string>
     	<string name="global_app_allocated_memory_descr">メモリを確保しました %1$s MB (Androidの制限値 %2$s MB, Dalvik %3$s MB).</string>
 	<string name="global_app_allocated_memory">割り当てられたメモリ</string>
-	<string name="native_app_allocated_memory_descr">アプリに割り当てられたネイティブメモリ %1$s MB (Dalvik %2$s MB, 他 %3$s MB).↵
-		関連メモリ %4$s MB (Android 制限値 %5$s MB, Dalvik %6$s MB).</string>
+	<string name="native_app_allocated_memory_descr">アプリに割り当てられたネイティブメモリ %1$s MB (Dalvik %2$s MB, 他 %3$s MB). 関連メモリ %4$s MB (Android 制限値 %5$s MB, Dalvik %6$s MB).</string>
 	<string name="native_app_allocated_memory">総ネイティブメモリ</string>
 	<string name="update_downlod_list">リストの再読み込み</string>
 	<string name="starting_point_too_far">出発地点が最寄りの道路から離れすぎています。</string>
@@ -1068,9 +1067,9 @@ POIの更新は利用できません</string>
 	<string name="prefs_plugins">プラグイン</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">ベクター形式の地図はすばやく表示されます。一部のデバイスではうまく動作しない場合があります。</string>
 	<string name="play_commands_of_currently_selected_voice">現在選択されている音声のコマンドを再生する</string>
-	<string name="debugging_and_development">OsmAnd開発</string>
+	<string name="debugging_and_development">OsmAnd開発者向けオプション</string>
 	<string name="native_rendering">ネイティブレンダリング</string>
-	<string name="test_voice_prompts">テスト音声プロンプト</string>    
+	<string name="test_voice_prompts">音声案内テスト用文字列</string>    
 	<string name="send_files_to_osm">OSMにGPXファイルを送りますか？</string>
 	<string name="gpx_visibility_txt">確認可能</string>
 	<string name="gpx_tags_txt">タグ</string>
@@ -1213,7 +1212,7 @@ ASTERはNASAと日本の経済産業省（METI）、そして宇宙システム
 	
 	<string name="amenity_type_user_defined">ユーザー定義</string>
 	<string name="fav_export_confirmation">以前にエクスポートしたお気に入りのファイルが存在します。置き換えますか？</string>
-	<string name="profile_settings">プロファイル固有の設定</string>
+	<string name="profile_settings">使用するプロファイルの選択</string>
 	<string name="global_settings">グローバル設定</string>
 	<string name="global_app_settings">グローバル アプリケーション設定</string>
 	<string name="download_files_not_enough_space">ダウンロードするのに十分な空き領域がありません。(必要容量:%1$sMB／空き容量%2$s)</string>
@@ -1328,7 +1327,7 @@ ASTERはNASAと日本の経済産業省（METI）、そして宇宙システム
 	<string name="av_camera_focus_edof">拡張被写界深度(EDOF)</string>
 	<string name="av_camera_focus_continuous">カメラは、継続的にフォーカスします</string>
 	<string name="amenity_type_seamark">満潮線(Seamark)</string>
-    <string name="app_modes_choose_descr">アプリケーション表示用のプロファイルを選択してください</string>
+    <string name="app_modes_choose_descr">アプリケーション内で表示する移動手段別プロファイルを選択(自動車、自転車、徒歩、その他…)</string>
     <string name="app_modes_choose">アプリケーションプロファイル</string>
 	<string name="map_widget_map_rendering">マップ描画:</string>
     <string name="app_mode_hiking">ハイキング</string>
@@ -2036,9 +2035,9 @@ OsmAndはオープンソースであり、活発に開発が進められいま
     <string name="flat_list_waypoints">全て</string>
     <string name="waypoints">経由点</string>
     <string name="targets">目的地</string>
-    <string name="way_alarms">道路障害</string>
-    <string name="speak_favorites">お気に入りをアナウンスする</string>
-    <string name="speak_poi">POIをアナウンスする</string>
+    <string name="way_alarms">交通警告</string>
+    <string name="speak_favorites">周辺のお気に入りをアナウンスする</string>
+    <string name="speak_poi">周辺のPOIをアナウンスする</string>
     <string name="download_additional_maps">不足分のマップ %1$s (%2$d MB)をダウンロードしますか?</string>
     <string name="more">追加…</string>
     <string name="rendering_value_browse_map_name">マップの閲覧</string>  
@@ -2046,7 +2045,7 @@ OsmAndはオープンソースであり、活発に開発が進められいま
     <string name="rendering_value_bicycle_name">自転車</string>
     <string name="rendering_value_pedestrian_name">歩行者</string>
     <string name="record_plugin_description">マップ画面上のボタンをタップすることであなたの経路を保存します。ローカルのGPXファイルへの旅行の記録やオンラインWebサービスの利用の設定が出来ます。</string>
-    <string name="record_plugin_name">旅行の記録</string>
+    <string name="record_plugin_name">OsmAnd開発</string>
     <string name="int_hour">時間</string>
     <string name="duration">期限</string>
     <string name="distance">距離</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 681a8d4d9f..7891b577b0 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -59,7 +59,7 @@
 	
 	<string name="rendering_out_of_memory">선택 영역을 표시할 충분한 프로세스 메모리가 없습니다</string>
 	<string name="use_fluorescent_overlays">형광색상 중첩(오버레이)</string>
-	<string name="use_fluorescent_overlays_descr">트랙과 경로를 표시하기 위해 형광색상을 사용합니다</string>
+	<string name="use_fluorescent_overlays_descr">형광색상으로 경로를 표시합니다</string>
 	<string name="offline_edition">오프라인 편집</string>
 	<string name="offline_edition_descr">오프라인 편집을 항상 사용합니다</string>
 
@@ -93,7 +93,7 @@
 	<string name="live_monitoring_url_descr">온라인 트래킹할 웹 주소를 지정합니다. 매개변수 형식 : 위도={0}, 경도={1}, 시간={2}, hdop={3}, 고도={4}, 속도={5}, bearing={6}</string>
 	<string name="live_monitoring_url">온라인 트래킹 웹 주소</string>
 	<string name="gpx_monitoring_disabled_warn">\'트랙을 GPX 파일에 기록\' 설정을 활성화 하세요.</string>
-	<string name="show_current_gpx_title">현재의 GPX트랙을 보여줍니다</string>
+	<string name="show_current_gpx_title">현재의 GPX경로를 표시합니다</string>
 	<string name="tip_recent_changes_0_7_0_t">0.7.0 버전에 대한 변경 사항들 :
 		\n\t- 오프라인 위키피디아 기사 포함 데이터
 		\n\t- 업데이트된 맵들
@@ -124,7 +124,7 @@
 	<string name="fav_export_confirmation">이전에 익스포트한 즐겨찾기에 대한 파일이 이미 존재합니다. 이 파일을 대체하시겠습니까?</string>
 <string name="profile_settings">특정 설정 프로필</string>
 	<string name="settings_preset">기본 프로필</string>
-	<string name="settings_preset_descr">각 프로필마다 지도보기 와 경로탐색 설정을 기억합니다. 여기에 기본 프로필을 설정합니다.</string>
+	<string name="settings_preset_descr">각 프로필마다 지도보기와 경로탐색 설정을 기억합니다. 여기에 기본 프로필을 설정합니다.</string>
 	
 	
 	<string name="routing_settings">경로탐색</string>
@@ -250,19 +250,18 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
 	
 	<string name="select_search_position">주변 검색 :</string>
 	<string name="context_menu_item_search">이 근처 검색</string>
-	<string name="tip_recent_changes_0_6_7_t">0.6.7 버전에 대한 변경사항들 :
+	<string name="tip_recent_changes_0_6_7_t">"0.6.7 버전에 대한 변경사항들 :
 \n\t- 오프라인 데이터 관리 (OsmAnd 에서 직접 오프라인 데이터 다운로드, 삭제, 활성화 / 비활성화)
 \n\t- 등록지점 및 그룹 (등록지점 그룹화, 삭제, 관리)
 \n\t- 앱 내의 GPX 탐색 (트랙 세부사항, 거리, 평균 속도, 고도 등 보기)
 \n\t- GPX 네비게이션 (다 많은 옵션, 종료 후 네비게이션 계속, 로타리 지원)
-\n\t- 오프라인 사용을 위해  GPX 트랙을 경로로 저장하는 기능
+\n\t- 오프라인 사용을 위해 GPX경로를 루트로 저장하는 기능
 \n\t- GPX 모니터링 개선 (부정확한 위치 필터링 및 정확도/고도/속도 저장)
-\n\t- OSM 커뮤니티로  GPX 업로드 (http://download.osmand.net/gpx/)
+\n\t- OSM 커뮤니티로 GPX 업로드 (http://download.osmand.net/gpx/)
 \n\t- 벡터 렌더링 개선
 \n\t- TTS 엔진 개선 (정확한 거리 안내, 마일 가능)
-\n\t- 버그 픽스
-	</string>
-	<string name="save_route_dialog_title">경로를 GPX트랙으로 저장</string>
+\n\t- 버그 수정 "</string>
+	<string name="save_route_dialog_title">경로를 GPX파일로 저장</string>
 	<string name="route_successfully_saved_at">경로가 \'%1$s\'로 성공적으로 저장되었습니다.</string>
 	<string name="filename_input">파일 이름 : </string>
 	<string name="file_with_name_already_exist">같은 이름의 파일이 이미 존재합니다.</string>
@@ -453,7 +452,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
 	<string name="send_location">위치 전송</string>
 	<string name="context_menu_item_share_location">위치 공유</string>
 	<string name="add_waypoint_dialog_added">GPX 포인트 \'\'{0}\'\' 가 성공적으로 추가되었습니다</string>
-	<string name="add_waypoint_dialog_title">기록된 GPX 트랙에 포인트 추가</string>
+	<string name="add_waypoint_dialog_title">기록된 GPX 경로에 포인트 추가</string>
 	<string name="context_menu_item_add_waypoint">GPX 포인트 추가</string>
 	<string name="amenity_type_administrative">관리</string>
 	<string name="amenity_type_barrier">배리어(Barrier)</string>
@@ -567,7 +566,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
 
 	<string name="map_route_by_gpx">GPX를 이용한 탐색</string>
 	<string name="gpx_files_not_found">GPX 파일을 /osmand/tracks 폴더에서 찾을 수 없습니다</string>
-	<string name="layer_gpx_layer">GPX 트랙…</string>
+	<string name="layer_gpx_layer">GPX 경로…</string>
 	<string name="error_reading_gpx">GPX 데이터를 읽는 도중 오류</string>
 
 	<string name="vector_data">오프라인 벡터 맵</string>
@@ -755,7 +754,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
 	<string name="loading_data">데이터 로딩…</string>
 	<string name="reading_indexes">로컬 데이터 읽기…</string>
 	<string name="previous_run_crashed">이전에 실행한 앱이 죽었습니다. 로그 파일은 {0}입니다. 문제를 알리고 로그 파일을 첨부하세요.</string>
-	<string name="saving_gpx_tracks">GPX 트랙을 SD에 저장 중…</string>
+	<string name="saving_gpx_tracks">GPX 경로를 SD에 저장 중…</string>
 	<string name="finished_task">종료되었습니다</string>
     <string name="reload_indexes_descr">SD 카드로부터 오프라인 데이터를 재적재합니다</string>
     <string name="reload_indexes">오프라인 데이터 재적재</string>
@@ -773,10 +772,10 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
     <string name="additional_settings">추가 설정</string>
     <string name="settings">설정</string>
     <string name="save_current_track_descr">현재의 트랙을 SD 카드에 저장합니다</string>
-    <string name="save_current_track">현재의 GPX트랙을 저장</string>
+    <string name="save_current_track">현재의 트랙을 GPX 파일로 저장</string>
     <string name="save_track_interval_descr">길안내하는 동안 트랙 기록을 저장하는 로깅 간격을 선택합니다</string>
     <string name="save_track_interval">길안내하는 동안 로깅 간격</string>
-    <string name="save_track_to_gpx_descrp">길안내하는 동안 트랙 디렉토리에 경로를 저장합니다</string>
+    <string name="save_track_to_gpx_descrp">길안내하는 동안 트랙을 GPX파일로 저장합니다</string>
     <string name="save_track_to_gpx">길안내하는 동안 트랙을 GPX파일로 저장</string>
     <string name="update_tile">맵 업데이트</string>
     <string name="reload_tile">타일 재로드</string>
@@ -969,7 +968,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
     <string name="route_info">경로 정보</string>
     <string name="routing_attr_prefer_motorway_name">전용도로 선호</string>
 	<string name="routing_attr_prefer_motorway_description">전용도로 선호</string>
-	<string name="routing_attr_short_way_name">최단 길</string>
+	<string name="routing_attr_short_way_name">최단길</string>
 	<string name="routing_attr_short_way_description">최단길 사용하기</string>
 	<string name="routing_attr_avoid_toll_name">유료도로 회피</string>
 	<string name="routing_attr_avoid_toll_description">유료도로 회피하기</string>
@@ -981,8 +980,8 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
 	<string name="routing_attr_avoid_motorway_description">전용도로 회피하기</string>
 	<string name="routing_attr_weight_name">최대중량</string>
 	<string name="routing_attr_weight_description">차량중량제한 지정하기</string>
-    <string name="android_19_location_disabled">"KitKat version 이후로 이전에 저장한 위치에 지도를 다운로드하고 업데이트 할 수 없습니다 (%s).
-\n모든 파일을 그곳에 복사하는 것을 허락하겠는가?
+    <string name="android_19_location_disabled">"킷캣(KitKat) 버전 이후로 이전에 저장한 위치에 지도를 다운로드하고 업데이트 할 수 없습니다 (%s).
+\n모든 파일을 그곳에 복사하는 것을 허락하겠습니까?
 \n Note : 이전 파일은 그대로 유지됩니다.
 \n Note : OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. "</string>
     <string name="application_dir_change_warning2">OsmAnd는 새 목적지로 데이터를 이동하려고 합니다. 그렇게 하겠습니까?</string>
@@ -991,11 +990,11 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
     <string name="copying_osmand_files">OsmAnd 파일을 복사중</string>
     <string name="calculate_osmand_route_gpx">OsmAnd 오프라인 경로 계산하기</string>
     <string name="app_mode_truck">트럭</string>
-    <string name="routing_preferences_descr">길찾기 선호도</string>
+    <string name="routing_preferences_descr">길찾기 환경설정</string>
     <string name="speech_rate_descr">TTS에 대한 음성속도를 지정합니다</string>
     <string name="speech_rate">음성 속도</string>
     <string name="complex_route_calculation_failed">빠른 경로 계산 실패(%s), 느린 계산으로 돌아감.</string>
-    <string name="disable_complex_routing">복잡한 라우팅 사용불능</string>
+    <string name="disable_complex_routing">복잡한 라우팅 사용불가</string>
     <string name="amenity_type_seamark">Seamark</string>
     <string name="app_modes_choose">앱 프로필</string>
 	<string name="map_widget_map_rendering">지도 렌더링:</string>
@@ -1008,7 +1007,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
     <string name="local_osm_changes_delete_all">모두 삭제하기</string>
     <string name="animate_routing_route_not_calculated">먼저 경로를 계산하세요</string>
     <string name="animate_routing_route">"탬색된 경로를 이용하여 모의주행하기 "</string>
-    <string name="animate_routing_gpx">GPX트랙을 이용하여 모의주행하기</string>
+    <string name="animate_routing_gpx">GPX경로를 이용하여 모의주행하기</string>
     <string name="remember_choice">내 선택을 기억하기</string>
     <string name="gps_status_eclipsim">GPS status</string>
     <string name="default_and">그리고</string>
@@ -1062,16 +1061,16 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
 	<string name="lang_pt">포르투갈어</string>
 	<string name="lang_sl">슬로베니아어</string>
 	<string name="lang_cy">웨일스어</string>
-	<string name="route_preferences">경로 관련설정</string>
-    <string name="guidance_preferences_descr">경로탐색 관련설정</string>
-    <string name="disable_complex_routing_descr">자동차 경로탐색의 2단계 라우팅 사용불가</string>
+	<string name="route_preferences">경로 환경설정</string>
+    <string name="guidance_preferences_descr">경로탐색 환경설정</string>
+    <string name="disable_complex_routing_descr">자동차 경로탐색의 복잡한 출발지/도착지 2단계 라우팅 사용불가</string>
     <string name="app_modes_choose_descr">앱에서 볼 수있는 사용자 프로필를 선택합니다</string>
     <string name="map_widget_appearance">나머지 요소 :</string>
 	<string name="local_osm_changes_delete_all_confirm">%1$d OSM 변경 사항을 삭제하려고 합니다.  확실합니까?</string>
-    <string name="route_is_too_long">OsmAnd 오프라인 라우팅(길찾기)는 200km 이상 떨어진 포인트를 계산할 때 매우 긴 시간이 걸리 수 있습니다. (가끔 작동 되지 않을 수 있음) 당신은 더 나은 성능을 위해 중간 중간 포인트를 추가할 수 있습니다.</string>
-	<string name="auto_zoom_close">좀더 가까이에</string>
-	<string name="auto_zoom_far">미드 레인지(중간 거리)에</string>
-	<string name="auto_zoom_farthest">롱 레인지(긴 거리)에</string>
+    <string name="route_is_too_long">OsmAnd 오프라인 라우팅(길찾기)는 200km 이상 떨어진 포인트를 계산할 때 매우 긴 시간이 걸리 수 있습니다. (가끔 작동 되지 않을 수 있습니다) 당신은 더 나은 성능을 위해 중간 중간 포인트를 추가할 수 있습니다.</string>
+	<string name="auto_zoom_close">가까운 거리에</string>
+	<string name="auto_zoom_far">중간 거리에</string>
+	<string name="auto_zoom_farthest">긴 거리에</string>
 	<string name="edit_tilesource_elliptic_tile">타원 메르카토르</string>
     <string name="edit_tilesource_expiration_time">만료 (분)</string>
     <string name="edit_tilesource_url_to_load">URL</string>
@@ -1093,22 +1092,14 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
 	<string name="destination_point">목적지 %1$s</string>
     <string name="context_menu_item_destination_point">목적지로 설정</string>
     <string name="please_select_address">먼저 도시나 거리를 선택</string>
-    <string name="tip_recent_changes_1_4_t">Changes in 1.4:
-	\n\t* Order waypoints in optimal way to visit all (Travelling salesman, door-to-door)
-		모든 곳을 방문하기 위한 최적화된 방식으로 포인트 순서
-	\n\t* Search street by name (in neighborhood) 
-		이름으로 거리 검색
-	\n\t* Planning mode plugin (load/edit/save GPX tracks)
-		플래닝모드 플러그인
-	\n\t* New download screen (download in background)
-		새 다운로드 화면
-	\n\t* Support GPX subfolders (organize your GPX tracks)
-		GPX 서브폴더 지원
-	\n\t* Delete SRTM files
-		SRTM 파일 삭제
-	\n\t* Support OSM Notes 
-		OSM 메모 지원 
-    </string>
+    <string name="tip_recent_changes_1_4_t">"Changes in 1.4:
+\n\t* 모든 곳을 방문하기 위한 최적화된 방식으로 포인트 순서
+\n\t* 이름으로 거리 검색
+\n\t* 플래닝모드 플러그인
+\n\t* 새 다운로드 화면
+\n\t* GPX 서브폴더 지원
+\n\t* SRTM 파일 삭제
+\n\t* OSM 노트 지원 "</string>
     <string name="search_street_in_neighborhood_cities">인근 도시에서 거리 검색</string>
     <string name="intermediate_items_sort_return">중간 포인트는 목적지까지 가는 길에 포인트의 순서를 최적화하기 위해 재 정렬.</string>
     <string name="intermediate_items_sort_by_distance">정렬 (도어 투 도어)</string>
@@ -1131,13 +1122,13 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
     <string name="distance_measurement_finish_subtrack">새로운 subtrack(세그먼트) 시작</string>
     <string name="distance_measurement_clear_route">모든 포인트 지우기</string>
     <string name="distance_measurement_save_gpx">GPX로 저장</string>
-    <string name="distance_measurement_load_gpx">기존 GPX 열기</string>
+    <string name="distance_measurement_load_gpx">기존 GPX파일 불러오기</string>
     <string name="wait_current_task_finished">현재 작업이 완료 될 때까지 기다리십시오</string>
     <string name="use_kalman_filter_compass_descr">나침반 흔들림을 방지하기 위해 칼만 필터를 사용</string>
     <string name="use_kalman_filter_compass">칼만 필터 사용</string>
     <string name="access_mark_final_location_first">접근성 모드 : 먼저 목적지를 선택하세요</string> 
-    <string name="use_magnetic_sensor_descr">방위센서(GPS) 대신 나침반 값을 결정하는 자기센서를 사용</string>
-    <string name="use_magnetic_sensor">자기센서를 사용</string>
+    <string name="use_magnetic_sensor_descr">방위센서(GPS) 대신 나침반 값을 결정하는 지자기센서를 사용</string>
+    <string name="use_magnetic_sensor">지자기센서를 사용</string>
     <string name="other_location">기타</string>
     <string name="files_limit">%1$d 파일 남음</string>
     <string name="install_paid">정식 버전</string>
@@ -1157,14 +1148,14 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
     <string name="monitoring_settings_descr">여행을 기록하는 방법을 구성합니다</string>
     <string name="osmand_monitoring_plugin_description">절전모드(스크린 끄기)에서 트래킹 및 경로탐색 활성화, 주기적으로 GPS 장치가 작동중일 때 . 표시 설정은 로컬 GPX 파일이나 웹 서비스를 사용하는 온라인에 트랙을 기록하는 설비 가능.</string>
     <string name="osmand_monitoring_plugin_name">로깅 서비스</string>
-    <string name="osmand_background_plugin_description">주기적으로 GPS 장치를 깨어 절전모드(스크린 끄기)에서 트래킹 및 경로탐색을 가능하게 하는 설정 표시.</string>
+    <string name="osmand_background_plugin_description">주기적으로 GPS 장치를 On 시켜 절전모드(스크린 끄기)에서 트래킹 및 경로탐색을 가능하게 합니다.</string>
     <string name="choose_osmand_theme_descr">앱 테마(색상)를 선택</string>
     <string name="choose_osmand_theme">앱 테마</string>
     <string name="accessibility_options">접근성(내게 필요한) 옵션</string>
     <string name="select_address_activity">주소 선택</string>
     <string name="favourites_list_activity">즐겨찾기 선택</string>
     <string name="local_openstreetmap_act_title">OSM 대량수정</string>
-    <string name="default_buttons_other_actions">다른 작업</string>
+    <string name="default_buttons_other_actions">다른 액션</string>
     <string name="available_downloads_left">"다운로드 할 파일  %1$d 가능"</string>
     
 	<string name="layer_hillshade">음영 레이어</string>
@@ -1190,10 +1181,10 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
     <string name="recording_photo_description">사진 %1$s of %2$s</string>
     <string name="av_def_action_picture">사진 찍기</string>
     <string name="recording_context_menu_precord">사진 찍기</string>
-    <string name="dropbox_plugin_description">Dropbox 플러그인은 Dropbox 계정으로 GPX트랙과 오디오/비디오 메모를 동기화 할 수 있습니다 .</string>
+    <string name="dropbox_plugin_description">Dropbox 플러그인은 Dropbox 계정으로 GPX경로와 오디오/비디오 노트를 동기화 할 수 있습니다 .</string>
     <string name="dropbox_plugin_name">드롭박스 플러그인</string>
     <string name="intermediate_points_change_order">순서 변경</string>
-    <string name="srtm_paid_version_msg">등고선 추가 개발을 지원하기 위해 구글시장에서 플러그인을 구입하시기 바랍니다 .</string>
+    <string name="srtm_paid_version_msg">등고선 추가 개발을 지원하기 위해 구글플레이에서 플러그인을 구입하시기 바랍니다 .</string>
     <string name="srtm_paid_version_title">등고선 플러그인</string>
     <string name="av_def_action_choose">요청에 대한 선택</string>
     <string name="av_def_action_video">비디오 녹화</string>
@@ -1211,7 +1202,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
     <string name="recording_error">"기록하는 동안 오류가 발생했습니다 "</string>
     <string name="recording_camera_not_available">카메라는 사용할 수 없습니다</string>
     <string name="recording_is_recorded">오디오/비디오는 기록되고 있습니다. 정지하려면 AV 위젯을 누르면 됩니다.</string>
-    <string name="recording_playing">지정된 레코딩에서 오디오가 재생되고 있습니다.\n%1$s</string>
+    <string name="recording_playing">지정된 녹음기에서 오디오가 재생되고 있습니다.\n%1$s</string>
     <string name="recording_open_external_player">외부 플레이어 열기</string>
     <string name="recording_delete_confirm">이 기록을 삭제하시겠습니까 ?</string>
     <string name="recording_unavailable">사용 불가능</string>
@@ -1307,10 +1298,10 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
 	<string name="snap_to_road_descr">길안내할 동안 차량을 도로에 밀착시킴</string>
 	<string name="snap_to_road">도로에 밀착</string>
 	<string name="osmand_play_title_30_chars">OsmAnd 지도 및 네비게이션</string>
-	<string name="osmand_short_description_80_chars">글로벌 모바일 지도 보기 및 오프라인 및 온라인 OSM지도를 위한 경로탐색</string>
+	<string name="osmand_short_description_80_chars">글로벌 모바일 지도 보기 및 오프라인 및 온라인 OSM 지도를 위한 경로탐색</string>
 	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM 자동 길안내 시스템) OsmAnd 글로벌 OpenStreetMap의 다양한 데이터에 접근할 수 있는 오픈 소스 탐색 응용 프로그램입니다. 모든 지도 데이터(벡터 맵 또는 타일 맵 ) 는 오프라인 사용을 위하여 휴대 전화 메모리 카드에 저장할 수 있습니다. OsmAnd는 또한 턴-바이-턴 음성 안내 등의 오프라인 및 온라인 라우팅(길찾기) 기능을 제공합니다. 핵심 기능 중 일부 : - 전체 오프라인 기능 (선택한 폴더에 저장, 벡터지도 또는 타일지도 다운로드 가능) - 컴팩트한 오프라인 벡터는 전 세계에서 사용가능 - 국가 또는 지역의 다운로드는 앱에서 직접 매핑 - GPX 또는 탐색 트랙, 관광 명소 등 가능한 여러 지도 레이어의 중첩, 즐겨 찾기, 등고선, 대중 교통 정류장, 사용자 정의 투명성 추가 - 주소 및 장소에 대한 오프라인 검색 장소(POI) - 짧은 거리를 위한 오프라인 라우팅 - 자동차, 자전거, 보행자 모드 : - 옵션으로 자동 주간/야간 지도 전환 - 옵션으로 속도에 따라 지도 줌레벨 변경 - 옴션으로 나침반이나 방향에 따라 맵 정렬 - 옴션으로 차선 안내, 속도제한 표시, 녹음음성 및 TTS음성 OsmAnd 무료 버전 제한 사항 : - 지도 다운로드 수 10회로 제한 - 위키 백과 또는 오프라인 관심 장소에 액세스할 수 없음. OsmAnd 는 적극적으로 개발하고 우리의 프로젝트와 프로젝트의 추가 진행은 개발 자금을 재정 지원에 의존하고 새로운 기능을 testdriving 하고있다. OsmAnd+ 를 구입, 또는 특정 새로운 기능에 자금을 지원하거나 osmand.net 에 일반 후원을 부탁드립니다. "</string>
 	<string name="osmand_plus_play_title_30_chars">OsmAnd+ 지도 및 네비게이션</string>
-	<string name="osmand_plus_short_description_80_chars">글로벌 모바일 지도보기 및 오프라인 및 온라인 OSM지도를 위한 경로탐색</string>
+	<string name="osmand_plus_short_description_80_chars">글로벌 모바일 지도보기 및 오프라인 및 온라인 OSM 지도를 위한 경로탐색</string>
 	<string name="osmand_plus_long_description_1000_chars">
 		OsmAnd + (OSM 자동 탐색 길안내 )
 
@@ -1465,7 +1456,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="tip_recent_changes_0_8_1_t">"Changes in 0.8.1:
 \n\t* 더욱 정밀한 경로(좀 더 느려짐)
 \n\t* 스마트 하고 빠른 경로 계산.
-\n\t* 자동차 길로 길안내. 
+\n\t* 자동차길로 길안내. 
 \n\t* 속도 제한 정보, 속도 카메라, 속도위반에 관한 정보.
 \n\t* 고속도로에서 향상된 음성안내. 
 \n\t* 주차 플러그인. (\'Where is my car parked at?\')
@@ -1608,10 +1599,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="av_photo_play_sound">사진찍을 때 소리재생</string>
 	<string name="av_photo_play_sound_descr">사진 찍을 때 소리를 재생할 것인지 선택</string>
 <string name="tip_recent_changes_1_7_1_t">"Changes in 1.7:
-\n\t* 중요한 지도는 2014년 2월 보다 새로운 지도 이어야 한다.
+\n\t* 중요한 지도는 2014년 2월 보다 새로운 지도이어야 합니다.
 \n\t* 완전히 업데이트된 길찾기(빠르고 정확하게).
 \n\t* 경로 플래닝에서 새로운 화면(더 직관적이고 더 강력하게).
-\n\t* 주의! GPS 경로파일은 경로설정 버튼으로 이용할 수 있다.
+\n\t* 주의! GPS 경로파일은 경로설정 버튼으로 이용할 수 있습니다.
 \n\t* 길안내모드에서 자동 숨김 버튼.
 \n\t* GPX 경로파일의 첫 포인트에서 오프라인 경로를 계산.
 \n\t* 터널에서 시뮬레이션 활성화.
@@ -1628,9 +1619,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="tip_map_styles_t">
 	</string>
     <string name="tip_recent_changes_1_2_t">"Fixes in 1.2.1:
-\n\t*Fix Geo Intent (Foursquare, c:geo) 지오 인텐트 고정
-\n\t*Fix screen tremble during navigation 경로탐색중 화면 떨림 고정
-\n\t*Other small fixes 다른 사소한 고정
+\n\t*Fix Geo Intent (Foursquare, c:geo) 지오 인텐트 수정\n\t*Fix screen tremble during navigation 경로탐색중 화면 떨림 수정
+\n\t*Other small fixes 다른 사소한 버그 수정
 \n\nChanges in 1.2:
 \n\t* Bug fixes (tuned routing, search, AV recording, voice prompts, some display improvements)
 \n\t* Easier hillshade overlay configuration (requires Contour Lines plugin)
@@ -1817,7 +1807,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
 	\n\t* 빠른 검색 주소 임력
 	\n\t* 라우팅 및 렌더링의 버그 수정
     </string>
-    <string name="always_center_position_on_map">센터에 항상 위치 표시</string>
+    <string name="always_center_position_on_map">지도 중심에 항상 위치 표시</string>
     <string name="voice_pref_title">음성</string>
     <string name="misc_pref_title">기타</string>
     <string name="localization_pref_title">현지화</string>
@@ -1868,7 +1858,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
     <string name="osmo_plugin_name">OsMo (실시간 친구위치 공유)</string>
     <string name="osmo_settings">OsMo (실시간 친구찾기)</string>
    	<string name="share_route_as_gpx">경로를 GPX 파일로 공유</string>
-	<string name="share_route_subject">OsmAnd 통해 공유된 경로</string>
+	<string name="share_route_subject">OsmAnd를 통해 공유된 경로</string>
 	<string name="arrival_distance">도착 알림</string>
     <string name="arrival_distance_descr">도착 알림을 원하세요 ?</string>
     <string name="keep_informing_never">결코</string>
@@ -1946,7 +1936,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
     <string name="osmo_sign_in">가입하기</string>
     <string name="osmo_create_groups_confirm">그룹을 만들려면 OsMo의 사용자 등록이 필요합니다.</string>
     <string name="osmo_credentials_not_valid">OsMo 자격증명이 유효하지 않습니다.</string>
-    <string name="osmo_regenerate_login_ids_confirm">개인 ID를 재발급 받으시겠습니까? 연결된 모든 장치는 더 이상 GPX트랙을 기록할 수 없습니다.</string>
+    <string name="osmo_regenerate_login_ids_confirm">개인 ID를 재발급 받으시겠습니까? 연결된 모든 장치는 더 이상 트랙을 기록할 수 없습니다.</string>
     <string name="osmo_regenerate_login_ids">사용자 ID 재생성</string>
     <string name="osmo_cancel_moving_target">이동 목적지 취소</string>
     <string name="osmo_center_location">화면 센터</string>
@@ -1960,9 +1950,9 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
     <string name="osmo_user_left">"사용자 %1$s가  그룹 %2$s에 남습니다"</string>
     <string name="osmo_show_group_notifications">그룹 알림 보기</string>
     <string name="osmo_show_group_notifications_descr">사용자가 그룹에 참여 또는 해체 할때 토스트 메시지를 표시</string>
-    <string name="gpx_file_is_empty">GPX트랙이 비어있습니다</string>
+    <string name="gpx_file_is_empty">GPX 경로가 비어있습니다</string>
     <string name="selected_track">선택된 경로</string>
-    <string name="my_tracks">모든 GPX트랙</string>
+    <string name="my_tracks">내 GPX경로</string>
     <string name="my_favorites">내 즐겨찾기</string>
     <string name="my_data_Button">내 장소</string>
     <string name="my_data_activity">내 장소</string>
@@ -1983,7 +1973,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
     <string name="gpx_selection_route_points">%1$s
 \n 루트 포인트 %2$s</string>
     <string name="gpx_selection_points">%1$s\n 포인트</string>
-    <string name="gpx_selection_track">%1$s\n GPX트랙 %2$s</string>
+    <string name="gpx_selection_track">%1$s\n GPX경로 %2$s</string>
     <string name="gpx_available_current_track">현재 기록중인 트랙</string>
     <string name="loading_smth">%1$s 불러오는 중…</string>
     <string name="map_widget_plain_time">현재 시간</string>
@@ -1999,7 +1989,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
     <string name="layer_amenity_label">포인트 레이블</string>
     <string name="show_zoom_buttons_navigation_descr">길안내중에 줌 버튼 보기</string>
     <string name="show_zoom_buttons_navigation">줌 버튼 보이기</string>
-    <string name="none_selected_gpx">"선택한 GPX 파일 없음. 이용 가능한 GPX트랙을 선택 하려면  누르고 있어요."</string>
+    <string name="none_selected_gpx">"선택한 GPX파일 없음. 이용 가능한 GPX경로를 선택 하려면  누르고 있어요."</string>
     <string name="local_index_unselect_gpx_file">선택을 취소합니다.</string>
     <string name="local_index_select_gpx_file">보이기위해 선택</string>
     <string name="sort_by_distance">거리로 정렬</string>
@@ -2018,7 +2008,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
     <string name="osmo_auto_connect_descr">앱 시작 후 서비스에 자동으로 연결</string>
     <string name="osmo_auto_connect">자동 연결</string>
     <string name="osmo_start_service">OsMo 서비스</string>
-    <string name="osmo_gpx_track_downloaded">OsMo GPX트랙 %1$s 다운로드됨.</string>
+    <string name="osmo_gpx_track_downloaded">OsMo GPX경로 %1$s 다운로드됨.</string>
     <string name="rendering_attr_hideBuildings_name">건물 숨기기</string>
     <string name="rendering_attr_hideNonVehicleHighways_name">비 차량 고속도로 숨기기</string>
     <string name="rendering_attr_hideText_name">텍스트 숨기기</string>
@@ -2061,7 +2051,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
  	<string name="continue_navigation">길안내 계속</string>
     <string name="pause_navigation">길안내 일시중지</string>
 	<string name="rendering_attr_alpineHiking_name">고산 하이킹 규모 (SAC)</string>
-    <string name="rendering_attr_alpineHiking_description">SAC scale에 따라 경로 렌더링</string>
+    <string name="rendering_attr_alpineHiking_description">SAC Scale에 따른 경로 렌더링</string>
     <string name="rendering_attr_osmcTraces_name">하이킹 심볼 오버레이</string>
     <string name="rendering_attr_osmcTraces_description">OSMC 흔적에 따라 경로 렌더링</string>
     
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 2b073b86e0..8888b56f3a 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1946,8 +1946,8 @@ 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="speak_favorites">Meld favorieten</string>
-    <string name="speak_poi">Meld interessepunt (POI)</string>
+    <string name="speak_favorites">Meld favorieten in de buurt</string>
+    <string name="speak_poi">Meld POI in de buurt</string>
     <string name="flat_list_waypoints">Alle</string>
     <string name="index_tours">Reizen</string>
     <string name="record_plugin_name">Reizen opnemen</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 916e1bafa2..850c60b0b8 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1929,9 +1929,9 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="flat_list_waypoints">Wszystkie</string>
     <string name="waypoints">Punkty trasy</string>
     <string name="targets">Kierunki</string>
-    <string name="way_alarms">Przeszkody</string>
-    <string name="speak_favorites">Pokazuj ulubione</string>
-    <string name="speak_poi">Pokazuj punkty POI</string>
+    <string name="way_alarms">Ostrzeżenia ruchu drogowego</string>
+    <string name="speak_favorites">Pokazuj okoliczne Ulubione</string>
+    <string name="speak_poi">Pokazuj okoliczne punkty POI</string>
     <string name="save_track_to_gpx_globally">Zapisz ścieżkę do pliku GPX</string>
 	<string name="save_track_to_gpx_globally_descr">Logowanie pozycji do pliku GPX można włączyć lub wyłączyć używając widgetu nagrywania GPX na głównym ekranie</string>
 	<string name="save_track_interval_globally">Częstotliwość zapisywania</string>
@@ -1939,4 +1939,12 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="confirm_every_run">Zawsze pytaj</string>
 	<string name="save_global_track_interval_descr">Wybierz interwał rejestrowania dla nagrywania ścieżki (włączonego poprzez widżet nagrywania GPX na mapie)</string>
 	<string name="save_global_track_interval">Ogólny interwał rejestrowania</string>
+	<string name="traffic_warning_speed_limit">Ograniczenie prędkości</string>
+    <string name="traffic_warning_border_control">Kontrola graniczna</string>
+    <string name="traffic_warning_payment">Punkt poboru opłat</string>
+    <string name="traffic_warning_stop">Znak Stop</string>
+    <string name="traffic_warning_calming">Uspokojenie ruchu</string>
+    <string name="traffic_warning_speed_camera">Fotoradar</string>
+    <string name="traffic_warning">Ostrzeżenia drogowe</string>
+	<string name="local_index_description">Kliknij istniejący element, aby zobaczyć szczegóły, naciśnij i przytrzymaj, aby wyłączyć lub usunąć. Aktualne dane na urządzeniu (%1$s wolne):</string>
 	</resources>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 245ccd27fe..bd4470510c 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="background_service_is_enabled_question">Serviciul încă rulează în background. Doriți să-l opriți?</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
     <string name="tip_recent_changes_1_0_0_t">Modificări în versiunea 1.0.0 :
 \n\t* Rutare îmbunătățită, mai rapidă și mai exactă (până la 250 km)
 \n\t* Posibilitate afișare hartă exclusiv pentru drumuri
@@ -645,8 +646,8 @@
 		\n\tMeniul context hartă conține toate acțiunile referitoare la un punct (poziție).
 	</string>
 	<string name="tip_initial">Trucuri și recomandări</string>
-	<string name="tip_initial_t">"\tOsmAnd este o aplicație pentru navigare cu multe funcții.
-\n\tPentru început, găsiți câteva recomandări și trucuri în pagina principala (vedeți icoana \'?\'). "</string>
+	<string name="tip_initial_t">"OsmAnd este o aplicație pentru navigare cu multe funcții.
+\n\nPentru început, găsiți câteva recomandări și instrucțiuni în pagina principala (vedeți icoana \'?\'). "</string>
 	<string name="next_button">Următorul</string>
 	<string name="previous_button">Precedentul</string>
 	<string name="unit_of_length_descr">Schimbă unitățile de măsură ale distanței și vitezei</string>
@@ -812,7 +813,7 @@
 	<string name="int_seconds">secunde</string>
 	<string name="int_min">min.</string>
 	<string name="background_service_int_descr">Alegeți intervalul de timp pentru menținerea activă a serviciilor folosite în fundal</string>
-	<string name="background_service_int">Interval menținere activă</string>
+	<string name="background_service_int">Interval menținere activă GPS</string>
 	<string name="background_service_provider_descr">Alege furnizorul serviciului de localizare pe timpul navigării în fundal</string>
 	<string name="background_service_provider">Furnizorul serviciului de localizare</string>
 	<string name="background_router_service_descr">Rulează OsmAnd în fundal pentru determinarea poziției în timp ce ecranul este oprit</string>
@@ -959,10 +960,10 @@
 	<string name="settings">Setări</string>
 	<string name="save_current_track_descr">Se salvează traseul curent pe cardul SD</string>
 	<string name="save_current_track">Salvează traseul GPX curent</string>
-	<string name="save_track_interval">Interval de salvare a poziției</string>
-	<string name="save_track_interval_descr">Se alege intervalul de timp de salvare a poziției curente</string>
-	<string name="save_track_to_gpx_descrp">Traseele vor fi salvate în format GPX grupate pe zile</string>
-	<string name="save_track_to_gpx">Salvează traseul GPX</string>
+	<string name="save_track_interval">Interval de salvare a poziției in timpul navigării</string>
+	<string name="save_track_interval_descr">Se alege intervalul de timp de salvare a poziției în timpul navigării</string>
+	<string name="save_track_to_gpx_descrp">Traseele vor fi salvate în memorie grupate pe zile</string>
+	<string name="save_track_to_gpx">Salvează traseul GPX in timpul navigării</string>
 	<string name="update_tile">Actualizare hartă</string>
 	<string name="reload_tile">Reîncarcă porțiunile de hartă raster</string>
 	<string name="mark_point">Punct țintă</string>
@@ -1089,7 +1090,7 @@
 	<string name="default_buttons_selectall">Selectează tot</string>
 	<string name="email">email</string>
 <string name="safe_mode_description">Safe mode (cod Android în loc de cod nativ).</string>
-    <string name="safe_mode">Safe mode</string>
+    <string name="safe_mode">Mod siguranță</string>
     <string name="native_library_not_running">Aplicația rulează în safe mode (se poate dezactiva de la Setări).</string>
     <string name="rendering_attr_showRoadMaps_description">Specificați când anume să fie afișate hărțile exclusiv cu drumuri:</string>
 	<string name="rendering_attr_showRoadMaps_name">Hărți doar pentru drumuri</string>
@@ -1336,4 +1337,119 @@
     <string name="disable_complex_routing">Dezactivează rutarea complexă</string>
     <string name="amenity_type_seamark">Baliză</string>
     <string name="route_is_too_long">Rutarea offline OsmAnd poate dura foarte mult timp (sau uneri nu funcționează) pentru puncte la distanța mai mare de 200km. Este posibil să doriți să adăugați puncte intermediare pentru o performanță mai bună.</string>
-	</resources>
\ No newline at end of file
+	<string name="traffic_warning_speed_limit">Limită viteză</string>
+    <string name="traffic_warning_border_control">Control graniță</string>
+    <string name="traffic_warning_payment">Cabina de taxă</string>
+    <string name="traffic_warning_stop">Stop</string>
+    <string name="traffic_warning_calming">Limitator viteză</string>
+    <string name="traffic_warning_speed_camera">Cameră trafic</string>
+    <string name="traffic_warning">Avertizare trafic</string>
+	<string name="speak_favorites">Anunță punctele favoritele apropiate</string>
+	<string name="speak_poi">Anunță punctele de interes apropiate</string>
+	<string name="way_alarms">Avertizări trafic</string>
+	<string name="sleep_mode_stop_dialog">Opresc modul sleep al GPS-ului?</string>
+	<string name="stop_navigation_service">Oprire</string>
+	<string name="confirm_every_run">Intreabă intotdeauna</string>
+	<string name="save_global_track_interval_descr">Alege intervalul de logare pentru inregistrarea generala a track-urilor(activat prin intermediul widget-ului de inregistrare GPX)</string>
+	<string name="save_global_track_interval">Interval general de logare</string>
+	<string name="enable_sleep_mode">Activează modul sleep al GPS-ului</string>
+	<string name="save_track_to_gpx_globally">Salveaza track-ul intr-un fișier GPX</string>
+	<string name="save_track_to_gpx_globally_descr">Salvarea pozitiei generale intr-un fișier GPX poate fi activată prin intermediul widget-ului de inregistrare GPX de pe fereastra hărții</string>
+	<string name="save_track_interval_globally">Interval de salvare</string>
+	<string name="rendering_attr_publicTransportMode_name">Modul transport public</string>
+	<string name="monitoring_settings">Înregistrare călătorie</string>
+    <string name="monitoring_settings_descr">Configurare mod înregistrare călătorie</string>
+    <string name="int_hour">h</string>
+    <string name="duration">Durată</string>
+    <string name="distance">Distanță</string>
+    <string name="flat_list_waypoints">Toate</string>
+    <string name="waypoints">Puncte de referință</string>
+    <string name="targets">Destinații</string>
+    <string name="download_additional_maps">Descarcă hărțile lipsă %1$s (%2$d MB)?</string>
+    <string name="more">Mai mult...</string>
+    <string name="rendering_value_browse_map_name">Derulează hartă</string>  
+    <string name="rendering_value_car_name">Mașină</string>
+    <string name="rendering_value_bicycle_name">Bicicletă</string>
+    <string name="rendering_value_pedestrian_name">Pieton</string>
+    <string name="rendering_attr_coloredBuildings_name">Cladiri colorate</string>
+    <string name="osmo_invite">Invită...</string>
+    <string name="osmo_leave_confirmation_msg">Vrei să părăsești grupul %1$s?</string>
+    <string name="osmo_specify_tracker_id">Vă rugăm să specificați id</string>
+    <string name="continue_navigation">Coninuați navigația</string>
+    <string name="pause_navigation">Întrerupeți navigația</string>
+    <string name="map_preferred_locale">Limba de afișare preferată</string>
+    <string name="local_map_names">Nume locale</string>
+    <string name="gps_wake_up_timer">Intervalul de trezire al GPS-ului</string>
+	<string name="index_tours">Călătorii</string>
+    <string name="record_plugin_name">Inregistrează călătoriile</string>
+    <string name="rendering_attr_subwayMode_name">Mod metrou</string>
+ 	<string name="keep_navigation_service">Păstrează</string>
+	<string name="map_preferred_locale_descr">Limba preferată pentru marcajele de pe hartă ( daca nu sunt disponibile se va comuta în limba Engleză sau pe denumirile locale)</string>
+    <string name="forward">Înainte</string>
+    <string name="home">Acasă</string>
+    <string name="live_monitoring_m_descr">Se trimite monitorizarea catre un serviciu web dacă înregistrarea GPX este activată.</string>
+	<string name="live_monitoring_m">Monitorizare online (GPS necesar)</string>
+    <string name="live_monitoring_start">Porniți monitorizarea online</string>
+	<string name="live_monitoring_stop">Opriți monitorizarea online</string>
+	<string name="gpx_monitoring_start">Porniți înregistrarea GPX</string>
+	<string name="gpx_monitoring_stop">Opriți înregistrarea GPX</string>
+    <string name="gpx_start_new_segment">Începeți un segment nou</string>
+    <string name="rendering_attr_hideBuildings_name">Ascunde clădirile</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Acunde drumurile care nu sunt pentru vehicule</string>
+    <string name="rendering_attr_hideText_name">Ascunde textul</string>
+    <string name="rendering_attr_buildings15zoom_name">Clădirile la nivel de zoom 15</string>
+    <string name="rendering_attr_moreDetailed_name">Mai multe detalii</string>
+    <string name="rendering_attr_lessDetailed_name">Mai puține detalii</string>
+    <string name="rendering_attr_hideAccess_name">Ascunde restricțiile de acces</string>
+    <string name="rendering_attr_showAccess_name">Arată restricțiile de acces</string>
+    <string name="rendering_attr_showSurfaceGrade_name">Arată calitatea drumului</string>
+    <string name="rendering_attr_showSurfaces_name">Arată suprafața drumului</string>
+    <string name="rendering_attr_showCycleRoutes_name">Arată rutele pentru biciclete</string>
+    <string name="osmo_auth_error_short">Autorizare eșuată</string>
+    <string name="osmo_group_information">Vă rugăm să citiți înainte de a crea un grup!</string>
+    <string name="osmo_not_signed_in">Logare OsMo eșuată</string>
+    <string name="osmo_gpx_points_downloaded">Puncte OsMo %1$s descărcate.</string>
+    <string name="osmo_auto_connect_descr">Conectare automată la serviciu după pornirea aplicației</string>
+    <string name="osmo_auto_connect">Auto-conectare</string>
+    <string name="osmo_start_service">Serviciul OsMo</string>
+    <string name="osmo_gpx_track_downloaded">Înregistrare OsMo %1$s descărcată.</string>
+    <string name="no_index_file_to_download">Nimic de descărcat, vă rugăm să verificați conexiunea la internet.</string>
+    <string name="local_index_unselect_gpx_file">Deselctați</string>
+    <string name="local_index_select_gpx_file">Selectați pentru afișare</string>
+    <string name="gpx_split_interval">Intervalul de împărțire</string>
+    <string name="sort_by_distance">Sortare după distanță</string>
+    <string name="sort_by_name">Sortare după nume</string>
+    <string name="visible_element">Arată pe hartă</string>
+    <string name="show_zoom_buttons_navigation_descr">Arată butoanele de zoom în timpul navigării</string>
+    <string name="show_zoom_buttons_navigation">Arată butoanele de zoom</string>
+    <string name="save_as_favorites_points">Salvează ca grup sau favorite</string>
+    <string name="select_destination_and_intermediate_points">Selectează punctele de reper</string>
+    <string name="layer_amenity_label">Etichete puncte</string>
+    <string name="loading_smth">Încărcare %1$s …</string>
+    <string name="map_widget_plain_time">Ora curentă</string>
+    <string name="gpx_wpt">Punct de reper</string>
+    <string name="none_selected_gpx">Niciun fișier GPX selectat. Pentru a selecta țineți apăsat pe un track disponibil.</string>
+    <string name="selected_gpx_info_show">\n\nȚineți apăsat pentru a vedea pe hartă</string>
+    <string name="selected">Selectat</string>
+    <string name="osmo_auth_error">Eroare de autorizare OsMo aparută : %1$s.\nPoate fi o cadere temporară a serviciului sau înregistrarea dumneavoastră a expirat.\nDoriți sa începeți o nouă înregistrare?</string>
+    <string name="osmo_group_by_invite">Intră pe baza invitației</string>
+    <string name="delay_navigation_start">Porniți ghidarea asistată automat</string>
+    <string name="gpx_info_subtracks">"Subtrack-uri: %1$s "</string>
+	<string name="gpx_info_waypoints">"Puncte de reper: %1$s "</string>
+	<string name="gpx_info_distance">"Distanță: %1$s (%2$s points) "</string>
+	<string name="gpx_info_start_time">"Timp pornire: %1$tF, %1$tT "</string>
+	<string name="gpx_info_end_time">"Timp sosire: %1$tF, %1$tT "</string>
+	<string name="gpx_info_average_speed">"Viteza medie: %1$s "</string>
+	<string name="gpx_info_maximum_speed">"Viteza maximă: %1$s "</string>
+	<string name="gpx_info_avg_altitude">Altitudinea medie: %1$s</string>
+	<string name="gpx_selection_segment_title">Segment</string>
+    <string name="record_plugin_description">Salvează înregistrările cu o singură atingere a ecranului. Arată setările pentru înregistrarea traseelor și stocarea locală în fișiere GPX folosind un serviciu web.</string>
+    <string name="av_camera_focus">Tip de focalizare al camerei</string>
+	<string name="av_camera_focus_descr">Selectați tipul de focalizare al camerei interne</string>
+	<string name="av_camera_focus_auto">Auto focalizare</string>
+	<string name="av_camera_focus_hiperfocal">Focalizare hiperfocală</string>
+	<string name="av_camera_focus_infinity">Focalizarea este setata la infinit</string>
+	<string name="av_camera_focus_macro">Macro(de aproape) mod de focalizare</string>
+	<string name="av_camera_focus_continuous">Camera focalizează in mod continuu</string>
+	<string name="av_photo_play_sound">Sunet la fotografiere</string>
+	</resources>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 4b777361de..ea3afea27f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -11,6 +11,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.search.SearchActivity;
+import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadIndexFragment;
 import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.plus.sherpafy.TourViewActivity;
@@ -376,7 +377,7 @@ public class MainMenuActivity extends Activity {
 
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
-					startActivity(new Intent(MainMenuActivity.this, DownloadIndexFragment.class));
+					startActivity(new Intent(MainMenuActivity.this, DownloadActivity.class));
 				}
 
 			});
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
index 54be00901a..d4ef094c2d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
@@ -64,7 +64,10 @@ public abstract class OsmandExpandableListFragment extends SherlockFragment impl
 
 	public ExpandableListView getExpandableListView() { return listView; }
 
-	public void setListView(ExpandableListView listView) { this.listView = listView;}
+	public void setListView(ExpandableListView listView) {
+		this.listView = listView;
+		listView.setOnChildClickListener(this);
+	}
 
 	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType) {
 		int r = isLightActionBar() ? iconLight : iconDark;
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index 35a5a7ef08..ffc787aaf1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -374,7 +374,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		if (id.equals(settings.VOICE_PROVIDER.getId())) {
 			if (MORE_VALUE.equals(newValue)) {
 				// listPref.set(oldValue); // revert the change..
-				final Intent intent = new Intent(this, DownloadIndexFragment.class);
+				final Intent intent = new Intent(this, DownloadActivity.class);
 				intent.putExtra(DownloadActivity.FILTER_CAT, DownloadActivityType.VOICE_FILE.getTag());
 				startActivity(intent);
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 75057bf4d7..0cf6e1ca08 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
@@ -14,11 +15,16 @@ import android.widget.*;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Window;
+import net.osmand.IndexConstants;
+import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.plus.*;
 import net.osmand.plus.activities.FavouritesActivity;
+import net.osmand.plus.activities.SettingsGeneralActivity;
 import net.osmand.plus.base.BasicProgressAsyncTask;
+import net.osmand.plus.base.SuggestExternalDirectoryDialog;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 
+import java.io.File;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -44,6 +50,8 @@ public class DownloadActivity extends SherlockFragmentActivity {
 	private TextView progressMessage;
 	private TextView progressPercent;
 	private ImageView cancel;
+	private UpdatesIndexFragment updatesIndexFragment;
+
 
 	public static final String FILTER_KEY = "filter";
 	public static final String FILTER_CAT = "filter_cat";
@@ -125,10 +133,61 @@ public class DownloadActivity extends SherlockFragmentActivity {
 			}
 		}
 
+		if(getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) {
+			boolean showedDialog = false;
+			if(Build.VERSION.SDK_INT < OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) {
+				SuggestExternalDirectoryDialog.showDialog(this, null, null);
+			}
+			if(!showedDialog) {
+				showDialogOfFreeDownloadsIfNeeded();
+			}
+		} else {
+			showDialogOfFreeDownloadsIfNeeded();
+		}
+
+
+		if (Build.VERSION.SDK_INT >= OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) {
+			final String currentStorage = settings.getExternalStorageDirectory().getAbsolutePath();
+			String primaryStorage = settings.getDefaultExternalStorageLocation();
+			if (!currentStorage.startsWith(primaryStorage)) {
+				// secondary storage
+				boolean currentDirectoryNotWritable = true;
+				for (String writeableDirectory : settings.getWritableSecondaryStorageDirectorys()) {
+					if (currentStorage.startsWith(writeableDirectory)) {
+						currentDirectoryNotWritable = false;
+						break;
+					}
+				}
+				if (currentDirectoryNotWritable) {
+					currentDirectoryNotWritable = !OsmandSettings.isWritable(settings.getExternalStorageDirectory());
+				}
+				if (currentDirectoryNotWritable) {
+					final String newLoc = settings.getMatchingExternalFilesDir(currentStorage);
+					if (newLoc != null && newLoc.length() != 0) {
+						AccessibleAlertBuilder ab = new AccessibleAlertBuilder(this);
+						ab.setMessage(getString(R.string.android_19_location_disabled,
+								settings.getExternalStorageDirectory()));
+						ab.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
+								copyFilesForAndroid19(newLoc);
+							}
+						});
+						ab.setNegativeButton(R.string.default_buttons_cancel, null);
+						ab.show();
+					}
+				}
+			}
+		}
+
 		getSupportActionBar().setHomeButtonEnabled(true);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 	}
 
+	public void setUpdatesIndexFragment(UpdatesIndexFragment fragment){
+		this.updatesIndexFragment = fragment;
+	}
+
 	@Override
 	protected void onResume() {
 		super.onResume();
@@ -154,7 +213,7 @@ public class DownloadActivity extends SherlockFragmentActivity {
 	public void setType(DownloadActivityType type) { this.type = type;}
 
 	public void changeType(final DownloadActivityType tp) {
-		invalidateOptionsMenu();
+		//invalidateOptionsMenu();
 		if (downloadListIndexThread != null && type != tp) {
 			type = tp;
 			downloadListIndexThread.runCategorization(tp);
@@ -320,9 +379,10 @@ public class DownloadActivity extends SherlockFragmentActivity {
 	}
 
 	public void updateDownloadList(List<IndexItem> list){
-		Fragment fragment = mTabsAdapter.getItem(2);
-		//will fall if change tab order
-		((UpdatesIndexFragment) fragment).updateItemsList(list);
+		if(updatesIndexFragment == null){
+			return;
+		}
+		updatesIndexFragment.updateItemsList(list);
 	}
 
 	public void updateDownloadButton(boolean scroll) {
@@ -376,5 +436,26 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		return items;
 	}
 
+	public boolean isLightActionBar() {
+		return ((OsmandApplication) getApplication()).getSettings().isLightActionBar();
+	}
+
+	private void copyFilesForAndroid19(final String newLoc) {
+		SettingsGeneralActivity.MoveFilesToDifferentDirectory task =
+				new SettingsGeneralActivity.MoveFilesToDifferentDirectory(this,
+						new File(settings.getExternalStorageDirectory(), IndexConstants.APP_DIR),
+						new File(newLoc, IndexConstants.APP_DIR)) {
+					protected Boolean doInBackground(Void[] params) {
+						Boolean result = super.doInBackground(params);
+						if(result) {
+							settings.setExternalStorageDirectory(newLoc);
+							getMyApplication().getResourceManager().resetStoreDirectory();
+							getMyApplication().getResourceManager().reloadIndexes(progress)	;
+						}
+						return result;
+					};
+				};
+		task.execute();
+	}
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
index 8f07ba3130..ae7ef61480 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
@@ -236,12 +236,6 @@ public class DownloadIndexAdapter extends OsmandBaseExpandableListAdapter implem
 			v = inflater.inflate(net.osmand.plus.R.layout.download_index_list_item, parent, false);
 		}
 		final View row = v;
-		row.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				downloadFragment.onChildClick(downloadFragment.getExpandableListView(), row, groupPosition, childPosition, getChildId(groupPosition, childPosition));
-			}
-		});
 		TextView item = (TextView) row.findViewById(R.id.download_item);
 		TextView description = (TextView) row.findViewById(R.id.download_descr);
 		IndexItem e = (IndexItem) getChild(groupPosition, childPosition);
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
index cf74483124..76b0218898 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
@@ -45,11 +45,11 @@ import com.actionbarsherlock.view.SubMenu;
 public class DownloadIndexFragment extends OsmandExpandableListFragment {
 	
 	/** menus **/
-	private static final int MORE_ID = 10;
-	private static final int RELOAD_ID = 0;
-	private static final int SELECT_ALL_ID = 1;
-	private static final int DESELECT_ALL_ID = 2;
-	private static final int FILTER_EXISTING_REGIONS = 3;
+	public static final int MORE_ID = 10;
+	public static final int RELOAD_ID = 0;
+	public static final int SELECT_ALL_ID = 1;
+	public static final int DESELECT_ALL_ID = 2;
+	public static final int FILTER_EXISTING_REGIONS = 3;
 	
     private TextWatcher textWatcher ;
 	private EditText filterText;
@@ -67,7 +67,6 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
 		listView.setAdapter(listAdapter);
 		setListView(listView);
 
-
 		getDownloadActivity().getSupportActionBar().setTitle(R.string.local_index_download);
 		// recreation upon rotation is pgetaprevented in manifest file
 
@@ -106,70 +105,6 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
 		settings = getMyApplication().getSettings();
 
 
-		if(getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) {
-			boolean showedDialog = false;
-			if(Build.VERSION.SDK_INT < OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) {
-				SuggestExternalDirectoryDialog.showDialog(getActivity(), null, null);
-			}
-			if(!showedDialog) {
-				getDownloadActivity().showDialogOfFreeDownloadsIfNeeded();
-			}
-		} else {
-			getDownloadActivity().showDialogOfFreeDownloadsIfNeeded();
-		}
-		
-
-		if (Build.VERSION.SDK_INT >= OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) {
-			final String currentStorage = settings.getExternalStorageDirectory().getAbsolutePath();
-			String primaryStorage = settings.getDefaultExternalStorageLocation();
-			if (!currentStorage.startsWith(primaryStorage)) {
-				// secondary storage
-				boolean currentDirectoryNotWritable = true;
-				for (String writeableDirectory : settings.getWritableSecondaryStorageDirectorys()) {
-					if (currentStorage.startsWith(writeableDirectory)) {
-						currentDirectoryNotWritable = false;
-						break;
-					}
-				}
-				if (currentDirectoryNotWritable) {
-					currentDirectoryNotWritable = !OsmandSettings.isWritable(settings.getExternalStorageDirectory());
-				}
-				if (currentDirectoryNotWritable) {
-					final String newLoc = settings.getMatchingExternalFilesDir(currentStorage);
-					if (newLoc != null && newLoc.length() != 0) {
-						AccessibleAlertBuilder ab = new AccessibleAlertBuilder(getDownloadActivity());
-						ab.setMessage(getString(R.string.android_19_location_disabled,
-								settings.getExternalStorageDirectory()));
-						ab.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
-							@Override
-							public void onClick(DialogInterface dialog, int which) {
-								copyFilesForAndroid19(newLoc);
-							}
-						});
-						ab.setNegativeButton(R.string.default_buttons_cancel, null);
-						ab.show();
-					}
-				}
-			}
-		}
-	}
-	
-	private void copyFilesForAndroid19(final String newLoc) {
-		MoveFilesToDifferentDirectory task = 
-				new MoveFilesToDifferentDirectory(getDownloadActivity(),
-						new File(settings.getExternalStorageDirectory(), IndexConstants.APP_DIR), 
-						new File(newLoc, IndexConstants.APP_DIR)) {
-			protected Boolean doInBackground(Void[] params) {
-				Boolean result = super.doInBackground(params);
-				if(result) {
-					settings.setExternalStorageDirectory(newLoc);
-					getMyApplication().getResourceManager().resetStoreDirectory();
-					getMyApplication().getResourceManager().reloadIndexes(progress)	;
-				}
-				return result;
-			};
-		};
-		task.execute();
 	}
 	
 	@Override
@@ -253,6 +188,7 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
 		}
 		return super.onOptionsItemSelected(item);
 	}
+
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		ActionBar actionBar = getDownloadActivity().getSupportActionBar();
@@ -273,12 +209,12 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
 		if (getMyApplication().getAppCustomization().showDownloadExtraActions()) {
 			SubMenu s = menu.addSubMenu(0, MORE_ID, 0, R.string.default_buttons_other_actions);
 			s.add(0, RELOAD_ID, 0, R.string.update_downlod_list);
-			s.add(0, FILTER_EXISTING_REGIONS, 0, R.string.filter_existing_indexes);
 			s.add(0, SELECT_ALL_ID, 0, R.string.select_all);
 			s.add(0, DESELECT_ALL_ID, 0, R.string.deselect_all);
 
 			s.setIcon(isLightActionBar() ? R.drawable.abs__ic_menu_moreoverflow_holo_light
 					: R.drawable.abs__ic_menu_moreoverflow_holo_dark);
+			s.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		}
 	}
 	
@@ -291,7 +227,7 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
 		DownloadActivity.downloadListIndexThread.getEntriesToDownload().clear();
 		listAdapter.notifyDataSetInvalidated();
 		
-		getView().findViewById(R.id.DownloadButton).setVisibility(View.GONE);
+		getDownloadActivity().findViewById(R.id.DownloadButton).setVisibility(View.GONE);
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 1d4d053f0e..7c92e38080 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -182,6 +182,7 @@ public class DownloadIndexesThread {
 				DownloadIndexAdapter adapter = ((DownloadIndexAdapter) uiFragment.getExpandableListAdapter());
 				if (adapter != null) {
 					adapter.setLoadedFiles(indexActivatedFileNames, indexFileNames);
+					updateFilesToUpdate();
 				}
 			}
 			currentRunningTask.remove(this);
@@ -391,9 +392,7 @@ public class DownloadIndexesThread {
 							uiFragment.getDownloadActivity().getEntriesToDownload().put(basemap, downloadEntry);
 							AccessibleToast.makeText(uiFragment.getDownloadActivity(), R.string.basemap_was_selected_to_download,
 									Toast.LENGTH_LONG).show();
-							if(uiFragment.findViewById(R.id.DownloadButton) != null) {
-								uiFragment.findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
-							}
+							uiFragment.getDownloadActivity().findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
 						}
 					}
 					if (indexFiles.isIncreasedMapVersion()) {
@@ -548,16 +547,6 @@ public class DownloadIndexesThread {
 		execute(inst, new Void[0]);
 	}
 
-	private void updateFilesToDownload(){
-		for (IndexItem item : itemsToUpdate){
-			for (String key : indexFileNames.keySet()){
-				if (item.getFileName().equals(indexFileNames.get(key))){
-					itemsToUpdate.remove(item);
-				}
-			}
-		}
-	}
-
 	private void prepareFilesToUpdate(List<IndexItem> filtered) {
 		itemsToUpdate.clear();
 		for (IndexItem item : filtered) {
@@ -573,7 +562,25 @@ public class DownloadIndexesThread {
 				itemsToUpdate.add(item);
 			}
 		}
-		itemsToUpdate.size();
+		uiFragment.getDownloadActivity().updateDownloadList(itemsToUpdate);
+	}
+
+	private void updateFilesToUpdate(){
+		List<IndexItem> stillUpdate = new ArrayList<IndexItem>();
+		for (IndexItem item : itemsToUpdate) {
+			String sfName = item.getTargetFileName();
+			java.text.DateFormat format = uiFragment.getDownloadActivity().getMyApplication().getResourceManager().getDateFormat();
+			String date = item.getDate(format);
+			String indexactivateddate = indexActivatedFileNames.get(sfName);
+			String indexfilesdate = indexFileNames.get(sfName);
+			if (date != null &&
+					!date.equals(indexactivateddate) &&
+					!date.equals(indexfilesdate) &&
+					indexActivatedFileNames.containsKey(sfName)) {
+				stillUpdate.add(item);
+			}
+		}
+		itemsToUpdate = stillUpdate;
 		uiFragment.getDownloadActivity().updateDownloadList(itemsToUpdate);
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index 070deed646..9befb659b1 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -640,10 +640,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 	}
 
 	public void localOptionsMenu(final int itemId) {
-		if (itemId == R.string.local_index_download) {
-			asyncLoader.setResult(null);
-			startActivity(new Intent(getDownloadActivity(), DownloadIndexFragment.class));
-		} else if (itemId == R.string.local_index_mi_reload) {
+		if (itemId == R.string.local_index_mi_reload) {
 			reloadIndexes();
 		} else if (itemId == R.string.local_index_mi_delete) {
 			openSelectionMode(itemId, R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_light,
@@ -861,7 +858,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 		}
 
 		@Override
-		public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
+		public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
 			View v = convertView;
 			final LocalIndexInfo child = (LocalIndexInfo) getChild(groupPosition, childPosition);
 			if (v == null ) {
diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index ff5781ac80..f0813a0cf9 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -10,12 +10,17 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.SubMenu;
+import net.osmand.access.AccessibleToast;
 import net.osmand.map.OsmandRegions;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandExpandableListFragment;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -26,33 +31,36 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 
 	private OsmandRegions osmandRegions;
 	private java.text.DateFormat format;
+	private UpdateIndexAdapter listAdapter;
+
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		format = getMyApplication().getResourceManager().getDateFormat();
 		osmandRegions = getMyApplication().getResourceManager().getOsmandRegions();
-		setListAdapter(new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, DownloadActivity.downloadListIndexThread.getItemsToUpdate()));
+		listAdapter = new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, DownloadActivity.downloadListIndexThread.getItemsToUpdate());
+		listAdapter.sort(new Comparator<IndexItem>() {
+			@Override
+			public int compare(IndexItem indexItem, IndexItem indexItem2) {
+				return indexItem.getVisibleName(getMyApplication(), osmandRegions).compareTo(indexItem2.getVisibleName(getMyApplication(), osmandRegions));
+			}
+		});
+		setListAdapter(listAdapter);
 		setHasOptionsMenu(true);
+		getDownloadActivity().setUpdatesIndexFragment(this);
 	}
 
 	@Override
 	public void onResume() {
 		super.onResume();
-
-		Map<IndexItem, List<DownloadEntry>> map = getDownloadActivity().getEntriesToDownload();
-
 	}
 
-	public void updateItemsList(List<IndexItem> items){
-		UpdateIndexAdapter adapter = (UpdateIndexAdapter) getListAdapter();
-		if (adapter == null){
+	public void updateItemsList(List<IndexItem> items) {
+		if(listAdapter == null){
 			return;
 		}
-		adapter.clear();
-		for (IndexItem item : items){
-			adapter.add(item);
-		}
+		listAdapter.setIndexFiles(items);
 	}
 
 	@Override
@@ -60,9 +68,93 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 		super.onListItemClick(l, v, position, id);
 	}
 
-	public DownloadActivity getDownloadActivity() { return (DownloadActivity)getActivity(); }
+	public DownloadActivity getDownloadActivity() {
+		return (DownloadActivity) getActivity();
+	}
 
-	private class UpdateIndexAdapter extends ArrayAdapter<IndexItem>{
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		ActionBar actionBar = getDownloadActivity().getSupportActionBar();
+		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+
+		if (getMyApplication().getAppCustomization().showDownloadExtraActions()) {
+			SubMenu s = menu.addSubMenu(0, DownloadIndexFragment.MORE_ID, 0, R.string.default_buttons_other_actions);
+			s.add(0, DownloadIndexFragment.RELOAD_ID, 0, R.string.update_downlod_list);
+			s.add(0, DownloadIndexFragment.SELECT_ALL_ID, 0, R.string.select_all);
+			s.add(0, DownloadIndexFragment.DESELECT_ALL_ID, 0, R.string.deselect_all);
+
+			s.setIcon(isLightActionBar() ? R.drawable.abs__ic_menu_moreoverflow_holo_light
+					: R.drawable.abs__ic_menu_moreoverflow_holo_dark);
+			s.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+		}
+	}
+
+	public OsmandApplication getMyApplication() {
+		return getDownloadActivity().getMyApplication();
+	}
+
+	public boolean isLightActionBar() {
+		return ((OsmandApplication) getActivity().getApplication()).getSettings().isLightActionBar();
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == DownloadIndexFragment.RELOAD_ID) {
+			// re-create the thread
+			DownloadActivity.downloadListIndexThread.runReloadIndexFiles();
+			return true;
+		} else if (item.getItemId() == DownloadIndexFragment.SELECT_ALL_ID) {
+			selectAll();
+			return true;
+		} else if (item.getItemId() == DownloadIndexFragment.FILTER_EXISTING_REGIONS) {
+			filterExisting();
+			return true;
+		} else if (item.getItemId() == DownloadIndexFragment.DESELECT_ALL_ID) {
+			deselectAll();
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	private void selectAll() {
+		int selected = 0;
+		for (int i = 0; i < listAdapter.getCount(); i++) {
+			IndexItem es = listAdapter.getItem(i);
+			if (!getDownloadActivity().getEntriesToDownload().containsKey(es)) {
+				selected++;
+				getDownloadActivity().getEntriesToDownload().put(es, es.createDownloadEntry(getMyApplication(),
+						getDownloadActivity().getType(), new ArrayList<DownloadEntry>(1)));
+
+			}
+		}
+		AccessibleToast.makeText(getDownloadActivity(), MessageFormat.format(getString(R.string.items_were_selected), selected), Toast.LENGTH_SHORT).show();
+		listAdapter.notifyDataSetInvalidated();
+		if (selected > 0) {
+			getDownloadActivity().updateDownloadButton(true);
+		}
+	}
+
+	public void deselectAll() {
+		DownloadActivity.downloadListIndexThread.getEntriesToDownload().clear();
+		listAdapter.notifyDataSetInvalidated();
+
+		getDownloadActivity().findViewById(R.id.DownloadButton).setVisibility(View.GONE);
+	}
+
+	private void filterExisting() {
+		final Map<String, String> listAlreadyDownloaded =  DownloadActivity.downloadListIndexThread.getDownloadedIndexFileNames();
+
+		final List<IndexItem> filtered = new ArrayList<IndexItem>();
+		for (IndexItem fileItem : listAdapter.getIndexFiles()) {
+			if(fileItem.isAlreadyDownloaded(listAlreadyDownloaded)){
+				filtered.add(fileItem);
+			}
+		}
+		listAdapter.setIndexFiles(filtered);
+		listAdapter.notifyDataSetChanged();
+	}
+
+	private class UpdateIndexAdapter extends ArrayAdapter<IndexItem> {
 		List<IndexItem> items;
 
 		public UpdateIndexAdapter(Context context, int resource, List<IndexItem> items) {
@@ -70,13 +162,17 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 			this.items = items;
 		}
 
+		public List<IndexItem> getIndexFiles() {
+			return items;
+		}
+
 		@Override
 		public View getView(final int position, View convertView, ViewGroup parent) {
 			View v = convertView;
 
-			if(v == null){
+			if (v == null) {
 				LayoutInflater inflater = (LayoutInflater) getDownloadActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-				v = inflater.inflate(R.layout.download_index_list_item, null);
+				v = inflater.inflate(R.layout.update_index_list_item, null);
 			}
 
 			TextView name = (TextView) v.findViewById(R.id.download_item);
@@ -94,7 +190,7 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 				public void onClick(View v) {
 					ch.setChecked(!ch.isChecked());
 					final IndexItem e = (IndexItem) getListAdapter().getItem(position);
-					if(ch.isChecked()){
+					if (ch.isChecked()) {
 						ch.setChecked(!ch.isChecked());
 						getDownloadActivity().getEntriesToDownload().remove(e);
 						getDownloadActivity().updateDownloadButton(true);
@@ -113,13 +209,19 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 
 			return v;
 		}
+
+		public void setIndexFiles(List<IndexItem> filtered) {
+			clear();
+			for (IndexItem item : filtered){
+				add(item);
+			}
+			sort(new Comparator<IndexItem>() {
+				@Override
+				public int compare(IndexItem indexItem, IndexItem indexItem2) {
+					return indexItem.getVisibleName(getMyApplication(), osmandRegions).compareTo(indexItem2.getVisibleName(getMyApplication(), osmandRegions));
+				}
+			});
+		}
 	}
 
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		ActionBar actionBar = getDownloadActivity().getSupportActionBar();
-		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-	}
-
-	public OsmandApplication getMyApplication() { return getDownloadActivity().getMyApplication(); }
 }
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
index 04f1549bae..e2cb2d4f63 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
@@ -5,6 +5,7 @@ import java.util.WeakHashMap;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadIndexFragment;
 import net.osmand.plus.sherpafy.TourInformation.StageFavorite;
 import net.osmand.plus.sherpafy.TourInformation.StageInformation;
@@ -376,7 +377,7 @@ public class TourViewActivity extends SherlockFragmentActivity {
 
 
 	public void startDownloadActivity() {
-		final Intent download = new Intent(this, DownloadIndexFragment.class);
+		final Intent download = new Intent(this, DownloadActivity.class);
 		download.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 		refreshListAfterDownload = true;
 		startActivity(download);
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
index fabdbb4799..070f2fe0c6 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
@@ -2,6 +2,6 @@
 <resources><string name="default_buttons_no">Nu</string>
     <string name="default_buttons_yes">Da</string>
     <string name="osmand_app_not_found">OsmAnd nu este instalat</string>
-    <string name="app_name">OsmAnd Parking</string>
+    <string name="app_name">Parcare OsmAnd</string>
     <string name="parking_plugin_installed">Plugin-ul OsmAnd Parking este instalat și activat în setările OsmAnd.</string>
 </resources>