diff --git a/OsmAnd-telegram/res/values-de/strings.xml b/OsmAnd-telegram/res/values-de/strings.xml
index 9904a15b68..70f5263818 100644
--- a/OsmAnd-telegram/res/values-de/strings.xml
+++ b/OsmAnd-telegram/res/values-de/strings.xml
@@ -28,7 +28,7 @@
 	<string name="by_group">Nach Gruppe</string>
 	<string name="shared_string_sort">Sortieren</string>
 	<string name="shared_string_sort_by">Sortieren nach</string>
-	<string name="choose_osmand_desc">Wählen Sie die OsmAnd-Version, in der die Kontakte auf der Karte angezeigt werden.</string>
+	<string name="choose_osmand_desc">Wählen Sie die OsmAnd-Version, in der Kontakte auf der Karte angezeigt werden.</string>
 	<string name="choose_osmand">Zu verwendende OsmAnd-Version auswählen</string>
 	<string name="turn_off_all">Alle ausschalten</string>
 	<string name="shared_string_exit">Beenden</string>
@@ -78,7 +78,7 @@
 	<string name="authentication_code_descr">Telegram hat Ihnen einen Code für OsmAnd zur Anmeldung an Ihrem Konto gesendet.</string>
 	<string name="enter_password">Passwort eingeben</string>
 	<string name="shared_string_login">Anmelden</string>
-	<string name="shared_string_logout">Abmeldung</string>
+	<string name="shared_string_logout">Abmelden</string>
 	<string name="not_logged_in">Sie sind nicht angemeldet</string>
 	<string name="initialization">Initialisierung</string>
 	<string name="logging_out">Abmeldung</string>
diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml
index 78a098779f..0991be4fdd 100644
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@@ -420,7 +420,7 @@
     <string name="rendering_attr_roadColors_description">Wubjerće barbowu šemu za dróhi:</string>
     <string name="rendering_attr_roadColors_name">Barbowa šema dróhow</string>
     <string name="map_widget_show_destination_arrow">Pokazaj směr do cila</string>
-    <string name="enable_plugin_monitoring_services">Zapińće nahrawanski modul, zo byšće móhł(a) wužiwać nahrawanske słužby (GPX-logging, online-tracking)</string>
+    <string name="enable_plugin_monitoring_services">Zapińće nahrawanski modul, zo byšće móhł(a) wužiwać nahrawanske słužby (GPX-nahrawanje, online-tracking)</string>
     <string name="non_optimal_route_calculation">Snadź njeoptimalne čary přez dołhe distancy wobličeć</string>
     <string name="gps_not_available">Prošu zapińće GPS w swojich nastajenjach</string>
     <string name="map_widget_monitoring_services">Słužby nahrawanja</string>
@@ -1517,4 +1517,7 @@
     <string name="route_info">Informacije wo čarje</string>
     <string name="routing_attr_prefer_motorway_name">Awtodróhi preferować</string>
     <string name="routing_attr_prefer_motorway_description">Awtodróhi preferować</string>
+    <string name="gpx_monitoring_start">GPX-nahrawanje započeć</string>
+    <string name="gpx_monitoring_stop">GPX-nahrawanje zastajić</string>
+    <string name="map_widget_monitoring">GPX-nahrawanje</string>
     </resources>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index dd94f861f3..f514f6423f 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -458,7 +458,7 @@
     <string name="wait_current_task_finished">Agarde até que remate a tarefa actual</string>
     <string name="use_kalman_filter_compass_descr">Diminúe o ruído nas lecturas do compás mais engade inercia.</string>
     <string name="use_kalman_filter_compass">Empregar o filtro Kalman</string>
-    <string name="use_magnetic_sensor_descr">Para a lectura do compás, emprega o sensor magnético en lugar do sensor da orientación.</string>
+    <string name="use_magnetic_sensor_descr">Para a lectura do compás, emprega o sensor magnético no canto do sensor da orientación.</string>
     <string name="use_magnetic_sensor">Empregar o sensor magnético</string>
     <string name="other_location">Outra</string>
     <string name="files_limit">Fican %1$d ficheiros</string>
@@ -1004,7 +1004,7 @@
 	<string name="pref_vector_map">Axustes dos mapas vectoriais</string>
 	<string name="delete_confirmation_msg">Eliminar %1$s?</string>
 	<string name="city_type_suburb">Zona residencial</string>
-	<string name="city_type_hamlet">Lugar</string>
+	<string name="city_type_hamlet">Aldea</string>
 	<string name="city_type_village">Vila pequena</string>
 	<string name="city_type_town">Vila grande</string>
 	<string name="city_type_city">Cidade</string>
@@ -1873,7 +1873,7 @@ Lon %2$s</string>
 	<string name="rendering_attr_pisteGrooming_name">Coidado de pistas</string>
     <string name="nautical_maps_missing">Para poder amosar mapas náuticos hai que descarga-lo mapa especial sen conexión</string>
 	<string name="edit_group">Editar o grupo</string>
-    <string name="parking_place">Lugar de aparcamento</string>
+    <string name="parking_place">Lugar do aparcamento</string>
     <string name="version_settings_descr">Descarregar versións para noite.</string>
     <string name="version_settings">Construcións (versións)</string>
     <string name="voices">Indicacións con voz</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 30f0f4d9dc..16a91d1e86 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -239,18 +239,18 @@
     
 	<string name="search_for">Pesquisar por</string>
 	<string name="coordinates">Coordenadas</string>
-	<string name="rendering_attr_publicTransportMode_name">Rotas de ônibus e trólebus</string>
-	<string name="rendering_attr_tramTrainRoutes_name">Rotas de bonde e trem</string>
-	<string name="rendering_attr_subwayMode_name">Rotas de metrô</string>
+	<string name="rendering_attr_publicTransportMode_name">Linhas de ônibus e trólebus</string>
+	<string name="rendering_attr_tramTrainRoutes_name">Linhas de bonde e trem</string>
+	<string name="rendering_attr_subwayMode_name">Linhas de metrô</string>
     <string name="lock_screen_request_explanation">%1$s precisa dessa permissão para desligar a tela para economizar energia.</string>
     <string name="wake_on_voice">Ligar tela</string>
     <string name="wake_on_voice_descr">Ligar tela do aparelho (se estiver desligada) quando se aproxima da manobra.</string>
     <string name="impassable_road">Evitar estradas…</string>
-    <string name="rendering_attr_trainLightrailRoutes_name">Rotas de trem</string>
-    <string name="rendering_attr_tramRoutes_name">Rotas de bonde</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Linhas de trem</string>
+    <string name="rendering_attr_tramRoutes_name">Linhas de bonde</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Compartilhar rota de táxi</string>
-    <string name="rendering_attr_trolleybusRoutes_name">Rotas de trólebus</string>
-    <string name="rendering_attr_busRoutes_name">Rotas de ônibus</string>
+    <string name="rendering_attr_trolleybusRoutes_name">Linhas de trólebus</string>
+    <string name="rendering_attr_busRoutes_name">Linhas de ônibus</string>
     <string name="rendering_category_hide">Ocultar</string>
     <string name="rendering_category_routes">Rotas</string>
     <string name="rendering_category_details">Detalhes</string>
@@ -347,7 +347,7 @@
 	<string name="routing_attr_avoid_unpaved_description">Evitar estradas não pavimentadas</string>
 	<string name="routing_attr_avoid_ferries_description">Evitar as balsas</string>
 	<string name="routing_attr_weight_name">Peso máximo</string>
-	<string name="routing_attr_weight_description">Especificar o peso do veículo permitido nas rotas</string>
+	<string name="routing_attr_weight_description">Especifique o limite de peso do veículo nas rotas.</string>
     <string name="copying_osmand_files_descr">Copiar arquivos de dados para o novo destino (%s)…</string>
     <string name="copying_osmand_files">Copiando arquivos de dados…</string>
     <string name="calculate_osmand_route_gpx">Calcular rota off-line</string>
@@ -756,7 +756,7 @@ Pôr do Sol: %2$s</string>
     <string name="download_hillshade_maps">Sombras de relevo</string>
     
     
-    <string name="precise_routing_mode_descr">Permitir calcular rotas precisas sem falhas. Está limitado pela distância e é lento.</string>
+    <string name="precise_routing_mode_descr">Calcular rotas precisas sem falhas. Está limitado pela distância e é lento.</string>
     <string name="precise_routing_mode">Roteamento preciso (alfa)</string>
     <string name="recording_context_menu_show">Mostrar</string>
     <string name="recording_photo_description">Foto %1$s %2$s</string>
@@ -1079,7 +1079,7 @@ Pôr do Sol: %2$s</string>
     <string name="arrival_distance_descr">Em quanto tempo você quer o anúncio da chegada?</string>
     <string name="rendering_out_of_memory">Não há memória suficiente para exibir a área selecionada</string>
 	<string name="use_fluorescent_overlays">Sobreposições fluorescentes</string>
-	<string name="use_fluorescent_overlays_descr">Usar cores fluorescentes para exibir as trilhas e rotas</string>
+	<string name="use_fluorescent_overlays_descr">Usar cores fluorescentes para exibir as trilhas e rotas.</string>
 	<string name="offline_edition">Edição off-line</string>
 	<string name="offline_edition_descr">Sempre usar edição off-line</string>
 	<string name="update_poi_does_not_change_indexes">As alterações de POIs dentro do aplicativo não tem efeito imediato nos mapas baixados, pois são salvas em arquivo local.</string>
@@ -1196,7 +1196,7 @@ Pôr do Sol: %2$s</string>
 	<string name="map_screen_orientation_descr">Vertical, horizontal ou a mesma do aparelho</string>
 	<string name="opening_hours_not_supported">O formato do horário de funcionamento não é suportado para edição</string>
 	<string name="add_new_rule">Adicionar nova regra</string>
-	<string name="transport_Routes">Rotas</string>
+	<string name="transport_Routes">Linhas</string>
 	<string name="transport_Stop">Parada</string>
 	<string name="transport_stops">paradas</string>
 	<string name="transport_search_after">Itinerário seguinte</string>
@@ -1676,7 +1676,7 @@ Pôr do Sol: %2$s</string>
     
 	<string name="routing_attr_avoid_borders_description">Evitar cruzar fronteiras nacionais</string>
 	<string name="routing_attr_height_name">Limite de altura</string>
-	<string name="routing_attr_height_description">Especificar a altura do veículo para ser permitida nas rotas</string>
+	<string name="routing_attr_height_description">Especifique a altura permitida do veículo nas rotas.</string>
     <string name="use_fast_recalculation">Recálculo de rota inteligente</string>
 	<string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota para viagens longas</string>
 <string name="rendering_value_disabled_name">Desativado</string>
@@ -1950,7 +1950,7 @@ Pôr do Sol: %2$s</string>
     <string name="shared_string_near">Perto de</string>
     <string name="no_address_found">Sem endereço determinado</string>
 	<string name="looking_up_address">Procurando endereço</string>
-    <string name="rendering_attr_horseRoutes_name">Rotas a cavalo</string>
+    <string name="rendering_attr_horseRoutes_name">Rotas para cavalos</string>
     <string name="update">Atualizar</string>
     <string name="only_download_over_wifi">Somente baixar via Wi-Fi</string>
     <string name="live_update">Atualização ao vivo</string>
@@ -2752,7 +2752,7 @@ Pôr do Sol: %2$s</string>
 	<string name="south_abbreviation">S</string>
 	<string name="north_abbreviation">N</string>
 	<string name="optional_point_name">Nome do ponto opcional</string>
-    <string name="transport_nearby_routes_within">Rotas próximas a</string>
+    <string name="transport_nearby_routes_within">Linhas próximas a</string>
     <string name="transport_nearby_routes">Cerca de</string>
     <string name="enter_the_file_name">Digite o nome do arquivo.</string>
     <string name="map_import_error">Erro de importação de mapa</string>
@@ -2951,4 +2951,5 @@ Pôr do Sol: %2$s</string>
     <string name="start_search_from_city">Iniciar pesquisa a partir da cidade</string>
     <string name="shared_string_restore">Restaurar</string>
     <string name="rendering_value_black_name">Preto</string>
+    <string name="more_transport_on_stop_hint">Esta parada tem outros meios de transporte.</string>
     </resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 9c5a226600..f7e418ac6d 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2895,7 +2895,7 @@
     <string name="in_app_purchase_desc_ex">После покупки этот план станет доступен для вас навсегда.</string>
     <string name="wikivoyage_travel_guide">Путеводитель</string>
     <string name="wikivoyage_travel_guide_descr">Просматривайте путеводители Викигида по самым интересным местам на планете внутри OsmAnd без подключения к интернету.</string>
-    <string name="travel_card_update_descr">Мы подготовили обновления и исправления в данных Викигида, обновите файл, чтобы увидеть их.</string>
+    <string name="travel_card_update_descr">Доступны новые данные Викигида, обновите файл, чтобы увидеть их.</string>
 	<string name="travel_card_download_descr">Скачайте путеводители Викигида для просмотра статей о местах по всему миру без подключения к Интернету.</string>
 	<string name="update_is_available">Доступно обновление</string>
 	<string name="download_file">Скачать файл</string>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 2a053495e7..5ccf05c4c5 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -163,7 +163,7 @@
 	<string name="poi_traffic_calming_cushion">緩衝墊</string>
 	<string name="poi_traffic_calming_chicane">減速彎道</string>
 	<string name="poi_traffic_calming_rumble_strip">車道屏</string>
-	<string name="poi_traffic_calming_table">路緣石</string>
+	<string name="poi_traffic_calming_table">減速平台</string>
 	<string name="poi_traffic_calming_choker">項鍊</string>
 	<string name="poi_traffic_signals">交通號誌</string>
 
@@ -3427,7 +3427,7 @@
 
 	<string name="poi_motorcycle_sales_yes">銷售</string>
 	<string name="poi_motorcycle_sales_no">銷售：無</string>
-	<string name="poi_motorcycle_sales_yes_used">銷售：有的;二手</string>
+	<string name="poi_motorcycle_sales_yes_used">銷售：有的，二手貨</string>
 	<string name="poi_motorcycle_sales_used">銷售：二手</string>
 	<string name="poi_lock_basin">塘形船閘</string>
 	<string name="poi_generator_output_electricity_no">輸出（電力）：無</string>