zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-08-01 16:15:56 +10:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge main into dev-gps

Browse Source 
- Resolved localization conflicts by keeping both GPS settings and room management strings
- Merged room management features from main
- Merged map and contacts screen updates from main
This commit is contained in:
zjs81
2026-01-19 18:51:02 -07:00
parent 98fc2d6e0a 2acba9eb84
commit 8387304d2a
30 changed files with 467 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/l10n/app_zh.arb
+3 -1
View File
@@ -1352,5 +1352,7 @@
"settings_locationGPSEnable": "启用GPS",
"settings_locationGPSEnableSubtitle": "启用GPS自动更新位置。",
"settings_locationIntervalSec": "GPS 间隔（秒）",
"settings_locationIntervalInvalid": "时间间隔必须至少为60秒，且小于86400秒。"
"settings_locationIntervalInvalid": "时间间隔必须至少为60秒，且小于86400秒。",
"contacts_manageRoom": "管理房间服务器",
"room_management": "房间服务器管理"
}