meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2.7.10' into copilot/improve-routing-speed

Browse source 
Resolve merge conflicts in:
- Localizable.xcstrings (new translation keys from 2.7.10)
- MeshtasticTests/RouterTests.swift (trailing comma style)
- MeshtasticTests/ConnectViewTests.swift (trailing comma style)

Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-04-05 01:47:50 +00:00 • committed by GitHub
commit eb9b0ff2c9
82 changed files with 1095 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

164
Localizable.xcstrings
View file

@ -2,7 +2,6 @@
"sourceLanguage" : "en",
"strings" : {
"" : {
"shouldTranslate" : false,
"localizations" : {
"da" : {
"stringUnit" : {
@ -10,7 +9,8 @@
"value" : ""
}
}
}
},
"shouldTranslate" : false
},
"\t%@" : {
"localizations" : {
@ -225,12 +225,12 @@
},
"shouldTranslate" : false
},
" : %@" : {
": %@" : {
"localizations" : {
"da" : {
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %@"
"value" : ": %@"
}
},
"es" : {
@ -242,42 +242,42 @@
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %@"
"value" : ": %@"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %@"
"value" : ": %@"
}
},
"sr" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %@"
"value" : ": %@"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %@"
"value" : ": %@"
}
},
"zh-Hant-TW" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %@"
"value" : ": %@"
}
}
},
"shouldTranslate" : false
},
" : %d" : {
": %d" : {
"localizations" : {
"da" : {
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %d"
"value" : ": %d"
}
},
"es" : {
@ -289,31 +289,31 @@
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %d"
"value" : ": %d"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %d"
"value" : ": %d"
}
},
"sr" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %d"
"value" : ": %d"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %d"
"value" : ": %d"
}
},
"zh-Hant-TW" : {
"stringUnit" : {
"state" : "translated",
"value" : " : %d"
"value" : ": %d"
}
}
},
@ -3018,7 +3018,9 @@
}
}
},
"A default self-signed certificate is included for localhost connections. Import a custom .p12 if needed. Client CA (.pem) validates connecting TAK clients." : {},
"A default self-signed certificate is included for localhost connections. Import a custom .p12 if needed. Client CA (.pem) validates connecting TAK clients." : {
},
"A green lock means the channel is securely encrypted with either a 128 or 256 bit AES key." : {
"localizations" : {
"es" : {
@ -3863,7 +3865,9 @@
}
}
},
"Add CA" : {},
"Add CA" : {
},
"Add Channel" : {
"localizations" : {
"da" : {
@ -11484,8 +11488,12 @@
}
}
},
"Client CA Certificate" : {},
"Client Configuration" : {},
"Client CA Certificate" : {
},
"Client Configuration" : {
},
"Client Hidden" : {
"extractionState" : "stale",
"localizations" : {
@ -12186,7 +12194,9 @@
}
}
},
"Configuration" : {},
"Configuration" : {
},
"Configuration for: %@" : {
"localizations" : {
"da" : {
@ -13804,6 +13814,9 @@
}
}
}
},
"Created by:" : {
},
"Created: %@" : {
"localizations" : {
@ -14570,7 +14583,9 @@
}
}
},
"Delete All" : {},
"Delete All" : {
},
"Delete all config, keys and BLE bonds? " : {
"localizations" : {
"es" : {
@ -18174,7 +18189,9 @@
}
}
},
"Download TAK Server Data Package" : {},
"Download TAK Server Data Package" : {
},
"Drag & Drop Firmware Update" : {
"localizations" : {
"da" : {
@ -18961,7 +18978,9 @@
}
}
},
"Enable TAK Server" : {},
"Enable TAK Server" : {
},
"Enable this device as a Store and Forward server. Requires an ESP32 device with PSRAM." : {
"localizations" : {
"da" : {
@ -19728,8 +19747,12 @@
}
}
},
"Enter P12 Password" : {},
"Enter the password for the PKCS#12 file" : {},
"Enter P12 Password" : {
},
"Enter the password for the PKCS#12 file" : {
},
"environment" : {
"extractionState" : "stale",
"localizations" : {
@ -23771,7 +23794,9 @@
}
}
},
"Generate a data package (.zip) to configure TAK clients to connect to this server." : {},
"Generate a data package (.zip) to configure TAK clients to connect to this server." : {
},
"Generate a new private key to replace the one currently in use. The public key will automatically be regenerated from your private key." : {
"localizations" : {
"es" : {
@ -27266,10 +27291,18 @@
}
}
},
"Import" : {},
"Import .pem" : {},
"Import Custom .p12" : {},
"Import Error" : {},
"Import" : {
},
"Import .pem" : {
},
"Import Custom .p12" : {
},
"Import Error" : {
},
"Import Route" : {
"localizations" : {
"da" : {
@ -28388,6 +28421,9 @@
}
}
}
},
"Last updated by:" : {
},
"Later" : {
"comment" : "A button that dismisses an alert without taking any action.",
@ -31354,6 +31390,10 @@
"comment" : "A description of the read-only mode feature in TAK Server.",
"isCommentAutoGenerated" : true
},
"Meshtastic does not collect any personal information. We do anonymously collect usage and crash data to improve the app. This helps us understand how the app is being used and where we can make improvements. The data we collect is non-personally identifiable and cannot be linked to you as an individual. You can opt out of this under app settings." : {
"comment" : "Privacy policy text for Meshtastic.",
"isCommentAutoGenerated" : true
},
"Meshtastic does not collect any personal information. We do anonymously collect usage and crash data to improve the app. You can opt out under app settings." : {
"localizations" : {
"es" : {
@ -32997,7 +33037,9 @@
}
}
},
"mTLS" : {},
"mTLS" : {
},
"Multiplier" : {
"localizations" : {
"da" : {
@ -39159,7 +39201,9 @@
}
}
},
"Port" : {},
"Port" : {
},
"Position" : {
"localizations" : {
"da" : {
@ -42816,7 +42860,9 @@
}
}
},
"Reload Bundled Certificates" : {},
"Reload Bundled Certificates" : {
},
"Remote administration for: %@" : {
"localizations" : {
"da" : {
@ -43623,7 +43669,9 @@
}
}
},
"Reset to Default" : {},
"Reset to Default" : {
},
"Restart" : {
"localizations" : {
"da" : {
@ -43676,7 +43724,9 @@
}
}
},
"Restart Server" : {},
"Restart Server" : {
},
"Restart to the node you are connected to" : {
"localizations" : {
"da" : {
@ -46448,8 +46498,6 @@
}
}
},
"Secure mTLS connection on port 8089. Both server and client certificates are required." : {},
"Secure mTLS connection on port 8089. Both server and client certificates are required. TAK Channel Index selects the channel index where TAK messages will be sent." : {
"comment" : "A footer for the TAK Server configuration section.",
"isCommentAutoGenerated" : true
@ -49143,7 +49191,9 @@
}
}
},
"Server Certificate" : {},
"Server Certificate" : {
},
"Server Option" : {
"localizations" : {
"da" : {
@ -49190,7 +49240,9 @@
}
}
},
"Server Status" : {},
"Server Status" : {
},
"Set" : {
"localizations" : {
"da" : {
@ -49237,6 +49289,10 @@
}
}
},
"Set a channel name" : {
"comment" : "A label for a button that sets a channel name.",
"isCommentAutoGenerated" : true
},
"Set LoRa Region" : {
"localizations" : {
"da" : {
@ -49856,6 +49912,10 @@
}
}
},
"Share with TAK Buddies" : {
"comment" : "A button that shares the QR code with TAK buddies.",
"isCommentAutoGenerated" : true
},
"Share your location in real-time and keep your group coordinated with integrated GPS features." : {
"localizations" : {
"de" : {
@ -52018,7 +52078,9 @@
}
}
},
"Status" : {},
"Status" : {
},
"Stay Connected Anywhere" : {
"localizations" : {
"de" : {
@ -52658,7 +52720,17 @@
}
},
"TAK Server" : {},
"TAK Cannot Be Used on Public Channel" : {
"comment" : "A warning displayed when the user's primary channel is public.",
"isCommentAutoGenerated" : true
},
"TAK Channel Index" : {
"comment" : "A label for the TAK channel index.",
"isCommentAutoGenerated" : true
},
"TAK Server" : {
},
"TAK Tracker" : {
"extractionState" : "stale",
"localizations" : {
@ -55989,7 +56061,9 @@
}
}
},
"TLS Certificates" : {},
"TLS Certificates" : {
},
"TLS Enabled" : {
"localizations" : {
"da" : {