Merge remote-tracking branch 'upstream/main' into fix/drone-airspace

# Conflicts:
#	docs/CURRENT-STATE.md
#	src/app/constructCatalog.test.mjs
#	src/app/sourceComposition.test.mjs
#	src/data/layerState.test.mjs
#	src/data/layerStateTokenLedger.test.mjs
#	src/i18n/locales/ar.json

src/i18n/locales/fr.json

@@ -331,7 +331,6 @@
   "STALE": "OBSOLÈTE",
   "PARTIAL": "PARTIEL",
   "FALLBACK": "SECOURS",
-  "{state} {layers}": "{state} : {layers}",
   "view band|STREET": "RUE",
   "view band|CITY": "VILLE",
   "view band|METRO": "MÉTROPOLE",
@@ -2819,7 +2818,7 @@
   "Radio volume": "Volume de la radio",
   "STATION SITE": "SITE DE LA STATION",
   "DIRECTORY: RADIO BROWSER": "ANNUAIRE : RADIO BROWSER",
-  "Audio connects directly to the broadcaster after you press play. Your IP is visible to that broadcaster.": "Le flux audio se connecte directement au diffuseur dès que vous lancez la lecture. Votre IP est visible par ce diffuseur.",
+  "Audio connects directly to the broadcaster when you press play, choose a station on the globe or ask voice to play. Your IP is visible to that broadcaster.": "Le flux audio se connecte directement au diffuseur dès que vous lancez la lecture, choisissez une station sur le globe ou la demandez par la voix. Votre IP est visible par ce diffuseur.",
   "Local RTL-SDR receiver": "Récepteur RTL-SDR local",
   "LOCAL RTL-SDR": "RTL-SDR LOCAL",
   "Chrome/Edge · WebUSB · one local tuner shared by FM and the Local ADS-B layer.": "Chrome/Edge · WebUSB · un seul tuner local partagé entre la FM et la couche ADS-B local.",
@@ -3025,5 +3024,74 @@
   "Audio": "Audio",
   "UTILITIES": "OUTILS",
   "Exit cockpit to fly to a drawing": "Quittez le cockpit pour rejoindre un dessin",
-  "Directions, drawing and your own files": "Itinéraire, dessin et vos propres fichiers"
+  "Directions, drawing and your own files": "Itinéraire, dessin et vos propres fichiers",
+  "Voice place search (needs an Overpass server)": "Recherche de lieux par la voix (nécessite un serveur Overpass)",
+  "OSM Places": "Lieux OSM",
+  "state or province": "État ou province",
+  "county or district": "comté ou district",
+  "neighbourhood": "quartier",
+  "natural region": "région naturelle",
+  "Which {place}?": "Quel lieu nommé {place} ?",
+  "Which place?": "Quel lieu ?",
+  "Not drawn: {parts}": "Non dessiné : {parts}",
+  "approximate": "approximatif",
+  "{pct}% cloud": "{pct} % de nuages",
+  "Over {area}": "Zone : {area}",
+  "{count} of {total} acquisitions match": {
+    "many": "Acquisitions correspondantes : {count} sur {total}",
+    "one": "Acquisitions correspondantes : {count} sur {total}",
+    "other": "Acquisitions correspondantes : {count} sur {total}"
+  },
+  "{n} acquisitions searched": {
+    "many": "Acquisitions examinées : {n}",
+    "one": "Acquisitions examinées : {n}",
+    "other": "Acquisitions examinées : {n}"
+  },
+  "No matching imagery": "Aucune image correspondante",
+  "Unknown number of {kind}": "{kind} : nombre inconnu",
+  "About {count} {kind}": "{kind} : environ {count}",
+  "At least {count} {kind}": "{kind} : au moins {count}",
+  "{count} {kind}": "{kind} : {count}",
+  "In {area}": "Zone : {area}",
+  "Area around {place}": "Environs : {place}",
+  "Area around landmark": "Environs d'un repère",
+  "Outline {place}": "Délimiter {place}",
+  "Outline area": "Délimiter une zone",
+  "Find {place}": "Trouver {place}",
+  "Find area": "Trouver une zone",
+  "Find recent imagery": "Trouver des images récentes",
+  "Find {what}": "Trouver {what}",
+  "Find places": "Trouver des lieux",
+  "Drawing outline": "Dessin du contour",
+  "Searching imagery catalog": "Recherche dans le catalogue d'images",
+  "Loading imagery": "Chargement des images",
+  "Searching OpenStreetMap": "Recherche dans OpenStreetMap",
+  "voice area|Area": "Zone",
+  "buffer sized to the place": "zone tampon à la taille du lieu",
+  "enclosing mapped area": "zone cartographiée englobante",
+  "the map was cleared while looking it up": "la carte a été effacée pendant la recherche",
+  "OpenStreetMap coverage varies by place": "La couverture OpenStreetMap varie selon les lieux",
+  "the catalog covers the last 30 days": "le catalogue couvre les 30 derniers jours",
+  "there are more": "il y en a d'autres",
+  "{radius} m around the landmark": "{radius} m autour du lieu",
+  "{count} parts": {
+    "many": "Parties : {count}",
+    "one": "Parties : {count}",
+    "other": "Parties : {count}"
+  },
+  "{drawn} of {total} parts drawn": {
+    "many": "Parties tracées : {drawn} sur {total}",
+    "one": "Parties tracées : {drawn} sur {total}",
+    "other": "Parties tracées : {drawn} sur {total}"
+  },
+  "{count} duplicate mappings merged": {
+    "many": "Doublons fusionnés : {count}",
+    "one": "Doublons fusionnés : {count}",
+    "other": "Doublons fusionnés : {count}"
+  },
+  "listed the first {limit}": "les {limit} premiers sont listés",
+  "counted over the bounding box of {area}, not its outline": "compté sur le rectangle englobant ({area}), pas sur le contour",
+  "Search cancelled": "Recherche annulée",
+  "Sea Marks": "Balisage maritime",
+  "Ski Pistes": "Pistes de ski"
 }