zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-07-30 07:18:45 +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_fr.arb
+6 -4
View File
@@ -1349,8 +1349,10 @@
"channels_scanQrCodeComingSoon": "Bientôt disponible",
"channels_enterHashtag": "Entrez le hashtag",
"channels_hashtagHint": "ex. #équipe",
"settings_locationGPSEnableSubtitle": "Activer la mise à jour automatique de la position grâce au GPS.",
"settings_locationIntervalInvalid": "L'intervalle doit être d’au moins 60 secondes et inférieur à 86400 secondes.",
"settings_locationGPSEnable": "Activer le GPS",
"settings_locationIntervalSec": "Intervalle GPS (Secondes)"
"settings_locationGPSEnable": "Habilita GPS",
"settings_locationGPSEnableSubtitle": "Habilita la actualización automática de la ubicación mediante GPS.",
"settings_locationIntervalSec": "Intervalo pour GPS (Segundos)",
"settings_locationIntervalInvalid": "El intervalo debe ser de al menos 60 segundos y menor que 86400 segundos.",
"contacts_manageRoom": "Gestionar Servidor de Habitación",
"room_management": "Administración del Servidor de Habitación"
}