diff --git a/app/src/main/assets/firmware_releases.json b/app/src/main/assets/firmware_releases.json
index dcb81f56dc..c749a8279e 100644
--- a/app/src/main/assets/firmware_releases.json
+++ b/app/src/main/assets/firmware_releases.json
@@ -188,6 +188,12 @@
     ]
   },
   "pullRequests": [
+    {
+      "id": "9798",
+      "title": "Attempt to fix issue 9713",
+      "page_url": "https://github.com/meshtastic/firmware/pull/9798",
+      "zip_url": "https://discord.com/invite/meshtastic"
+    },
     {
       "id": "9749",
       "title": "Add AEAD (AES-CCM) authenticated encryption for PSK channels",
@@ -199,12 +205,6 @@
       "title": "Add VL53L0 distance sensor.",
       "page_url": "https://github.com/meshtastic/firmware/pull/9706",
       "zip_url": "https://discord.com/invite/meshtastic"
-    },
-    {
-      "id": "9675",
-      "title": "add FromRadioSync BLE characteristic",
-      "page_url": "https://github.com/meshtastic/firmware/pull/9675",
-      "zip_url": "https://discord.com/invite/meshtastic"
     }
   ]
 }
\ No newline at end of file
diff --git a/core/data/README.md b/core/data/README.md
index a9c5bb15e6..7e2450e304 100644
--- a/core/data/README.md
+++ b/core/data/README.md
@@ -19,6 +19,7 @@ Internal components that handle raw data fetching from APIs or disk.
 ```mermaid
 graph TB
   :core:data[data]:::android-library
+  :core:data --> :core:repository
   :core:data -.-> :core:analytics
   :core:data -.-> :core:common
   :core:data -.-> :core:database
diff --git a/core/database/README.md b/core/database/README.md
index dd56166f1f..3ee07f244c 100644
--- a/core/database/README.md
+++ b/core/database/README.md
@@ -26,6 +26,7 @@ The `NodeInfoDao` implements specific logic to protect against impersonation and
 ```mermaid
 graph TB
   :core:database[database]:::android-library
+  :core:database -.-> :core:repository
   :core:database -.-> :core:common
   :core:database -.-> :core:di
   :core:database -.-> :core:model
diff --git a/core/network/README.md b/core/network/README.md
index e6507888aa..f826c27237 100644
--- a/core/network/README.md
+++ b/core/network/README.md
@@ -18,8 +18,10 @@ The module uses **Ktor** as its primary HTTP client for high-performance, asynch
 ```mermaid
 graph TB
   :core:network[network]:::android-library
+  :core:network --> :core:repository
   :core:network -.-> :core:di
   :core:network -.-> :core:model
+  :core:network -.-> :core:proto
 
 classDef android-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
 classDef android-application-compose fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
diff --git a/core/prefs/README.md b/core/prefs/README.md
index 71816e8bd5..ea99a70f80 100644
--- a/core/prefs/README.md
+++ b/core/prefs/README.md
@@ -19,6 +19,7 @@ Uses Kotlin property delegates to simplify reading and writing preferences.
 ```mermaid
 graph TB
   :core:prefs[prefs]:::android-library
+  :core:prefs -.-> :core:repository
 
 classDef android-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
 classDef android-application-compose fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
diff --git a/core/resources/src/commonMain/composeResources/values-zh-rCN/strings.xml b/core/resources/src/commonMain/composeResources/values-zh-rCN/strings.xml
index 5ffc2d6d5e..2a5ff134f3 100644
--- a/core/resources/src/commonMain/composeResources/values-zh-rCN/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-zh-rCN/strings.xml
@@ -310,6 +310,7 @@
     <string name="direct_message">私信</string>
     <string name="nodedb_reset">重置节点数据库</string>
     <string name="delivery_confirmed">已送达</string>
+    <string name="delivery_confirmed_reboot_warning">在应用设置时，您的设备可能会断开连接并重启。</string>
     <string name="error">错误</string>
     <string name="ignore">忽略</string>
     <string name="remove_ignored">从忽略中删除</string>
@@ -930,7 +931,9 @@
     <string name="map_type_terrain">地形</string>
     <string name="map_type_hybrid">混合</string>
     <string name="manage_map_layers">管理地图图层</string>
+    <string name="map_layer_formats">地图图层支持 .kml, .kmz, 或 GeoJSON 格式。</string>
     <string name="map_layers_title">地图图层</string>
+    <string name="no_map_layers_loaded">没有加载地图层</string>
     <string name="add_layer_button">添加图层</string>
     <string name="hide_layer">隐藏图层</string>
     <string name="show_layer">显示图层</string>
@@ -939,6 +942,10 @@
     <string name="nodes_at_this_location">在此位置的节点</string>
     <string name="selected_map_type">所选地图类型</string>
     <string name="manage_custom_tile_sources">管理自定义瓦片源</string>
+    <string name="add_custom_tile_source">添加网络瓷块源</string>
+    <string name="no_custom_tile_sources_found">未找到自定义源</string>
+    <string name="edit_custom_tile_source">编辑网络图层源</string>
+    <string name="delete_custom_tile_source">删除网络图层源</string>
     <string name="name_cannot_be_empty">名称不能为空。</string>
     <string name="provider_name_exists">服务提供商名已存在。</string>
     <string name="url_cannot_be_empty">URL 不能为空。</string>
@@ -1154,8 +1161,55 @@
     <string name="refresh">刷新</string>
     <string name="updated">更新</string>
     <!-- Network Map Layers -->
+    <string name="add_network_layer">添加网络图层</string>
+    <string name="refresh_layer">刷新图层</string>
+    <string name="local_mbtiles_file">本地MBTiles 文件</string>
+    <string name="add_local_mbtiles_file">添加本地MBTiles 文件</string>
+    <string name="error_invalid_custom_provider">自定义地图源的名称无效，URL模板或本地URI。</string>
+    <string name="error_provider_exists">此名称的自定义瓦片源已存在</string>
+    <string name="error_copy_mbtiles_failed">无法将 MBTiles 文件复制到内部存储</string>
+    <string name="tak">TAK (ATAK)</string>
+    <string name="tak_config">TAK 配置</string>
+    <string name="tak_team">队伍颜色</string>
+    <string name="tak_role">成员角色</string>
+    <string name="tak_team_unspecified_color">未指定</string>
+    <string name="tak_team_white">白色</string>
+    <string name="tak_team_yellow">黄色</string>
+    <string name="tak_team_orange">橙色</string>
+    <string name="tak_team_magenta">品红</string>
     <string name="tak_team_red">红</string>
+    <string name="tak_team_maroon">栗色</string>
+    <string name="tak_team_purple">紫色</string>
+    <string name="tak_team_dark_blue">深蓝色</string>
     <string name="tak_team_blue">蓝</string>
+    <string name="tak_team_cyan">蓝绿色</string>
+    <string name="tak_team_teal">蓝绿色</string>
     <string name="tak_team_green">绿</string>
+    <string name="tak_team_dark_green">深绿色</string>
+    <string name="tak_team_brown">棕色</string>
+    <string name="tak_role_unspecified">未指定</string>
+    <string name="tak_role_teammember">团队成员</string>
+    <string name="tak_role_teamlead">团队组长</string>
+    <string name="tak_role_hq">指挥中心</string>
+    <string name="tak_role_sniper">狙击手</string>
+    <string name="tak_role_medic">医疗</string>
+    <string name="tak_role_forwardobserver">转发观察员</string>
+    <string name="tak_role_rto">无线电电话操作员</string>
+    <string name="tak_role_k9">Doggo (K9)</string>
+    <string name="traffic_management">交通管理</string>
+    <string name="traffic_management_config">流量管理配置</string>
     <string name="traffic_management_enabled">开启模块</string>
+    <string name="traffic_management_position_dedup">调度位置</string>
+    <string name="traffic_management_position_precision">位置精度 (bits)</string>
+    <string name="traffic_management_position_min_interval">最小位置间隔(秒)</string>
+    <string name="traffic_management_nodeinfo_direct_response">节点信息直连响应</string>
+    <string name="traffic_management_nodeinfo_direct_response_max_hops">直接响应的最大节点数</string>
+    <string name="traffic_management_rate_limit_enabled">调用次数限制</string>
+    <string name="traffic_management_rate_limit_window">速度限制窗口 (秒)</string>
+    <string name="traffic_management_rate_limit_max_packets">窗口最大数据包</string>
+    <string name="traffic_management_drop_unknown_enabled">丢弃的未知包</string>
+    <string name="traffic_management_unknown_packet_threshold">未知包阈值</string>
+    <string name="traffic_management_exhaust_hop_telemetry">仅本地远程远程(中继)</string>
+    <string name="traffic_management_exhaust_hop_position">本地位置(中继)</string>
+    <string name="traffic_management_router_preserve_hops">保留路由跳数</string>
 </resources>