zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-07-27 14:06:38 +10:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge main into dev-gps

Browse Source 
- 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
parent 98fc2d6e0a 2acba9eb84
commit 8387304d2a
30 changed files with 467 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/l10n/app_localizations.dart
+14 -2
View File
@@ -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: