diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 1465867592..cb4d5357c5 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -99,7 +99,7 @@
 		\n\t登錄為\'綠色\' - 表示裝置與伺服器是相同的
 		\n\t登錄為\'藍色\' - 表示伺服器有更新的版本
 		\n\t登錄為斜體字 - 表示未在裝置上使用</string>
-	<string name="filterpoi_activity">產生興趣點篩選</string>
+	<string name="filterpoi_activity">建立興趣點篩選</string>
 	<string name="recalculate_route_to_your_location">交通模式：</string>
 	<string name="select_navigation_mode">選擇交通模式</string>
 	<string name="monitor_preferences">追蹤中</string>
@@ -107,7 +107,7 @@
 	<string name="day_night_info">日/夜資訊</string>
 	<string name="map_widget_day_night">日/夜地圖</string>
 	<string name="map_widget_vector_attributes">繪圖屬性：</string>
-	<string name="map_widget_renderer">繪圖樣式</string>
+	<string name="map_widget_renderer">地圖樣式</string>
 	<string name="live_monitoring_mode_off">啟動\n 線上追蹤</string>
 	<string name="live_monitoring_mode_on">停止\n 線上追蹤</string>
 	<string name="position_on_map_descr">在地圖上選取所在地的位置標記</string>
@@ -117,23 +117,23 @@
 	<string name="avoid_unpaved">避開顛頗路面</string>
 	<string name="avoid_ferries">避開渡輪</string>
 	<string name="avoid_in_routing_title">避開…</string>
-	<string name="avoid_in_routing_descr">避開收費路、顛頗路面、渡輪</string>
+	<string name="avoid_in_routing_descr">避開收費道路、顛頗路面、渡輪</string>
 	<string name="map_widget_fluorescent">螢光導航路線</string>
 	<string name="map_widget_show_ruler">比例尺</string>
 	<string name="map_widget_appearance">雜項：</string>
 	<string name="map_widget_view_direction">目視方向</string>
 	<string name="map_widget_transparent">透明面版</string>
-	<string name="monitoring_mode_off">啟動GPX記錄</string>
-	<string name="monitoring_mode_on">停止\n GPX記錄。</string>
+	<string name="monitoring_mode_off">記錄 GPX</string>
+	<string name="monitoring_mode_on">停止\n GPX 記錄。</string>
 	<string name="bg_service_sleep_mode_off">開啟\n 休眠模式</string>
-	<string name="bg_service_sleep_mode_on">關閉\n  休眠模式</string>
-	<string name="gps_wakeup_interval">GPS喚醒間隔：%s</string>
+	<string name="bg_service_sleep_mode_on">關閉\n 休眠模式</string>
+	<string name="gps_wakeup_interval">GPS 喚醒間隔：%s</string>
 	<string name="int_continuosly">繼續</string>
 	<string name="screen_is_locked">要解鎖螢幕，按下鎖圖示</string>
-	<string name="map_widget_top_text">道路名稱</string>
+	<string name="map_widget_top_text">街道名稱</string>
 	<string name="map_widget_config">畫面設定</string>
 	<string name="map_widget_map_select">地圖來源</string>
-	<string name="map_widget_back_to_loc">現在位置</string>
+	<string name="map_widget_back_to_loc">目前位置</string>
 	<string name="map_widget_lock_screen">鎖住螢幕</string>
 	<string name="map_widget_compass">電子羅盤</string>
 	<string name="map_widget_top_stack">狀態列：</string>
@@ -141,17 +141,17 @@
 	<string name="map_widget_right_stack">右邊面版：</string>
 	<string name="map_widget_left_stack">左邊面版：</string>
 	<string name="map_widget_parking">停車場</string>
-	<string name="map_widget_monitoring">GPX記錄中</string>
+	<string name="map_widget_monitoring">GPX 記錄中</string>
 	<string name="map_widget_speed">速度</string>
 	<string name="map_widget_distance">目地的</string>
 	<string name="map_widget_altitude">高度</string>
 	<string name="map_widget_time">剩餘時間</string>
 	<string name="map_widget_next_turn">下個轉彎</string>
-	<string name="map_widget_next_turn_small">下個轉彎 (小)</string>
+	<string name="map_widget_next_turn_small">下個轉彎(小)</string>
 	<string name="map_widget_next_next_turn">第二個轉彎</string>
 	<string name="map_widget_mini_route">迷你導航路線圖</string>
 	<string name="bg_service_screen_lock">鎖住螢幕</string>
-	<string name="bg_service_screen_unlock">解開螢幕</string>
+	<string name="bg_service_screen_unlock">解鎖螢幕</string>
 	<string name="bg_service_screen_lock_toast">螢幕已鎖</string>
 	<string name="bg_service_interval">設定喚醒間隔：</string>
 	<string name="show_cameras">顯示測速照相</string>
@@ -161,9 +161,9 @@
 	<string name="route_updated_loc_found">一旦找到定位時導航路線將重新規劃</string>
 	<string name="osmand_parking_hours">小時</string>
 	<string name="osmand_parking_minutes">分鐘</string>
-	<string name="osmand_parking_position_description_add_time">你的愛車停在：</string>
+	<string name="osmand_parking_position_description_add_time">您的愛車停在：</string>
 	<string name="select_animate_speedup">選擇模擬路線速度</string>
-    	<string name="global_app_allocated_memory_descr">已配置記憶體%1$s MB (Android限制%2$s MB, Dalvik %3$s MB)。</string>
+    	<string name="global_app_allocated_memory_descr">已配置記憶體%1$s MB (Android 限制%2$s MB, Dalvik %3$s MB)。</string>
 	<string name="global_app_allocated_memory">已配置記憶</string>
 	<string name="native_app_allocated_memory">原生記憶體總計</string>
 	<string name="update_downlod_list">重載入列表</string>
@@ -172,15 +172,15 @@
 	<string name="osmand_parking_event">由停車場取車</string>
 	<string name="osmand_parking_warning">警示</string>
 	<string name="osmand_parking_warning_text">取車通知先前已加到您的行事曆中。它會留在那裡直到您手動刪除它。</string>    
-	<string name="osmand_parking_time_limit_title">設定停車限時</string>
+	<string name="osmand_parking_time_limit_title">設定停車時限</string>
 	<string name="osmand_parking_delete_confirm">您要移除停車位置嗎？</string>
 	<string name="osmand_parking_delete">刪除停車位置標記</string>
 	<string name="osmand_parking_choose_type">選擇停車場種類</string>
-	<string name="osmand_parking_lim_text">限時</string>
-	<string name="osmand_parking_no_lim_text">非限時</string>
+	<string name="osmand_parking_lim_text">時限</string>
+	<string name="osmand_parking_no_lim_text">無時限</string>
 	<string name="osmand_parking_add_event">增加一個通知到行事曆</string>
-	<string name="osmand_parking_time_limit">限時停車場</string>
-	<string name="osmand_parking_time_no_limit">非限時停車場</string>
+	<string name="osmand_parking_time_limit">時間限制停車場</string>
+	<string name="osmand_parking_time_no_limit">無時間限制停車場</string>
 	<string name="osmand_parking_position_description">您停車的地點。 %1$s</string>
 	<string name="osmand_parking_position_description_add">取車地點：</string>
 	<string name="osmand_parking_pm">下午</string>
@@ -195,17 +195,17 @@
 	<string name="gpxup_trackable">可追蹤的</string>
 	<string name="gpxup_private">私人的</string>
 	<string name="asap">儘快</string>
-	<string name="save_route_as_gpx">將路線存成GPX檔</string>
+	<string name="save_route_as_gpx">將路線存成 GPX 檔</string>
 	<string name="route_roundabout">迴轉處：在第%1$d出口過去</string>
 	<string name="route_kl">靠左行走</string>
 	<string name="route_kr">靠右行走</string>
 	<string name="rendering_attr_noPolygons_description">讓地圖上所有的陸地區域特徵具透明性</string>
 	<string name="rendering_attr_noPolygons_name">隱藏多角形</string>
-	<string name="rendering_attr_appMode_name">繪製模式</string>
+	<string name="rendering_attr_appMode_name">繪圖模式</string>
 	<string name="rendering_attr_appMode_description">為地圖最佳化</string>
 	<string name="rendering_attr_contourLines_description">顯示縮放階層 (需要輪廓資料)：</string>
 	<string name="rendering_attr_contourLines_name">顯示等高線</string>
-	<string name="rendering_attr_hmRendered_description">增加詳細地圖顯示資訊的量</string>
+	<string name="rendering_attr_hmRendered_description">增加地圖顯示詳細的資訊量</string>
 	<string name="rendering_attr_hmRendered_name">顯示更多地圖細節</string>
 	<string name="local_index_routing_data">導航路線資料</string>
 	<string name="navigate_point_format">格式：</string>
@@ -215,7 +215,7 @@
 	<string name="transport_search_desc">交通設施查尋</string>
 	<string name="favourites_search_desc">我的最愛查尋</string>
 	<string name="history_search_desc">歷史記錄查尋</string>
-	<string name="offline_navigation_not_available">OsmAnd離線導航暫時不能用。</string>
+	<string name="offline_navigation_not_available">OsmAnd 離線導航暫時不能使用。</string>
 	<string name="left_side_navigation">左駕</string>
 	<string name="left_side_navigation_descr">選擇左駕的國家</string>
 	<string name="download_link_and_local_description">點選此處下載或更新離線資料\n按任何一項查看細節，按住即可解除或刪除。目前裝置上的資料(%1$s 免費)：</string>
@@ -224,13 +224,13 @@
 	<string name="modify_transparency">調整透明度(0 - 透明, 255 - 不透明)</string>
 	<string name="confirm_interrupt_download">您要中斷檔案下載嗎？</string>
 	<string name="first_time_msg">感謝您使用 OsmAnd。對於此應用程式的許多功能，您需要一些區域性的離線資料，您可以透過\'設定\' -&gt; \'資料管理\'來下載。之後您可瀏覽地圖、位置地址、查尋興趣點以及尋找共公交通設施。</string>    
-	<string name="basemap_was_selected_to_download">基本地圖為某些特別的應用功能必需使用的並且預設為下載。</string>
+	<string name="basemap_was_selected_to_download">基本地圖，為某些特別的應用功能必需使用的，並且預設為下載。</string>
 	<string name="select_index_file_to_download">找不到任何資料。如果您不能在您的區域找到，您可以自行製作(參考http://osmand.net)。</string>
 	<string name="local_indexes_cat_tile">線上網格地圖</string>
 	<string name="local_indexes_cat_map">離線地圖(向量地圖)</string>
 	<string name="gpx_index_settings_descr"> (包含GPX分析器)</string>
-	<string name="index_settings_descr">在您的裝置上，下載地圖與管理離線圖資</string>
-	<string name="map_online_plugin_is_not_installed">啟用線上地圖附加到不同的地圖來源</string>
+	<string name="index_settings_descr">在您的裝置上，下載地圖與管理離線圖資存儲</string>
+	<string name="map_online_plugin_is_not_installed">啟用線上地圖外掛元件，來選擇不同的地圖來源</string>
 	<string name="map_online_data">線上網格地圖</string>
 	<string name="map_online_data_descr">使用線上地圖(下載暫存地圖到SD卡)</string>
 	<string name="online_map_settings">線上地圖</string>
@@ -1187,7 +1187,7 @@
     <string name="native_library_not_running">應用程式在安全模式中執行(在設定裡停用它)。</string>
     <string name="background_service_is_enabled_question">OsmAnd 休眠模式服務仍在執行。您想要關閉它嗎？</string>
     <string name="osmand_play_title_30_chars">OsmAnd 地圖和導航</string>
-	<string name="osmand_plus_play_title_30_chars">OsmAnd+ 地圖與導航</string>
+	<string name="osmand_plus_play_title_30_chars">OsmAnd+ 地圖和導航</string>
 	<string name="native_app_allocated_memory_descr">原生記憶體總計由應用程式 %1$ MB (Dalvik %2$ MB，其它 %3$ MB) 。Proportional memory %4$ MB (Android 限制 %5$ MB，Dalvik %6$ MB)分配佔用。</string>
 	<string name="context_menu_item_destination_point">設定為目的地</string>
     <string name="please_select_address">首先選擇城市或街道</string>