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
@@ -661,6 +661,9 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get contacts_manageRepeater => 'Wiederholungen verwalten';
@override
String get contacts_manageRoom => 'Verwalten Sie den Raumserver';
@override
String get contacts_roomLogin => 'Raum-Login';
@@ -1600,6 +1603,9 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get repeater_management => 'Repeater-Verwaltung';
@override
String get room_management => 'Raumserververwaltung';
@override
String get repeater_managementTools => 'Verwaltungs-Tools';