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

lib/l10n/app_en.arb

@@ -258,7 +258,8 @@
     }
   },
   "contacts_manageRepeater": "Manage Repeater",
-  "contacts_roomLogin": "Room Login",
+  "contacts_manageRoom": "Manage Room Server",
+  "contacts_roomLogin": "Room Server Login",
   "contacts_openChat": "Open Chat",
   "contacts_editGroup": "Edit Group",
   "contacts_deleteGroup": "Delete Group",
@@ -702,7 +703,7 @@
   "dialog_disconnectConfirm": "Are you sure you want to disconnect from this device?",
 
   "login_repeaterLogin": "Repeater Login",
-  "login_roomLogin": "Room Login",
+  "login_roomLogin": "Room Server Login",
   "login_password": "Password",
   "login_enterPassword": "Enter password",
   "login_savePassword": "Save password",
@@ -765,6 +766,7 @@
   "path_setPath": "Set Path",
 
   "repeater_management": "Repeater Management",
+  "room_management": "Room Server Management",
   "repeater_managementTools": "Management Tools",
   "repeater_status": "Status",
   "repeater_statusSubtitle": "View repeater status, stats, and neighbors",