mirror of
https://github.com/zjs81/meshcore-open.git
synced 2026-08-01 16:15:56 +10:00
Merge remote-tracking branch 'origin/dev' into gps-toggle-in-settings
# Conflicts: # lib/l10n/app_bg.arb # lib/l10n/app_de.arb # lib/l10n/app_es.arb # lib/l10n/app_fr.arb # lib/l10n/app_hu.arb # lib/l10n/app_it.arb # lib/l10n/app_ja.arb # lib/l10n/app_ko.arb # lib/l10n/app_localizations_es.dart # lib/l10n/app_localizations_it.dart # lib/l10n/app_localizations_nl.dart # lib/l10n/app_localizations_pt.dart # lib/l10n/app_localizations_sv.dart # lib/l10n/app_localizations_uk.dart # lib/l10n/app_nl.arb # lib/l10n/app_pl.arb # lib/l10n/app_pt.arb # lib/l10n/app_ru.arb # lib/l10n/app_sk.arb # lib/l10n/app_sl.arb # lib/l10n/app_sv.arb # lib/l10n/app_uk.arb # lib/l10n/app_zh.arb
This commit is contained in:
@@ -44,6 +44,9 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get common_close => 'Close';
|
||||
|
||||
@override
|
||||
String get common_done => 'Done';
|
||||
|
||||
@override
|
||||
String get common_edit => 'Edit';
|
||||
|
||||
@@ -427,9 +430,7 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
String get settings_advertLocationSubtitle => 'Include location in advert.';
|
||||
|
||||
@override
|
||||
String settings_multiAck(String value) {
|
||||
return 'Multi-ACKs: $value';
|
||||
}
|
||||
String get settings_multiAck => 'Multi-ACKs';
|
||||
|
||||
@override
|
||||
String get settings_telemetryModeUpdated => 'Telemetry mode updated';
|
||||
@@ -437,6 +438,13 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get settings_actions => 'Actions';
|
||||
|
||||
@override
|
||||
String get settings_deleteAllPaths => 'Delete All Paths';
|
||||
|
||||
@override
|
||||
String get settings_deleteAllPathsSubtitle =>
|
||||
'Clear all path data from contacts.';
|
||||
|
||||
@override
|
||||
String get settings_sendAdvertisement => 'Send Advertisement';
|
||||
|
||||
@@ -1074,6 +1082,11 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get channels_public => 'Public';
|
||||
|
||||
@override
|
||||
String channels_via(String path) {
|
||||
return 'via $path';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_private => 'Private';
|
||||
|
||||
@@ -1430,6 +1443,9 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get chat_successes => 'successes';
|
||||
|
||||
@override
|
||||
String get chat_score => 'Score';
|
||||
|
||||
@override
|
||||
String get chat_removePath => 'Remove path';
|
||||
|
||||
@@ -1527,6 +1543,12 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
return 'Unread: $count';
|
||||
}
|
||||
|
||||
@override
|
||||
String get chat_markAsUnread => 'Mark as Unread';
|
||||
|
||||
@override
|
||||
String get chat_newMessages => 'New messages';
|
||||
|
||||
@override
|
||||
String get chat_openLink => 'Open Link?';
|
||||
|
||||
@@ -1608,6 +1630,24 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get map_flags => 'Flags';
|
||||
|
||||
@override
|
||||
String get map_type => 'Type';
|
||||
|
||||
@override
|
||||
String get map_path => 'Path';
|
||||
|
||||
@override
|
||||
String get map_location => 'Location';
|
||||
|
||||
@override
|
||||
String get map_estLocation => 'Est. Location';
|
||||
|
||||
@override
|
||||
String get map_publicKey => 'Public Key';
|
||||
|
||||
@override
|
||||
String get map_publicKeyPrefixHint => 'e.g. ab12';
|
||||
|
||||
@override
|
||||
String get map_shareMarkerHere => 'Share marker here';
|
||||
|
||||
@@ -1692,6 +1732,9 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get map_sharedPin => 'Shared pin';
|
||||
|
||||
@override
|
||||
String get map_sharedAt => 'Shared';
|
||||
|
||||
@override
|
||||
String get map_joinRoom => 'Join Room';
|
||||
|
||||
@@ -3601,6 +3644,37 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get losLegendTerrain => 'Terrain';
|
||||
|
||||
@override
|
||||
String get losBlockedSpotsTitle => 'Blocked spots';
|
||||
|
||||
@override
|
||||
String get losBlockedSpotsHint =>
|
||||
'Tap a blocked spot to highlight it on the map.';
|
||||
|
||||
@override
|
||||
String losBlockedSpotChip(
|
||||
String distance,
|
||||
String distanceUnit,
|
||||
String obstruction,
|
||||
String heightUnit,
|
||||
) {
|
||||
return '$distance $distanceUnit • $obstruction $heightUnit';
|
||||
}
|
||||
|
||||
@override
|
||||
String get losSelectedObstructionTitle => 'Selected obstruction';
|
||||
|
||||
@override
|
||||
String losSelectedObstructionDetails(
|
||||
String obstruction,
|
||||
String heightUnit,
|
||||
String distanceFromA,
|
||||
String distanceUnit,
|
||||
String distanceFromB,
|
||||
) {
|
||||
return 'Blocked by $obstruction $heightUnit, $distanceFromA from A and $distanceFromB from B ($distanceUnit).';
|
||||
}
|
||||
|
||||
@override
|
||||
String get losFrequencyLabel => 'Frequency';
|
||||
|
||||
@@ -4052,4 +4126,40 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
|
||||
@override
|
||||
String get translation_systemLanguage => 'System language';
|
||||
|
||||
@override
|
||||
String get background_serviceTitle => 'MeshCore running';
|
||||
|
||||
@override
|
||||
String get background_serviceText => 'Keeping BLE connected';
|
||||
|
||||
@override
|
||||
String appSettings_translationModelDeleted(String name) {
|
||||
return 'Deleted $name';
|
||||
}
|
||||
|
||||
@override
|
||||
String appSettings_translationModelDeleteFailed(String error) {
|
||||
return 'Failed to delete: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String channels_channelUpdateFailed(String error) {
|
||||
return 'Failed to update channel: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get contact_typeChat => 'Chat';
|
||||
|
||||
@override
|
||||
String get contact_typeRepeater => 'Repeater';
|
||||
|
||||
@override
|
||||
String get contact_typeRoom => 'Room';
|
||||
|
||||
@override
|
||||
String get contact_typeSensor => 'Sensor';
|
||||
|
||||
@override
|
||||
String get contact_typeUnknown => 'Unknown';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user