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
+3 -1
View File
@@ -1350,7 +1350,9 @@
"channels_enterHashtag": "Voer hashtag in",
"channels_hashtagHint": "bijv. #team",
"settings_locationGPSEnable": "GPS inschakelen",
"settings_locationGPSEnableSubtitle": "Activeer automatisch locatieupdates via GPS.",
"settings_locationIntervalSec": "Interval voor GPS (Seconden)",
"settings_locationIntervalInvalid": "De intervallen moeten minstens 60 seconden zijn en minder dan 86400 seconden.",
"settings_locationGPSEnableSubtitle": "Activeer automatisch locatieupdates via GPS."
"contacts_manageRoom": "Beheer Ruimte Server",
"room_management": "Beheer Server Kamer"
}