Merge branch '2.7.6' into firmware-updates

# Conflicts:
#	Localizable.xcstrings
#	Meshtastic.xcodeproj/project.pbxproj
#	Meshtastic.xcworkspace/xcshareddata/swiftpm/Package.resolved
This commit is contained in:
Jake-B 2025-12-18 07:27:11 -05:00
commit 2c131599cd
43 changed files with 1909 additions and 3954 deletions

View file

@ -3891,7 +3891,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Ambient Lighting module config received: %@"
"value" : "收到环境照明模块配置: %@"
}
},
"zh-Hant-TW" : {
@ -5179,6 +5179,12 @@
}
}
}
},
"Bearing: %@" : {
},
"Bearing: N/A" : {
},
"Begin Update" : {
"comment" : "A button that initiates the process of flashing new firmware to a device.",
@ -5511,7 +5517,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Bluetooth config received: %@"
"value" : "收到蓝牙配置: %@"
}
},
"zh-Hant-TW" : {
@ -6179,7 +6185,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Canned Message module config received: %@"
"value" : "收到预设消息模块配置: %@"
}
},
"zh-Hant-TW" : {
@ -6365,7 +6371,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Canned Messages Messages Received For: %@"
"value" : "收到预设消息: %@"
}
},
"zh-Hant-TW" : {
@ -8146,6 +8152,9 @@
}
}
}
},
"Compass" : {
},
"Config" : {
"localizations" : {
@ -10491,7 +10500,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Detection Sensor module config received: %@"
"value" : "收到检测传感器模块配置: %@"
}
},
"zh-Hant-TW" : {
@ -10717,7 +10726,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Device config received: %@"
"value" : "收到设备配置: %@"
}
},
"zh-Hant-TW" : {
@ -10901,7 +10910,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Device Metadata admin message received from: %@"
"value" : "已收到来自设备元数据管理员的消息, 来自: %@"
}
},
"zh-Hant-TW" : {
@ -11878,7 +11887,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Display config received: %@"
"value" : "收到显示屏配置: %@"
}
},
"zh-Hant-TW" : {
@ -11912,7 +11921,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "示华氏度"
"value" : "示华氏度"
}
},
"zh-Hant-TW" : {
@ -12078,6 +12087,9 @@
}
}
}
},
"Distance: %@" : {
},
"Documentation" : {
"localizations" : {
@ -12164,7 +12176,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "双击作为按钮"
"value" : "双击代替按钮"
}
},
"zh-Hant-TW" : {
@ -12510,7 +12522,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "回"
"value" : "回"
}
},
"zh-Hant-TW" : {
@ -13501,7 +13513,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "除所有 App 数据?"
"value" : "除所有 App 数据?"
}
},
"zh-Hant-TW" : {
@ -13541,7 +13553,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "除所有设备和 App 数据?"
"value" : "除所有设备和 App 数据?"
}
},
"zh-Hant-TW" : {
@ -14191,7 +14203,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "External Notification module config received: %@"
"value" : "收到外部通知模块配置: %@"
}
},
"zh-Hant-TW" : {
@ -14812,7 +14824,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Finish"
"value" : "完成"
}
},
"zh-Hant-TW" : {
@ -14911,7 +14923,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "固件升级文"
"value" : "固件升级文"
}
},
"zh-Hant-TW" : {
@ -16564,7 +16576,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "GPS Receive GPIO"
"value" : "GPS 接收 GPIO"
}
},
"zh-Hant-TW" : {
@ -16598,7 +16610,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "GPS Transmit GPIO"
"value" : "GPS 发送 GPIO"
}
},
"zh-Hant-TW" : {
@ -18134,7 +18146,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "如果难以访问设备的重置按钮,请在此进入 DFU 模式。"
"value" : "如果难以触及设备的重置按钮,请在此进入 DFU 模式。"
}
},
"zh-Hant-TW" : {
@ -18168,7 +18180,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "如果设置,您发送的任何数据包都会回传到设备。"
"value" : "如果设置,您发送的任何数据包都会回传到设备。"
}
},
"zh-Hant-TW" : {
@ -18764,7 +18776,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "倒置顶栏,用于双色显示"
"value" : "倒置顶栏,用于双色显示"
}
},
"zh-Hant-TW" : {
@ -20187,7 +20199,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "LoRa config received: %@"
"value" : "收到 LoRa 配置: %@"
}
},
"zh-Hant-TW" : {
@ -21371,7 +21383,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Message received from the text message app."
"value" : "收到来自短信应用的消息。"
}
},
"zh-Hant-TW" : {
@ -22378,7 +22390,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "MyInfo received: %@"
"value" : "收到我的消息: %@"
}
},
"zh-Hant-TW" : {
@ -22738,7 +22750,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Network config received: %@"
"value" : "收到网络配置: %@"
}
},
"zh-Hant-TW" : {
@ -24964,6 +24976,9 @@
}
}
}
},
"Open Compass" : {
},
"Open Settings" : {
"localizations" : {
@ -25958,7 +25973,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "PAX Counter message received for: %@"
"value" : "收到 PAX 计数信息: %@"
}
},
"zh-Hant-TW" : {
@ -27694,7 +27709,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Process"
"value" : "处理"
}
},
"zh-Hant-TW" : {
@ -29480,7 +29495,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Requested Canned Messages Module Messages for node: %@"
"value" : "请求的节点预设消息模块消息: %@"
}
},
"zh-Hant-TW" : {
@ -30608,7 +30623,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Routing received for RequestID: %@ Ack Status: %@"
"value" : "收到请求ID为 %@ 的路由, Ack 状态: %@"
}
},
"zh-Hant-TW" : {
@ -30756,7 +30771,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "RTTTL Ringtone config received: %@"
"value" : "收到 RTTTL 铃声配置: %@"
}
},
"zh-Hant-TW" : {
@ -32567,7 +32582,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sent a Channel for: %@ Channel Index %d"
"value" : "已发送频道: %@ 频道索引 %d"
}
},
"zh-Hant-TW" : {
@ -32631,7 +32646,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sent a LoRa.Config for: %@"
"value" : "发送 LoRa.Config 给: %@"
}
},
"zh-Hant-TW" : {
@ -32696,7 +32711,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sent a Position Packet from the Apple device GPS to node: %@"
"value" : "从苹果设备 GPS 发送定位数据包给节点: %@"
}
},
"zh-Hant-TW" : {
@ -32760,7 +32775,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sent a Trace Route Request to node: %@"
"value" : "发送跟踪路由请求到节点: %@"
}
},
"zh-Hant-TW" : {
@ -32824,7 +32839,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sent a Waypoint Packet from: %@"
"value" : "发送来自的航点数据包: %@"
}
},
"zh-Hant-TW" : {
@ -32888,7 +32903,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sent message %@ from %@ to %@"
"value" : "发送消息 %@ 来自 %@ 给 %@"
}
},
"zh-Hant-TW" : {
@ -33210,7 +33225,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Serial module config received: %@"
"value" : "收到串口模块配置: %@"
}
},
"zh-Hant-TW" : {
@ -35403,7 +35418,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Store & Forward module config received: %@"
"value" : "收到存储和转发模块配置: %@"
}
},
"zh-Hant-TW" : {
@ -36026,7 +36041,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Telemetry module config received: %@"
"value" : "收到遥测模块配置: %@"
}
},
"zh-Hant-TW" : {
@ -38297,7 +38312,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Trace Route request returned: %@"
"value" : "跟踪路由请求回复: %@"
}
},
"zh-Hant-TW" : {
@ -41355,7 +41370,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Waypoint Packet received from node: %@"
"value" : "收到航点数据包, 来自节点: %@"
}
},
"zh-Hant-TW" : {
@ -41545,7 +41560,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "锁意味着什么?"
"value" : "锁头图标含义"
}
},
"zh-Hant-TW" : {
@ -41585,7 +41600,7 @@
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "什么是 Meshtastic?"
"value" : "Meshtastic 是什么?"
}
},
"zh-Hant-TW" : {