diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index bf9fe81455..7a3b144f51 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -3755,7 +3755,7 @@ Lon %2$s</string>
     <string name="turn_screen_on_descr">Escolle as opcións de acender a pantalla (asegúrate de que o OsmAnd está no primeiro plano cando o dispositivo está a ser bloqueado):</string>
     <string name="turn_screen_on_navigation_instructions">Instrucións de navegación</string>
     <string name="turn_screen_on_power_button">Botón de acendido</string>
-    <string name="turn_screen_on_wake_time_descr">Escolle o tempo de espera da pantalla após acender. (\"%1$s\" non aplica tempo de espera).</string>
+    <string name="turn_screen_on_wake_time_descr">Escolle o tempo de espera da pantalla após acender. (\"%1$s\" non aplica tempo de espera.)</string>
     <string name="keep_screen_off">Manter a pantalla apagada</string>
     <string name="pseudo_mercator_projection">Proxección pseudo-Mercator</string>
     <string name="sqlite_db_file">Ficheiro SQLiteDB</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 149975187b..5d2607f1ef 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -2241,7 +2241,7 @@
     <string name="quick_action_add_destination">Célpont megadása</string>
     <string name="quick_action_replace_destination">Célpont lecserélése</string>
     <string name="quick_action_add_first_intermediate">Hozzáadás első köztes célpontként</string>
-    <string name="quick_action_add_destination_desc">"Gomb, amely beállítja a képernyő középpontját úti célnak, a  korábban beállított célpont utolsó köztes célpont lesz."</string>
+    <string name="quick_action_add_destination_desc">Gomb, amely beállítja a képernyő középpontját úti célnak, a korábban beállított célpont utolsó köztes célpont lesz.</string>
     <string name="quick_action_replace_destination_desc">Váltógomb, amely a képernyő középpontját beállítja új úti célként, lecserélve korábban kiválasztott célpontot (ha volt).</string>
     <string name="quick_action_add_first_intermediate_desc">Gomb, amely beállítja a képernyő közepét első köztes célpontnak.</string>
     <string name="no_overlay">Nincs rátétréteg</string>
@@ -3773,4 +3773,8 @@
     <string name="app_mode_go_cart">Gokart</string>
     <string name="osm_edit_closed_note">Lezárt OSM-jegyzet</string>
     <string name="app_mode_wheelchair_forward">Előre döntött kerekesszék</string>
+    <string name="set_working_days_to_continue">A folytatáshoz adja meg a munkanapokat</string>
+    <string name="route_between_points">Útvonal pontok között</string>
+    <string name="plan_a_route">Útvonaltervezés</string>
+    <string name="add_to_a_track">Hozzáadás nyomvonalhoz</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml
index e70fcd1ae7..83fa14cbdc 100644
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@@ -157,7 +157,7 @@
     <string name="poi_drinking_water">Drikkevann</string>
     <string name="poi_sightseeing">Sightseeing</string>
     <string name="poi_seafood">Sjømatforretning</string>
-    <string name="poi_confectionery">Konditori</string>
+    <string name="poi_confectionery">Godteributikk</string>
     <string name="poi_fast_food">Hurtigmat</string>
     <string name="poi_food_court">Mathall</string>
     <string name="poi_air_transport">Lufttransport</string>
@@ -293,8 +293,8 @@
     <string name="poi_toll_booth">Bomstasjon</string>
     <string name="poi_border_control">Grensekontroll</string>
     <string name="poi_fee_no">Nei</string>
-    <string name="poi_internet_access_fee_yes">Internettilgang - gebyr</string>
-    <string name="poi_internet_access_fee_no">Internettilgang - ingen gebyr</string>
+    <string name="poi_internet_access_fee_yes">Internettilgang: gebyr</string>
+    <string name="poi_internet_access_fee_no">Internettilgang: ingen gebyr</string>
     <string name="poi_diet_vegetarian_only">Bare vegetarisk</string>
     <string name="poi_diet_vegetarian_yes">Vegetarisk</string>
     <string name="poi_diet_vegetarian_no">Vegetarisk: nei</string>
@@ -449,7 +449,7 @@
     <string name="poi_smoking_dedicated">Dedikert til røykere</string>
     <string name="poi_tactile_paving_yes">Ja</string>
     <string name="poi_traffic_signals_sound_yes">Ja</string>
-    <string name="poi_traffic_signals_sound_no">Nei</string>
+    <string name="poi_traffic_signals_sound_no">Lyd: nei</string>
     <string name="poi_piste_grooming_no">Nei</string>
     <string name="poi_capacity_disabled_yes">Ja</string>
     <string name="poi_aerialway_heating_yes">Ja</string>
@@ -1337,7 +1337,7 @@
     <string name="poi_reservoir">Reservoar</string>
     <string name="poi_college">Høyskole</string>
     <string name="poi_bailiff">Fogd</string>
-    <string name="poi_tax_inspection">Skattekontor</string>
+    <string name="poi_tax_inspection">Skattekontroll</string>
     <string name="poi_climbing_crag">Ja</string>
     <string name="poi_traffic_calming_cushion">Fartshump</string>
     <string name="poi_traffic_calming_table">Bred fartshump</string>
@@ -1569,4 +1569,6 @@
     <string name="poi_seamark_water_level_part_submerged">Vann-nivå: Delvis nedsenket</string>
     <string name="poi_tactile_paving_incorrect">Uriktig</string>
     <string name="poi_fire_hydrant_pressure_filter">Trykk</string>
+    <string name="poi_drive_through_no">Drive-through: nei</string>
+    <string name="poi_drive_in_no">Drive-in: Nei</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 3cb0a667c4..01e474a30c 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -172,10 +172,9 @@
 \n
 \nPara retornar a um estilo convencional de mapa do OsmAnd, simplesmente desative este complemento ou altere o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado.</string>
     <string name="plugin_ski_name">Mapa de esqui</string>
-    <string name="plugin_ski_descr">Este plugin para o OsmAnd coloca ao seu alcance detalhes de pistas de descida de esqui, de travessia, rotas de esqui alpino, teleféricos e elevadores de esqui. Rotas e pistas são mostradas com codificação de cores por dificuldade e retratadas em um estilo especial de mapa \'Inverno\' que assimila uma paisagem de inverno cor de neve. 
+    <string name="plugin_ski_descr">Este plugin para o OsmAnd coloca ao seu alcance detalhes de pistas de descida de esqui, de travessia, rotas de esqui alpino, teleféricos e elevadores de esqui. Rotas e pistas são mostradas com codificação de cores por dificuldade e retratadas em um estilo especial de mapa \'Inverno\' que assimila uma paisagem de inverno cor de neve.
 \n
-\n 
-\nAtivando esta visão muda o estilo de mapa de \'Inverno e esqui\', mostrando todas as características da paisagem em condições invernais. Essa visão pode ser revertida desativando aqui ou alterando o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado.</string>
+\nAtivando esta visão muda o estilo de mapa para \'Inverno e esqui\', mostrando todas as características da paisagem em condições invernais. Essa visão pode ser revertida desativando aqui ou alterando o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado.</string>
     <string name="audionotes_plugin_name">Notas de áudio/vídeo</string>
     <string name="audionotes_plugin_description">Faça anotações de áudio/foto/vídeo durante uma viagem, usando um botão de mapa ou o menu de contexto da localização.</string>
     <string name="osmand_parking_plugin_name">Estacionamento</string>
@@ -2765,13 +2764,14 @@ Pôr do Sol: %2$s</string>
 \n• Grave ou carregue uma trilha GPX e siga-a
 \n</string>
     <string name="osmand_extended_description_part3">Mapa
-\n• Exibe POIs (ponto de interesse) em torno de você
-\n• Ajusta o mapa na sua direção de movimento (ou bússola)
-\n• Mostra a sua posição e direção para onde está olhando
-\n• Compartilhe sua posição para que seus amigos possam encontrá-lo
-\n• Mantém seus lugares mais importantes em \'Favoritos\'
-\n• Permite-lhe escolher como exibir nomes no mapa: em inglês, local ou escrita fonética
-\n• Exibe mapas on-line especializados, vista de satélite (do Bing), camadas diferentes como trilhas GPX de navegação/turismo e camadas adicionais com transparência personalizável</string>
+\n • Exibe PDIs (ponto de interesse) em torno de você
+\n • Ajusta o mapa na sua direção de movimento (ou bússola)
+\n • Mostra a sua posição e direção para onde está olhando
+\n • Compartilhe sua posição para que seus amigos possam encontrá-lo
+\n • Mantém seus lugares mais importantes em \'Favoritos\'
+\n • Permite-lhe escolher como exibir nomes no mapa: em inglês, local ou escrita fonética
+\n • Exibe mapas on-line especializados, vista de satélite (do Bing), camadas diferentes como trilhas GPX de navegação/turismo e camadas adicionais com transparência personalizável
+\n</string>
     <string name="osmand_plus_extended_description_part1">OsmAnd+ (Direções de Navegação Automatizada do OSM) é um aplicativo de mapa e navegação com acesso a dados livres de todo o mundo em alta qualidade do OSM. 
 \nPoderá usar a navegação visual ou por voz, ver POIs (pontos de interesse), criar e gerenciar trilhas GPX, usar informação de altitude e curvas de nível, escolher entre modos dirigir, andar de bicicleta e pedestres, editar o OSM e muito mais. 
 \n 
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index a695637c93..13a9737fe6 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -56,7 +56,7 @@
     <string name="filter_existing_indexes">A descarregar</string>
     <string name="shared_string_select_all">Marcar tudo</string>
     <string name="shared_string_refresh">Atualizar</string>
-    <string name="general_settings_descr">Configure a visualização e configurações comuns para a aplicação.</string>
+    <string name="general_settings_descr">Definir a visualização e configurações comuns para a app.</string>
     <string name="general_settings">Configurações Gerais</string>
     <string name="index_settings_descr">Descarregar e gerir ficheiros de mapas offline armazenados no seu aparelho.</string>
     <string name="index_settings">Gerir Ficheiros de mapa</string>
@@ -421,8 +421,8 @@
     <string name="play_commands_of_currently_selected_voice">Selecione uma voz e teste reproduzindo anúncios:</string>
     <string name="debugging_and_development">Desenvolvimento OsmAnd</string>
     <string name="native_rendering">Renderização nativa</string>
-    <string name="test_voice_prompts">Testar comandos de voz</string>
-    <string name="switch_to_raster_map_to_see">Nenhum mapa vetorial presente para este local. Pode descarregar um em Configurações (\'Gerir ficheiros de mapas\') ou mudar para o suplemento \"mapas online\".</string>
+    <string name="test_voice_prompts">Testar anúncios de voz</string>
+    <string name="switch_to_raster_map_to_see">Descarregue um mapa vetorial offline para esta localização em \'Configurações\' (\'Gerir ficheiros de mapa\') ou mude para a extensão \'Online maps\'.</string>
     <string name="send_files_to_osm">Enviar ficheiros GPX para o OSM\?</string>
     <string name="gpx_visibility_txt">Visibilidade</string>
     <string name="gpx_tags_txt">Etiquetas</string>
@@ -444,20 +444,20 @@
     <string name="zoomIn">Aproximar</string>
     <string name="zoomIs">O nível de zoom é</string>
     <string name="north">norte</string>
-    <string name="north_north_east">Norte-Nordeste</string>
-    <string name="north_east">Nordeste</string>
-    <string name="east_north_east">leste-norte-leste</string>
+    <string name="north_north_east">norte-nordeste</string>
+    <string name="north_east">nordeste</string>
+    <string name="east_north_east">leste-nordeste</string>
     <string name="east">Leste</string>
     <string name="east_south_east">leste-sudeste</string>
     <string name="south_east">Sudeste</string>
     <string name="south_south_east">sul-sudeste</string>
     <string name="south">sul</string>
     <string name="south_south_west">sul-sudoeste</string>
-    <string name="south_west">Sudoeste</string>
+    <string name="south_west">sudoeste</string>
     <string name="west_south_west">oeste-sudoeste</string>
     <string name="west">oeste</string>
     <string name="west_north_west">oeste-noroeste</string>
-    <string name="north_west">Noroeste</string>
+    <string name="north_west">noroeste</string>
     <string name="north_north_west">norte-noroeste</string>
     <string name="front">avançar</string>
     <string name="front_right">frente à direita</string>
@@ -475,7 +475,7 @@
     <string name="direction_style_sidewise">Laterais (8 setores)</string>
     <string name="direction_style_clockwise">No sentido horário (12 setores)</string>
     <string name="settings_direction_style">Estilo de direções</string>
-    <string name="settings_direction_style_descr">Escolha o estilo para expressar sentidos relativos ao movimento.</string>
+    <string name="settings_direction_style_descr">Escolha o estilo para expressar sentidos relativos ao movimento</string>
     <string name="auto_announce_on">Iniciar anúncio automático</string>
     <string name="auto_announce_off">Parar o anúncio automático</string>
     <string name="i_am_here">Estou aqui</string>
@@ -491,8 +491,8 @@
     <string name="local_openstreetmap_uploading">A enviar…</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/anotações enviados</string>
     <string name="local_openstreetmap_uploadall">Enviar todos</string>
-    <string name="local_openstreetmap_upload">Enviar a modificação OSM</string>
-    <string name="local_openstreetmap_delete">Eliminar alteração</string>
+    <string name="local_openstreetmap_upload">Enviar a edição ao OSM</string>
+    <string name="local_openstreetmap_delete">Apagar alteração</string>
     <string name="local_openstreetmap_descr_title">Edição assíncrona de OSM:</string>
     <string name="local_openstreetmap_settings">POIs / anotações guardados no aparelho</string>
     <string name="local_openstreetmap_settings_descr">Mostrar e gerir POIs/anotações OSM guardados localmente.</string>
@@ -519,7 +519,7 @@
     <string name="index_name_other">Mapas globais</string>
     <string name="index_name_wiki">POIs da Wikipédia mundial</string>
     <string name="index_name_voice">Avisos de voz (gravados, recursos limitados)</string>
-    <string name="index_name_tts_voice">Avisos de voz (TTS-synthesized, preferido)</string>
+    <string name="index_name_tts_voice">Avisos de voz (TTS, preferido)</string>
     <string name="amenity_type_user_defined">Definido pelo utilizador</string>
     <string name="fav_export_confirmation">Já existe um ficheiro de favoritos exportados anteriormente. Quer substitui-lo\?</string>
     <string name="profile_settings">Configurações específicas de Perfil</string>
@@ -548,11 +548,11 @@
     <string name="city_type_city">Cidade</string>
     <string name="animate_route_off">Parar animação</string>
     <string name="animate_route">Iniciar animação</string>
-    <string name="file_can_not_be_renamed">O ficheiro não pode ser renomeado.</string>
+    <string name="file_can_not_be_renamed">Não foi possível renomear o ficheiro.</string>
     <string name="file_with_name_already_exists">Já existe um ficheiro com esse nome.</string>
     <string name="shared_string_gpx_route">Rota GPX</string>
-    <string name="poi_query_by_name_matches_categories">Several POI categories found matching the query :</string>
-    <string name="data_to_search_poi_not_available">Não existem dados locais para busca de POI.</string>
+    <string name="poi_query_by_name_matches_categories">Várias categorias de POI relacionadas encontradas.</string>
+    <string name="data_to_search_poi_not_available">Descarregar dados offline para procurar POIs.</string>
     <string name="old_poi_file_should_be_deleted">O ficheiro POI \'%1$s\' é redundante e pode ser eliminado.</string>
     <string name="update_poi_file_not_found">Não foi encontrado (e não pôde ser criado) o ficheiro local para guardar as mudanças de POI.</string>
     <string name="button_upgrade_osmandplus">Upgrade para OsmAnd+</string>
@@ -578,7 +578,7 @@
     <string name="show_more_map_detail">Ver mais detalhes de mapa</string>
     <string name="show_more_map_detail_descr">Mostrar detalhes do mapa vetorial (estradas, etc.) já em níveis de zoom mais baixos.</string>
     <string name="favourites_delete_multiple_succesful">Pontos favoritos eliminados.</string>
-    <string name="favorite_delete_multiple">Vai eliminar %1$d favoritos e %2$d grupos favoritos. Tem a certeza\?</string>
+    <string name="favorite_delete_multiple">Tem a certeza que quer apagar %1$d Favoritos e %2$d Grupos de Favoritos\?</string>
     <string name="favorite_home_category">Casa</string>
     <string name="favorite_friends_category">Amigos</string>
     <string name="favorite_places_category">Locais</string>
@@ -610,10 +610,10 @@
     <string name="local_indexes_cat_poi">POI - Pontos de Interesse</string>
     <string name="ttsvoice">Voz TTS</string>
     <string name="search_offline_clear_search">Nova Pesquisa</string>
-    <string name="map_text_size_descr">Selecione o tamanho do texto para os nomes no mapa.</string>
+    <string name="map_text_size_descr">Tamanho do texto para os nomes no mapa:</string>
     <string name="map_text_size">Text size</string>
     <string name="installing_new_resources">Preparando novos dados…</string>
-    <string name="internet_connection_required_for_online_route">Está selecionado um serviço de navegação on-line, mas não está conectado à Internet neste momento.</string>
+    <string name="internet_connection_required_for_online_route">A navegação online não funciona offline.</string>
     <string name="tts_language_not_supported_title">Idioma não suportado</string>
     <string name="tts_language_not_supported">O idioma selecionado não é suportado pelo mecanismo Android TTS (texto para voz) instalado. Quer procurar outro mecanismo TTS na loja de aplicações\? Caso contrário, será usado o idioma predefinido do TTS.</string>
     <string name="tts_missing_language_data_title">Faltam dados de voz TTS</string>
diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml
index 93541c0d37..7a51db4b80 100644
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@@ -131,7 +131,7 @@
     <string name="poi_bicycle_track">Kolesarska proga</string>
     <string name="poi_horse_track">Jahalna proga</string>
     <string name="poi_bmx">Steza BMX</string>
-    <string name="poi_parking">Parkirišča</string>
+    <string name="poi_parking">Parkirišče</string>
     <string name="poi_library">Knjižnica</string>
     <string name="poi_cinema">Kinodvorana</string>
     <string name="poi_casino">Casino igralnica</string>
@@ -811,4 +811,8 @@
     <string name="poi_bureau_de_change">Menjalnica</string>
     <string name="poi_money_lender">Posojilodajalec</string>
     <string name="poi_pawnbroker">Zastavljalnica</string>
+    <string name="poi_compressed_air">Stisnjen zrak</string>
+    <string name="poi_fuel_coal">Gorivo: premog</string>
+    <string name="poi_fuel_wood">Gorivo: les</string>
+    <string name="poi_aerodrome">Letališče</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index b72be1f2c0..192ba786b0 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -261,7 +261,7 @@
     <string name="layer_yandex_traffic">Yandex的流量</string>
     <string name="layer_route">路线</string>
     <string name="shared_string_favorites">我的最爱</string>
-    <string name="layer_osm_bugs">OSM错误</string>
+    <string name="layer_osm_bugs">OSM注记(在线)</string>
     <string name="network_provider">网络</string>
     <string name="int_seconds">秒</string>
     <string name="int_min">分钟</string>
@@ -532,9 +532,9 @@
     <string name="auto_announce_off">停止自动播报</string>
     <string name="rendering_out_of_memory">没有足够的进程内存来显示选择的区域</string>
     <string name="update_poi_does_not_change_indexes">应用中的POI修改不会影响已下载的地图文件，修改会保存到本地文件中。</string>
-    <string name="local_openstreetmap_were_uploaded">已上传 {0} 个 POI/Bugs</string>
+    <string name="local_openstreetmap_were_uploaded">已上传 {0} 个兴趣点/注记</string>
     <string name="local_openstreetmap_descr_title">异步 OSM 编辑：</string>
-    <string name="local_openstreetmap_settings">本地保存的 OSM POIs/Bugs</string>
+    <string name="local_openstreetmap_settings">OSM兴趣点/注记已在设备上保存</string>
     <string name="show_current_gpx_title">显示当前轨迹</string>
     <string name="free_version_message">此 OsmAnd 免费版本最多支持下载 %1$s 套数据，并且不支持离线维基百科文章。</string>
     <string name="poi_context_menu_showdescription">显示 POI 描述。</string>
@@ -908,19 +908,19 @@
     <string name="osm_save_offline">离线保存</string>
     <string name="osm_edit_modified_poi">已修改 OSM POI</string>
     <string name="osm_edit_deleted_poi">已删除 OSM POI</string>
-    <string name="context_menu_item_open_note">打开 OSM 注解</string>
-    <string name="osm_edit_reopened_note">重新打开 OSM 注解</string>
-    <string name="osm_edit_commented_note">已评论 OSM 注解</string>
-    <string name="osm_edit_created_note">已创建 OSM 注解</string>
-    <string name="osn_bug_name">OSM 注解</string>
-    <string name="osn_add_dialog_title">创建注解</string>
+    <string name="context_menu_item_open_note">打开 OSM 注记</string>
+    <string name="osm_edit_reopened_note">重新打开 OSM 注记</string>
+    <string name="osm_edit_commented_note">已评论 OSM 注记</string>
+    <string name="osm_edit_created_note">已创建 OSM 注记</string>
+    <string name="osn_bug_name">OSM 注记</string>
+    <string name="osn_add_dialog_title">创建注记</string>
     <string name="osn_comment_dialog_title">添加评论</string>
-    <string name="osn_reopen_dialog_title">重新打开注解</string>
-    <string name="osn_close_dialog_title">关闭注解</string>
-    <string name="osn_add_dialog_success">注解创建成功</string>
-    <string name="osn_add_dialog_error">发生异常：注解未创建</string>
-    <string name="osn_close_dialog_success">注解成功关闭</string>
-    <string name="osn_close_dialog_error">发生异常：注解未关闭</string>
+    <string name="osn_reopen_dialog_title">重新打开注记</string>
+    <string name="osn_close_dialog_title">关闭注记</string>
+    <string name="osn_add_dialog_success">注记已创建</string>
+    <string name="osn_add_dialog_error">无法创建注记</string>
+    <string name="osn_close_dialog_success">注记已关闭</string>
+    <string name="osn_close_dialog_error">无法关闭注记。</string>
     <string name="shared_string_commit">提交</string>
     <string name="context_menu_item_delete_waypoint">删除 GPX 路径点？</string>
     <string name="context_menu_item_edit_waypoint">编辑 GPX 路径点</string>
@@ -1082,7 +1082,7 @@
     <string name="shared_string_share">分享</string>
     <string name="shared_string_export">导出</string>
     <string name="shared_string_more">更多…</string>
-    <string name="upload_osm_note_description">您可以匿名上传您的 OSM 笔记，或者使用您的 OpenStreetMap.org 账号。</string>
+    <string name="upload_osm_note_description">匿名上传您的 OSM 注记，或者使用您的 OpenStreetMap.org 账号。</string>
     <string name="wiki_around">附近的维基百科文章</string>
     <string name="search_map_hint">搜索城市或地区</string>
     <string name="upload_poi">上传兴趣点</string>
@@ -1149,7 +1149,7 @@
     <string name="dahboard_options_dialog_title">配置仪表板</string>
     <string name="use_dashboard_btn">使用仪表板</string>
     <string name="dashboard_or_drawer_title">仪表板或菜单控制</string>
-    <string name="audionotes_plugin_name">音频/视频笔记</string>
+    <string name="audionotes_plugin_name">音频/视频注记</string>
     <string name="rendering_value_light_brown_name">浅棕色</string>
     <string name="rendering_value_dark_brown_name">深棕色</string>
     <string name="use_osm_live_routing">OsmAnd 实时导航</string>
@@ -1257,9 +1257,9 @@
     <string name="increase_search_radius">增加搜索范围</string>
     <string name="nothing_found">什么都没找到</string>
     <string name="nothing_found_descr">尝试改变搜索查询内容或增加搜索范围。</string>
-    <string name="quick_action_showhide_osmbugs_title">显示/隐藏 OSM 笔记</string>
-    <string name="quick_action_osmbugs_show">显示 OSM 笔记</string>
-    <string name="quick_action_osmbugs_hide">隐藏 OSM 笔记</string>
+    <string name="quick_action_showhide_osmbugs_title">显示/隐藏 OSM 注记</string>
+    <string name="quick_action_osmbugs_show">显示 OSM 注记</string>
+    <string name="quick_action_osmbugs_hide">隐藏 OSM 注记</string>
     <string name="shared_string_add_photos">添加照片</string>
     <string name="routing_attr_allow_private_description">允许进入私有土地。</string>
     <string name="download_tab_downloads">全部下载</string>
@@ -1343,7 +1343,7 @@
     <string name="mapillary_widget_descr">可以助您迅速将图片提交到 Mapillary。</string>
     <string name="mapillary">Mapillary</string>
     <string name="plugin_mapillary_descr">将街道平面照片給每个人。发现新地点、写作、获取整个世界。</string>
-    <string name="quick_action_showhide_osmbugs_descr">轻点动作按钮会在地图上显示或隐藏 OSM 注解。</string>
+    <string name="quick_action_showhide_osmbugs_descr">轻点动作按钮会在地图上显示或隐藏 OSM 注记。</string>
     <string name="sorted_by_distance">按距离排序</string>
     <string name="search_favorites">搜索我的收藏</string>
     <string name="hillshade_menu_download_descr">要在地图上看到起伏的山坡，您需要下载这个地区的地形阴影层地图。</string>
@@ -1526,7 +1526,7 @@
     <string name="osm_live_header">此订阅使世界各地的所有地图每小时更新一次。收入的一部分可以回馈到 OSM 社区和支付每个 OSM 作出了贡献的人。如果你喜欢 OsmAnd 和 OSM 并且想要支持他们，这是支持他们最佳的方式。</string>
     <string name="download_files_error_not_enough_space">没有足够的空间！存储需要 {3} MB 的暂存空间，{1} MB 的永久空间。可用空间只有 {2} MB 。</string>
     <string name="download_files_question_space_with_temp">下载 {0} 个文件吗？{3} MB 暂时，{1} MB 永久使用的存储空间。（可用空间是 {2} MB）</string>
-    <string name="upload_osm_note">上传 OSM 注释</string>
+    <string name="upload_osm_note">上传 OSM 注记</string>
     <string name="consider_turning_polygons_off">建议关闭多边形渲染。</string>
     <string name="clear_updates_proposition_message">您可以删除已下载的更新和回到原始地图版本</string>
     <string name="switch_start_finish">交换起始点和目的地</string>
@@ -1586,7 +1586,7 @@
     <string name="welcome_select_region">要正确地反映您的交通标志和法规，请选择您驾驶的地区：</string>
     <string name="welcome_text">OsmAnd 提供了全球的离线地图浏览和全球的离线导航。</string>
     <string name="osm_changes_added_to_local_edits">OSM 更改添加到本地的变更集</string>
-    <string name="local_recordings_delete_all_confirm">要删除 %1$d 个注解。是否确定？</string>
+    <string name="local_recordings_delete_all_confirm">你确定要删除 %1$d 个注记吗？</string>
     <string name="local_osm_changes_upload_all_confirm">你将要上传 %1$d 个更改到 OSM。是否确定？</string>
     <string name="delay_to_start_navigation_descr">指定等待时间以便继续留在航路规划屏幕。</string>
     <string name="delay_to_start_navigation">开始转弯提醒前…</string>
@@ -1636,12 +1636,12 @@
     <string name="rename_failed">重命名失败。</string>
     <string name="days_behind">天前</string>
     <string name="back_to_map">返回地图</string>
-    <string name="share_note">分享注解</string>
+    <string name="share_note">分享注记</string>
     <string name="location_on_map">位置：
 \n 纬度 %1$s
 \n 经度 %2$s</string>
     <string name="watch">观看</string>
-    <string name="notes">注解</string>
+    <string name="notes">音视频注记</string>
     <string name="rendering_attr_pisteRoutes_name">滑雪场</string>
     <string name="free">%1$s 可用</string>
     <string name="rendering_attr_pisteGrooming_name">滑雪道修整</string>
@@ -1925,15 +1925,15 @@
     <string name="recording_playing">从已指定的录音开始播放音频。
 \n%1$s</string>
     <string name="recording_delete_confirm">你想要删除此记录吗？</string>
-    <string name="recording_context_menu_arecord">设置音频注释</string>
-    <string name="recording_context_menu_vrecord">设置视频注释</string>
+    <string name="recording_context_menu_arecord">做音频注记</string>
+    <string name="recording_context_menu_vrecord">做视频注记</string>
     <string name="layer_recordings">记录层</string>
     <string name="recording_can_not_be_played">录音不能播放</string>
     <string name="recording_context_menu_delete">删除记录</string>
     <string name="recording_description">正在录制 %1$s %3$s %2$s</string>
-    <string name="map_widget_av_notes">音频/视频注释</string>
-    <string name="audionotes_location_not_defined">以位置去关联的附注尚未下定义。\"使用位置 …\"，把注解分配给指定的位置。</string>
-    <string name="map_widget_audionotes">音频注释</string>
+    <string name="map_widget_av_notes">音频/视频注记</string>
+    <string name="audionotes_location_not_defined">轻触\"使用位置 …\"以在此添加注记。</string>
+    <string name="map_widget_audionotes">音频注记</string>
     <string name="rendering_attr_alpineHiking_name"/>
     <string name="rendering_attr_alpineHiking_description">依据 SAC 分级计算路径</string>
     <string name="rendering_attr_hikingRoutesOSMC_name"/>
@@ -2054,7 +2054,7 @@
     <string name="arrival_distance_descr">你想到达通知何时通知？</string>
     <string name="use_fluorescent_overlays">荧光覆盖</string>
     <string name="use_fluorescent_overlays_descr">使用荧光颜色来显示轨迹和路线。</string>
-    <string name="local_openstreetmap_settings_descr">显示和管理在设备端数据库的 OSM 兴趣点/注解</string>
+    <string name="local_openstreetmap_settings_descr">显示和管理在您设备数据库中的 OSM 兴趣点/注记。</string>
     <string name="live_monitoring_interval_descr">指定在线追踪间隔时间。</string>
     <string name="live_monitoring_interval">在线跟踪时间间隔</string>
     <string name="live_monitoring_url_descr">指定位置的 Web 地址参数语法：lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}。</string>
@@ -2259,10 +2259,10 @@
     <string name="quick_action_add_poi">添加 POI</string>
     <string name="quick_action_map_style">更改地图样式</string>
     <string name="quick_action_map_style_switch">地图显示风格已改为\"%s\"。</string>
-    <string name="quick_action_take_audio_note">录制音频注释</string>
-    <string name="quick_action_take_video_note">录制视频注释</string>
-    <string name="quick_action_take_photo_note">设置图片注释</string>
-    <string name="quick_action_add_osm_bug">添加 OSM 注解</string>
+    <string name="quick_action_take_audio_note">新音频注记</string>
+    <string name="quick_action_take_video_note">新视频注记</string>
+    <string name="quick_action_take_photo_note">新图片注记</string>
+    <string name="quick_action_add_osm_bug">添加 OSM 注记</string>
     <string name="quick_action_navigation_voice">打开关闭声音</string>
     <string name="quick_action_navigation_voice_off">语音开启</string>
     <string name="quick_action_add_gpx">添加 GPX 地标</string>
@@ -2277,10 +2277,10 @@
     <string name="quick_favorites_name_preset">预设的名称</string>
     <string name="quick_action_add_marker_descr">轻触动作按钮将会在屏幕中心的位置增加一个地图记号。</string>
     <string name="quick_action_add_gpx_descr">轻触动作按钮将会在屏幕中心的位置增加一个 GPX 地标。</string>
-    <string name="quick_action_take_audio_note_descr">轻触动作按钮将会在屏幕中心的位置增加一个音频注释。</string>
-    <string name="quick_action_take_video_note_descr">轻触动作按钮将会在屏幕中心的位置增加一个视频注释。</string>
-    <string name="quick_action_take_photo_note_descr">轻触动作按钮将会在屏幕中心的位置增加一个照片注释。</string>
-    <string name="quick_action_add_osm_bug_descr">轻触动作按钮将会在屏幕中心的位置增加一个 OSM 注解。</string>
+    <string name="quick_action_take_audio_note_descr">在屏幕中心的位置添加音频注记的按钮。</string>
+    <string name="quick_action_take_video_note_descr">在屏幕中心的位置添加视频注记的按钮。</string>
+    <string name="quick_action_take_photo_note_descr">在屏幕中心的位置添加照片注记的按钮。</string>
+    <string name="quick_action_add_osm_bug_descr">在屏幕中心的位置添加 OSM 注记的按钮。</string>
     <string name="quick_action_add_poi_descr">轻触动作按钮将会在屏幕中心的位置增加一个 POI。</string>
     <string name="quick_action_add_parking_descr">轻触动作按钮将会在屏幕中心的位置增加一个停车场。</string>
     <string name="quick_action_interim_dialog">显示一个临时的对话框</string>
@@ -2359,8 +2359,8 @@
     <string name="wrong_format">格式错误</string>
     <string name="shared_string_road">道路</string>
     <string name="show_map">显示地图</string>
-    <string name="osn_modify_dialog_title">修改笔记</string>
-    <string name="context_menu_item_modify_note">修改 OSM 笔记</string>
+    <string name="osn_modify_dialog_title">修改注记</string>
+    <string name="context_menu_item_modify_note">修改 OSM 注记</string>
     <string name="coordinates_format">坐标格式</string>
     <string name="use_system_keyboard">使用系统键盘</string>
     <string name="use_location">使用位置</string>
@@ -2387,14 +2387,14 @@
     <string name="modify_the_search_query">修改搜索查询。</string>
     <string name="shared_string_actions">操作</string>
     <string name="shared_string_marker">标记</string>
-    <string name="empty_state_osm_edits_descr">创建或修改 OSM 兴趣点，打开或评论 OSM 笔记并贡献 GPX 轨迹文件。</string>
+    <string name="empty_state_osm_edits_descr">创建或修改 OSM 兴趣点，打开或评论 OSM 注记并贡献 GPX 轨迹文件。</string>
     <string name="shared_string_deleted">已删除</string>
     <string name="shared_string_edited">已编辑</string>
     <string name="shared_string_added">已添加</string>
     <string name="marker_activated">标记%s 已激活。</string>
     <string name="one_tap_active_descr">点击地图上的标记将其移动到活动标记的顶端, 而不打开上下文菜单。</string>
     <string name="one_tap_active">\'一个点击\'激活</string>
-    <string name="empty_state_av_notes">做笔记!</string>
+    <string name="empty_state_av_notes">做注记!</string>
     <string name="empty_state_av_notes_desc">使用小部件或上下文菜单, 在地图上的每个点添加音频、视频或照片注释。</string>
     <string name="notes_by_date">按日期说明</string>
     <string name="by_date">按日期</string>
@@ -2431,15 +2431,15 @@
     <string name="will_open_tomorrow_at">明日开始营业时间</string>
     <string name="rendering_attr_hidePOILabels_name">兴趣点（POI）标签</string>
     <string name="show_number_pad">显示数字盘</string>
-    <string name="switch_osm_notes_visibility_desc">在地图上显示/隐藏 OSM 笔记。</string>
+    <string name="switch_osm_notes_visibility_desc">在地图上显示/隐藏 OSM 注记。</string>
     <string name="gpx_file_desc">GPX - 适合导出到 JOSM 或其它 OSM 编辑器。</string>
     <string name="osc_file_desc">OSC - 适合导出到 OpenStreetMap。</string>
     <string name="shared_string_gpx_file">GPX 文件</string>
     <string name="osc_file">OSC 文件</string>
     <string name="choose_file_type">选择文件类型</string>
-    <string name="osm_edits_export_desc">选择导出类型：OSM 笔记、POI（兴趣点）或者同时使用两者。</string>
+    <string name="osm_edits_export_desc">导出OSM 注记、POI（兴趣点）或两者。</string>
     <string name="all_data">所有数据</string>
-    <string name="osm_notes">OSM 笔记</string>
+    <string name="osm_notes">OSM 注记</string>
     <string name="shared_string_paste">粘贴</string>
     <string name="tap_on_map_to_hide_interface">全屏模式</string>
     <string name="import_file">导入文件</string>
@@ -2541,7 +2541,7 @@
     <string name="search_no_results_feedback">没有搜索结果？
 \n向我们提供反馈</string>
     <string name="point_deleted">点 %1$s 已删除</string>
-    <string name="osn_modify_dialog_error">无法修改笔记</string>
+    <string name="osn_modify_dialog_error">无法修改注记</string>
     <string name="fast_coordinates_input">快速坐标输入</string>
     <string name="my_location">我的位置</string>
     <string name="descendingly">降序</string>
@@ -2828,4 +2828,69 @@
     <string name="import_rendering_file">导入渲染文件</string>
     <string name="app_mode_shuttle_bus">班车</string>
     <string name="app_mode_pickup_truck">皮卡</string>
+    <string name="pseudo_mercator_projection">球面正轴等角圆柱投影</string>
+    <string name="shared_string_poi_types">兴趣点类型</string>
+    <string name="shared_string_terrain">地形</string>
+    <string name="shared_string_transparency">透明度</string>
+    <string name="shared_string_zoom_levels">缩放等级</string>
+    <string name="shared_string_legend">图例</string>
+    <string name="quick_action_show_hide_terrain">显示/隐藏地形</string>
+    <string name="quick_action_terrain_hide">隐藏地形</string>
+    <string name="quick_action_terrain_show">显示地形</string>
+    <string name="delete_description">删除描述</string>
+    <string name="add_description">添加描述</string>
+    <string name="select_shape">选择形状</string>
+    <string name="shared_string_circle">圆形</string>
+    <string name="shared_string_square">方形</string>
+    <string name="shared_string_octagon">八边形</string>
+    <string name="shared_string_min">闽语</string>
+    <string name="developer_plugin">开发者插件</string>
+    <string name="replace_point_descr">以此替换另一点。</string>
+    <string name="app_mode_ski_snowmobile">雪地车</string>
+    <string name="shared_string_languages">语言</string>
+    <string name="shared_string_language">语言</string>
+    <string name="shared_string_all_languages">所有语言</string>
+    <string name="some_articles_may_not_available_in_lang">某些Wikipedia条目可能无法以您的语言提供。</string>
+    <string name="lang_zhyue">粤语</string>
+    <string name="lang_zhminnan">闽南语</string>
+    <string name="custom_color">自定义颜色</string>
+    <string name="search_poi_types">搜索兴趣点类型</string>
+    <string name="radius_ruler_item">半径尺</string>
+    <string name="subscription_osmandlive_item">订阅 - OsmAnd Live</string>
+    <string name="quick_action_transport_hide">隐藏公共交通</string>
+    <string name="quick_action_transport_show">显示公共交通</string>
+    <string name="quick_action_show_hide_transport">显示/隐藏公共交通</string>
+    <string name="create_edit_poi">创建/编辑兴趣点</string>
+    <string name="edit_online_source">编辑在线资源</string>
+    <string name="mercator_projection">正轴等角圆柱投影</string>
+    <string name="storage_format">储存格式</string>
+    <string name="shared_string_delete_all_q">删除所有\?</string>
+    <string name="uninstall_speed_cameras">卸载测速摄像</string>
+    <string name="shared_string_legal">合法</string>
+    <string name="speed_camera_pois">测速摄像兴趣点</string>
+    <string name="shared_string_uninstall">卸载</string>
+    <string name="speed_cameras_alert">在某些国家法律禁止使用测速摄像警报。</string>
+    <string name="vessel_height_warning_link">设置船只高度</string>
+    <string name="vessel_height_warning">您可以设置船只高度，以避免过低桥梁。请记住，如果桥是可移动的，我们将使用它在打开状态下的高度。</string>
+    <string name="vessel_height_limit_description">设置船只高度，以避免过低桥梁。请记住，如果桥是可移动的，我们将使用它在打开状态下的高度。</string>
+    <string name="vessel_width_limit_description">设置船只宽度以避免狭窄的桥梁</string>
+    <string name="quick_action_showhide_mapillary_title">显示/隐藏Mapillary</string>
+    <string name="quick_action_mapillary_hide">隐藏Mapillary</string>
+    <string name="quick_action_mapillary_show">显示Mapillary</string>
+    <string name="item_deleted">%1$s 已删除</string>
+    <string name="shared_string_uninstall_and_restart">卸载并重新启动</string>
+    <string name="quick_action_remove_next_destination">删除下一个目的地</string>
+    <string name="use_volume_buttons_as_zoom_descr">启用以使用设备音量按钮控制地图缩放级别。</string>
+    <string name="use_volume_buttons_as_zoom">音量按钮用于缩放</string>
+    <string name="please_provide_point_name_error">请提供该点的名称</string>
+    <string name="app_mode_wheelchair">轮椅</string>
+    <string name="set_working_days_to_continue">您需要设置工作日以继续</string>
+    <string name="route_between_points">两点间路线</string>
+    <string name="plan_a_route">规划路线</string>
+    <string name="photo_notes">图片注记</string>
+    <string name="video_notes">视频注记</string>
+    <string name="multimedia_notes_view_descr">你的OSM注记在 %1$s。</string>
+    <string name="show_closed_notes">显示关闭的注记</string>
+    <string name="osm_edit_closed_note">关闭的OSM注记</string>
+    <string name="add_online_source">添加在线资源</string>
 </resources>
\ No newline at end of file