diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 0adb3da81b..789cb7c4bc 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -861,4 +861,9 @@
 	<string name="poi_leather">Галянтарэя</string>
 	<string name="poi_swimming_pool_shop">Тавары для басэйна</string>
 	<string name="poi_model">Мадэлістам</string>
+	<string name="poi_fashion">Крама моды</string>
+	<string name="poi_furnace">Крама абагравальнікаў</string>
+	<string name="poi_scuba_diving_shop">Крама для плаваньня з маскамі</string>
+	<string name="poi_trophy">Узнагароды, прызы</string>
+	<string name="poi_height_restrictor">Абмежавальнік вышыні</string>
 	</resources>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 0d7ae0caeb..cdcc847447 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -929,7 +929,7 @@
 	<string name="renderers_descr">Абярыце стыль адмалёўкі мапы</string>
 	<string name="poi_context_menu_website">Паказаць сайт POI</string>
 	<string name="poi_context_menu_call">Паказаць тэлефон POI</string>
-	<string name="download_type_to_filter">набярыце каб фільтраваць</string>
+	<string name="download_type_to_filter">фільтраваць</string>
 	<string name="use_high_res_maps">Дысплей высокай рэзалюцыі</string>
 	<string name="use_high_res_maps_descr">Не расьцягваць (з размыццём) фрагмэнты мапы на дысплеях з высокай шчыльнасьцю</string>
 	
@@ -2022,4 +2022,5 @@
     <string name="lang_bpy">бішнупрыя</string>
     <string name="lang_nv">наваха</string>
     <string name="lang_new">неварская</string>
+    <string name="restart_is_required">Каб ужыць зьмены, трэба перезапусьць праграму.</string>
     </resources>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index d53a1da15d..6dd753796e 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -2104,4 +2104,6 @@ OsmAnd е с отворен код и активно да се развива. 
     <string name="lang_ceb">Себуански</string>
     <string name="lang_ms">Малайски</string>
     <string name="lang_ht">Хаитянски</string>
-    </resources>
+    <string name="osmo_plugin_description">"Това развирение добавя функционалността на наблюдението на OsMo в реално време, за справка http://osmo.mobi.\nВие може да следите другите устройства и да бъдете проследявани. Можете да създавате анонимни групи, да им показвате местоположението си и да общувате. Разширението се предлага с различни възможности за проследяване по време на връзката или постоянно.\nАнонимните групи се създават за определен брой дни и имат ограничени възможности, например без отдалечено управление и администратор. Пълноценните групи, от друга страна, могат да се създават на сайта и само регистрираните потребители имат достъп до тях. "</string>
+	<string name="plugin_nautical_descr">"Тази добавка обогатява приложението на OsmAnd map and navigation като създава карти за гребане, ветроходство и други водни спортове.\n\nСпециалната добавка за карти на OsmAnd позволява морски навигационни символи и диаграми за вътрешна и крайбрежна навигация. Описанитето на всеки навигационнен символ показва подробностите, необходими за разпознаването и значението му (категория, фигура, цвят, последователност, препратка и др.).\n\n\nЗа да се върнете към някой от обикновените режими на картите на OsmAnd, просто исключете добавката или сменете \'Map style\' в менюто \'Configure map\' както желате да стане. "</string>
+	</resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index a2bb723e03..5e01115cda 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2068,4 +2068,21 @@
     <string name="lang_os">Ossetisk</string>
     <string name="lang_eo">Esperanto</string>
     <string name="restart_is_required">For at anvende ændringerne, er genstart af programmet nødvendigt.</string>
+    <string name="rendering_attr_currentTrackColor_name">Áktuel GPX farve</string>
+    <string name="rendering_attr_currentTrackWidth_name">Aktuel GPX bredde</string>
+    <string name="rendering_value_red_name">Rød</string>
+    <string name="rendering_value_translucent_red_name">Gennemsigtig rød</string>
+    <string name="rendering_value_translucent_orange_name">Gennemsigtigt orange</string>
+    <string name="rendering_value_yellow_name">Gul</string>
+    <string name="rendering_value_translucent_yellow_name">Gennemsigtigt gul</string>
+    <string name="rendering_value_lightgreen_name">Lysegrøn</string>
+    <string name="rendering_value_translucent_lightgreen_name">Gennemsigtig lysegrøn</string>
+    <string name="rendering_value_green_name">Grøn</string>
+    <string name="rendering_value_translucent_green_name">Gennemsigtig grøn</string>
+    <string name="rendering_value_lightblue_name">Lyseblå</string>
+    <string name="rendering_value_translucent_lightblue_name">Gennemsigtig lyseblå</string>
+    <string name="rendering_value_blue_name">Blå</string>
+    <string name="rendering_value_translucent_blue_name">Gennemsigtig blå</string>
+    <string name="rendering_value_purple_name">Lilla</string>
+    <string name="rendering_value_translucent_purple_name">Gennemsigtig lilla</string>
     </resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 73dba68129..e94fdef362 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -1982,4 +1982,22 @@
     <string name="lang_ml">Malayalam</string>
     <string name="lang_lb">Luxemburgués</string>
     <string name="lang_os">Osetio</string>
+    <string name="rendering_attr_currentTrackColor_name">Color actual del GPX</string>
+    <string name="rendering_attr_currentTrackWidth_name">Ancho actual del GPX</string>
+    <string name="rendering_value_red_name">Rojo</string>
+    <string name="rendering_value_translucent_red_name">Rojo translúcido</string>
+    <string name="rendering_value_translucent_orange_name">Anaranjado translúcido</string>
+    <string name="rendering_value_yellow_name">Amarillo</string>
+    <string name="rendering_value_translucent_yellow_name">Amarillo translúcido</string>
+    <string name="rendering_value_lightgreen_name">Verde claro</string>
+    <string name="rendering_value_translucent_lightgreen_name">Verde claro translúcido</string>
+    <string name="rendering_value_green_name">Verde</string>
+    <string name="rendering_value_translucent_green_name">Verde translúcido</string>
+    <string name="rendering_value_lightblue_name">Azul claro</string>
+    <string name="rendering_value_translucent_lightblue_name">Azul claro translúcido</string>
+    <string name="rendering_value_blue_name">Azul</string>
+    <string name="rendering_value_translucent_blue_name">Azul translúcido</string>
+    <string name="rendering_value_purple_name">Púrpura</string>
+    <string name="rendering_value_translucent_purple_name">Púrpura translúcida</string>
+    <string name="restart_is_required">Para aplicar los cambios, se necesita reiniciar la aplicación.</string>
     </resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 356cb66e5c..b5120c08b5 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1063,7 +1063,7 @@
 	<string name="intermediate_point">Étape %1$s</string>
     <string name="gps_not_available">Veuillez activer le GPS dans les paramètres</string>
     <string name="map_widget_show_destination_arrow">Direction de la destination</string>
-    <string name="enable_plugin_monitoring_services">Activez le greffon de suivi pour utiliser les services d\'enregistrement des traces</string>
+    <string name="enable_plugin_monitoring_services">Activez le greffon d\'enregistrement d\'itinéraire pour utiliser les services d\'enregistrement de position (journalisation GPX, suivi en ligne)</string>
     <string name="non_optimal_route_calculation">Calcule un itinéraire éventuellement non optimal pour les trajets longues distances</string>
     <string name="rendering_attr_roadColors_description">Sélectionnez un thème de couleurs pour les routes :</string>
 	<string name="rendering_attr_roadColors_name">Thème de couleurs pour les routes</string>
@@ -2051,7 +2051,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="local_recordings_delete_all_confirm">Vous allez supprimer %1$d notes. Etes-vous sûrs ?</string>
 	<string name="gps_network_not_enabled">Le service de localisation est arrêté. Souhaitez-vous l’activer ?</string>
     <string name="disable_recording_once_app_killed_descrp">Met en pause l\'enregistrement de la trace GPX lors de l\'arrêt d\'OsmAnd (via les applications récentes) et l\'indicateur disparaîtra de la barre de notification Android.</string>
-	<string name="disable_recording_once_app_killed">Interdire l\'enregistrement autonome</string>
+	<string name="disable_recording_once_app_killed">Interdire la journalisation autonome</string>
     <string name="download_wikipedia_files">Souhaitez-vous télécharger les données Wikipédia (%1$s MB) ?</string>
     <string name="lang_ms">Malaisien</string>
     <string name="lang_ht">Haïtien</string>
@@ -2077,4 +2077,31 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="archive_wikipedia_data">Le format de vos données Wikipédia hors-ligne est obsolète. Voulez-vous archiver ces données ?</string>
     <string name="lang_te">Télougou</string>
     <string name="restart_is_required">Afin de prendre en compte vos modifications, un redémarrage de l\'application est nécessaire.</string>
+    <string name="rendering_attr_currentTrackColor_name">Couleur GPX actuelle</string>
+    <string name="rendering_attr_currentTrackWidth_name">Largeur GPX actuelle</string>
+    <string name="rendering_value_red_name">Rouge</string>
+    <string name="rendering_value_translucent_red_name">Rouge translucide</string>
+    <string name="rendering_value_translucent_orange_name">Orange translucide</string>
+    <string name="rendering_value_yellow_name">Jaune</string>
+    <string name="rendering_value_translucent_yellow_name">Jaune translucide</string>
+    <string name="rendering_value_lightgreen_name">Vert clair</string>
+    <string name="rendering_value_translucent_lightgreen_name">Vert clair translucide</string>
+    <string name="rendering_value_green_name">Vert</string>
+    <string name="rendering_value_translucent_green_name">Vert translucide</string>
+    <string name="rendering_value_lightblue_name">Bleu clair</string>
+    <string name="rendering_value_translucent_lightblue_name">Bleu clair translucide</string>
+    <string name="rendering_value_blue_name">Bleu</string>
+    <string name="rendering_value_translucent_blue_name">Bleu translucide</string>
+    <string name="rendering_value_purple_name">Violet</string>
+    <string name="rendering_value_translucent_purple_name">Violet translucide</string>
+    <string name="lang_az">Azéri</string>
+    <string name="lang_bpy">Bishnupriya</string>
+    <string name="lang_ta">Tamoul</string>
+    <string name="lang_ml">Malayâlam</string>
+    <string name="lang_os">Ossète</string>
+    <string name="lang_nb">Norvégien, Bokmål</string>
+    <string name="lang_vo">Volapük</string>
+    <string name="lang_new">Néwari / Népal Bhasa</string>
+    <string name="lang_ceb">Cébouano</string>
+    <string name="lang_tl">Tagalog</string>
     </resources>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index b68f71966f..2899cb8fcb 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -2002,4 +2002,21 @@
     <string name="lang_lb">Luxemburgi</string>
     <string name="lang_os">Oszét</string>
     <string name="lang_eo">Eszperantó</string>
+    <string name="rendering_value_translucent_red_name">Átlátszó piros</string>
+    <string name="rendering_value_translucent_orange_name">Átlátszó narancs</string>
+    <string name="rendering_value_yellow_name">Sárga</string>
+    <string name="rendering_value_translucent_yellow_name">Átlátszó sárga</string>
+    <string name="rendering_value_lightgreen_name">Világoszöld</string>
+    <string name="rendering_value_translucent_lightgreen_name">Átlátszó világoszöld</string>
+    <string name="rendering_value_green_name">Zöld</string>
+    <string name="rendering_value_translucent_green_name">Átlátszó zöld</string>
+    <string name="rendering_value_lightblue_name">Világoskék</string>
+    <string name="rendering_value_translucent_lightblue_name">Átlátszó világoskék</string>
+    <string name="rendering_value_blue_name">Kék</string>
+    <string name="rendering_value_translucent_blue_name">Átlátszó kék</string>
+    <string name="rendering_value_purple_name">Lila</string>
+    <string name="rendering_value_translucent_purple_name">Átlátszó lila</string>
+    <string name="restart_is_required">A módosítások érvénybe lépéséhez újra kell indítani az alkalmazást.</string>
+    <string name="rendering_attr_currentTrackColor_name">Jelenlegi GPX szín</string>
+    <string name="rendering_attr_currentTrackWidth_name">Jelenlegi GPX szélesség</string>
     </resources>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index f163764b9b..c3abb7cebc 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1751,4 +1751,5 @@
     <string name="lang_lb">Luxemburguês</string>
     <string name="lang_os">Osseta</string>
     <string name="lang_eo">Esperanto</string>
+    <string name="restart_is_required">Para aplicar as alterações, é necessário reiniciar o aplicativo.</string>
     </resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 11bbe20c84..341c872e79 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2016,4 +2016,21 @@
     <string name="archive_wikipedia_data">Bi sunt datos Wikipedia bècios e non cumpatìbiles. Los boles archiviare?</string>
     <string name="download_wikipedia_files">Boles iscarrigare àteros datos Wikipedia in prus (%1$s MB) ?</string>
     <string name="disable_recording_once_app_killed_descrp">At a pònnere in pàusa sa registratzione GPX cando OsmAnd at a èssere istudadu (tràmite sas aplicatziones reghentes). (S\'indicatore de sa modalidade OsmAnd a reposu at a iscumpàrrere dae sa barra de notìfica de Android.)</string>
+    <string name="rendering_attr_currentTrackColor_name">Colore rasta GPX atuale</string>
+    <string name="rendering_attr_currentTrackWidth_name">Largària rasta GPX atuale</string>
+    <string name="rendering_value_red_name">Ruju</string>
+    <string name="rendering_value_translucent_orange_name">Arantzu translùcidu</string>
+    <string name="rendering_value_yellow_name">Grogu</string>
+    <string name="rendering_value_translucent_yellow_name">Grogu translùcidu</string>
+    <string name="rendering_value_lightgreen_name">Birde craru</string>
+    <string name="rendering_value_translucent_lightgreen_name">Birde craru translùcidu</string>
+    <string name="rendering_value_green_name">Birde</string>
+    <string name="rendering_value_translucent_green_name">Birde translùcidu</string>
+    <string name="rendering_value_lightblue_name">Biaitu craru</string>
+    <string name="rendering_value_translucent_lightblue_name">Biaitu craru translùcidu</string>
+    <string name="rendering_value_blue_name">Biaitu</string>
+    <string name="rendering_value_translucent_blue_name">Biaitu translùcidu</string>
+    <string name="rendering_value_purple_name">Pùrpura</string>
+    <string name="rendering_value_translucent_purple_name">Pùrpura translùcidu</string>
+    <string name="restart_is_required">Pro aplicare sas modìficas, depes torrare a allùere s\'aplicatzione.</string>
     </resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index bb85520b84..3ac800bed1 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2216,4 +2216,21 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="lang_lb">Luxembursky</string>
     <string name="lang_os">Osetsky</string>
     <string name="lang_eo">Esperanto</string>
+    <string name="rendering_attr_currentTrackColor_name">Súčasná farba GPX</string>
+    <string name="rendering_attr_currentTrackWidth_name">Súčasná šírka GPX</string>
+    <string name="rendering_value_red_name">Červená</string>
+    <string name="rendering_value_translucent_red_name">Priehľadná červená</string>
+    <string name="rendering_value_translucent_orange_name">Priehľadná oranžová</string>
+    <string name="rendering_value_yellow_name">Žltá</string>
+    <string name="rendering_value_translucent_yellow_name">Priehľadná žltá</string>
+    <string name="rendering_value_lightgreen_name">Svetlozelená</string>
+    <string name="rendering_value_translucent_lightgreen_name">Priehľadná svetlozelená</string>
+    <string name="rendering_value_green_name">Zelená</string>
+    <string name="rendering_value_translucent_green_name">Priehľadná zelená</string>
+    <string name="rendering_value_lightblue_name">Svetlomodrá</string>
+    <string name="rendering_value_translucent_lightblue_name">Priehľadná svetlomodrá</string>
+    <string name="rendering_value_blue_name">Modrá</string>
+    <string name="rendering_value_purple_name">Fialová</string>
+    <string name="rendering_value_translucent_purple_name">Priehľadná fialová</string>
+    <string name="restart_is_required">Pre použitie týchto zmien je nutné reštartovať aplikáciu.</string>
     </resources>
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 1fdd383f01..536f9a5de7 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -265,4 +265,6 @@
 
 	<string name="poi_water_well">Криниця</string>
 	<string name="poi_standpipe">Напірна труба</string>
-	</resources>
+	<string name="poi_highway_crossing">Переїзд</string>
+
+</resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index ba97b5c23e..4bc0beba67 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2039,4 +2039,22 @@
     <string name="lang_lb">盧森堡語</string>
     <string name="lang_os">奧塞提亞語</string>
     <string name="lang_eo">世界語</string>
+    <string name="restart_is_required">為了套用變更，必需重新啟動應用程式。</string>
+    <string name="rendering_attr_currentTrackColor_name">目前 GPX 的顏色</string>
+    <string name="rendering_attr_currentTrackWidth_name">目前 GPX 的寬度</string>
+    <string name="rendering_value_red_name">紅色</string>
+    <string name="rendering_value_translucent_red_name">半透明的紅色</string>
+    <string name="rendering_value_translucent_orange_name">半透明的橙色</string>
+    <string name="rendering_value_yellow_name">黃色</string>
+    <string name="rendering_value_translucent_yellow_name">半透明的黃色</string>
+    <string name="rendering_value_lightgreen_name">淺綠色</string>
+    <string name="rendering_value_translucent_lightgreen_name">半透明的淺綠色</string>
+    <string name="rendering_value_green_name">綠色</string>
+    <string name="rendering_value_translucent_green_name">半透明的綠色</string>
+    <string name="rendering_value_lightblue_name">淡藍色</string>
+    <string name="rendering_value_translucent_lightblue_name">半透明的淡藍色</string>
+    <string name="rendering_value_blue_name">藍色</string>
+    <string name="rendering_value_translucent_blue_name">半透明的藍色</string>
+    <string name="rendering_value_purple_name">紫色</string>
+    <string name="rendering_value_translucent_purple_name">半透明的紫色</string>
     </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index eb782728b9..a702521e22 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,23 @@
          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_currentTrackColor_name">Current GPX color</string>
+    <string name="rendering_attr_currentTrackWidth_name">Current GPX width</string>
+    <string name="rendering_value_red_name">Red</string>
+    <string name="rendering_value_translucent_red_name">Translucent red</string>
+    <string name="rendering_value_translucent_orange_name">Translucent orange</string>
+    <string name="rendering_value_yellow_name">Yellow</string>
+    <string name="rendering_value_translucent_yellow_name">Translucent yellow</string>
+    <string name="rendering_value_lightgreen_name">Lightgreen</string>
+    <string name="rendering_value_translucent_lightgreen_name">Translucent lightgreen</string>
+    <string name="rendering_value_green_name">Green</string>
+    <string name="rendering_value_translucent_green_name">Translucent green</string>
+    <string name="rendering_value_lightblue_name">Lightblue</string>
+    <string name="rendering_value_translucent_lightblue_name">Translucent lightblue</string>
+    <string name="rendering_value_blue_name">Blue</string>
+    <string name="rendering_value_translucent_blue_name">Translucent blue</string>
+    <string name="rendering_value_purple_name">Purple</string>
+    <string name="rendering_value_translucent_purple_name">Translucent purple</string>
     <string name="restart_is_required">In order to apply the changes, restart of the application is required.</string>
     <string name="light_theme">Light</string>
     <string name="dark_theme">Dark</string>
diff --git a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
index 63980af991..2a5324a5e7 100644
--- a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
@@ -150,6 +150,13 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 						req.setStringFilter(ctColor, p.get());
 					}
 				}
+				CommonPreference<String> p2 = view.getSettings().getCustomRenderProperty("currentTrackWidth");
+				if(p2 != null && p2.isSet()) {
+					RenderingRuleProperty ctWidth = rrs.PROPS.get("currentTrackWidth");
+					if(ctWidth != null) {
+						req.setStringFilter(ctWidth, p2.get());
+					}
+				}
 				String additional = "";
 				if (routePoints) {
 					additional = "routePoints=true";