diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 3e325159f3..8c7ed3af42 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -149,8 +149,8 @@
     <string name="offline_edition">离线编辑</string>
     <string name="offline_edition_descr">始终使用离线编辑。</string>
     <string name="local_openstreetmap_uploading">正在上传…</string>
-    <string name="local_openstreetmap_upload">上传修改OSM</string>
-    <string name="local_openstreetmap_delete">删除修改</string>
+    <string name="local_openstreetmap_upload">上传编辑到 OSM</string>
+    <string name="local_openstreetmap_delete">删除编辑</string>
     <string name="local_openstreetmap_uploadall">所有上传</string>
     <string name="free_version_title">免费版</string>
     <string name="index_name_north_america">北美</string>
@@ -166,8 +166,8 @@
     <string name="index_name_oceania">大洋洲</string>
     <string name="index_name_other">全球和专题地图</string>
     <string name="index_name_wiki">全球维基百科的POI</string>
-    <string name="index_name_voice">语音包（录制，功能有限）</string>
-    <string name="index_name_tts_voice">语音包（TTS合成，优先选用）</string>
+    <string name="index_name_voice">语音提示（录音，功能有限）</string>
+    <string name="index_name_tts_voice">语音提示（TTS，首选）</string>
     <string name="amenity_type_osmwiki">维基百科（离线）</string>
     <string name="amenity_type_user_defined">用户自定义</string>
     <string name="settings_preset">用户配置文件</string>
@@ -186,7 +186,7 @@
     <string name="city_type_city">城市</string>
     <string name="button_upgrade_osmandplus">升级OsmAnd+</string>
     <string name="shared_string_rename">重命名</string>
-    <string name="local_index_upload_gpx_description">上传GPX文件OSM社区。它们将被用于改善地图。</string>
+    <string name="local_index_upload_gpx_description">将 GPX 文件上传到 OSM 社区，改进地图。</string>
     <string name="local_index_mi_upload_gpx">发送到OSM</string>
     <string name="favorite_home_category">家</string>
     <string name="favorite_friends_category">朋友</string>
@@ -195,11 +195,11 @@
     <string name="favourites_edit_dialog_category">类别</string>
     <string name="shared_string_no_thanks">谢谢，不用了</string>
     <string name="trace_rendering">渲染调试信息</string>
-    <string name="gpx_option_reverse_route">反向GPX方向</string>
+    <string name="gpx_option_reverse_route">反转轨迹方向</string>
     <string name="internet_not_available">在没有连接到互联网的情况下，无法进行操作。</string>
     <string name="shared_string_next">下一页</string>
     <string name="shared_string_previous">上一页</string>
-    <string name="unit_of_length_descr">更改长度单位。</string>
+    <string name="unit_of_length_descr">改变测量的距离。</string>
     <string name="unit_of_length">长度单位</string>
     <string name="si_mi_feet">英里/英尺</string>
     <string name="si_mi_yard">英里/码</string>
@@ -251,7 +251,7 @@
     <string name="shared_string_import">导入</string>
     <string name="send_report">发送报告</string>
     <string name="any_poi">任何</string>
-    <string name="thanks_yandex_traffic">由于Yandex的交通信息。</string>
+    <string name="thanks_yandex_traffic">感谢 Yandex 提供交通信息。</string>
     <string name="layer_yandex_traffic">Yandex的流量</string>
     <string name="layer_route">路线</string>
     <string name="shared_string_favorites">收藏</string>
@@ -269,7 +269,7 @@
     <string name="route_head">头</string>
     <string name="first_time_continue">后来</string>
     <string name="first_time_download">下载区域</string>
-    <string name="search_poi_location">正在搜索信号…</string>
+    <string name="search_poi_location">等待信号……</string>
     <string name="map_orientation_portrait">竖屏</string>
     <string name="map_orientation_landscape">横屏</string>
     <string name="map_screen_orientation">屏幕方向</string>
@@ -292,9 +292,9 @@
     <string name="error_occurred_saving_gpx">无法保存 GPX 文件。</string>
     <string name="arrived_at_destination">你已到达。</string>
     <string name="invalid_locations">无效的座标</string>
-    <string name="go_back_to_osmand">回到OsmAnd地图</string>
+    <string name="go_back_to_osmand">返回地图</string>
     <string name="shared_string_close">关闭</string>
-    <string name="saving_gpx_tracks">将GPX轨迹保存到SD卡…</string>
+    <string name="saving_gpx_tracks">保存 GPX 文件……</string>
     <string name="finished_task">成品</string>
     <string name="use_online_routing_descr">使用互联网计算路线。</string>
     <string name="use_online_routing">使用在线导航</string>
@@ -351,18 +351,18 @@
     <string name="about_version">版本：</string>
     <string name="shared_string_about">关于</string>
     <string name="about_settings_descr">版本信息，许可证，项目成员</string>
-    <string name="local_index_tile_data_expire">过期(分钟)：%1$s</string>
+    <string name="local_index_tile_data_expire">到期时间（分钟）： %1$s</string>
     <string name="local_index_tile_data_downloadable">可下载：%1$s</string>
     <string name="local_index_tile_data_maxzoom">最大显示级别：%1$s</string>
     <string name="local_index_tile_data_minzoom">最小显示级别：%1$s</string>
     <string name="local_index_tile_data_name">地图瓦片数据：%1$s</string>
     <string name="edit_tilesource_successfully">地图瓦片数据源 %1$s 已成功保存</string>
-    <string name="edit_tilesource_elliptic_tile">椭圆墨卡托</string>
+    <string name="edit_tilesource_elliptic_tile">椭圆墨卡托投影</string>
     <string name="edit_tilesource_maxzoom">最大显示级别</string>
-    <string name="edit_tilesource_expiration_time">过期(分钟)</string>
+    <string name="edit_tilesource_expiration_time">到期时间（分钟）</string>
     <string name="edit_tilesource_minzoom">最小显示级别</string>
     <string name="edit_tilesource_url_to_load">URL</string>
-    <string name="edit_tilesource_choose_existing">选择已有来源…</string>
+    <string name="edit_tilesource_choose_existing">选择现有的……</string>
     <string name="maps_define_edit">定义/编辑…</string>
     <string name="map_widget_fps_info">FPS 调试信息</string>
     <string name="driving_region_descr">选择驾驶区域：美国、欧洲、英国、亚洲等。</string>
@@ -370,14 +370,14 @@
     <string name="driving_region_japan">日本</string>
     <string name="driving_region_us">美国</string>
     <string name="driving_region_canada">加拿大</string>
-    <string name="driving_region_europe_asia">欧洲、亚洲、拉丁美洲及相似地区</string>
-    <string name="driving_region_uk">英国、印度、澳大利亚及其他</string>
+    <string name="driving_region_europe_asia">欧洲、亚洲、拉丁美洲和类似地区</string>
+    <string name="driving_region_uk">英国、印度和类似地区</string>
     <string name="speak_title">播报…</string>
     <string name="speak_descr">设置街道名称、交通警告（强制停车、减速带）、测速仪警告、限速等公告。</string>
     <string name="speak_speed_limit">播报限速</string>
     <string name="speak_cameras">播报测速电子眼</string>
     <string name="speak_traffic_warnings">播报交通信息</string>
-    <string name="osb_author_or_password_not_specified">请在设置中指定OSM用户名和密码</string>
+    <string name="osb_author_or_password_not_specified">请在“设置”中指定 OSM 用户和密码</string>
     <string name="context_menu_item_directions_to">设为终点</string>
     <string name="context_menu_item_directions_from">设为起点</string>
     <string name="route_descr_map_location">地图： </string>
@@ -387,7 +387,7 @@
     <string name="route_from">起点：</string>
     <string name="destination_point">终点 %1$s</string>
     <string name="context_menu_item_destination_point">设为终点</string>
-    <string name="please_select_address">先选择城市或街道</string>
+    <string name="please_select_address">首先设置城市或街道</string>
     <string name="search_street_in_neighborhood_cities">在相邻城市搜索街道</string>
     <string name="local_osm_changes_backup_successful">OSM 修改文件已成功生成 %1$s</string>
     <string name="local_osm_changes_backup_failed">无法备份 OSM 更改。</string>
@@ -402,7 +402,7 @@
     <string name="distance_measurement_start_editing">开始编辑</string>
     <string name="distance_measurement_finish_editing">完成编辑</string>
     <string name="distance_measurement_clear_route">清除所有点</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="install_paid">完整版本</string>
     <string name="cancel_navigation">停止导航</string>
@@ -438,7 +438,7 @@
     <string name="av_use_external_camera_descr">使用系统应用拍照。</string>
     <string name="av_settings_descr">设置音频和视频设置。</string>
     <string name="av_settings">音频/视频设置 </string>
-    <string name="recording_error">录制时发生错误 </string>
+    <string name="recording_error">录制失败</string>
     <string name="recording_camera_not_available">摄像头不可用</string>
     <string name="recording_is_recorded">音频/视频正在记录，要停止请点击AV窗体。</string>
     <string name="recording_open_external_player">打开外部播放器</string>
@@ -510,7 +510,7 @@
     <string name="map_online_data_descr">使用在线地图（在储存卡上下载并缓存瓦片）。</string>
     <string name="shared_string_online_maps">在线地图</string>
     <string name="online_map_settings_descr">配置在线或缓存瓦片地图来源。</string>
-    <string name="osmand_accessibility_description">显示特殊可用性功能的设置。</string>
+    <string name="osmand_accessibility_description"></string>
     <string name="vector_maps_may_display_faster_on_some_devices">矢量地图很可能显示更快速。但在某些设备上不能正常工作。</string>
     <string name="test_voice_prompts">测试语音提示</string>
     <string name="switch_to_raster_map_to_see">这个位置没有离线矢量地图。您可以从设置(数据管理)中下载，或者切换到在线地图。</string>
@@ -530,7 +530,7 @@
     <string name="local_openstreetmap_descr_title">异步 OSM 编辑：</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="free_version_message">你可以下载或更新 %1$s 地图。</string>
     <string name="poi_context_menu_showdescription">显示 POI 描述。</string>
     <string name="fav_export_confirmation">已存在上次导出的收藏夹文件。是否要替换它？</string>
     <string name="routing_settings_descr">指定导航选项。</string>
@@ -552,30 +552,32 @@
     <string name="delete_confirmation_msg">删除 %1$s？</string>
     <string name="animate_route_off">停止模拟导航</string>
     <string name="animate_route">开始模拟导航</string>
-    <string name="file_can_not_be_renamed">文件无法重命名。</string>
-    <string name="file_with_name_already_exists">同名文件已存在。</string>
-    <string name="poi_query_by_name_matches_categories">找到了几个相关的 POI 类别。</string>
-    <string name="data_to_search_poi_not_available">用于搜索POI的本地数据不存在。</string>
+    <string name="file_can_not_be_renamed">无法重命名文件。</string>
+    <string name="file_with_name_already_exists">已经有一个同名的文件存在。</string>
+    <string name="poi_query_by_name_matches_categories">找到了几个相关的兴趣点类别。</string>
+    <string name="data_to_search_poi_not_available">下载离线数据以搜索兴趣点。</string>
     <string name="poi_filter_by_name">按名称搜索</string>
     <string name="old_poi_file_should_be_deleted">兴趣点数据文件 \'%1$s\' 是多余的，可以删除。</string>
     <string name="update_poi_file_not_found">用于维护 POI 改动的本地文件不存在，且无法创建。</string>
-    <string name="map_version_changed_info">服务器包含与您当前应用版本不兼容的地图文件。要下载并使用这些文件，请将应用程序升级至新版本。</string>
+    <string name="map_version_changed_info">下载新版本的应用程序，以便能够使用新的地图文件。</string>
     <string name="search_position_current_location_search">搜索位置…</string>
     <string name="search_position_current_location_found">我的位置（已找到）</string>
     <string name="search_position_address">地址…</string>
     <string name="search_position_favorites">收藏夹…</string>
     <string name="shared_string_undefined">未定义</string>
     <string name="search_position_map_view">上次地图显示位置</string>
-    <string name="route_successfully_saved_at">路线已成功保存为 \'%1$s\'。</string>
+    <string name="route_successfully_saved_at">路线保存为“%1$s”。</string>
     <string name="filename_input">文件名： </string>
     <string name="file_with_name_already_exist">同名文件已存在。</string>
     <string name="shared_string_save">保存</string>
     <string name="local_index_items_uploaded">%2$d 个项目中的 %1$d 个已成功上传。</string>
     <string name="show_more_map_detail">显示更多地图细节</string>
-    <string name="favourites_delete_multiple_succesful">收藏点已成功删除。</string>
+    <string name="favourites_delete_multiple_succesful">收藏点已删除。</string>
     <string name="favorite_delete_multiple">您将要删除 %1$d 个收藏点和 %2$d 个收藏组。是否确认？</string>
     <string name="basemap_missing">基础世界地图(小比例尺下覆盖整个世界)丢失。请考虑下载 World_basemap_x.obf 以确保应用运行环境完整。</string>
-    <string name="local_index_gpx_info_show">\n\n长按进入选项</string>
+    <string name="local_index_gpx_info_show">"
+\n
+\n长按选项"</string>
     <string name="local_index_installed">本地版本</string>
     <string name="local_index_descr_title">管理地图文件。</string>
     <string name="shared_string_download">下载</string>
@@ -583,8 +585,8 @@
     <string name="local_index_address_data">地址数据</string>
     <string name="local_index_transport_data">交通设施数据</string>
     <string name="local_index_map_data">地图数据</string>
-    <string name="local_indexes_cat_tts">语音数据(TTS)</string>
-    <string name="local_indexes_cat_voice">语音数据(录制)</string>
+    <string name="local_indexes_cat_tts">语音提示（TTS）</string>
+    <string name="local_indexes_cat_voice">语音提示（录音）</string>
     <string name="local_indexes_cat_poi">兴趣点数据</string>
     <string name="ttsvoice">TTS语音</string>
     <string name="search_offline_clear_search">新搜索</string>
@@ -592,18 +594,18 @@
     <string name="map_text_size">地图字体大小</string>
     <string name="trace_rendering_descr">显示渲染性能。</string>
     <string name="installing_new_resources">解包新数据…</string>
-    <string name="internet_connection_required_for_online_route">已选择在线导航服务，但网络连接不可用。</string>
+    <string name="internet_connection_required_for_online_route">在线导航不能离线工作。</string>
     <string name="tts_language_not_supported_title">不支持的语言</string>
     <string name="tts_missing_language_data_title">数据丢失</string>
     <string name="gpx_option_destination_point">使用当前终点</string>
     <string name="voice_stream_notification">提醒语音音频</string>
-    <string name="voice_stream_music">媒体/音乐音频</string>
+    <string name="voice_stream_music">媒体/导航音频</string>
     <string name="warning_tile_layer_not_downloadable">应用程序无法下载地图图层 %1$s，请尝试重新安装。</string>
     <string name="overlay_transparency_descr">调整叠加层透明度。</string>
     <string name="overlay_transparency">叠加层透明度</string>
     <string name="map_transparency_descr">调整基本地图透明度。</string>
     <string name="map_transparency">基础地图透明度</string>
-    <string name="layer_underlay">背景层地图…</string>
+    <string name="layer_underlay">背景层地图……</string>
     <string name="map_underlay">背景层地图</string>
     <string name="map_underlay_descr">选择背景层地图</string>
     <string name="layer_overlay">叠加层地图…</string>
@@ -635,7 +637,7 @@
     <string name="application_dir">存储目录</string>
     <string name="gps_status_app_not_found">GPS 状态应用未安装。是否转到应用市场中搜索？</string>
     <string name="voice_is_not_available_msg">语音指引不可用。请到“设置”→“常规设置”→“语音指引”中选择想要的语音数据包并下载。</string>
-    <string name="voice_is_not_available_title">未选择引导语音</string>
+    <string name="voice_is_not_available_title">选择一个语音提示包</string>
     <string name="daynight_descr">调整夜间和白天模式之间的切换。</string>
     <string name="download_files_question">是否下载 {0} 个文件({1} MB)？</string>
     <string name="items_were_selected">已选择 {0} 个项目</string>
@@ -646,11 +648,11 @@
     <string name="shared_string_download_map">下载地图</string>
     <string name="maps_could_not_be_downloaded">此地图无法下载</string>
     <string name="rendering_exception">无法绘制所选区域。</string>
-    <string name="show_point_options">使用位置 …</string>
-    <string name="renderer_load_sucess">渲染器已成功加载</string>
+    <string name="show_point_options">使用位置……</string>
+    <string name="renderer_load_sucess">已加载渲染器</string>
     <string name="renderer_load_exception">无法加载渲染器。</string>
     <string name="renderers">矢量渲染器</string>
-    <string name="renderers_descr">选择渲染器外观</string>
+    <string name="renderers_descr">选择渲染外观</string>
     <string name="poi_context_menu_website">显示POI网址</string>
     <string name="poi_context_menu_call">显示POI电话</string>
     <string name="context_menu_item_search_transport">搜索交通设施</string>
@@ -659,17 +661,18 @@
     <string name="vector_data">离线矢量地图</string>
     <string name="poi_context_menu_modify">修改 POI</string>
     <string name="poi_context_menu_delete">删除 POI</string>
-    <string name="rotate_map_none_opt">保持地图正北朝上</string>
+    <string name="rotate_map_none_opt">不旋转（正北永远朝上）</string>
     <string name="rotate_map_to_bearing_descr">地图对齐方式：</string>
     <string name="rotate_map_to_bearing">地图朝向</string>
     <string name="show_route">路线详情</string>
-    <string name="fav_imported_sucessfully">收藏夹已成功导入</string>
+    <string name="fav_imported_sucessfully">收藏已导入</string>
     <string name="av_photo_play_sound_descr">选择是否有拍照声。</string>
-    <string name="av_photo_play_sound">拍照时播放声音</string>
+    <string name="av_photo_play_sound">播放相机快门声</string>
     <string name="voice_data_not_supported">语音数据版本不支持</string>
     <string name="voice_data_corrupted">指定的语音数据已损坏</string>
-    <string name="voice_data_unavailable">选择的语音数据不可用</string>
-    <string name="sd_unmounted">SD卡无法访问。\n您将无法查看地图和进行搜索。</string>
+    <string name="voice_data_unavailable">所选语音提示包不可用</string>
+    <string name="sd_unmounted">无法访问存储卡。
+\n你将无法看到地图或查找内容。</string>
     <string name="sd_mounted_ro">SD卡处于只读状态。\n您将只能查看已有地图，无法从互联网下载。</string>
     <string name="unzipping_file">正在解压缩文件…</string>
     <string name="search_near_map">在上一次地图中心附近搜索</string>
@@ -679,14 +682,14 @@
     <string name="add_new_rule">添加新规则</string>
     <string name="show_transport_over_map_description">在地图上显示公共交通站点。</string>
     <string name="show_transport_over_map">显示公共交通站点</string>
-    <string name="hello">导航应用 OsmAnd</string>
+    <string name="hello">OsmAnd 导航应用</string>
     <string name="update_poi_success">POI 数据已成功更新 ({0} 已载入)</string>
     <string name="update_poi_error_local">无法更新本地兴趣点列表。</string>
     <string name="update_poi_error_loading">无法从服务器加载数据。</string>
     <string name="update_poi_no_offline_poi_index">此区域没有可用的离线 POI 数据</string>
     <string name="update_poi_is_not_available_for_zoom">小比例尺下更新 POI 功能不可用</string>
     <string name="context_menu_item_update_poi">更新 POI</string>
-    <string name="context_menu_item_update_map_confirm">是否要通过互联网更新本地数据？</string>
+    <string name="context_menu_item_update_map_confirm">从互联网更新本地数据？</string>
     <string name="search_history_city">城市：{0}</string>
     <string name="search_history_street">街道：{0}，{1}</string>
     <string name="search_history_int_streets">交叉路口：{0} x {1} 在 {2}</string>
@@ -705,7 +708,7 @@
     <string name="route_general_information">总距离 %1$s，行驶时间 %2$d 时 %3$d 分。</string>
     <string name="router_service_descr">在线或离线导航服务。</string>
     <string name="router_service">导航服务</string>
-    <string name="sd_dir_not_accessible">SD卡上的数据存储目录无法访问！</string>
+    <string name="sd_dir_not_accessible">存储卡上的存储文件夹无法访问！</string>
     <string name="download_question">是否下载 {0} - {1}？</string>
     <string name="download_question_exist">{0} 的离线数据已经存在({1})。是否要更新它({2})？</string>
     <string name="address">地址</string>
@@ -713,7 +716,7 @@
     <string name="downloading_list_indexes">正在下载可用区域的列表…</string>
     <string name="list_index_files_was_not_loaded">区域列表未能从 osmand.net 获取。</string>
     <string name="fav_points_edited">收藏点已被编辑</string>
-    <string name="mark_final_location_first">请首先选择目的地</string>
+    <string name="mark_final_location_first">请先设置目的地</string>
     <string name="opening_hours">营业时间</string>
     <string name="opening_changeset">正在打开修改集…</string>
     <string name="closing_changeset">正在关闭修改集…</string>
@@ -739,23 +742,23 @@
     <string name="update_tile">更新地图</string>
     <string name="reload_tile">重新载入地图瓦片</string>
     <string name="mark_point">目标</string>
-    <string name="shared_string_add_to_favorites">加入收藏夹</string>
+    <string name="shared_string_add_to_favorites">添加到“收藏”</string>
     <string name="use_english_names_descr">在当地名称和英文名称之间选择。</string>
-    <string name="use_english_names">在地图中使用英文名称</string>
-    <string name="app_settings">应用程序设置</string>
+    <string name="use_english_names">在地图上使用英文名称</string>
+    <string name="app_settings">应用设置</string>
     <string name="search_address">搜索地址</string>
     <string name="choose_building">选择建筑物</string>
     <string name="choose_street">选择街道</string>
     <string name="choose_city">选择城市</string>
     <string name="ChooseCountry">选择国家</string>
     <string name="show_poi_over_map_description">显示上一次使用的兴趣点叠加层。</string>
-    <string name="show_poi_over_map">显示POI</string>
+    <string name="show_poi_over_map">显示兴趣点叠加</string>
     <string name="map_tile_source_descr">选择在线或缓存地图瓦片的来源。</string>
     <string name="map_tile_source">瓦片地图来源</string>
     <string name="map_source">地图来源</string>
     <string name="show_location">显示位置</string>
     <string name="use_internet_to_download_tile">使用互联网下载丢失的地图瓦片</string>
-    <string name="app_description">导航应用程序</string>
+    <string name="app_description">导航应用</string>
     <string name="searchpoi_activity">选择POI</string>
     <string name="search_POI_level_btn">搜索更多</string>
     <string name="choose_available_region">从列表中选择区域</string>
@@ -785,13 +788,13 @@
     <string name="poi_remove_success">已删除</string>
     <string name="poi_action_add">添加</string>
     <string name="poi_action_change">修改</string>
-    <string name="poi_action_succeded_template">动作 {0} 已成功完成。</string>
-    <string name="poi_error_unexpected_template">执行动作 {0} 时发生意外的错误。</string>
+    <string name="poi_action_succeded_template">动作 {0} 已完成。</string>
+    <string name="poi_error_unexpected_template">无法执行动作 {0}。</string>
     <string name="poi_error_io_error_template">执行动作 {0} 时发生 I/O 错误。</string>
     <string name="poi_error_info_not_loaded">节点的信息未能加载</string>
     <string name="poi_dialog_other_tags_message">所有其他标记都已保留</string>
-    <string name="edit_filter_delete_dialog_title">是否删除选中的过滤器？</string>
-    <string name="edit_filter_delete_message">过滤器 %1$s 已被删除</string>
+    <string name="edit_filter_delete_dialog_title">删除此筛选规则？</string>
+    <string name="edit_filter_delete_message">筛选规则“%1$s”已被删除</string>
     <string name="edit_filter_create_message">过滤器 %1$s 已创建</string>
     <string name="av_camera_focus_auto">自动对焦</string>
     <string name="clear_intermediate_points">清除中途点</string>
@@ -819,11 +822,11 @@
     <string name="shared_string_topbar">顶栏</string>
     <string name="full_report">完整报告</string>
     <string name="recalculate_route">重新计算路线</string>
-    <string name="open_street_map_login_and_pass">OpenStreetMap 登录名和密码</string>
+    <string name="open_street_map_login_and_pass">OSM 用户名和密码</string>
     <string name="donations">捐赠</string>
     <string name="number_of_recipients">接收者数量</string>
     <string name="osm_user_stat">编辑数 %1$s，排名 %2$s，总计编辑 %3$s</string>
-    <string name="osm_editors_ranking">OSM 编辑排名</string>
+    <string name="osm_editors_ranking">OSM 编辑者排名</string>
     <string name="osm_live_subscribe_btn">订阅</string>
     <string name="osm_live_subscription">OsmAnd 实时订阅</string>
     <string name="osm_live_user_public_name">公开名称</string>
@@ -849,16 +852,16 @@
     <string name="shared_string_toolbar">工具栏</string>
     <string name="shared_string_widgets">小工具</string>
     <string name="shared_string_add_to_map_markers">添加地图标记</string>
-    <string name="add_points_to_map_markers_q">您确定要添加所有地点到地图标记？</string>
+    <string name="add_points_to_map_markers_q">将所有点添加为地图标记？</string>
     <string name="select_map_markers">选择地图标记</string>
     <string name="shared_string_reverse_order">反向顺序</string>
     <string name="show_map_markers_description">激活地图标记功能。</string>
-    <string name="clear_active_markers_q">您要移除所有有效标记？</string>
-    <string name="clear_markers_history_q">您要清除历史地图标记？</string>
+    <string name="clear_active_markers_q">删除所有的活动标记？</string>
+    <string name="clear_markers_history_q">清除地图标记历史记录？</string>
     <string name="active_markers">激活标记</string>
     <string name="map_markers">地图标记</string>
     <string name="map_marker">地图标记</string>
-    <string name="rendering_attr_showMtbRoutes_name">显示 MTB 路线</string>
+    <string name="rendering_attr_showMtbRoutes_name">显示山地自行车道</string>
     <string name="show_polygons">显示多边形</string>
     <string name="shared_string_email_address">电子邮件地址</string>
     <string name="rendering_attr_hideUnderground_name">隐藏地下物体</string>
@@ -948,7 +951,7 @@
     <string name="si_m_s">米/秒</string>
     <string name="si_min_km">分钟每千米</string>
     <string name="si_min_m">分钟/英里</string>
-    <string name="si_nm_h">海里/小时 (节)</string>
+    <string name="si_nm_h">海里每小时（节）</string>
     <string name="nm_h">节</string>
     <string name="min_mile">分钟每米</string>
     <string name="min_km">分/千米</string>
@@ -1005,7 +1008,7 @@
     <string name="lang_et">爱沙尼亚语</string>
     <string name="lang_ceb">宿务语</string>
     <string name="disable_recording_once_app_killed">避免独立日志</string>
-    <string name="gps_network_not_enabled">位置服务未启用。您确定要开启？</string>
+    <string name="gps_network_not_enabled">位置服务已关闭。要开启吗？</string>
     <string name="download_wikipedia_files">下载额外的维基百科数据 (%1$s MB) 吗？</string>
     <string name="shared_string_import2osmand">导入到 OsmAnd</string>
     <string name="read_full_article">阅读完整文章（在线）</string>
@@ -1016,10 +1019,10 @@
     <string name="rendering_value_disabled_name">已禁用</string>
     <string name="shared_string_logoff">退出</string>
     <string name="rendering_attr_hideHouseNumbers_name">隐藏门牌号码</string>
-    <string name="copying_osmand_file_failed">复制文件失败</string>
+    <string name="copying_osmand_file_failed">移动文件失败</string>
     <string name="storage_directory_external">外部存储</string>
     <string name="storage_directory_multiuser">多用户存储</string>
-    <string name="storage_directory_internal_app">内部应用存储</string>
+    <string name="storage_directory_internal_app">内部存储</string>
     <string name="storage_directory_manual">手动指定</string>
     <string name="storage_directory_default">内部存储</string>
     <string name="storage_directory">地图存储</string>
@@ -1076,11 +1079,11 @@
     <string name="shared_string_more">更多…</string>
     <string name="upload_osm_note_description">匿名上传您的 OSM 注记，或者使用您的 OpenStreetMap.org 账号。</string>
     <string name="wiki_around">附近的维基百科文章</string>
-    <string name="search_map_hint">搜索城市或地区</string>
+    <string name="search_map_hint">城市或地区</string>
     <string name="upload_poi">上传兴趣点</string>
     <string name="route_calculation">路线计算</string>
-    <string name="gpx_no_tracks_title">您暂时没有轨迹</string>
-    <string name="gpx_no_tracks_title_folder">您也可以将轨迹添加到文件夹下</string>
+    <string name="gpx_no_tracks_title">你还没有任何轨迹文件</string>
+    <string name="gpx_no_tracks_title_folder">你也可以将轨迹文件添加到文件夹</string>
     <string name="shared_string_continue">继续</string>
     <string name="shared_string_pause">暂停</string>
     <string name="gpx_logging_no_data">无数据</string>
@@ -1088,7 +1091,7 @@
     <string name="save_track_min_speed_descr">筛选器：不记录低于该速度的点。</string>
     <string name="shared_string_notifications">通知</string>
     <string name="christmas_poi">圣诞兴趣点</string>
-    <string name="christmas_desc_q">显示圣诞兴趣点？</string>
+    <string name="christmas_desc_q">显示圣诞假期兴趣点？</string>
     <string name="search_hint">输入城市、地址、兴趣点名称</string>
     <string name="create_custom_poi">创建自定义过滤器</string>
     <string name="custom_search">自定义搜索</string>
@@ -1184,7 +1187,7 @@
     <string name="rendering_value_germanRoadAtlas_name">德国道路地图</string>
     <string name="rendering_value_highContrastRoads_name">高对比度道路</string>
     <string name="rendering_value_americanRoadAtlas_name">美国道路地图</string>
-    <string name="layer_poi">兴趣点…</string>
+    <string name="layer_poi">兴趣点叠加层……</string>
     <string name="layer_map">地图来源…</string>
     <string name="quick_action_map_source">改变地图来源</string>
     <string name="quick_action_map_source_action">添加地图来源</string>
@@ -1212,7 +1215,7 @@
     <string name="speed_limit_exceed">速度限制容忍程度</string>
     <string name="rendering_category_others">其他地图属性</string>
     <string name="print_route">显示路线</string>
-    <string name="search_osm_offline">搜索地理位置</string>
+    <string name="search_osm_offline">按地理位置搜索</string>
     <string name="srtm_color_scheme">颜色方案</string>
     <string name="change_color">改变颜色</string>
     <string name="edit_name">编辑名称</string>
@@ -1332,7 +1335,7 @@
     <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>
+    <string name="hillshade_menu_download_descr">下载“山体阴影”叠加层地图以显示垂直阴影。</string>
     <string name="hillshade_purchase_header">安装“等高线”插件以显示渐变的垂直区域。</string>
     <string name="hide_from_zoom_level">基于缩放级别开始隐藏</string>
     <string name="srtm_menu_download_descr">下载本地区使用的“等高线”地图。</string>
@@ -1341,7 +1344,7 @@
     <string name="show_from_zoom_level">从缩放级别开始显示</string>
     <string name="favorite_group_name">组名称</string>
     <string name="animate_my_location">动画处理我的位置</string>
-    <string name="animate_my_location_desc">在导航过程中打开\"我的位置\"的动画地图平移。</string>
+    <string name="animate_my_location_desc">在导航过程中开启“我的位置”的动画地图平移。</string>
     <string name="quick_action_add_destination_desc">轻点按钮将在屏幕中心位置添加一个目的地。以前设定的目的地成为最后的中转点。</string>
     <string name="quick_action_replace_destination_desc">使画面居中的新航线目的地的按钮，取代之前选择的目的地（如果有的话）。</string>
     <string name="quick_action_add_first_intermediate_desc">使屏幕居中的按钮，是第一中间目的。</string>
@@ -1351,8 +1354,8 @@
     <string name="depth_contour_descr">海洋等深线和航海点。</string>
     <string name="sea_depth_thanks">感谢你购买“航海等深线”</string>
     <string name="index_item_depth_contours_osmand_ext">航海等深线</string>
-    <string name="index_item_depth_points_southern_hemisphere">南半球航海等深线</string>
-    <string name="index_item_depth_points_northern_hemisphere">北半球航海等深线</string>
+    <string name="index_item_depth_points_southern_hemisphere">南半球航海深度点</string>
+    <string name="index_item_depth_points_northern_hemisphere">北半球航海深度点</string>
     <string name="download_depth_countours">航海等深线</string>
     <string name="nautical_maps">航海地图</string>
     <string name="analyze_on_map">在地图上分析</string>
@@ -1366,7 +1369,7 @@
     <string name="shared_string_slope">坡度</string>
     <string name="add_new_folder">添加新文件夹</string>
     <string name="route_points_category_name">转到这条路线上</string>
-    <string name="track_points_category_name">在这条路线的突出点</string>
+    <string name="track_points_category_name">航点、兴趣点、命名的特征</string>
     <string name="shared_string_gpx_track">轨迹</string>
     <string name="shared_string_time_moving">移动的时间</string>
     <string name="shared_string_time_span">时间跨度</string>
@@ -1412,7 +1415,7 @@
     <string name="translit_name_if_miss">如果 %1$s 的名称缺失则音译</string>
     <string name="translit_names">音译名称</string>
     <string name="new_filter_desc">请输入新筛选器的名称，该名称将添加到你的\"类别\"选项卡中。</string>
-    <string name="osm_live_payment_desc">每个月会收取认购费用。您可以在 Google Play 随时取消您的订购。</string>
+    <string name="osm_live_payment_desc">订阅按选定的时间段收费。可随时在 Google Play 上取消。</string>
     <string name="donation_to_osm_desc">你的部分捐款将发送给 OSM 捐助者。订阅费用保持不变。</string>
     <string name="osm_live_subscription_desc">启用认购可每小时、每天、每周的更新以及世界各地所有的地图无限制的下载。</string>
     <string name="get_it">获得</string>
@@ -1466,7 +1469,7 @@
     <string name="access_direction_haptic_feedback">触觉方向</string>
     <string name="access_direction_haptic_feedback_descr">由振动指示目标点方向。</string>
     <string name="use_osm_live_routing_description">启用导航时由 OsmAnd 实时服务提供的更新。</string>
-    <string name="access_no_destination">未设置目的地</string>
+    <string name="access_no_destination">辅助功能插件：没有设置目的地</string>
     <string name="map_widget_magnetic_bearing">磁方位</string>
     <string name="map_widget_bearing">相对方位</string>
     <string name="access_disable_offroute_recalc">当您离开道路时不重新计算路线</string>
@@ -2174,7 +2177,7 @@
     <string name="local_index_mi_backup">停用</string>
     <string name="local_indexes_cat_backup">已停用</string>
     <string name="tts_language_not_supported">安装的 Android TTS（文本到语音）引擎不支持所选语言，将使用其预设的 TTS 语言。在市场上寻找其他 TTS 引擎？</string>
-    <string name="tts_missing_language_data">安装所选语言没有数据。你想要去市场安装吗？</string>
+    <string name="tts_missing_language_data">去应用市场下载选定的语言？</string>
     <string name="gpx_option_from_start_point">沿着整条轨迹</string>
     <string name="switch_to_vector_map_to_see">指定以脱机矢量地图显示
 \n
@@ -2214,9 +2217,9 @@
     <string name="no_fav_to_save">没有我的收藏标点要保存</string>
     <string name="share_fav_subject">通过 OsmAnd 分享我的收藏夹</string>
     <string name="none_region_found">在 SD 卡上找到的区域没有离线数据。从互联网下载区域数据。</string>
-    <string name="poi_namefinder_query_empty">输入搜索条件来查找 POI</string>
+    <string name="poi_namefinder_query_empty">输入查找兴趣点</string>
     <string name="menu_layers">地图图层</string>
-    <string name="context_menu_item_search_poi">POI 搜索</string>
+    <string name="context_menu_item_search_poi">搜索兴趣点</string>
     <string name="use_trackball_descr">使用轨迹球设备来移动地图。</string>
     <string name="use_trackball">使用轨迹球</string>
     <string name="background_service_wait_int_descr">设置每个背景位置固定所允许的最高等待时间。</string>
@@ -2420,14 +2423,14 @@
     <string name="shared_string_reload">重新载入</string>
     <string name="shared_string_reset">重置</string>
     <string name="store_tracks_in_monthly_directories">按月将记录的轨迹存放在文件夹中</string>
-    <string name="store_tracks_in_monthly_directories_descrp">按照月份将记录的轨迹存储在子文件夹中（例如 2017-01）。</string>
+    <string name="store_tracks_in_monthly_directories_descrp">按照月份将记录的轨迹存储在子文件夹中（例如 2018-01）。</string>
     <string name="mapillary_menu_descr_tile_cache">重新加载区片以查看最新的数据。</string>
     <string name="mapillary_menu_title_tile_cache">区片缓存</string>
     <string name="average">平均</string>
     <string name="ascent_descent">升序/降序</string>
     <string name="max_min">最大/最小</string>
     <string name="of">%2$d 中的 %1$d</string>
-    <string name="moving_time">移动时间</string>
+    <string name="moving_time">运动时间</string>
     <string name="min_max">最小/最大</string>
     <string name="quick_action_resume_pause_navigation">暂停/继续导航</string>
     <string name="quick_action_resume_pause_navigation_descr">暂停或恢复导航的按钮。</string>
@@ -2478,8 +2481,8 @@
     <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_desc">使用小部件或上下文菜单, 在地图上的每个点添加音频、视频或照片注释。</string>
-    <string name="notes_by_date">按日期说明</string>
+    <string name="empty_state_av_notes_desc">通过使用小部件或上下文菜单将音频、视频或照片注记添加到地图上的任何点。</string>
+    <string name="notes_by_date">按日期排序的视频或音频注记</string>
     <string name="by_date">按日期</string>
     <string name="by_type">按类型</string>
     <string name="looking_for_tracks_with_waypoints">用航路点寻找轨迹</string>
@@ -2501,7 +2504,7 @@
     <string name="show_guide_line_descr">显示从你的位置到活动标记位置的方向线。</string>
     <string name="show_arrows_descr">显示一个或两个箭头指示方向到活动标记。</string>
     <string name="distance_indication_descr">选择如何显示到活动标记的距离。</string>
-    <string name="active_markers_descr">选择想显示多少的方向指标。</string>
+    <string name="active_markers_descr">指定方向指示器的数量。</string>
     <string name="digits_quantity">小数位数</string>
     <string name="shared_string_right">右方</string>
     <string name="shared_string_left">左方</string>
@@ -2514,7 +2517,7 @@
     <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 - 适合导出到 OSM。</string>
     <string name="shared_string_gpx_file">GPX 文件</string>
@@ -2667,7 +2670,7 @@
     <string name="quick_action_switch_night_mode">夜间模式</string>
     <string name="quick_action_day_night_switch_mode">切换日间/夜间模式</string>
     <string name="download_wiki_region_placeholder">此地区</string>
-    <string name="quick_action_edit_actions">编辑活动</string>
+    <string name="quick_action_edit_actions">编辑动作</string>
     <string name="coord_input_save_as_track_descr">你增加了%1$s 个目标。输入文件名后点击\"保存\"。</string>
     <string name="ask_for_location_permission">请在允许OsmAnd获取定位信息后继续。</string>
     <string name="routeInfo_smoothness_name">平顺度</string>
@@ -2724,7 +2727,7 @@
     <string name="step_by_step">逐步</string>
     <string name="routeInfo_road_types_name">道路类型</string>
     <string name="exit_at">退出于</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">在地图中显示或隐藏已选中的GPX轨迹的按钮。</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">在地图上显示或隐藏所选轨迹的按钮。</string>
     <string name="add_destination_query">请先设置目的地</string>
     <string name="use_osm_live_public_transport_description">为OsmAnd Live启用公共交通的变更情况。</string>
     <string name="add_start_and_end_points">添加出发地和目的地</string>
@@ -3562,4 +3565,68 @@
     <string name="select_track_file">选择轨迹文件</string>
     <string name="wiki_menu_download_descr">需要其他地图才能在地图上查看维基百科兴趣点。</string>
     <string name="quick_action_switch_profile_descr">操作按钮在选定的配置文件之间切换。</string>
+    <string name="sett_parrot_ext_input">Parrot</string>
+    <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
+    <string name="external_input_device">外部输入设备</string>
+    <string name="sort_by_category">按类别排序</string>
+    <string name="navigate_point_mgrs">MGRS</string>
+    <string name="lang_oc">奥克西坦语</string>
+    <string name="simulate_your_location_gpx_descr">使用录制的 GPX 轨迹模拟你的位置。</string>
+    <string name="osm_recipient_stat">编辑 %1$s，总计 %2$s mBTC</string>
+    <string name="choose_navigation_type">选择导航配置文件</string>
+    <string name="keep_showing_on_map">继续在地图上显示</string>
+    <string name="show_direction">距离指示</string>
+    <string name="passed">最后使用：%1$s</string>
+    <string name="show_arrows_on_the_map">在地图上显示箭头</string>
+    <string name="show_guide_line">显示方向线</string>
+    <string name="move_to_history">移动到历史</string>
+    <string name="plan_route_no_markers_toast">你必须至少添加一个标记才能使用此功能。</string>
+    <string name="import_as_favorites">导入为收藏</string>
+    <string name="first_intermediate_dest_description">添加始发站</string>
+    <string name="waypoints_removed_from_map_markers">从地图标记中删除的航点</string>
+    <string name="use_two_digits_longitude">使用两位数的经度</string>
+    <string name="wikivoyage_search_hint">搜索国家、城市或省份</string>
+    <string name="delete_search_history">删除搜索历史记录</string>
+    <string name="online_webpage_warning">页面仅在线提供。在网页浏览器中打开？</string>
+    <string name="select_travel_book">选择一本旅游书籍</string>
+    <string name="shared_string_wifi_only">仅在 Wi-Fi 上</string>
+    <string name="shared_string_only_with_wifi">仅在 Wi-Fi 上</string>
+    <string name="purchase_dialog_subtitle">选择合适的项目</string>
+    <string name="purchase_dialog_travel_description">购买以下其中一项，即可获得离线旅游指南功能：</string>
+    <string name="unlock_all_features">解锁所有 OsmAnd 功能</string>
+    <string name="contour_lines_hillshade_maps">等高线和山体阴影地图</string>
+    <string name="daily_map_updates">每小时更新地图</string>
+    <string name="monthly_map_updates">每月更新地图</string>
+    <string name="welcome_to_open_beta">欢迎使用公开测试版</string>
+    <string name="start_editing_card_image_text">任何人都可以编辑的自由的全球旅游指南。</string>
+    <string name="travel_card_download_descr">下载 Wikivoyage 旅行指南，在没有连接到互联网的情况下查看世界各地的文章。</string>
+    <string name="mapnik_render_descr">旧的默认 \'Mapnik\' 风格。与 \'Mapnik\' 颜色相似。</string>
+    <string name="keep_passed_markers">在地图上保留已通过的标记</string>
+    <string name="choose_track_file_to_follow">选择要跟随的轨迹文件</string>
+    <string name="rendering_attr_highway_class_state_road_name">国道</string>
+    <string name="application_profiles_descr">选择要在应用程序中可见的配置文件。</string>
+    <string name="routing_profile_broutrer">BRouter（离线）</string>
+    <string name="base_profile_descr_boat">船、划船、帆船</string>
+    <string name="base_profile_descr_pedestrian">散步、徒步、跑步</string>
+    <string name="base_profile_descr_bicycle">山地自行车、轻便摩托车、马</string>
+    <string name="base_profile_descr_car">汽车、卡车、摩托车</string>
+    <string name="select_nav_profile_dialog_title">选择导航类型</string>
+    <string name="select_base_profile_dialog_message">基于你的自定义配置文件的默认应用程序配置文件之一，这定义了基本的设置，如部件的默认可见性和速度和距离的单位。这些是默认的应用程序配置文件，以及它们可以扩展到的自定义配置文件的例子：</string>
+    <string name="select_base_profile_dialog_title">选择用以开始的配置文件</string>
+    <string name="profile_alert_delete_msg">是否确定要删除“%s”配置文件</string>
+    <string name="profile_alert_need_save_msg">首先保存配置文件的更改</string>
+    <string name="profile_alert_cant_delete_base">你不能删除 OsmAnd 的基本配置文件</string>
+    <string name="profile_alert_duplicate_name_msg">已经有该名称的配置文件</string>
+    <string name="profile_alert_need_profile_name_msg">你必须先指定一个配置文件名称。</string>
+    <string name="profile_alert_need_profile_name_title">输入配置文件名称</string>
+    <string name="profile_alert_need_routing_type_msg">请为新应用配置文件选择导航类型</string>
+    <string name="profile_alert_need_routing_type_title">选择导航类型</string>
+    <string name="settings_derived_routing_mode_string">用户模式，派生自： %s</string>
+    <string name="show_compass_ruler">显示指南针标尺</string>
+    <string name="settings_privacy_and_security_desc">选择你分享的数据</string>
+    <string name="privacy_and_security_change_descr">如果同意我们的%1$s，请点击“允许”</string>
+    <string name="visited_screens_collect_descr">帮助我们了解 OsmAnd 功能的受欢迎程度。</string>
+    <string name="downloaded_maps_collect_descr">帮助我们了解国家和地区地图的受欢迎程度。</string>
+    <string name="collected_data_descr">定义允许 OsmAnd 分享哪些数据。</string>
+    <string name="choose_data_to_share">选择要分享的数据类型：</string>
 </resources>
\ No newline at end of file