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

lib/l10n/app_localizations_fr.dart

@@ -44,6 +44,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get common_close => 'Fermer';
 
+  @override
+  String get common_done => 'Done';
+
   @override
   String get common_edit => 'Modifier';
 
@@ -438,9 +441,7 @@ class AppLocalizationsFr extends AppLocalizations {
       'Inclure l\'emplacement dans l\'annonce';
 
   @override
-  String settings_multiAck(String value) {
-    return 'Multi-ACKs : $value';
-  }
+  String get settings_multiAck => 'Plusieurs accusés de réception';
 
   @override
   String get settings_telemetryModeUpdated =>
@@ -449,6 +450,13 @@ class AppLocalizationsFr 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 => 'S\'annoncer';
 
@@ -1099,6 +1107,11 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get channels_public => 'Public';
 
+  @override
+  String channels_via(String path) {
+    return 'via $path';
+  }
+
   @override
   String get channels_private => 'Privé';
 
@@ -1462,6 +1475,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get chat_successes => 'Succès';
 
+  @override
+  String get chat_score => 'Score';
+
   @override
   String get chat_removePath => 'Supprimer le chemin';
 
@@ -1565,6 +1581,12 @@ class AppLocalizationsFr extends AppLocalizations {
     return 'Non lu : $count';
   }
 
+  @override
+  String get chat_markAsUnread => 'Mark as Unread';
+
+  @override
+  String get chat_newMessages => 'New messages';
+
   @override
   String get chat_openLink => 'Ouvrir le lien ?';
 
@@ -1647,6 +1669,24 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get map_flags => 'Drapeaux';
 
+  @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 => 'Partager le marqueur ici';
 
@@ -1732,6 +1772,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get map_sharedPin => 'Clé partagée';
 
+  @override
+  String get map_sharedAt => 'Partagé';
+
   @override
   String get map_joinRoom => 'Rejoindre le room server';
 
@@ -3686,6 +3729,37 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get losLegendTerrain => 'Terrain';
 
+  @override
+  String get losBlockedSpotsTitle => 'Places occupés';
+
+  @override
+  String get losBlockedSpotsHint =>
+      'Sélectionnez un emplacement bloqué pour le mettre en évidence sur la carte.';
+
+  @override
+  String losBlockedSpotChip(
+    String distance,
+    String distanceUnit,
+    String obstruction,
+    String heightUnit,
+  ) {
+    return '$distance $distanceUnit • $obstruction $heightUnit';
+  }
+
+  @override
+  String get losSelectedObstructionTitle => 'Obstruction sélectionnée';
+
+  @override
+  String losSelectedObstructionDetails(
+    String obstruction,
+    String heightUnit,
+    String distanceFromA,
+    String distanceUnit,
+    String distanceFromB,
+  ) {
+    return 'Bloqué par $obstruction, à une hauteur de $heightUnit, à une distance de $distanceFromA par rapport à A et à une distance de $distanceFromB par rapport à B ($distanceUnit).';
+  }
+
   @override
   String get losFrequencyLabel => 'Fréquence';
 
@@ -4161,4 +4235,40 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get translation_systemLanguage => 'Langue du système';
+
+  @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';
 }