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

Keep both sides at the end of the de, fr, it, ja, pt and zh-Hant locale
files, where main's scene authoring strings landed next to this layer's.

scripts/format-scope.json

@@ -569,6 +569,7 @@
   "src/data/cctvCataloniaSource.test.mjs",
   "src/data/cctvHk.test.mjs",
   "src/data/cctvVegvesen.test.mjs",
+  "src/data/cctvA22.test.mjs",
   "src/data/cctvNyc.test.mjs",
   "src/data/cctvNswSource.test.mjs",
   "src/data/cctvTxdotSource.test.mjs",