Merge main into dev-gps

- 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
30 changed files with 467 additions and 236 deletions
+6
View File
@@ -663,6 +663,9 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get contacts_manageRepeater => 'Gérer le répétiteur';
@override
String get contacts_manageRoom => 'Gérer le serveur de salle';
@override
String get contacts_roomLogin => 'Connexion Salle';
@@ -1605,6 +1608,9 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get repeater_management => 'Gestion des répétiteurs';
@override
String get room_management => 'Gestion du serveur de pièce';
@override
String get repeater_managementTools => 'Outils de Gestion';