diff --git a/app/build.gradle b/app/build.gradle
index f1a03d1fb..85f154361 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,8 +32,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdk 34
-        versionCode 30514 // format is Mmmss (where M is 1+the numeric major number
-        versionName "2.5.14"
+        versionCode 30515 // format is Mmmss (where M is 1+the numeric major number
+        versionName "2.5.15"
         testInstrumentationRunner "com.geeksville.mesh.TestRunner"
 
         // per https://developer.android.com/studio/write/vector-asset-studio
diff --git a/app/src/main/assets/device_hardware.json b/app/src/main/assets/device_hardware.json
index 853bec3b8..e045a5c00 100644
--- a/app/src/main/assets/device_hardware.json
+++ b/app/src/main/assets/device_hardware.json
@@ -141,7 +141,7 @@
   },
   {
     "hwModel": 12,
-    "hwModelSlug": "TBEAM_S3_CORE",
+    "hwModelSlug": "LILYGO_TBEAM_S3_CORE",
     "platformioTarget": "tbeam-s3-core",
     "architecture": "esp32-s3",
     "activelySupported": true,
diff --git a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
index 4dbc4f771..988c49877 100644
--- a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
@@ -209,6 +209,9 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD
                                 closeGatt() // Close the old non-auto connection
                                 lowLevelConnect(true)
                             }
+                        } else if (status == 147) {
+                            info("got 147, calling lostConnection()")
+                            lostConnection("code 147")
                         }
 
                         if (status == 257) { // mystery error code when phone is hung
diff --git a/app/src/main/proto b/app/src/main/proto
index 02e6576ef..2cffaf53e 160000
--- a/app/src/main/proto
+++ b/app/src/main/proto
@@ -1 +1 @@
-Subproject commit 02e6576efaa2f691be9504b8c1c6261703f7a277
+Subproject commit 2cffaf53e3faf1b6e41a8b8f05312f2f893be413
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index be7bda186..ea3beb138 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -256,7 +256,7 @@
     <string name="device_metrics_log">Geräte-Metriken-Protokoll</string>
     <string name="node_map">Nodekarte</string>
     <string name="position_log">Positions-Protokoll</string>
-    <string name="env_metrics_log">Umgebungs-Metriken-Protokoll</string>
+    <string name="env_metrics_log">Sensor-Protokoll</string>
     <string name="sig_metrics_log">Signal-Metriken-Protkoll</string>
     <string name="administration">Administration</string>
     <string name="remote_admin">Fernadministration</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index df0a8eb8e..b8397e501 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="node_filter_placeholder">Filter</string>
-    <string name="desc_node_filter_clear">clear node filter</string>
-    <string name="node_filter_include_unknown">Include unknown</string>
-    <string name="node_filter_show_details">Show details</string>
+    <string name="node_filter_placeholder">Filtras</string>
+    <string name="desc_node_filter_clear">išvalyti NODE filtrą</string>
+    <string name="node_filter_include_unknown">Įtraukti nežinomus</string>
+    <string name="node_filter_show_details">Rodyti detales</string>
     <string name="node_sort_alpha">A-Z</string>
-    <string name="node_sort_channel">Channel</string>
-    <string name="node_sort_distance">Distance</string>
+    <string name="node_sort_channel">Kanalas</string>
+    <string name="node_sort_distance">Atstumas</string>
     <string name="node_sort_hops_away">Hops away</string>
-    <string name="node_sort_last_heard">Last heard</string>
-    <string name="node_sort_via_mqtt">via MQTT</string>
-    <string name="unrecognized">Unrecognized</string>
+    <string name="node_sort_last_heard">Seniausiai girdėtas</string>
+    <string name="node_sort_via_mqtt">per MQTT</string>
+    <string name="unrecognized">Be kategorijos</string>
     <string name="message_status_enroute">Waiting to be acknowledged</string>
-    <string name="message_status_queued">Queued for sending</string>
+    <string name="message_status_queued">Eilėje išsiuntimui</string>
     <string name="routing_error_none">Acknowledged</string>
-    <string name="routing_error_no_route">No route</string>
+    <string name="routing_error_no_route">Nėra maršruto</string>
     <string name="routing_error_got_nak">Received a negative acknowledgment</string>
     <string name="routing_error_timeout">Timeout</string>
     <string name="routing_error_no_interface">No Interface</string>
     <string name="routing_error_max_retransmit">Max Retransmission Reached</string>
-    <string name="routing_error_no_channel">No Channel</string>
+    <string name="routing_error_no_channel">Nėra kanalo</string>
     <string name="routing_error_too_large">Packet too large</string>
-    <string name="routing_error_no_response">No response</string>
-    <string name="routing_error_bad_request">Bad Request</string>
+    <string name="routing_error_no_response">Nėra atsakymo</string>
+    <string name="routing_error_bad_request">Bloga užklausa</string>
     <string name="routing_error_duty_cycle_limit">Regional Duty Cycle Limit Reached</string>
-    <string name="routing_error_not_authorized">Not Authorized</string>
+    <string name="routing_error_not_authorized">Neautorizuotas</string>
     <string name="routing_error_pki_failed">Encrypted Send Failed</string>
     <string name="routing_error_pki_unknown_pubkey">Unknown Public Key</string>
-    <string name="routing_error_admin_bad_session_key">Bad session key</string>
+    <string name="routing_error_admin_bad_session_key">Blogas sesijos raktas</string>
     <string name="routing_error_admin_public_key_unauthorized">Public Key unauthorized</string>
     <string name="role_client">App connected or standalone messaging device.</string>
     <string name="role_client_mute">Device that does not forward packets from other devices.</string>
@@ -55,10 +55,10 @@
     <string name="unknown_username">Nežinomas vartotojo vardas</string>
     <string name="send">Siųsti</string>
     <string name="send_text">Siųsti tekstą</string>
-    <string name="warning_not_paired">Šiuo telefonu dar susietas joks Meshtastic suderinamas radijas. Prašome suporuoti įrenginį ir nustatyti savo vartotojo vardą..\n\nŠi atvirojo kodo programa yra kūrimo stadijoje, jei pastebėsite problemas, prašome pranešti mūsų forume: https://github.com/orgs/meshtastic/discussions\n\nDaugiau informacijos rasite mūsų interneto svetainėje - www.meshtastic.org.</string>
+    <string name="warning_not_paired">Su šiuo telefonu dar nėra susietas joks Meshtastic įtaisais. Prašome suporuoti įrenginį ir nustatyti savo vartotojo vardą.\n\nŠi atvirojo kodo programa yra kūrimo stadijoje, jei pastebėsite problemas, prašome pranešti mūsų forume: https://github.com/orgs/meshtastic/discussions\n\nDaugiau informacijos rasite mūsų interneto svetainėje - www.meshtastic.org.</string>
     <string name="you">Tu</string>
     <string name="your_name">Jūsų vardas</string>
-    <string name="analytics_okay">Anoniminė naudojimo statistika ir avarijų ataskaitos.</string>
+    <string name="analytics_okay">Siųsti anoniminę naudojimo statistika ir klaidų ataskaitas.</string>
     <string name="looking_for_meshtastic_devices">Ieškoma Meshtastic įrenginių…</string>
     <string name="starting_pairing">Pradėti susiejimą</string>
     <string name="url_for_join">URL prisijungimui prie Meshtastic tinklo</string>
@@ -91,7 +91,7 @@
     <string name="app_too_old">Reikalingas programos atnaujinimas</string>
     <string name="must_update">Urite atnaujinti šią programą programėlių parduotuvėje (arba Github). Ji per sena, kad galėtų bendrauti su šiuo radijo įrangos programinės įrangos versija. Prašome perskaityti mūsų <a href="https://meshtastic.org/docs/software/android/installation">dokumentaciją</a> šia tema.</string>
     <string name="none">Nėra (išjungti)</string>
-    <string name="modem_config_turbo">Short Range / Turbo</string>
+    <string name="modem_config_turbo">Mažo nuotolio / Turbo</string>
     <string name="modem_config_short">Trumpas nuotolis / Greitas</string>
     <string name="modem_config_medium">Vidutinis nuotolis / Greitas</string>
     <string name="modem_config_long">Ilgas nuotolis / Greitas</string>
@@ -121,13 +121,13 @@
     <string name="region">Regionas</string>
     <string name="cant_change_no_radio">Nepavyko pakeisti kanalo, nes radijas dar nėra prisijungęs. Bandykite dar kartą.</string>
     <string name="save_messages">Eksportuoti rangetest.csv</string>
-    <string name="reset">Atkurti</string>
+    <string name="reset">Nustatyti iš naujo</string>
     <string name="scan">Skenuoti</string>
     <string name="are_you_sure_change_default">Ar tikrai norite pakeisti į numatytąjį kanalą?</string>
     <string name="reset_to_defaults">Atkurti numatytuosius parametrus</string>
     <string name="apply">Taikyti</string>
     <string name="no_app_found">Nerasta jokia programa URL siuntimui</string>
-    <string name="theme">Grafiniai apvalkalai</string>
+    <string name="theme">Išvaizda</string>
     <string name="theme_light">Šviesi</string>
     <string name="theme_dark">Tamsi</string>
     <string name="theme_system">Sistemos numatyta</string>
@@ -167,7 +167,7 @@
     <string name="cant_shutdown">Shutdown not supported on this device</string>
     <string name="reboot">Perkrauti</string>
     <string name="traceroute">Traceroute</string>
-    <string name="intro_show">Rodyti įvada</string>
+    <string name="intro_show">Rodyti įvadą</string>
     <string name="intro_welcome">Sveikiname prisijungus prie Meshtastic</string>
     <string name="intro_welcome_text">Meshtastic yra atvirojo kodo, nepriklausomas nuo tinklo, šifruota komunikacijos platforma. Meshtastic radijo ryšys formuoja tinklą ir komunikuoja, naudodamas LoRa protokolą siųsti bei gauti tekstinius pranešimus.</string>
     <string name="intro_started">... Pradėkime!</string>
@@ -188,8 +188,8 @@ Suderinamus įrenginius galite pamatyti apsilankę adresu www.meshtastic.org/doc
     <string name="direct_message">Tiesioginė žinutė</string>
     <string name="nodedb_reset">NodeDB perkrauti</string>
     <string name="nodedb_reset_description">Tai išvalys visus mazgus iš šio sąrašo.</string>
-    <string name="delivery_confirmed">Delivery confirmed</string>
-    <string name="error">Error</string>
+    <string name="delivery_confirmed">Pristatymas patvirtintas</string>
+    <string name="error">Klaida</string>
     <string name="ignore">Ignoruoti</string>
     <string name="ignore_add">Ar pridėti „%s“ į ignoruojamų sąrašą? Po šio pakeitimo jūsų radijas bus perkrautas.</string>
     <string name="ignore_remove">Ar pašalinti „%s“ iš ignoruojamų sąrašo? Po šio pakeitimo jūsų radijas bus perkrautas.</string>
@@ -201,7 +201,7 @@ Suderinamus įrenginius galite pamatyti apsilankę adresu www.meshtastic.org/doc
     <string name="device_settings">Radijo modulio konfigūracija</string>
     <string name="module_settings">Modulio konfigūracija</string>
     <string name="add">Pridėti</string>
-    <string name="edit">Edit</string>
+    <string name="edit">Redaguoti</string>
     <string name="calculating">Skaičiuojama…</string>
     <string name="map_offline_manager">Neprisijungusio režimo valdymas</string>
     <string name="map_cache_size">Dabartinis talpyklos dydis</string>
@@ -220,25 +220,25 @@ Suderinamus įrenginius galite pamatyti apsilankę adresu www.meshtastic.org/doc
     <string name="waypoint_new">Naujas orientyras</string>
     <string name="waypoint_received">Gautas orientyras: %s</string>
     <string name="error_duty_cycle">Pasiektas veikimo ciklo limitas. Šiuo metu negalima siųsti žinučių, bandykite vėliau.</string>
-    <string name="remove">Remove</string>
+    <string name="remove">Pašalinti</string>
     <string name="remove_node_text">This node will be removed from your list until your node receives data from it again.</string>
-    <string name="mute">Mute</string>
-    <string name="mute_notifications">Mute notifications</string>
-    <string name="mute_8_hours">8 hours</string>
-    <string name="mute_1_week">1 week</string>
-    <string name="mute_always">Always</string>
-    <string name="replace">Replace</string>
-    <string name="wifi_qr_code_scan">Scan WiFi QR code</string>
+    <string name="mute">Nutildyti</string>
+    <string name="mute_notifications">Nutildyti pranešimus</string>
+    <string name="mute_8_hours">8 valandos</string>
+    <string name="mute_1_week">1 savaitė</string>
+    <string name="mute_always">Visada</string>
+    <string name="replace">Pakeisti</string>
+    <string name="wifi_qr_code_scan">Nuskenuoti WiFi QR kodą</string>
     <string name="wifi_qr_code_error">Invalid WiFi Credential QR code format</string>
     <string name="navigate_back">Navigate Back</string>
-    <string name="battery">Battery</string>
+    <string name="battery">Baterija</string>
     <string name="channel_utilization">Channel Utilization</string>
     <string name="air_utilization">Air Utilization</string>
-    <string name="temperature">Temperature</string>
-    <string name="humidity">Humidity</string>
+    <string name="temperature">Temperatūra</string>
+    <string name="humidity">Drėgmė</string>
     <string name="logs">Logs</string>
     <string name="hops_away">Hops Away</string>
-    <string name="info">Information</string>
+    <string name="info">Informacija</string>
     <string name="ch_util_definition">Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).</string>
     <string name="air_util_definition">Percent of airtime for transmission used within the last hour.</string>
     <string name="iaq">IAQ</string>
@@ -261,21 +261,21 @@ Suderinamus įrenginius galite pamatyti apsilankę adresu www.meshtastic.org/doc
     <string name="position_log">Position Log</string>
     <string name="env_metrics_log">Environment Metrics Log</string>
     <string name="sig_metrics_log">Signal Metrics Log</string>
-    <string name="administration">Administration</string>
-    <string name="remote_admin">Remote Administration</string>
-    <string name="bad">Bad</string>
-    <string name="fair">Fair</string>
-    <string name="good">Good</string>
-    <string name="none_quality">None</string>
-    <string name="signal">Signal</string>
-    <string name="signal_quality">Signal Quality</string>
+    <string name="administration">Administravimas</string>
+    <string name="remote_admin">Nuotolinis administravimas</string>
+    <string name="bad">Blogas</string>
+    <string name="fair">Pakankamas</string>
+    <string name="good">Geras</string>
+    <string name="none_quality">Nėra</string>
+    <string name="signal">Signalas</string>
+    <string name="signal_quality">Signalo kokybė</string>
     <string name="traceroute_log">Traceroute Log</string>
-    <string name="traceroute_direct">Direct</string>
+    <string name="traceroute_direct">Tiesiogiai</string>
     <plurals name="traceroute_hops">
-        <item quantity="one">1 hop</item>
-        <item quantity="few">%d hops</item>
-        <item quantity="many">%d hops</item>
-        <item quantity="other">%d hops</item>
+        <item quantity="one">Vienas</item>
+        <item quantity="few">Keli</item>
+        <item quantity="many">Daug</item>
+        <item quantity="other">Kita</item>
     </plurals>
     <string name="traceroute_diff">Hops towards %1$d Hops back %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8ae6c4dc8..621023bf1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="node_filter_placeholder">筛选器</string>
+    <string name="node_filter_placeholder">筛选器csvfganw</string>
     <string name="desc_node_filter_clear">清除筛选</string>
     <string name="node_filter_include_unknown">包括未知内容</string>
     <string name="node_filter_show_details">显示详细信息</string>
@@ -46,18 +46,18 @@
     <string name="rebroadcast_mode_known_only">与 LOCAL_ONLY 类似，忽略来自其他网状网络的消息，但更进一步，忽略来自不在节点已知列表中的节点的消息。</string>
     <string name="rebroadcast_mode_none">仅限 SENSOR、TRACKER 和 TAK_TRACKER 角色，此模式将禁止所有重新广播，与 CLIENT_MUTE 角色类似。</string>
     <string name="rebroadcast_mode_core_portnums_only">忽略来自非标准端口号（如 TAK、RangeTest、PaxCounter 等）的数据包，仅重新广播标准端口号的数据包：NodeInfo、Text、Position、Telemetry 和 Routing。</string>
-    <string name="channel_name">頻道名稱</string>
-    <string name="channel_options">頻道選項</string>
+    <string name="channel_name">频道名称</string>
+    <string name="channel_options">频道选项</string>
     <string name="qr_code">QR 码</string>
-    <string name="unset">取消設定</string>
-    <string name="connection_status">連線狀態</string>
-    <string name="application_icon">應用程式圖示</string>
+    <string name="unset">取消设定</string>
+    <string name="connection_status">连线状态</string>
+    <string name="application_icon">应用程序图标</string>
     <string name="unknown_username">未知的使用者名称</string>
     <string name="send">传送</string>
-    <string name="send_text">传送讯息</string>
+    <string name="send_text">发送短信</string>
     <string name="warning_not_paired">您尚未将手机与 Meshtastic 兼容的装置配对。请先配对装置并设置您的用户名称。\n\n此开源应用程序仍在开发中，如有问题，请在我们的论坛 https://github.com/orgs/meshtastic/discussions 上面发文询问。\n\n 也可参阅我们的网页 - www.meshtastic.org。</string>
     <string name="you">你</string>
-    <string name="your_name">你的名称</string>
+    <string name="your_name">您的姓名</string>
     <string name="analytics_okay">匿名使用统计信息和故障报告</string>
     <string name="looking_for_meshtastic_devices">正在寻找 Meshtastic 装置...</string>
     <string name="starting_pairing">开始配对</string>
@@ -68,18 +68,18 @@
     <string name="are_you_sure_channel">您确定要更改频道吗？在您分享新的频道设定之前，与其他节点的所有通讯都将停止。</string>
     <string name="new_channel_rcvd">收到新的频道 URL</string>
     <string name="permission_missing">Meshtastic 需要位置权限并启用位置信息才能通过蓝牙查找新设备。找到之后可以再关闭这权限。</string>
-    <string name="report_bug">報告BUG</string>
-    <string name="report_a_bug">回报问题</string>
+    <string name="report_bug">报告 Bug</string>
+    <string name="report_a_bug">报告 Bug 详细信息</string>
     <string name="report_bug_text">您确定要报告错误吗？报告后，请在 https://github.com/orgs/meshtastic/discussions 上贴文，以便我们可以将报告与您发现的问题匹配。</string>
     <string name="report">报告</string>
-    <string name="not_paired_yet">您還沒有配對.</string>
-    <string name="change_radio">換設備</string>
-    <string name="pairing_completed">配對完成，開始服務</string>
-    <string name="pairing_failed_try_again">配對失敗，請重新選擇</string>
-    <string name="location_disabled">位置訪問已關閉,無法向設備提供位置.</string>
+    <string name="not_paired_yet">您还没有配对.</string>
+    <string name="change_radio">换设备</string>
+    <string name="pairing_completed">配对完成，启动服务</string>
+    <string name="pairing_failed_try_again">配对失败，请重新选择</string>
+    <string name="location_disabled">位置访问已关闭，无法向网络提供位置信息</string>
     <string name="share">分享</string>
     <string name="disconnected">已断开连接</string>
-    <string name="device_sleeping">設備休眠中</string>
+    <string name="device_sleeping">设备休眠中</string>
     <string name="connected_count">已连接：%1$s 的 %2$s 上线</string>
     <string name="update_firmware">更新固件</string>
     <string name="ip_address">IP地址：</string>
@@ -113,29 +113,29 @@
     <string name="message_reception_state">消息接收状态</string>
     <string name="message_delivery_status">消息传递状态</string>
     <string name="meshtastic_messages_notifications">消息通知</string>
-    <string name="protocol_stress_test">協定壓力測試</string>
-    <string name="firmware_too_old">需要韧体更新</string>
+    <string name="protocol_stress_test">协议压力测试</string>
+    <string name="firmware_too_old">需要固件更新</string>
     <string name="firmware_old">版本过旧，无法与此应用程序通讯。请前往设定面板并选择「更新韧体」。欲了解更多信息，请参阅 Github 上的<a href="https://meshtastic.org/docs/getting-started/flashing-firmware">韧体安装指南</a>。</string>
     <string name="okay">好的</string>
     <string name="must_set_region">您必须先选择一个地区</string>
     <string name="region">地区</string>
     <string name="cant_change_no_radio">无法更改频道，因为装置尚未连接。请再试一次。</string>
-    <string name="save_messages">导出 rangetest.csv</string>
+    <string name="save_messages">导出信号测试数据.csv</string>
     <string name="reset">重置</string>
     <string name="scan">扫描</string>
     <string name="are_you_sure_change_default">您是否确定要改回默认频道？</string>
-    <string name="reset_to_defaults">恢复预设设置</string>
+    <string name="reset_to_defaults">重置为默认设置</string>
     <string name="apply">申请</string>
     <string name="no_app_found">找不到可用于发送 URL 的应用程序。</string>
     <string name="theme">主題</string>
     <string name="theme_light">浅色</string>
     <string name="theme_dark">深色</string>
-    <string name="theme_system">跟随系统</string>
+    <string name="theme_system">系统默认设置</string>
     <string name="choose_theme">选择主题</string>
     <string name="background_required">背景定位</string>
     <string name="why_background_required">使用此功能，您必须授予「一直允许」的位置权限选项。\n这允许 Meshtastic 读取您的智能手机位置，并在应用程序关闭或未使用时，将位置发送给网状网络中的其他成员。</string>
     <string name="required_permissions">所需权限：</string>
-    <string name="provide_location_to_mesh">提供網格的位置</string>
+    <string name="provide_location_to_mesh">向网格提供手机位置</string>
     <string name="camera_required">相机权限</string>
     <string name="why_camera_required">我们必须获得访问摄像头的权限才能读取 QR 码。不会保存任何图片或影片。</string>
     <string name="notification_required">通知权限</string>
@@ -144,45 +144,47 @@
     <string name="modem_config_slow_short">短距離（速度慢）</string>
     <string name="modem_config_slow_medium">中等距離（速度慢）</string>
     <plurals name="delete_messages">
-        <item quantity="other">删除 %s 讯息?</item>
+        <item quantity="other">删除 讯息?
+
+删除 %s 讯息?</item>
     </plurals>
     <string name="delete">删除</string>
     <string name="delete_for_everyone">也从所有人的聊天纪录中删除</string>
     <string name="delete_for_me">從我的聊天紀錄中刪除</string>
-    <string name="select_all">選擇全部</string>
-    <string name="modem_config_slow_long">長距離（速度慢）</string>
-    <string name="map_style_selection">样式选择</string>
+    <string name="select_all">选择全部</string>
+    <string name="modem_config_slow_long">长距离（慢速）</string>
+    <string name="map_style_selection">主题选择</string>
     <string name="map_download_region">下载区域</string>
-    <string name="name">名稱</string>
-    <string name="description">描述說明</string>
-    <string name="locked">鎖定</string>
-    <string name="save">儲存</string>
-    <string name="preferences_language">語言</string>
-    <string name="preferences_system_default">系統預設</string>
-    <string name="resend">重新傳送</string>
-    <string name="shutdown">關機</string>
+    <string name="name">名称</string>
+    <string name="description">说明</string>
+    <string name="locked">锁定</string>
+    <string name="save">保存</string>
+    <string name="preferences_language">语言</string>
+    <string name="preferences_system_default">系统默认值</string>
+    <string name="resend">重新发送</string>
+    <string name="shutdown">关机</string>
     <string name="cant_shutdown">此设备不支持关机</string>
-    <string name="reboot">重新開機</string>
+    <string name="reboot">重新开机</string>
     <string name="traceroute">追踪器</string>
-    <string name="intro_show">顯示介紹指南</string>
-    <string name="intro_welcome">歡迎來到 Meshtastic</string>
+    <string name="intro_show">简要介绍</string>
+    <string name="intro_welcome">欢迎来到Meshtasc</string>
     <string name="intro_welcome_text">Meshtastic 是一个开源、离网、加密的通讯平台。Meshtastic 无线电组成网状网络，使用 LoRa 协议传送文字讯息进行通讯。</string>
-    <string name="intro_started">…讓我們開始吧！</string>
+    <string name="intro_started">…让我们开始吧！</string>
     <string name="intro_started_text">使用藍牙、序列埠或 WiFi 連接您的 Meshtastic 設備。 \n\n您可以在 www.meshtastic.org/docs/hardware 查看兼容的設備</string>
-    <string name="intro_encryption">"設置加密"</string>
+    <string name="intro_encryption">"设置加密"</string>
     <string name="intro_encryption_text">作为标准，设置了默认加密密钥。 要启用您自己的频道和增强加密，请转到频道选项卡并更改频道名称，这将为 AES256 加密设置一个随机密钥。 \n\n要与其他设备通信，他们需要扫描您的二维码或点击共享链接来配置频道设置。</string>
-    <string name="message">讯息:</string>
+    <string name="message">信息</string>
     <string name="quick_chat">快速聊天选项</string>
     <string name="quick_chat_new">新的快速聊天</string>
     <string name="quick_chat_edit">编辑快速聊天</string>
-    <string name="quick_chat_append">附加到讯息</string>
+    <string name="quick_chat_append">附加到消息中</string>
     <string name="quick_chat_instant">实时发送</string>
     <string name="factory_reset">恢复出厂设置</string>
     <string name="factory_reset_description">这将清除你已经完成的所有设备设定。</string>
     <string name="bluetooth_disabled">蓝牙已禁用</string>
     <string name="permission_missing_31">Meshtastic 需要附近设备许可才能通过蓝牙查找和连接设备。 您可以在不使用时将其关闭。</string>
     <string name="direct_message">私信</string>
-    <string name="nodedb_reset">节点数据库重置</string>
+    <string name="nodedb_reset">重置节点数据库</string>
     <string name="nodedb_reset_description">这将从该列表中清除所有节点。</string>
     <string name="delivery_confirmed">发送确认</string>
     <string name="error">错误</string>
@@ -190,11 +192,11 @@
     <string name="ignore_add">添加 \'%s\' 到忽略列表？</string>
     <string name="ignore_remove">从忽略列表中删除 \'%s\' ？</string>
     <string name="map_select_download_region">选择下载地区</string>
-    <string name="map_tile_download_estimate">瓷砖下载估计:</string>
+    <string name="map_tile_download_estimate">局部地图下载估算:</string>
     <string name="map_start_download">开始下载</string>
-    <string name="request_position">要求位置</string>
+    <string name="request_position">请求位置</string>
     <string name="close">关闭</string>
-    <string name="device_settings">设备设定</string>
+    <string name="device_settings">设备配置</string>
     <string name="module_settings">模块设定</string>
     <string name="add">新增</string>
     <string name="edit">编辑</string>
@@ -202,8 +204,8 @@
     <string name="map_offline_manager">脱机管理</string>
     <string name="map_cache_size">当前缓存大小</string>
     <string name="map_cache_info">缓存容量: %1$.2f MB\n缓存使用: %2$.2f MB</string>
-    <string name="map_clear_tiles">清除下载的图砖</string>
-    <string name="map_tile_source">图砖来源</string>
+    <string name="map_clear_tiles">清除下载的区域地图</string>
+    <string name="map_tile_source">区域地图来源</string>
     <string name="map_purge_success">清除 %s 的 SQL 快取</string>
     <string name="map_purge_fail">清除 SQL 快取失败，请查看 logcat 纪录</string>
     <string name="map_cache_manager">缓存管理员</string>
@@ -211,10 +213,10 @@
     <string name="map_download_errors">下载完成，但有 %d 个错误</string>
     <string name="map_cache_tiles">%d 图砖</string>
     <string name="map_subDescription">方位：%1$d° 距离：%2$s</string>
-    <string name="waypoint_edit">編輯航點</string>
-    <string name="waypoint_delete">刪除航點?</string>
-    <string name="waypoint_new">新建航點</string>
-    <string name="waypoint_received">收到編輯航點：%s</string>
+    <string name="waypoint_edit">编辑航点</string>
+    <string name="waypoint_delete">删除航点?</string>
+    <string name="waypoint_new">新建航点</string>
+    <string name="waypoint_received">收到编辑航点：%s</string>
     <string name="error_duty_cycle">占空比限制已达到。暂时无法发送消息，请稍后再试。</string>
     <string name="remove">移除</string>
     <string name="remove_node_text">此节点将从您的列表中删除，直到您的节点再次收到它的数据。</string>