diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 98f38532ed..6b0f01028c 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -643,7 +643,7 @@
 	<string name="power_managment_setting_never">Ніколі</string>
 	<string name="power_managment_setting_auto">Аўтаматычна</string>
 	<string name="power_managment_setting_manual_max">Максімальнае захаванне энергіі</string>
-	<string name="enable_logging_warning_message">Опцыя ўключае запіс журнала падзей для мэтаў дыягностыкі. Гэта можа дапамагчы нашай камандзе вырашаць праблемы з праграмай. Уключайце гэтую опцыю часова, каб запісаць і паслаць нам дэталёвую інфармацыю, пра знойденую вамі праблему.</string>
+	<string name="enable_logging_warning_message">Опцыя ўключае запіс журнала падзей для мэтаў дыягностыкі. Гэта можа дапамагчы нашай камандзе вырашаць праблемы з праграмай. Уключайце гэтую опцыю часова, каб запісаць і паслаць нам дэталёвую інфармацыю пра знойденую вамі праблему праз кнопку \"Паведаміць аб памылцы\".</string>
 	<string name="access_rules_author_only">Рэдагаванне анлайн</string>
 	<string name="driving_options_title">Налады пракладкі маршрута</string>
 	<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 0a9ad19a42..f7678a8771 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -646,7 +646,7 @@
 	<string name="power_managment_setting_never">Niemals</string>
 	<string name="power_managment_setting_auto">Auto</string>
 	<string name="power_managment_setting_manual_max">Maximale Stromsparung</string>
-	<string name="enable_logging_warning_message">Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik aufzuzeichnen. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option nur auf Ersuchen des Organic Maps-Supports.</string>
+	<string name="enable_logging_warning_message">Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik aufzuzeichnen. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option, reproduzieren Sie das Problem und senden Sie die Protokolle über die Schaltfläche \"Fehler melden\" an uns.</string>
 	<string name="access_rules_author_only">Online bearbeiten</string>
 	<string name="driving_options_title">Routenbeschränkungen</string>
 	<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 0425027ab3..f930f6633d 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -657,7 +657,7 @@
 	<string name="power_managment_setting_never">Никогда</string>
 	<string name="power_managment_setting_auto">Авто</string>
 	<string name="power_managment_setting_manual_max">Максимальное энергосбережение</string>
-	<string name="enable_logging_warning_message">Данная настройка включается для записи действий в целях диагностики, чтобы помочь нашей команде выявить проблемы с приложением. Временно включайте эту настройку только для отправки детальной информации о найденной вами проблеме в приложении.</string>
+	<string name="enable_logging_warning_message">Данная настройка включается для записи действий в целях диагностики, чтобы помочь нашей команде выявить проблемы с приложением. Временно включайте эту настройку только для отправки детальной информации о найденной вами проблеме в приложении через кнопку \"Сообщить о проблеме\".</string>
 	<string name="access_rules_author_only">Редактируется онлайн</string>
 	<string name="driving_options_title">Настройки объезда</string>
 	<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index ae0546ae62..b69277cb6f 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -650,7 +650,7 @@
 	<string name="power_managment_setting_never">Ніколи</string>
 	<string name="power_managment_setting_auto">Автоматично</string>
 	<string name="power_managment_setting_manual_max">Максимальне енергозбереження</string>
-	<string name="enable_logging_warning_message">Дана опція вмикається для логування дій з метою діагностики. Це допомагає команді виявити проблеми з додатком. Тимчасово включайте цю настройку тільки для відправки детальної інформації про знайдену вами проблему в додатку.</string>
+	<string name="enable_logging_warning_message">Дана опція вмикається для логування дій з метою діагностики. Це допомагає команді виявити проблеми з додатком. Тимчасово включайте цю настройку тільки для відправки детальної інформації про знайдену вами проблему в додатку через кнопку \"Сповістити про помилку\".</string>
 	<string name="access_rules_author_only">Редагується онлайн</string>
 	<string name="driving_options_title">Налаштування об’їзду</string>
 	<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 020b18fb35..209fc88012 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -39,11 +39,11 @@
 	<!-- Text in About screen -->
 	<string name="about_headline">對每個人都免費，用愛製成</string>
 	<!-- Text in About screen -->
-	<string name="about_proposition_1">•沒有廣告，沒有跟踪，沒有數據收集</string>
+	<string name="about_proposition_1">•沒有廣告，不會跟踪您，更不會收集您的數據</string>
 	<!-- Text in About screen -->
 	<string name="about_proposition_2">• 節省電池電量，不使用後台數據</string>
 	<!-- Text in About screen -->
-	<string name="about_proposition_3">•快速，簡約，沒有垃圾</string>
+	<string name="about_proposition_3">•快速，簡約，不含垃圾軟體</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">由愛好者和志願者創建的開源應用程序。</string>
 	<!-- The button that opens system location settings -->
@@ -99,7 +99,7 @@
 	<!-- Measurement units title in settings activity -->
 	<string name="measurement_units">測量單位</string>
 	<!-- Detailed description of Measurement Units settings button -->
-	<string name="measurement_units_summary">請選擇公里或英哩</string>
+	<string name="measurement_units_summary">選擇公里或英哩</string>
 
 	<!-- SECTION: Search categories -->
 	<!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @eat! -->
@@ -235,9 +235,9 @@
 	<!-- Text in menu -->
 	<string name="website">網站</string>
 	<!-- Text in About menu, opens Organic Maps news website -->
-	<string name="news">消息</string>
+	<string name="news">新聞</string>
 	<!-- Text in menu -->
-	<string name="facebook">臉書</string>
+	<string name="facebook">Facebook</string>
 	<!-- Text in menu -->
 	<string name="twitter">X (推特)</string>
 	<!-- Text in menu -->
@@ -245,19 +245,19 @@
 	<!-- Settings: Send feedback button and dialog title -->
 	<string name="feedback">意見反應</string>
 	<!-- Text in menu -->
-	<string name="rate_the_app">為該應用程式評分</string>
+	<string name="rate_the_app">為我們評分</string>
 	<!-- Text in menu -->
 	<string name="help">幫助</string>
 	<!-- Button in the main Help dialog -->
 	<string name="faq">問題和解答</string>
 	<!-- Button in the main menu -->
-	<string name="donate">捐款</string>
+	<string name="donate">捐助我們</string>
 	<!-- Button in the main Help dialog -->
 	<string name="how_to_support_us">支持項目</string>
 	<!-- Button in the main Help dialog -->
 	<string name="copyright">版權</string>
 	<!-- Text in menu + Button in the main Help dialog -->
-	<string name="report_a_bug">報告錯誤</string>
+	<string name="report_a_bug">報告問題</string>
 	<!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
 	<string name="compass_calibration_recommended">通過以八字形移動手機來校準指南針來改善箭頭方向</string>
 	<!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
@@ -282,7 +282,7 @@
 	<!-- Context menu item for downloader. -->
 	<string name="downloader_download_map">下載地圖</string>
 	<!-- Item status in downloader. -->
-	<string name="downloader_retry">重試</string>
+	<string name="downloader_retry">重新下載</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_delete_map">刪除地圖</string>
 	<!-- Item in context menu. -->
@@ -373,8 +373,8 @@
 	<string name="hide">隱藏</string>
 	<string name="categories">類別</string>
 	<string name="history">記錄</string>
-	<string name="search_not_found">很抱歉，找不到任何東西。</string>
-	<string name="search_not_found_query">請嘗試其他搜尋字詞。</string>
+	<string name="search_not_found">很抱歉，沒有找到任何地點。</string>
+	<string name="search_not_found_query">請嘗試搜尋其它關鍵詞。</string>
 	<string name="search_history_title">搜尋歷史紀錄</string>
 	<string name="search_history_text">檢視最近的搜尋。</string>
 	<string name="clear_search">清除搜尋記錄</string>
@@ -382,8 +382,8 @@
 	<string name="read_in_wikipedia">維基百科</string>
 	<string name="p2p_your_location">您的位置</string>
 	<string name="p2p_start">開始</string>
-	<string name="p2p_from_here">從</string>
-	<string name="p2p_to_here">路線終點</string>
+	<string name="p2p_from_here">從這出發</string>
+	<string name="p2p_to_here">到這去</string>
 	<string name="p2p_only_from_current">導航只能從您目前的位置開始。</string>
 	<string name="p2p_reroute_from_current">你是否想要規劃目前位置的路線？</string>
 	<!-- Edit open hours/set time and minutes dialog -->
@@ -462,15 +462,15 @@
 	<string name="editor_edit_place_category_title">類別</string>
 	<string name="detailed_problem_description">問題的詳細描述</string>
 	<string name="editor_report_problem_other_title">不同的問題</string>
-	<string name="placepage_add_business_button">添加組織</string>
+	<string name="placepage_add_business_button">將地點添加到 OpenStreetMap</string>
 	<string name="message_invalid_feature_position">物件無法設置在這裡</string>
 	<!-- Text in About and OSM Login screens. %@ is replaced by a local, human readable date. -->
-	<string name="osm_presentation">截至%s的OpenStreetMap的製圖數據。就像Wikipedia一樣，您可以為世界上所有用戶添加或編輯位置。</string>
+	<string name="osm_presentation">截止到 %s 的 OpenStreetMap 地圖數據。就像 Wikipedia 一樣，您可以為世界上所有用戶添加或編輯位置。</string>
 	<string name="login_to_make_edits_visible">登入來讓其他使用者能看到您所作出的修改。</string>
 	<!-- Downloaded 10 **of** 20 <- it is that "of" -->
 	<string name="downloader_of">%1$d個/共%2$d個</string>
 	<string name="download_over_mobile_header">用手機網路連線下載嗎？</string>
-	<string name="download_over_mobile_message">用某些方案或漫遊的話這可能相當昂貴。</string>
+	<string name="download_over_mobile_message">如果您使用行動數據或漫遊來進行下載，將可能導致額外的費用。</string>
 	<string name="error_enter_correct_house_number">輸入正確的門牌號碼</string>
 	<string name="editor_storey_number">樓層數（最大 %d）</string>
 	<!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
@@ -479,7 +479,7 @@
 	<string name="error_enter_correct_zip_code">輸入正確的郵遞區號</string>
 	<!-- Place Page title for long tap -->
 	<string name="core_placepage_unknown_place">未知的位置</string>
-	<string name="editor_other_info">給OSM編輯器發送標記</string>
+	<string name="editor_other_info">給 OSM 社區發送標記</string>
 	<string name="editor_detailed_description_hint">詳細註釋</string>
 	<string name="editor_detailed_description">您建議的變更將傳送至 OpenStreetMap 社群。說明無法在 Organic Maps 中編輯的詳細資料。</string>
 	<string name="editor_more_about_osm">關於 OpenStreetMap 的更多資訊</string>
@@ -489,7 +489,7 @@
 	<!-- Error title that appears after certain time without location. -->
 	<string name="current_location_unknown_title">繼續偵測您的目前位置？</string>
 	<!-- Error that appears after certain time without location. -->
-	<string name="current_location_unknown_message">目前位置未知，可能您在建築物內或隧道內。</string>
+	<string name="current_location_unknown_message">我們無法確定您的當前位置，可能是因為您在建築物內或隧道內。</string>
 	<string name="current_location_unknown_continue_button">繼續</string>
 	<string name="current_location_unknown_stop_button">停止</string>
 	<!-- abbreviation for meters -->
@@ -518,7 +518,7 @@
 	<string name="editor_reset_edits_button">重設</string>
 	<string name="editor_remove_place_message">移除已新增的位置？</string>
 	<string name="editor_remove_place_button">移除</string>
-	<string name="editor_place_doesnt_exist">位置不存在</string>
+	<string name="editor_place_doesnt_exist">該地點不存在</string>
 	<!-- Phone number error message -->
 	<string name="error_enter_correct_phone">輸入正確的電話號碼</string>
 	<string name="error_enter_correct_web">輸入有效網址</string>
@@ -631,7 +631,7 @@
 	<string name="power_managment_setting_never">從不</string>
 	<string name="power_managment_setting_auto">自動</string>
 	<string name="power_managment_setting_manual_max">最大程度省電</string>
-	<string name="enable_logging_warning_message">此選項啟用以記錄操作來進行診斷。這有助於團隊辨別 app 的問題。請僅在Organic Maps支援請求時開啟該選項。</string>
+	<string name="enable_logging_warning_message">暫時啟用此選項，以便使用「回報問題」功能在幫助對話框中記錄並手動發送詳細的診斷日誌給我們。日誌可能包含位置資訊。</string>
 	<string name="access_rules_author_only">線上編輯</string>
 	<string name="driving_options_title">繞行設定</string>
 	<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -723,7 +723,7 @@
 	<!-- Description in preferences -->
 	<string name="enable_show_on_lock_screen_description">啟用後，即使設備已鎖定，應用程式仍會在鎖定螢幕上運作。</string>
 	<!-- OpenStreetMap text on splash screen -->
-	<string name="splash_subtitle">來自 OpenStreetMap 的地圖數據</string>
+	<string name="splash_subtitle">地圖數據來自 OpenStreetMap</string>
 	<!-- Tip #00 -->
 	<string name="app_tip_00">感謝您使用我們社區構建的地圖！</string>
 	<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 829cd89ae9..996ec4e373 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -16,7 +16,7 @@
 	<!-- Settings/Downloader - info for country which started downloading -->
 	<string name="downloading">下载…</string>
 	<!-- Choose measurement on first launch alert - choose metric system button -->
-	<string name="kilometres">千米</string>
+	<string name="kilometres">公里</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">英里</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
@@ -39,11 +39,11 @@
 	<!-- Text in About screen -->
 	<string name="about_headline">对每个人都免费，用爱制成</string>
 	<!-- Text in About screen -->
-	<string name="about_proposition_1">•没有广告，没有跟踪，没有数据收集</string>
+	<string name="about_proposition_1">•没有广告，不会跟踪您，更不会收集您的数据</string>
 	<!-- Text in About screen -->
 	<string name="about_proposition_2">• 节省电池电量，不使用后台数据</string>
 	<!-- Text in About screen -->
-	<string name="about_proposition_3">•快速，简约，没有垃圾</string>
+	<string name="about_proposition_3">•快速，简约，不含垃圾软件</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">由爱好者和志愿者创建的开源应用程序。</string>
 	<!-- The button that opens system location settings -->
@@ -99,7 +99,7 @@
 	<!-- Measurement units title in settings activity -->
 	<string name="measurement_units">测量单位</string>
 	<!-- Detailed description of Measurement Units settings button -->
-	<string name="measurement_units_summary">选择英里或公里</string>
+	<string name="measurement_units_summary">选择公里或英里</string>
 
 	<!-- SECTION: Search categories -->
 	<!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @eat! -->
@@ -111,7 +111,7 @@
 	<!-- Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! -->
 	<string name="fuel">汽油</string>
 	<!-- Search category for parking lots; any changes should be duplicated in categories.txt @parking! -->
-	<string name="parking">停车</string>
+	<string name="parking">停车场</string>
 	<!-- Search category for clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @shopping! -->
 	<string name="shopping">购物</string>
 	<!-- Search category for second_hand/charity/antique/auction shops; any changes should be duplicated in categories.txt @secondhand! -->
@@ -119,7 +119,7 @@
 	<!-- Search category for places to stay; any changes should be duplicated in categories.txt @hotel! -->
 	<string name="hotel">旅店</string>
 	<!-- Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @tourism! -->
-	<string name="tourism">景点</string>
+	<string name="tourism">旅游景点</string>
 	<!-- Search category for entertainment; any changes should be duplicated in categories.txt @entertainment! -->
 	<string name="entertainment">娱乐</string>
 	<!-- Search category for ATMs; any changes should be duplicated in categories.txt @atm! -->
@@ -139,7 +139,7 @@
 	<!-- Search category for post offices; any changes should be duplicated in categories.txt @post! -->
 	<string name="post">邮政</string>
 	<!-- Search category for police; any changes should be duplicated in categories.txt @police! -->
-	<string name="police">警察</string>
+	<string name="police">警察局</string>
 	<!-- Search category for WiFi access; any changes should be duplicated in categories.txt @wifi! -->
 	<string name="wifi">无线网络</string>
 	<!-- Search category for recycling; any changes should be duplicated in categories.txt @recycling! -->
@@ -236,25 +236,25 @@
 	<!-- Text in About menu, opens Organic Maps news website -->
 	<string name="news">新闻</string>
 	<!-- Text in menu -->
-	<string name="facebook">脸书</string>
+	<string name="facebook">Facebook</string>
 	<!-- Text in menu -->
 	<string name="twitter">X (推特)</string>
 	<!-- Settings: Send feedback button and dialog title -->
 	<string name="feedback">反馈</string>
 	<!-- Text in menu -->
-	<string name="rate_the_app">为该应用打分</string>
+	<string name="rate_the_app">为我们评分</string>
 	<!-- Text in menu -->
 	<string name="help">帮助</string>
 	<!-- Button in the main Help dialog -->
 	<string name="faq">问题和解答</string>
 	<!-- Button in the main menu -->
-	<string name="donate">捐款</string>
+	<string name="donate">捐助我们</string>
 	<!-- Button in the main Help dialog -->
 	<string name="how_to_support_us">支持项目</string>
 	<!-- Button in the main Help dialog -->
 	<string name="copyright">版权</string>
 	<!-- Text in menu + Button in the main Help dialog -->
-	<string name="report_a_bug">报告漏洞</string>
+	<string name="report_a_bug">报告问题</string>
 	<!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
 	<string name="compass_calibration_recommended">通过以八字形运动移动手机来改善箭头方向，以校准罗盘。</string>
 	<!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
@@ -279,7 +279,7 @@
 	<!-- Context menu item for downloader. -->
 	<string name="downloader_download_map">下载地图</string>
 	<!-- Item status in downloader. -->
-	<string name="downloader_retry">重复</string>
+	<string name="downloader_retry">重新下载</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_delete_map">删除地图</string>
 	<!-- Item in context menu. -->
@@ -297,7 +297,7 @@
 	<!-- location service disabled -->
 	<string name="enable_location_services">请启用位置服务</string>
 	<string name="save">保存</string>
-	<string name="edit_description_hint">您的描述（文本或html）</string>
+	<string name="edit_description_hint">您的描述（文本或 html）</string>
 	<string name="create">创建</string>
 	<!-- red color -->
 	<string name="red">红色</string>
@@ -370,11 +370,11 @@
 	<string name="hide">隐藏</string>
 	<string name="categories">类别</string>
 	<string name="history">历史</string>
-	<string name="search_not_found">抱歉，没有找到任何东西。</string>
-	<string name="search_not_found_query">请尝试其它查询。</string>
-	<string name="search_history_title">搜索历史</string>
+	<string name="search_not_found">很抱歉，没有找到任何地点。</string>
+	<string name="search_not_found_query">请尝试搜索其它关键词。</string>
+	<string name="search_history_title">搜索历史记录</string>
 	<string name="search_history_text">快速访问最近的搜索查询。</string>
-	<string name="clear_search">清除历史搜索</string>
+	<string name="clear_search">清除搜索记录</string>
 	<!-- Place Page link to Wikipedia article (if map object has it). -->
 	<string name="read_in_wikipedia">维基百科</string>
 	<string name="p2p_your_location">您的位置</string>
@@ -431,7 +431,7 @@
 	<string name="street">街道</string>
 	<!-- Editable House Number text field (in address block). -->
 	<string name="house_number">门牌号码</string>
-	<string name="details">细节</string>
+	<string name="details">详细信息</string>
 	<!-- Text field to enter non-existing street name, below list of known streets around -->
 	<string name="add_street">添加街道</string>
 	<string name="choose_language">选择语言</string>
@@ -459,15 +459,15 @@
 	<string name="editor_edit_place_category_title">类别</string>
 	<string name="detailed_problem_description">问题的详细描述</string>
 	<string name="editor_report_problem_other_title">一个不同的问题</string>
-	<string name="placepage_add_business_button">添加组织</string>
+	<string name="placepage_add_business_button">将地点添加到 OpenStreetMap</string>
 	<string name="message_invalid_feature_position">对象无法设置在这里</string>
 	<!-- Text in About and OSM Login screens. %@ is replaced by a local, human readable date. -->
-	<string name="osm_presentation">截至%s的OpenStreetMap的制图数据。就像Wikipedia一样，您可以为世界上所有用户添加或编辑位置。</string>
+	<string name="osm_presentation">截止到 %s 的 OpenStreetMap 地图数据。就像维基百科一样，您可以为世界上所有用户添加或编辑位置。</string>
 	<string name="login_to_make_edits_visible">登录，让其他用户能看到您所作出的修改。</string>
 	<!-- Downloaded 10 **of** 20 <- it is that "of" -->
 	<string name="downloader_of">%1$d个/共%2$d个</string>
 	<string name="download_over_mobile_header">用手机网络连接下载吗？</string>
-	<string name="download_over_mobile_message">用一些方案或漫游的话这可能相当昂贵。</string>
+	<string name="download_over_mobile_message">如果您使用移动数据或漫游来进行下载，将可能导致额外的费用。</string>
 	<string name="error_enter_correct_house_number">输入正确的房屋号</string>
 	<string name="editor_storey_number">楼号 (最大 %d)</string>
 	<!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
@@ -476,7 +476,7 @@
 	<string name="error_enter_correct_zip_code">输入正确的邮政编码</string>
 	<!-- Place Page title for long tap -->
 	<string name="core_placepage_unknown_place">未知位置</string>
-	<string name="editor_other_info">给OSM编辑器发送标记</string>
+	<string name="editor_other_info">给 OSM 社区发送标记</string>
 	<string name="editor_detailed_description_hint">详细备注</string>
 	<string name="editor_detailed_description">您建议的更改将发送至 OpenStreetMap 社区。说明无法在 Organic Maps 编辑的详情。</string>
 	<string name="editor_more_about_osm">关于 OpenStreetMap 的更多信息</string>
@@ -486,7 +486,7 @@
 	<!-- Error title that appears after certain time without location. -->
 	<string name="current_location_unknown_title">继续检测您的当前位置？</string>
 	<!-- Error that appears after certain time without location. -->
-	<string name="current_location_unknown_message">当前位置未知，可能您在建筑内或隧道内。</string>
+	<string name="current_location_unknown_message">我们无法确定您的当前位置，可能是因为您在建筑物内或隧道内。</string>
 	<string name="current_location_unknown_continue_button">继续</string>
 	<string name="current_location_unknown_stop_button">停止</string>
 	<!-- abbreviation for meters -->
@@ -500,8 +500,8 @@
 	<!-- A unit of measure -->
 	<string name="ft">英尺</string>
 	<string name="miles_per_hour">英里每小时</string>
-	<string name="hour">小時</string>
-	<string name="minute">分鐘</string>
+	<string name="hour">小时</string>
+	<string name="minute">分钟</string>
 	<string name="placepage_more_button">更多</string>
 	<!-- A referral link on the place page for some hotels -->
 	<string name="more_on_kayak">照片、评论、预订</string>
@@ -515,7 +515,7 @@
 	<string name="editor_reset_edits_button">重置</string>
 	<string name="editor_remove_place_message">删除已添加的位置？</string>
 	<string name="editor_remove_place_button">删除</string>
-	<string name="editor_place_doesnt_exist">位置不存在</string>
+	<string name="editor_place_doesnt_exist">该地点不存在</string>
 	<!-- Phone number error message -->
 	<string name="error_enter_correct_phone">输入正确的电话号码</string>
 	<string name="error_enter_correct_web">输入有效网址</string>
@@ -624,7 +624,7 @@
 	<string name="power_managment_setting_never">从不</string>
 	<string name="power_managment_setting_auto">自动</string>
 	<string name="power_managment_setting_manual_max">最大程度省电</string>
-	<string name="enable_logging_warning_message">此选项启用以记录操作来进行诊断。这有助于团队识别应用程序的问题。请仅在Organic Maps支持请求时开启该选项。</string>
+	<string name="enable_logging_warning_message">临时启用此选项，以便使用“报告错误”功能在帮助对话框中记录并手动发送有关您的问题的详细诊断日志给我们。日志可能包含位置信息。</string>
 	<string name="access_rules_author_only">在线编辑</string>
 	<string name="driving_options_title">绕行设置</string>
 	<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -714,7 +714,7 @@
 	<!-- Description in preferences -->
 	<string name="enable_show_on_lock_screen_description">启用后，即使设备已锁定，应用程序仍将在锁屏上运行。</string>
 	<!-- OpenStreetMap text on splash screen -->
-	<string name="splash_subtitle">地图数据来自OpenStreetMap</string>
+	<string name="splash_subtitle">地图数据来自 OpenStreetMap</string>
 	<!-- Tip #00 -->
 	<string name="app_tip_00">感谢您使用我们的社区地图！</string>
 	<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index eb76a66fee..4354a7f7d6 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -21,7 +21,7 @@
 "downloading" = "下载…";
 
 /* Choose measurement on first launch alert - choose metric system button */
-"kilometres" = "千米";
+"kilometres" = "公里";
 
 /* Leave Review dialog - Review button */
 "leave_a_review" = "发表评论";
@@ -105,7 +105,7 @@
 "fuel" = "汽油";
 
 /* Search category for parking lots; any changes should be duplicated in categories.txt @parking! */
-"parking" = "停车";
+"parking" = "停车场";
 
 /* Search category for clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @shopping! */
 "shopping" = "购物";
@@ -117,7 +117,7 @@
 "hotel" = "旅店";
 
 /* Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @tourism! */
-"tourism" = "景点";
+"tourism" = "旅游景点";
 
 /* Search category for entertainment; any changes should be duplicated in categories.txt @entertainment! */
 "entertainment" = "娱乐";
@@ -147,7 +147,7 @@
 "post" = "邮政";
 
 /* Search category for police; any changes should be duplicated in categories.txt @police! */
-"police" = "警察";
+"police" = "警察局";
 
 /* Search category for WiFi access; any changes should be duplicated in categories.txt @wifi! */
 "wifi" = "无线网络";
@@ -289,7 +289,7 @@
 "mastodon" = "Mastodon";
 
 /* Text in menu */
-"facebook" = "脸书";
+"facebook" = "Facebook";
 
 /* Text in menu */
 "twitter" = "X (推特)";
@@ -304,7 +304,7 @@
 "openstreetmap" = "OpenStreetMap";
 
 /* Text in menu */
-"rate_the_app" = "为该应用打分";
+"rate_the_app" = "为我们评分";
 
 /* Text in menu */
 "help" = "帮助";
@@ -313,7 +313,7 @@
 "faq" = "问题和解答";
 
 /* Button in the main menu */
-"donate" = "捐款";
+"donate" = "捐助我们";
 
 /* Button in the main Help dialog */
 "how_to_support_us" = "支持项目";
@@ -322,7 +322,7 @@
 "copyright" = "版权";
 
 /* Text in menu + Button in the main Help dialog */
-"report_a_bug" = "报告漏洞";
+"report_a_bug" = "报告问题";
 
 /* Alert text */
 "email_error_body" = "电子邮件客户端尚未建立。请配置或使用任何其他方式与我们联系%@";
@@ -372,7 +372,7 @@
 "downloader_download_map" = "下载地图";
 
 /* Item status in downloader. */
-"downloader_retry" = "重复";
+"downloader_retry" = "重新下载";
 
 /* Item in context menu. */
 "downloader_delete_map" = "删除地图";
@@ -521,15 +521,15 @@
 
 "history" = "历史";
 
-"search_not_found" = "抱歉，没有找到任何东西。";
+"search_not_found" = "很抱歉，没有找到任何地点。";
 
-"search_not_found_query" = "请尝试其它查询。";
+"search_not_found_query" = "请尝试搜索其它关键词。";
 
-"search_history_title" = "搜索历史";
+"search_history_title" = "搜索历史记录";
 
 "search_history_text" = "快速访问最近的搜索查询。";
 
-"clear_search" = "清除历史搜索";
+"clear_search" = "清除搜索记录";
 
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "维基百科";
@@ -642,7 +642,7 @@
 /* Editable House Number text field (in address block). */
 "house_number" = "门牌号码";
 
-"details" = "细节";
+"details" = "详细信息";
 
 /* Text field to enter non-existing street name, below list of known streets around */
 "add_street" = "添加街道";
@@ -716,7 +716,7 @@
 
 "download_over_mobile_header" = "用手机网络连接下载吗？";
 
-"download_over_mobile_message" = "用一些方案或漫游的话这可能相当昂贵。";
+"download_over_mobile_message" = "如果您使用移动数据或漫游来进行下载，将可能导致额外的费用。";
 
 "error_enter_correct_house_number" = "输入正确的房屋号";
 
@@ -732,7 +732,7 @@
 /* Place Page title for long tap */
 "core_placepage_unknown_place" = "未知位置";
 
-"editor_other_info" = "给OSM编辑器发送标记";
+"editor_other_info" = "给 OSM 社区发送标记";
 
 "editor_detailed_description_hint" = "详细备注";
 
@@ -750,7 +750,7 @@
 "current_location_unknown_title" = "继续检测您的当前位置？";
 
 /* Error that appears after certain time without location. */
-"current_location_unknown_message" = "当前位置未知，可能您在建筑内或隧道内。";
+"current_location_unknown_message" = "我们无法确定您的当前位置，可能是因为您在建筑物内或隧道内。";
 
 "current_location_unknown_continue_button" = "继续";
 
@@ -758,7 +758,7 @@
 
 "current_location_unknown_error_title" = "当前位置未知";
 
-"current_location_unknown_error_message" = "搜索您的位置时发生错误。请检查您的设备是否工作正常，然后重试。";
+"current_location_unknown_error_message" = "定位到您的当前位置时出错。请检查您的设备是否正常运作，然后再试一次。";
 
 "location_services_disabled_header" = "地点定位被禁用";
 
@@ -788,9 +788,9 @@
 
 "miles_per_hour" = "英里每小时";
 
-"hour" = "小時";
+"hour" = "小时";
 
-"minute" = "分鐘";
+"minute" = "分钟";
 
 "placepage_more_button" = "更多";
 
@@ -827,7 +827,7 @@
 
 "editor_remove_place_button" = "删除";
 
-"editor_place_doesnt_exist" = "位置不存在";
+"editor_place_doesnt_exist" = "该地点不存在";
 
 "text_more_button" = "…更多";
 
@@ -863,7 +863,7 @@
 "recent_track_background_dialog_message" = "Organic Maps使用背景中的地理位置记录您最近去过的路径。";
 
 /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */
-"about_description" = "Organic Maps 是一款免费的开源离线地图应用程序。无广告。没有跟踪。如果您在地图上看到错误，请在 OpenStreetMap 中修复它。该项目由爱好者在我们的空闲时间创建，因此我们需要您的反馈和支持。";
+"about_description" = "Organic Maps 是一款免费的开源离线地图应用程序。无广告。不会跟踪您。如果您在地图上看到错误，请在 OpenStreetMap 中修复它。该项目由爱好者在我们的空闲时间创建，因此我们需要您的反馈和支持。";
 
 "general_settings" = "常规设置";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index da38cf77dc..536de3ab29 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -274,7 +274,7 @@
 "website" = "網站";
 
 /* Text in About menu, opens Organic Maps news website */
-"news" = "消息";
+"news" = "新聞";
 
 /* Text in menu */
 "github" = "GitHub";
@@ -289,7 +289,7 @@
 "mastodon" = "Mastodon";
 
 /* Text in menu */
-"facebook" = "臉書";
+"facebook" = "Facebook";
 
 /* Text in menu */
 "twitter" = "X (推特)";
@@ -304,7 +304,7 @@
 "openstreetmap" = "開放街圖";
 
 /* Text in menu */
-"rate_the_app" = "為該應用程式評分";
+"rate_the_app" = "為我們評分";
 
 /* Text in menu */
 "help" = "幫助";
@@ -313,7 +313,7 @@
 "faq" = "問題和解答";
 
 /* Button in the main menu */
-"donate" = "捐款";
+"donate" = "捐助我們";
 
 /* Button in the main Help dialog */
 "how_to_support_us" = "支持項目";
@@ -322,7 +322,7 @@
 "copyright" = "版權";
 
 /* Text in menu + Button in the main Help dialog */
-"report_a_bug" = "報告錯誤";
+"report_a_bug" = "報告問題";
 
 /* Alert text */
 "email_error_body" = "電子郵件客戶端尚未建立。請設定或使用任何其他方式與我們聯絡%@";
@@ -372,7 +372,7 @@
 "downloader_download_map" = "下載地圖";
 
 /* Item status in downloader. */
-"downloader_retry" = "重試";
+"downloader_retry" = "重新下載";
 
 /* Item in context menu. */
 "downloader_delete_map" = "刪除地圖";
@@ -521,9 +521,9 @@
 
 "history" = "記錄";
 
-"search_not_found" = "很抱歉，找不到任何東西。";
+"search_not_found" = "很抱歉，沒有找到任何地點。";
 
-"search_not_found_query" = "請嘗試其他搜尋字詞。";
+"search_not_found_query" = "請嘗試搜尋其它關鍵詞。";
 
 "search_history_title" = "搜尋歷史紀錄";
 
@@ -541,9 +541,9 @@
 
 "p2p_start" = "開始";
 
-"p2p_from_here" = "從";
+"p2p_from_here" = "從這出發";
 
-"p2p_to_here" = "路線終點";
+"p2p_to_here" = "到這去";
 
 "p2p_only_from_current" = "導航只能從您目前的位置開始。";
 
@@ -716,7 +716,7 @@
 
 "download_over_mobile_header" = "用手機網路連線下載嗎？";
 
-"download_over_mobile_message" = "用某些方案或漫遊的話這可能相當昂貴。";
+"download_over_mobile_message" = "如果您使用行動數據或漫遊來進行下載，將可能導致額外的費用。";
 
 "error_enter_correct_house_number" = "輸入正確的門牌號碼";
 
@@ -732,7 +732,7 @@
 /* Place Page title for long tap */
 "core_placepage_unknown_place" = "未知的位置";
 
-"editor_other_info" = "給OSM編輯器發送標記";
+"editor_other_info" = "給 OSM 社區發送標記";
 
 "editor_detailed_description_hint" = "詳細註釋";
 
@@ -750,7 +750,7 @@
 "current_location_unknown_title" = "繼續偵測您的目前位置？";
 
 /* Error that appears after certain time without location. */
-"current_location_unknown_message" = "目前位置未知，可能您在建築物內或隧道內。";
+"current_location_unknown_message" = "我們無法確定您的當前位置，可能是因為您在建築物內或隧道內。";
 
 "current_location_unknown_continue_button" = "繼續";
 
@@ -758,7 +758,7 @@
 
 "current_location_unknown_error_title" = "目前位置未知。";
 
-"current_location_unknown_error_message" = "搜尋您的位置時發生錯誤。請檢查您的裝置是否正常運作，然後重試。";
+"current_location_unknown_error_message" = "定位到您的當前位置時出錯。請檢查您的裝置是否正常運作，然後再試一次。";
 
 "location_services_disabled_header" = "地點定位被禁用";
 
@@ -827,7 +827,7 @@
 
 "editor_remove_place_button" = "移除";
 
-"editor_place_doesnt_exist" = "位置不存在";
+"editor_place_doesnt_exist" = "該地點不存在";
 
 "text_more_button" = "…更多";
 
@@ -863,7 +863,7 @@
 "recent_track_background_dialog_message" = "Organic Maps使用背景中的地理位置記錄您最近去過的路徑。";
 
 /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */
-"about_description" = "Organic Maps 是一款免費的開源離線地圖 app。沒有廣告，不會追蹤。如果您在地圖上看到錯誤，請在 OpenStreetMap 中修復吧。這個專案由愛好者在我們的空閒時間創建，因此我們需要您的回饋和支援。";
+"about_description" = "Organic Maps 是一款免費的開源離線地圖 app。沒有廣告，不會追蹤您。如果您在地圖上看到錯誤，請在 OpenStreetMap 中修復吧。這個專案由愛好者在我們的空閒時間創建，因此我們需要您的回饋和支援。";
 
 "general_settings" = "一般設定";