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_bg.arb

@@ -1352,5 +1352,7 @@
   "settings_locationIntervalSec": "Интервал за GPS (Секунди)",
   "settings_locationGPSEnable": "Активиране на GPS",
   "settings_locationGPSEnableSubtitle": "Активирайте автоматичното актуализиране на местоположението чрез GPS.",
-  "settings_locationIntervalInvalid": "Интервалът трябва да бъде поне 60 секунди и по-малко от 86400 секунди."
+  "settings_locationIntervalInvalid": "Интервалът трябва да бъде поне 60 секунди и по-малко от 86400 секунди.",
+  "room_management": "Управление на сървъра за стая",
+  "contacts_manageRoom": "Управление на сървър за стая"
 }

lib/l10n/app_de.arb

@@ -1348,9 +1348,5 @@
   "channels_scanQrCode": "Scannen Sie einen QR-Code",
   "channels_scanQrCodeComingSoon": "Bald verfügbar",
   "channels_enterHashtag": "Gib Hashtag ein",
-  "channels_hashtagHint": "z.B. #team",
-  "settings_locationGPSEnable": "GPS aktivieren",
-  "settings_locationGPSEnableSubtitle": "Aktivieren Sie die automatische Aktualisierung der Standortdaten per GPS.",
-  "settings_locationIntervalInvalid": "Der Zeitraum muss mindestens 60 Sekunden betragen und weniger als 86400 Sekunden sein.",
-  "settings_locationIntervalSec": "Zeitintervall für GPS (Sekunden)"
+  "channels_hashtagHint": "z.B. #team"
 }

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",

lib/l10n/app_es.arb

@@ -1353,4 +1353,6 @@
   "settings_locationGPSEnableSubtitle": "Habilita la actualización automática de la ubicación mediante GPS.",
   "settings_locationIntervalSec": "Intervalo para 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"
 }

lib/l10n/app_fr.arb

@@ -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"
 }

lib/l10n/app_it.arb

@@ -1352,5 +1352,7 @@
   "settings_locationGPSEnable": "Abilita GPS",
   "settings_locationGPSEnableSubtitle": "Abilita l'aggiornamento automatico della posizione tramite GPS.",
   "settings_locationIntervalSec": "Intervallo GPS (Secondi)",
-  "settings_locationIntervalInvalid": "L'intervallo deve essere di almeno 60 secondi e inferiore a 86400 secondi."
+  "settings_locationIntervalInvalid": "L'intervallo deve essere di almeno 60 secondi e inferiore a 86400 secondi.",
+  "contacts_manageRoom": "Gestisci Server Camera",
+  "room_management": "Gestione del Server di Camera"
 }

lib/l10n/app_localizations.dart

@@ -1308,10 +1308,16 @@ abstract class AppLocalizations {
   /// **'Manage Repeater'**
   String get contacts_manageRepeater;
 
+  /// No description provided for @contacts_manageRoom.
+  ///
+  /// In en, this message translates to:
+  /// **'Manage Room Server'**
+  String get contacts_manageRoom;
+
   /// No description provided for @contacts_roomLogin.
   ///
   /// In en, this message translates to:
-  /// **'Room Login'**
+  /// **'Room Server Login'**
   String get contacts_roomLogin;
 
   /// No description provided for @contacts_openChat.
@@ -2696,7 +2702,7 @@ abstract class AppLocalizations {
   /// No description provided for @login_roomLogin.
   ///
   /// In en, this message translates to:
-  /// **'Room Login'**
+  /// **'Room Server Login'**
   String get login_roomLogin;
 
   /// No description provided for @login_password.
@@ -2891,6 +2897,12 @@ abstract class AppLocalizations {
   /// **'Repeater Management'**
   String get repeater_management;
 
+  /// No description provided for @room_management.
+  ///
+  /// In en, this message translates to:
+  /// **'Room Server Management'**
+  String get room_management;
+
   /// No description provided for @repeater_managementTools.
   ///
   /// In en, this message translates to:

lib/l10n/app_localizations_bg.dart

@@ -664,6 +664,9 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Управление на Повтарящ се Елемент';
 
+  @override
+  String get contacts_manageRoom => 'Управление на сървър за стая';
+
   @override
   String get contacts_roomLogin => 'Вход в стаята';
 
@@ -1601,6 +1604,9 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get repeater_management => 'Управление на повторители';
 
+  @override
+  String get room_management => 'Управление на сървъра за стая';
+
   @override
   String get repeater_managementTools => 'Инструменти за управление';
 

lib/l10n/app_localizations_de.dart

@@ -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';
 

lib/l10n/app_localizations_en.dart

@@ -655,7 +655,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String get contacts_manageRepeater => 'Manage Repeater';
 
   @override
-  String get contacts_roomLogin => 'Room Login';
+  String get contacts_manageRoom => 'Manage Room Server';
+
+  @override
+  String get contacts_roomLogin => 'Room Server Login';
 
   @override
   String get contacts_openChat => 'Open Chat';
@@ -1453,7 +1456,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get login_repeaterLogin => 'Repeater Login';
 
   @override
-  String get login_roomLogin => 'Room Login';
+  String get login_roomLogin => 'Room Server Login';
 
   @override
   String get login_password => 'Password';
@@ -1575,6 +1578,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get repeater_management => 'Repeater Management';
 
+  @override
+  String get room_management => 'Room Server Management';
+
   @override
   String get repeater_managementTools => 'Management Tools';
 

lib/l10n/app_localizations_es.dart

@@ -662,6 +662,9 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Gestionar Repetidor';
 
+  @override
+  String get contacts_manageRoom => 'Gestionar Servidor de Habitación';
+
   @override
   String get contacts_roomLogin => 'Inicio de Sala';
 
@@ -1599,6 +1602,9 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get repeater_management => 'Gestión de Repetidores';
 
+  @override
+  String get room_management => 'Administración del Servidor de Habitación';
+
   @override
   String get repeater_managementTools => 'Herramientas de Gestión';
 

lib/l10n/app_localizations_fr.dart

@@ -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';
 

lib/l10n/app_localizations_it.dart

@@ -660,6 +660,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Gestisci Ripetitore';
 
+  @override
+  String get contacts_manageRoom => 'Gestisci Server Camera';
+
   @override
   String get contacts_roomLogin => 'Login Camera';
 
@@ -1597,6 +1600,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get repeater_management => 'Gestione Ripetitori';
 
+  @override
+  String get room_management => 'Gestione del Server di Camera';
+
   @override
   String get repeater_managementTools => 'Strumenti di Gestione';
 

lib/l10n/app_localizations_nl.dart

@@ -658,6 +658,9 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Beheer Repeater';
 
+  @override
+  String get contacts_manageRoom => 'Beheer Ruimte Server';
+
   @override
   String get contacts_roomLogin => 'Ruimte Inloggen';
 
@@ -1592,6 +1595,9 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get repeater_management => 'Beheer Repeaters';
 
+  @override
+  String get room_management => 'Beheer Server Kamer';
+
   @override
   String get repeater_managementTools => 'Beheerinstrumenten';
 

lib/l10n/app_localizations_pl.dart

@@ -663,6 +663,9 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Zarządzaj Powtórzami';
 
+  @override
+  String get contacts_manageRoom => 'Zarządzaj Serwerem Pokoju';
+
   @override
   String get contacts_roomLogin => 'Logowanie do pokoju';
 
@@ -1601,6 +1604,9 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get repeater_management => 'Zarządzanie Powtórzami';
 
+  @override
+  String get room_management => 'Zarządzanie Serwerem Pokoju';
+
   @override
   String get repeater_managementTools => 'Narzędzia Zarządzania';
 

lib/l10n/app_localizations_pt.dart

@@ -663,6 +663,9 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Gerenciar Repetidor';
 
+  @override
+  String get contacts_manageRoom => 'Gerenciar Servidor de Sala';
+
   @override
   String get contacts_roomLogin => 'Login no Quarto';
 
@@ -1599,6 +1602,9 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get repeater_management => 'Gerenciamento de Repetidor';
 
+  @override
+  String get room_management => 'Gerenciamento de Servidor de Sala';
+
   @override
   String get repeater_managementTools => 'Ferramentas de Gerenciamento';
 

lib/l10n/app_localizations_sk.dart

@@ -656,6 +656,9 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Spravovať opakované zoznamy';
 
+  @override
+  String get contacts_manageRoom => 'Spravovať server miestnosti';
+
   @override
   String get contacts_roomLogin => 'Prihlásenie do miestnosti';
 
@@ -1594,6 +1597,9 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get repeater_management => 'Správa opakérov';
 
+  @override
+  String get room_management => 'Správa servera miestnosti';
+
   @override
   String get repeater_managementTools => 'Nástroje na správu';
 

lib/l10n/app_localizations_sl.dart

@@ -658,6 +658,9 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Upravljajte Ponovitve';
 
+  @override
+  String get contacts_manageRoom => 'Upravljajte strežnik sobe';
+
   @override
   String get contacts_roomLogin => 'Vnos v sobo';
 
@@ -1594,6 +1597,9 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get repeater_management => 'Upravljanje ponovitve';
 
+  @override
+  String get room_management => 'Upravljanje stremlišča';
+
   @override
   String get repeater_managementTools => 'Upravne orodje';
 

lib/l10n/app_localizations_sv.dart

@@ -652,6 +652,9 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get contacts_manageRepeater => 'Hantera Upprepare';
 
+  @override
+  String get contacts_manageRoom => 'Hantera Rumserver';
+
   @override
   String get contacts_roomLogin => 'Rum Inloggning';
 
@@ -1583,6 +1586,9 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get repeater_management => 'Återuppspelarens Hantering';
 
+  @override
+  String get room_management => 'Rumserverhantering';
+
   @override
   String get repeater_managementTools => 'Administrationsverktyg';
 

lib/l10n/app_localizations_zh.dart

@@ -623,6 +623,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get contacts_manageRepeater => '管理重复项';
 
+  @override
+  String get contacts_manageRoom => '管理房间服务器';
+
   @override
   String get contacts_roomLogin => '房间登录';
 
@@ -1525,6 +1528,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get repeater_management => '重复器管理';
 
+  @override
+  String get room_management => '房间服务器管理';
+
   @override
   String get repeater_managementTools => '管理工具';
 

lib/l10n/app_nl.arb

@@ -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"
 }

lib/l10n/app_pl.arb

@@ -1350,7 +1350,9 @@
   "channels_enterHashtag": "Wprowadź hashtag",
   "channels_hashtagHint": "np. #zespół",
   "settings_locationGPSEnable": "Włącz GPS",
-  "settings_locationIntervalSec": "Interwał dla GPS (Sekundy)",
   "settings_locationGPSEnableSubtitle": "Włącza automatyczne aktualizowanie pozycji za pomocą GPS.",
-  "settings_locationIntervalInvalid": "Interwał musi wynosić co najmniej 60 sekund i mniej niż 86400 sekund."
+  "settings_locationIntervalSec": "Interwał dla GPS (Sekundy)",
+  "settings_locationIntervalInvalid": "Interwał musi wynosić co najmniej 60 sekund i mniej niż 86400 sekund.",
+  "contacts_manageRoom": "Zarządzaj Serwerem Pokoju",
+  "room_management": "Zarządzanie Serwerem Pokoju"
 }

lib/l10n/app_pt.arb

@@ -1353,4 +1353,6 @@
   "settings_locationGPSEnableSubtitle": "Habilita a atualização automática da localização via GPS.",
   "settings_locationIntervalInvalid": "O intervalo deve ser de pelo menos 60 segundos e inferior a 86400 segundos.",
   "settings_locationIntervalSec": "Intervalo para GPS (Segundos)"
+  "contacts_manageRoom": "Gerenciar Servidor de Sala",
+  "room_management": "Gerenciamento de Servidor de Sala"
 }

lib/l10n/app_sk.arb

@@ -559,7 +559,7 @@
   "chat_setCustomPath": "Nastaviť vlastnú cestu",
   "chat_setCustomPathSubtitle": "Ručne zadajte trasu.",
   "chat_clearPath": "Vyčistiš cestu",
-  "chat_clearPathSubtitle": "Znovu nájsť vynútene pri nasledujacej pošlite",
+  "chat_clearPathSubtitle": "Znovu nájsť vynútene pri nasledujúcej pošlite",
   "chat_pathCleared": "Cesta vyčistená. Nasledujúce prepočetné získa trasu znova.",
   "chat_floodModeSubtitle": "Použite prepínanie trasy v navigačnom paneli.",
   "chat_floodModeEnabled": "Odosporňovacia prevádzka je zapnutá. Vypnite ju znova cez ikonu routovania v navigačnom páse.",
@@ -1352,5 +1352,7 @@
   "settings_locationGPSEnable": "Aktivovať GPS",
   "settings_locationGPSEnableSubtitle": "Povolí automatické aktualizovanie polohy pomocou GPS.",
   "settings_locationIntervalSec": "Interval pre GPS (Sekundy)",
-  "settings_locationIntervalInvalid": "Interval musí byť aspoň 60 sekúnd a menej ako 86400 sekúnd."
+  "settings_locationIntervalInvalid": "Interval musí byť aspoň 60 sekúnd a menej ako 86400 sekúnd.",
+  "contacts_manageRoom": "Spravovať server miestnosti",
+  "room_management": "Správa servera miestnosti"
 }

lib/l10n/app_sl.arb

@@ -176,7 +176,7 @@
   "appSettings_languageBg": "Български",
   "appSettings_notifications": "Obveščanja",
   "appSettings_enableNotifications": "Omogoči obveščanje",
-  "appSettings_enableNotificationsSubtitle": "Prejmujte obvestila o sporočilih in oglasih",
+  "appSettings_enableNotificationsSubtitle": "Prejmite obvestila o sporočilih in oglasih",
   "appSettings_notificationPermissionDenied": "Odobritev obvestila zavrnjena",
   "appSettings_notificationsEnabled": "Obvestila omogočena",
   "appSettings_notificationsDisabled": "Obvestila so izklopljena",
@@ -256,7 +256,7 @@
   "contacts_contactsWillAppear": "Kontakti se bodo prikazali, ko naprave oglasijo.",
   "contacts_searchContacts": "Iskanje kontaktov...",
   "contacts_noUnreadContacts": "Nerešeno kontaktov.",
-  "contacts_noContactsFound": "Niti ena osebe ali skupine ni najdena.",
+  "contacts_noContactsFound": "Niti ena oseba ali skupine ni najdena.",
   "contacts_deleteContact": "Izbrisati Kontakt",
   "contacts_removeConfirm": "Izbrisati {contactName} iz kontaktov?",
   "@contacts_removeConfirm": {
@@ -291,7 +291,7 @@
     }
   },
   "contacts_filterContacts": "Filtri kontakt\\,...",
-  "contacts_noContactsMatchFilter": "Niti ena osebe ne ustreza vašemu kriteriju.",
+  "contacts_noContactsMatchFilter": "Niti ena oseba ne ustreza vašemu kriteriju.",
   "contacts_noMembers": "Nič članov.",
   "contacts_lastSeenNow": "Datum zadnjega vpisa zdaj",
   "contacts_lastSeenMinsAgo": "Zadnjič videti {minutes} minut nazaj",
@@ -606,7 +606,7 @@
   },
   "map_title": "Mapa omrežja",
   "map_noNodesWithLocation": "Nihče od notranjih elementov nima podatkov o lokaciji.",
-  "map_nodesNeedGps": "Omrežje morajo deliti svoje GPS koordinate,\nda se prikazajo na zemljeobrazniku.",
+  "map_nodesNeedGps": "Omrežje morajo deliti svoje GPS koordinate,\nda se prikazao na zemljeobrazniku.",
   "map_nodesCount": "Omize: {count}",
   "@map_nodesCount": {
     "placeholders": {
@@ -1351,6 +1351,8 @@
   "channels_hashtagHint": "npr. #ekipa",
   "settings_locationGPSEnable": "Omogoči GPS",
   "settings_locationGPSEnableSubtitle": "Omogoči samodejno posodabljanje lokacije z GPS-jem.",
+  "settings_locationIntervalSec": "Interval za GPS (Sekunde)",
   "settings_locationIntervalInvalid": "Intervallo mora biti vsaj 60 sekund in manj kot 86400 sekund.",
-  "settings_locationIntervalSec": "Interval za GPS (Sekunde)"
+  "contacts_manageRoom": "Upravljajte strežnik sobe",
+  "room_management": "Upravljanje stremlišča"
 }

lib/l10n/app_sv.arb

@@ -1349,8 +1349,10 @@
   "channels_scanQrCodeComingSoon": "Kommer snart",
   "channels_enterHashtag": "Ange hashtag",
   "channels_hashtagHint": "t.ex. #team",
-  "settings_locationGPSEnableSubtitle": "Aktiverar automatiska uppdateringar av platsen med hjälp av GPS.",
   "settings_locationGPSEnable": "Aktivera GPS",
+  "settings_locationGPSEnableSubtitle": "Aktivera automatiska uppdateringar av platsen med hjälp av GPS.",
   "settings_locationIntervalSec": "Interval för GPS (Sekunder)",
-  "settings_locationIntervalInvalid": "Intervalet måste vara minst 60 sekunder och mindre än 86400 sekunder."
+  "settings_locationIntervalInvalid": "Intervalet måste vara minst 60 sekunder och mindre än 86400 sekunder.",
+  "contacts_manageRoom": "Hantera Rumserver",
+  "room_management": "Rumserverhantering"
 }

lib/l10n/app_zh.arb

@@ -1352,5 +1352,7 @@
   "settings_locationGPSEnable": "启用GPS",
   "settings_locationGPSEnableSubtitle": "启用GPS自动更新位置。",
   "settings_locationIntervalSec": "GPS 间隔（秒）",
-  "settings_locationIntervalInvalid": "时间间隔必须至少为60秒，且小于86400秒。"
+  "settings_locationIntervalInvalid": "时间间隔必须至少为60秒，且小于86400秒。",
+  "contacts_manageRoom": "管理房间服务器",
+  "room_management": "房间服务器管理"
 }