From 2863bd89511ca08936d4da905a3d56a63b333168 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 01:27:27 -0500 Subject: [PATCH 01/84] feat(cctv): focus nearest camera to an explicit point --- scripts/format-scope.json | 1 + src/layers/cctv/controls.js | 19 +++++++++ src/layers/cctv/navigation.js | 41 ++++++++++++++----- src/layers/cctv/navigation.test.mjs | 61 +++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+), 9 deletions(-) create mode 100644 src/layers/cctv/navigation.test.mjs diff --git a/scripts/format-scope.json b/scripts/format-scope.json index cd836a5cb2..2fd5ab2d14 100644 --- a/scripts/format-scope.json +++ b/scripts/format-scope.json @@ -502,6 +502,7 @@ "src/layers/cctv/ingestion.js", "src/layers/cctv/hover.js", "src/layers/cctv/navigation.js", + "src/layers/cctv/navigation.test.mjs", "src/layers/cctv/index.js", "src/layers/cctv/model.js", "src/layers/cctv/geometryQueue.js", diff --git a/src/layers/cctv/controls.js b/src/layers/cctv/controls.js index af9f1f4275..e6839cb5f1 100644 --- a/src/layers/cctv/controls.js +++ b/src/layers/cctv/controls.js @@ -336,6 +336,25 @@ export function createControls({ state: layerState, services, parts, source }) { return nextId; }, + /** + * Selects the camera nearest an explicit WGS84 point and optionally flies. + * @param {number} lat Latitude in degrees. + * @param {number} lon Longitude in degrees. + * @param {Object} [options={}] + * @param {boolean} [options.focus=true] Whether to fly after selection. + * @param {number} [options.durationSec] Fly-to duration in seconds. + * @returns {string|null} The nearest camera ID, or null if none found. + */ + focusNearestToPoint(lat, lon, options = {}) { + const nearest = parts.navigation.nearestCameraIdToPoint(lat, lon); + if (!nearest) return null; + parts.selection.setActiveCamera(nearest); + if (options.focus !== false) { + parts.navigation.focusCamera(nearest, options.durationSec || 1.8); + } + return nearest; + }, + /** * Selects and flies to the camera nearest the current viewer position. * @param {Object} [options={}] diff --git a/src/layers/cctv/navigation.js b/src/layers/cctv/navigation.js index 6c576bb4f1..2c3bdbcb3f 100644 --- a/src/layers/cctv/navigation.js +++ b/src/layers/cctv/navigation.js @@ -8,21 +8,30 @@ export function createNavigation({ source, }) { /** - * Finds the camera closest to the Cesium viewer's current position. + * Find the catalog camera nearest one WGS84 point. + * @param {number} lat Latitude in degrees. + * @param {number} lon Longitude in degrees. * @returns {string|null} Camera ID of the nearest camera, or null. */ - - function nearestCameraIdToViewer() { - const carto = layerState._viewer?.camera?.positionCartographic; - if (!carto || !layerState._records.length) return null; - const lat = Cesium.Math.toDegrees(carto.latitude); - const lon = Cesium.Math.toDegrees(carto.longitude); + function nearestCameraIdToPoint(lat, lon) { + const latitude = Number(lat); + const longitude = Number(lon); + if ( + !Number.isFinite(latitude) || + !Number.isFinite(longitude) || + latitude < -90 || + latitude > 90 || + longitude < -180 || + longitude > 180 || + !layerState._records.length + ) + return null; let best = null; for (const record of layerState._records) { const distKm = parts.model.haversineKm( - lat, - lon, + latitude, + longitude, record.camera.lat, record.camera.lon, ); @@ -33,6 +42,19 @@ export function createNavigation({ return best?.id || null; } + /** + * Finds the camera closest to the Cesium viewer's current position. + * @returns {string|null} Camera ID of the nearest camera, or null. + */ + function nearestCameraIdToViewer() { + const carto = layerState._viewer?.camera?.positionCartographic; + if (!carto) return null; + return nearestCameraIdToPoint( + Cesium.Math.toDegrees(carto.latitude), + Cesium.Math.toDegrees(carto.longitude), + ); + } + /** * Flies the Cesium viewer camera to frame the specified CCTV camera, * looking along its heading from above. @@ -148,6 +170,7 @@ export function createNavigation({ return (((Math.floor(currentIdx) + delta) % total) + total) % total; } return { + nearestCameraIdToPoint, nearestCameraIdToViewer, focusCctvRecord, focusCamera, diff --git a/src/layers/cctv/navigation.test.mjs b/src/layers/cctv/navigation.test.mjs new file mode 100644 index 0000000000..59ae59fb13 --- /dev/null +++ b/src/layers/cctv/navigation.test.mjs @@ -0,0 +1,61 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; + +import { createNavigation } from './navigation.js'; + +function fixture() { + const records = [ + { camera: { id: 'west', lat: 40, lon: -120 } }, + { camera: { id: 'east', lat: 40, lon: -100 } }, + ]; + const state = { + _records: records, + _viewer: { + camera: { + positionCartographic: { + latitude: (40 * Math.PI) / 180, + longitude: (-101 * Math.PI) / 180, + }, + }, + }, + }; + const parts = { + model: { + haversineKm(lat1, lon1, lat2, lon2) { + return Math.hypot(lat1 - lat2, lon1 - lon2); + }, + }, + }; + const navigation = createNavigation({ + state, + services: {}, + parts, + source: {}, + }); + return { state, navigation }; +} + +test('nearest camera can be resolved from an explicit WGS84 target', () => { + const { navigation } = fixture(); + assert.equal(navigation.nearestCameraIdToPoint(40, -119), 'west'); + assert.equal(navigation.nearestCameraIdToPoint(40, -101), 'east'); +}); + +test('viewer-nearest delegates to the same target-point owner', () => { + const { navigation } = fixture(); + assert.equal(navigation.nearestCameraIdToViewer(), 'east'); +}); + +test('invalid target coordinates fail closed', () => { + const { navigation } = fixture(); + for (const [lat, lon] of [ + [NaN, 0], + [0, Infinity], + [90.00001, 0], + [-90.00001, 0], + [0, 180.00001], + [0, -180.00001], + ]) { + assert.equal(navigation.nearestCameraIdToPoint(lat, lon), null); + } +}); From 3b3bf29f9bab49f009f7578532e4d9e534f31c85 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:38:31 -0500 Subject: [PATCH 02/84] perf: cancel superseded imagery thumbnail refinement --- src/layers/recentImagery/thumbnails.js | 41 +++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/src/layers/recentImagery/thumbnails.js b/src/layers/recentImagery/thumbnails.js index 47c383f139..cd4c8fed7e 100644 --- a/src/layers/recentImagery/thumbnails.js +++ b/src/layers/recentImagery/thumbnails.js @@ -35,6 +35,8 @@ export function createThumbnailLoader({ const queue = []; let inFlight = 0; let touchCounter = 0; + let supersededQueued = 0; + let supersededInFlight = 0; let destroyed = false; function notify(key) { @@ -212,9 +214,39 @@ export function createThumbnailLoader({ candidates.length, extra, ); + const keys = []; order.forEach((index, priority) => { - this.request(candidates[index], box, priority); + const candidate = candidates[index]; + if (!candidate?.key) return; + keys.push(candidate.key); + this.request(candidate, box, priority); }); + return keys; + }, + + /** + * Keep only refinement work still wanted by the current UI intent. + * + * Known decoded/probed entries may remain warm under the LRU residency + * policy, but queued or in-flight acquisition for no-longer-wanted keys is + * cancelled. A cancelled known-present re-fetch keeps its proven metadata. + * @param {Iterable} keys + */ + retain(keys) { + const wanted = new Set(keys || []); + for (let index = queue.length - 1; index >= 0; index -= 1) { + const entry = queue[index]; + if (wanted.has(entry.key)) continue; + queue.splice(index, 1); + supersededQueued += 1; + if (entry.status === 'unknown') entries.delete(entry.key); + } + for (const entry of [...entries.values()]) { + if (!entry.loading || wanted.has(entry.key)) continue; + entry.controller?.abort(); + supersededInFlight += 1; + if (entry.status === 'unknown') entries.delete(entry.key); + } }, /** @@ -259,6 +291,13 @@ export function createThumbnailLoader({ return () => listeners.delete(listener); }, + refinementStats() { + return { + supersededQueued, + supersededInFlight, + }; + }, + stats() { return { inFlight, From 60bf311f90c6de6ee5d8841ecb8c377fca806606 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:38:36 -0500 Subject: [PATCH 03/84] perf: retain only current imagery thumbnail intent --- src/layers/recentImagery/index.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/layers/recentImagery/index.js b/src/layers/recentImagery/index.js index 23b12f44c1..8187872c21 100644 --- a/src/layers/recentImagery/index.js +++ b/src/layers/recentImagery/index.js @@ -568,12 +568,14 @@ export function createRecentImageryLayer({ const list = stripList(); if (!list.length) return; reconcileFocus(); - thumbnails.requestOrdered(list, _box, { - focusIndex: Math.max(0, focusIndexIn(list)), - firstVisible: _visible.first, - lastVisible: _visible.last, - extra: 2, - }); + const wanted = new Set( + thumbnails.requestOrdered(list, _box, { + focusIndex: Math.max(0, focusIndexIn(list)), + firstVisible: _visible.first, + lastVisible: _visible.last, + extra: 2, + }) || [], + ); for (const key of new Set([ _assigned.a, _assigned.b, @@ -581,8 +583,11 @@ export function createRecentImageryLayer({ _followKey, ])) { const candidate = candidateFor(key); - if (sourceOn(candidate)) thumbnails.request(candidate, _box, 0); + if (!sourceOn(candidate)) continue; + thumbnails.request(candidate, _box, 0); + wanted.add(candidate.key); } + thumbnails.retain?.(wanted); } function resetCatalog() { From ee8848e81f09fed30d7e89de9a618d88ea4d9099 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:38:39 -0500 Subject: [PATCH 04/84] test: track retained imagery thumbnail intent --- src/layers/recentImagery/testDoubles.mjs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/layers/recentImagery/testDoubles.mjs b/src/layers/recentImagery/testDoubles.mjs index 2b00e5b019..e6932a166a 100644 --- a/src/layers/recentImagery/testDoubles.mjs +++ b/src/layers/recentImagery/testDoubles.mjs @@ -275,6 +275,7 @@ export function fakeThumbnails() { const requested = []; /** Direct `request` calls: `[key, priority]`. */ const requests = []; + const retained = []; const ask = (key) => { if (!requested.includes(key)) requested.push(key); }; @@ -282,6 +283,7 @@ export function fakeThumbnails() { calls, requested, requests, + retained, requestOrdered(candidates, box, window) { calls.push(['ordered', candidates.map((c) => c.key), window]); const { focusIndex, firstVisible, lastVisible, extra } = window; @@ -291,12 +293,18 @@ export function fakeThumbnails() { lastVisible, candidates.length, extra, - ).forEach((index) => ask(candidates[index].key)); + ); + const keys = order.map((index) => candidates[index].key); + keys.forEach(ask); + return keys; }, request(candidate, box, priority) { ask(candidate.key); requests.push([candidate.key, priority]); }, + retain(keys) { + retained.push([...keys]); + }, /** Settle every requested key still unknown, as the loader would. */ probeRequested(status = 'present') { for (const key of requested) From c3fd6eaf24a302628baca6d571cbd1c3f8683960 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:38:43 -0500 Subject: [PATCH 05/84] test: cover stale thumbnail cancellation --- src/layers/recentImagery/thumbnails.test.mjs | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/layers/recentImagery/thumbnails.test.mjs b/src/layers/recentImagery/thumbnails.test.mjs index 891b2e8dd2..f88b05c5f7 100644 --- a/src/layers/recentImagery/thumbnails.test.mjs +++ b/src/layers/recentImagery/thumbnails.test.mjs @@ -315,3 +315,27 @@ test('a request queued behind an aborted fetch still starts once the abort settl tracked: 1, }); }); + + +test('retain aborts stale acquisition while allowing the current intent to start', async () => { + const { loader, fetch } = fixture({ maxInFlight: 1 }); + const stale = candidate('S30', '2026-09-10'); + const current = candidate('S30', '2026-09-11'); + + loader.request(stale, BOX, 0); + loader.request(current, BOX, 1); + assert.equal(fetch.calls.length, 1); + assert.match(fetch.calls[0].url, /TIME=2026-09-10/); + + loader.retain([current.key]); + assert.equal(fetch.calls[0].signal.aborted, true); + await settle(); + + assert.equal(fetch.calls.length, 2, 'current intent starts after stale abort'); + assert.match(fetch.calls[1].url, /TIME=2026-09-11/); + assert.deepEqual(loader.refinementStats(), { + supersededQueued: 0, + supersededInFlight: 1, + }); + assert.equal(loader.get(stale.key).status, 'unknown'); +}); From ab0754623e51c5134ff277ae46361f7e86adeeac Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:38:46 -0500 Subject: [PATCH 06/84] test: prove imagery layer retains current thumbnail intent --- src/layers/recentImagery/index.test.mjs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/layers/recentImagery/index.test.mjs b/src/layers/recentImagery/index.test.mjs index 7675d0f3a9..ce90f7ad57 100644 --- a/src/layers/recentImagery/index.test.mjs +++ b/src/layers/recentImagery/index.test.mjs @@ -1061,6 +1061,10 @@ test('alpha, split and visible range notify without re-rendering the row', async f.layer.setSplit(0.25); f.layer.setVisibleRange(1, 3); assert.equal(f.thumbnails.calls.at(-1)[2].firstVisible, 1); + assert.ok( + f.thumbnails.retained.at(-1).includes(f.snap().focus.key), + 'the current focus remains in the retained refinement intent', + ); assert.equal(rowRenders, rows); assert.deepEqual(f.reasons.slice(-2), ['alpha', 'split']); f.layer.setAlpha('bad'); From 61d65aa2d872d15fdcea37ff83ea8c808daf973f Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:38:49 -0500 Subject: [PATCH 07/84] docs: record stale imagery thumbnail cancellation --- docs/CURRENT-STATE.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 22ce1eb3b2..4808b64197 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -1,3 +1,12 @@ +## Generation-style stale thumbnail cancellation — September 29, 2026 + +Recent Imagery thumbnail acquisition now retains only the current refinement +intent. When focus, visible strip range, pins or preview intent changes, queued +thumbnail work for no-longer-wanted days is removed and in-flight acquisition is +aborted. Already-probed/decoded entries may remain warm under the existing LRU +residency policy, and cancelling a re-fetch never forgets proven availability or +acquisition metadata. Diagnostics count superseded queued and in-flight work. + # God's Eye View Current State ## Cyber HUD — September 23, 2026 From 5e28b5a72c3ba4b42271aff29e09ae606aa405f0 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:38:54 -0500 Subject: [PATCH 08/84] docs: note stale imagery thumbnail cancellation --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58103d04da..1ffa66d1db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +- Cancel Recent Imagery thumbnail acquisition that no longer belongs to the current focus/visible/pin/preview intent. Stale queued work is removed and stale in-flight fetches are aborted while known-good decoded/probed entries may remain warm under the existing cache policy; cancellation counters are exposed for diagnostics. + - Public Overpass instances are no longer used by default. Street Traffic roads come from TomTom flow tiles, OpenFreeMap vector tiles, or both, chosen on the layer row (TomTom / OSM / Hybrid) or with `?trafficRoads=`. With a From 455d36fe9233cfbfe2fff527689b6fe9f389a12b Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:39:27 -0500 Subject: [PATCH 09/84] test: fix retained thumbnail order fake --- src/layers/recentImagery/testDoubles.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layers/recentImagery/testDoubles.mjs b/src/layers/recentImagery/testDoubles.mjs index e6932a166a..d96acada0e 100644 --- a/src/layers/recentImagery/testDoubles.mjs +++ b/src/layers/recentImagery/testDoubles.mjs @@ -287,7 +287,7 @@ export function fakeThumbnails() { requestOrdered(candidates, box, window) { calls.push(['ordered', candidates.map((c) => c.key), window]); const { focusIndex, firstVisible, lastVisible, extra } = window; - thumbnailOrder( + const order = thumbnailOrder( focusIndex, firstVisible, lastVisible, From 8b4952415e9396b13e5424244d3f6708d7fec883 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Tue, 29 Sep 2026 13:39:31 -0500 Subject: [PATCH 10/84] test: format stale thumbnail cancellation proof --- src/layers/recentImagery/thumbnails.test.mjs | 46 +++++++++++--------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/src/layers/recentImagery/thumbnails.test.mjs b/src/layers/recentImagery/thumbnails.test.mjs index f88b05c5f7..d57d764726 100644 --- a/src/layers/recentImagery/thumbnails.test.mjs +++ b/src/layers/recentImagery/thumbnails.test.mjs @@ -316,26 +316,32 @@ test('a request queued behind an aborted fetch still starts once the abort settl }); }); +test( + 'retain aborts stale acquisition while allowing the current intent to start', + async () => { + const { loader, fetch } = fixture({ maxInFlight: 1 }); + const stale = candidate('S30', '2026-09-10'); + const current = candidate('S30', '2026-09-11'); -test('retain aborts stale acquisition while allowing the current intent to start', async () => { - const { loader, fetch } = fixture({ maxInFlight: 1 }); - const stale = candidate('S30', '2026-09-10'); - const current = candidate('S30', '2026-09-11'); + loader.request(stale, BOX, 0); + loader.request(current, BOX, 1); + assert.equal(fetch.calls.length, 1); + assert.match(fetch.calls[0].url, /TIME=2026-09-10/); - loader.request(stale, BOX, 0); - loader.request(current, BOX, 1); - assert.equal(fetch.calls.length, 1); - assert.match(fetch.calls[0].url, /TIME=2026-09-10/); + loader.retain([current.key]); + assert.equal(fetch.calls[0].signal.aborted, true); + await settle(); - loader.retain([current.key]); - assert.equal(fetch.calls[0].signal.aborted, true); - await settle(); - - assert.equal(fetch.calls.length, 2, 'current intent starts after stale abort'); - assert.match(fetch.calls[1].url, /TIME=2026-09-11/); - assert.deepEqual(loader.refinementStats(), { - supersededQueued: 0, - supersededInFlight: 1, - }); - assert.equal(loader.get(stale.key).status, 'unknown'); -}); + assert.equal( + fetch.calls.length, + 2, + 'current intent starts after stale abort', + ); + assert.match(fetch.calls[1].url, /TIME=2026-09-11/); + assert.deepEqual(loader.refinementStats(), { + supersededQueued: 0, + supersededInFlight: 1, + }); + assert.equal(loader.get(stale.key).status, 'unknown'); + }, +); From d38303fcd4af0938e2c48f784a8b0778b1cfcf8b Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Wed, 30 Sep 2026 20:51:50 -0500 Subject: [PATCH 11/84] chore: add one-shot branch formatter --- .github/workflows/tmp-format-fix.yml | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/tmp-format-fix.yml diff --git a/.github/workflows/tmp-format-fix.yml b/.github/workflows/tmp-format-fix.yml new file mode 100644 index 0000000000..40dce117ed --- /dev/null +++ b/.github/workflows/tmp-format-fix.yml @@ -0,0 +1,37 @@ +name: Temporary branch formatter + +on: + push: + branches: + - perf/imagery-stale-thumbnail-cancellation-20260929 + +permissions: + contents: write + +jobs: + format: + if: github.actor != 'github-actions[bot]' + runs-on: ubuntu-latest + env: + PUPPETEER_SKIP_DOWNLOAD: 1 + steps: + - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 + with: + ref: perf/imagery-stale-thumbnail-cancellation-20260929 + - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 + with: + node-version: 24.14.0 + cache: npm + - run: npm ci + - run: npm run format + - name: Commit formatting + shell: bash + run: | + if git diff --quiet; then + exit 0 + fi + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git add -u + git commit -m "style: apply adopted formatting" + git push origin HEAD:perf/imagery-stale-thumbnail-cancellation-20260929 From 0de14670ed3559198627354a7f3f84c69629a4df Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2026 01:52:24 +0000 Subject: [PATCH 12/84] style: apply adopted formatting --- src/layers/recentImagery/thumbnails.test.mjs | 49 +++++++++----------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/src/layers/recentImagery/thumbnails.test.mjs b/src/layers/recentImagery/thumbnails.test.mjs index d57d764726..087430cf33 100644 --- a/src/layers/recentImagery/thumbnails.test.mjs +++ b/src/layers/recentImagery/thumbnails.test.mjs @@ -316,32 +316,29 @@ test('a request queued behind an aborted fetch still starts once the abort settl }); }); -test( - 'retain aborts stale acquisition while allowing the current intent to start', - async () => { - const { loader, fetch } = fixture({ maxInFlight: 1 }); - const stale = candidate('S30', '2026-09-10'); - const current = candidate('S30', '2026-09-11'); +test('retain aborts stale acquisition while allowing the current intent to start', async () => { + const { loader, fetch } = fixture({ maxInFlight: 1 }); + const stale = candidate('S30', '2026-09-10'); + const current = candidate('S30', '2026-09-11'); - loader.request(stale, BOX, 0); - loader.request(current, BOX, 1); - assert.equal(fetch.calls.length, 1); - assert.match(fetch.calls[0].url, /TIME=2026-09-10/); + loader.request(stale, BOX, 0); + loader.request(current, BOX, 1); + assert.equal(fetch.calls.length, 1); + assert.match(fetch.calls[0].url, /TIME=2026-09-10/); - loader.retain([current.key]); - assert.equal(fetch.calls[0].signal.aborted, true); - await settle(); + loader.retain([current.key]); + assert.equal(fetch.calls[0].signal.aborted, true); + await settle(); - assert.equal( - fetch.calls.length, - 2, - 'current intent starts after stale abort', - ); - assert.match(fetch.calls[1].url, /TIME=2026-09-11/); - assert.deepEqual(loader.refinementStats(), { - supersededQueued: 0, - supersededInFlight: 1, - }); - assert.equal(loader.get(stale.key).status, 'unknown'); - }, -); + assert.equal( + fetch.calls.length, + 2, + 'current intent starts after stale abort', + ); + assert.match(fetch.calls[1].url, /TIME=2026-09-11/); + assert.deepEqual(loader.refinementStats(), { + supersededQueued: 0, + supersededInFlight: 1, + }); + assert.equal(loader.get(stale.key).status, 'unknown'); +}); From 683fbe32eff70aa93566e3e8c3da521636f8d4dc Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Wed, 30 Sep 2026 20:52:56 -0500 Subject: [PATCH 13/84] chore: remove one-shot branch formatter --- .github/workflows/tmp-format-fix.yml | 37 ---------------------------- 1 file changed, 37 deletions(-) delete mode 100644 .github/workflows/tmp-format-fix.yml diff --git a/.github/workflows/tmp-format-fix.yml b/.github/workflows/tmp-format-fix.yml deleted file mode 100644 index 40dce117ed..0000000000 --- a/.github/workflows/tmp-format-fix.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Temporary branch formatter - -on: - push: - branches: - - perf/imagery-stale-thumbnail-cancellation-20260929 - -permissions: - contents: write - -jobs: - format: - if: github.actor != 'github-actions[bot]' - runs-on: ubuntu-latest - env: - PUPPETEER_SKIP_DOWNLOAD: 1 - steps: - - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 - with: - ref: perf/imagery-stale-thumbnail-cancellation-20260929 - - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 - with: - node-version: 24.14.0 - cache: npm - - run: npm ci - - run: npm run format - - name: Commit formatting - shell: bash - run: | - if git diff --quiet; then - exit 0 - fi - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add -u - git commit -m "style: apply adopted formatting" - git push origin HEAD:perf/imagery-stale-thumbnail-cancellation-20260929 From 82f7355837e9dae5f72003224448427f05934ec4 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Thu, 1 Oct 2026 00:52:10 -0500 Subject: [PATCH 14/84] chore: add one-shot downstream format fixer --- .github/workflows/downstream-format-fix.yml | 37 +++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/downstream-format-fix.yml diff --git a/.github/workflows/downstream-format-fix.yml b/.github/workflows/downstream-format-fix.yml new file mode 100644 index 0000000000..38b856350e --- /dev/null +++ b/.github/workflows/downstream-format-fix.yml @@ -0,0 +1,37 @@ +name: Downstream format fix + +on: + push: + branches: + - perf/imagery-stale-thumbnail-cancellation-20260929 + +permissions: + contents: write + +jobs: + format: + if: ${{ github.actor != 'github-actions[bot]' }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + with: + ref: perf/imagery-stale-thumbnail-cancellation-20260929 + - uses: actions/setup-node@v5 + with: + node-version: 24.14.0 + cache: npm + - run: npm ci + env: + PUPPETEER_SKIP_DOWNLOAD: 1 + - run: npm run format + - name: Commit formatting if needed + shell: bash + run: | + if git diff --quiet; then + exit 0 + fi + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git add -A + git commit -m "chore: apply adopted formatting" + git push From 85227cca9dc0fa74055c5f4e9490fea932f86875 Mon Sep 17 00:00:00 2001 From: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Date: Thu, 1 Oct 2026 00:52:52 -0500 Subject: [PATCH 15/84] chore: remove one-shot downstream format fixer --- .github/workflows/downstream-format-fix.yml | 37 --------------------- 1 file changed, 37 deletions(-) delete mode 100644 .github/workflows/downstream-format-fix.yml diff --git a/.github/workflows/downstream-format-fix.yml b/.github/workflows/downstream-format-fix.yml deleted file mode 100644 index 38b856350e..0000000000 --- a/.github/workflows/downstream-format-fix.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Downstream format fix - -on: - push: - branches: - - perf/imagery-stale-thumbnail-cancellation-20260929 - -permissions: - contents: write - -jobs: - format: - if: ${{ github.actor != 'github-actions[bot]' }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v5 - with: - ref: perf/imagery-stale-thumbnail-cancellation-20260929 - - uses: actions/setup-node@v5 - with: - node-version: 24.14.0 - cache: npm - - run: npm ci - env: - PUPPETEER_SKIP_DOWNLOAD: 1 - - run: npm run format - - name: Commit formatting if needed - shell: bash - run: | - if git diff --quiet; then - exit 0 - fi - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add -A - git commit -m "chore: apply adopted formatting" - git push From dddd1fa03fe54481fbe5822f7d73cdd4435fda2f Mon Sep 17 00:00:00 2001 From: daikaginza Date: Sat, 17 Oct 2026 07:28:26 +0700 Subject: [PATCH 16/84] fix(i18n): translate mapped-site feedback by its shape where it is shown Add the Mapped Installations feedback shapes (site counts in view or around the contact, and the Overpass retry lines) to statusText.js, and show statusMessage through translateStatusPiece in the Layers panel, the nearby-search toast and the awareness panel. The voice card's analyst notes already fall back to translateStatusLine, so they pick the shapes up too. --- scripts/package-boundaries.json | 7 ++-- src/layers/awareness/panel.js | 5 +-- src/ui/contextBindings.js | 3 +- src/ui/layerPanel.js | 14 ++++---- src/ui/statusText.js | 52 +++++++++++++++++++++++++++- src/voice/analystEmptyNotes.test.mjs | 21 +++++++++++ 6 files changed, 88 insertions(+), 14 deletions(-) diff --git a/scripts/package-boundaries.json b/scripts/package-boundaries.json index 43bc3d4de9..190e377e98 100644 --- a/scripts/package-boundaries.json +++ b/scripts/package-boundaries.json @@ -566,7 +566,8 @@ "src/i18n/locale.js", "src/i18n/locales/es.json", "src/i18n/locales/ru.json", - "src/ui/layerNames.js" + "src/ui/layerNames.js", + "src/ui/statusText.js" ], "external": [] }, @@ -1242,7 +1243,9 @@ "src/i18n/locale.js", "src/i18n/locales/es.json", "src/i18n/locales/ru.json", - "src/ui/unitLabels.js" + "src/ui/unitLabels.js", + "src/ui/layerNames.js", + "src/ui/statusText.js" ], "external": ["cesium"] }, diff --git a/src/layers/awareness/panel.js b/src/layers/awareness/panel.js index 5fe2a0ac8a..f8f3d55eb9 100644 --- a/src/layers/awareness/panel.js +++ b/src/layers/awareness/panel.js @@ -2,7 +2,8 @@ import { formatAwarenessLabel, AWARENESS_RADIUS_M, } from '../../data/militaryAwarenessEngine.js'; -import { formatNumber, t, translateKnown } from '../../i18n/index.js'; +import { formatNumber, t } from '../../i18n/index.js'; +import { translateStatusPiece } from '../../ui/statusText.js'; import { formatQuantity } from '../../ui/unitLabels.js'; import { AWARENESS_PAGE_SIZE, AWARENESS_PAGE_ROTATE_MS } from './policy.js'; @@ -39,7 +40,7 @@ function presentAwarenessDistance(meters) { function presentAwarenessReason(summary = {}) { return summary.reasonTemplate ? t(summary.reasonTemplate, summary.reasonValues) - : translateKnown(summary.reason || ''); + : translateStatusPiece(summary.reason || ''); } export function createPanel({ state: layerState, services, parts, source }) { diff --git a/src/ui/contextBindings.js b/src/ui/contextBindings.js index 16a21df4f4..ef663eb702 100644 --- a/src/ui/contextBindings.js +++ b/src/ui/contextBindings.js @@ -1,4 +1,5 @@ import { t } from '../i18n/index.js'; +import { translateStatusPiece } from './statusText.js'; import { shouldExpandGlobalContextPanel } from '../rightRailPolicy.js'; export function _initGlobalContextPanel() { @@ -109,7 +110,7 @@ export function _initGlobalContextPanel() { if (this.destroyed || searched === false) return false; const stats = this.installations.getStats?.(); this.showToast( - stats?.statusMessage || + (stats?.statusMessage && translateStatusPiece(stats.statusMessage)) || (stats?.status === 'zoom-in' ? t('Zoom in to search mapped installations') : t('Nearby installations refreshed')), diff --git a/src/ui/layerPanel.js b/src/ui/layerPanel.js index 109d96c60a..7a69f74281 100644 --- a/src/ui/layerPanel.js +++ b/src/ui/layerPanel.js @@ -11,14 +11,12 @@ import { } from './layerNames.js'; export { localizeLayerName } from './layerNames.js'; import { createWeatherPanel } from './weatherPanel.js'; -import { translateFeedError, translateStatusLine } from './statusText.js'; import { - formatNumber, - getLocale, - msg, - t, - translateKnown, -} from '../i18n/index.js'; + translateFeedError, + translateStatusLine, + translateStatusPiece, +} from './statusText.js'; +import { formatNumber, getLocale, msg, t } from '../i18n/index.js'; // Feed-state values are machine ids (QA hooks, CSS feed-* classes); only the // label translates. @@ -672,7 +670,7 @@ export class LayerPanel { typeof stats.statusMessage === 'string' && stats.statusMessage.trim() ) { - return `${source} · ${translateKnown(stats.statusMessage.trim())}`; + return `${source} · ${translateStatusPiece(stats.statusMessage.trim())}`; } const ago = stats.lastUpdate ? this._timeAgo(stats.lastUpdate) : t('never'); if (stats.loading) { diff --git a/src/ui/statusText.js b/src/ui/statusText.js index b0899d55e1..b241abdbff 100644 --- a/src/ui/statusText.js +++ b/src/ui/statusText.js @@ -208,9 +208,59 @@ const STATUS_PIECE_PATTERNS = [ ], ]; +// Mapped Installations feedback (installationFeedback in +// data/installationFeedback.js): getStats().statusMessage is English data, and +// the Layers panel, the toast, the awareness panel and the voice card's analyst +// note show it through here. Keep these in step with that helper. +const MAPPED_SITE_PATTERNS = [ + [ + /^(.+) — retrying in (\d+)s$/, + ([, reason, seconds]) => + t('{reason} — retrying in {seconds}s', { + reason: translateKnown(reason), + seconds, + }), + ], + [ + /^(.+) — retry pending$/, + ([, reason]) => + t('{reason} — retry pending', { reason: translateKnown(reason) }), + ], + [/^No mapped sites in view$/, () => t('No mapped sites in view')], + [ + /^(\d+) mapped sites? in view$/, + ([, count]) => + tn( + Number(count), + '{count} mapped site in view', + '{count} mapped sites in view', + ), + ], + [ + /^No mapped sites within (\d+) km of the contact$/, + ([, km]) => + t('No mapped sites within {km} km of the contact', { + km: formatNumber(Number(km)), + }), + ], + [ + /^(\d+) mapped sites? within (\d+) km of the contact$/, + ([, count, km]) => + tn( + Number(count), + '{count} mapped site within {km} km of the contact', + '{count} mapped sites within {km} km of the contact', + { km: formatNumber(Number(km)) }, + ), + ], +]; + /** A status piece by its shape in the UI language, or null. */ function statusPatternText(piece) { - for (const [pattern, format] of STATUS_PIECE_PATTERNS) { + for (const [pattern, format] of [ + ...STATUS_PIECE_PATTERNS, + ...MAPPED_SITE_PATTERNS, + ]) { const match = pattern.exec(piece); if (match) return format(match); } diff --git a/src/voice/analystEmptyNotes.test.mjs b/src/voice/analystEmptyNotes.test.mjs index b0de16ebd5..101fe06179 100644 --- a/src/voice/analystEmptyNotes.test.mjs +++ b/src/voice/analystEmptyNotes.test.mjs @@ -74,6 +74,14 @@ const transitCoverage = [ 'transit: No feed here yet · 12 regions available', ]; +// Mapped Installations' statusMessage (data/installationFeedback.js). +const installationNotes = [ + 'military-installations: No mapped sites in view', + 'military-installations: No mapped sites within 25 km of the contact', + 'military-installations: Overpass timed out — retrying in 30s', + 'military-installations: Zoom in to search mapped installations', +]; + for (const locale of ['es', 'ru']) { for (const [layerKey, caveat] of cases) { test(`${locale}: analyst note "${caveat}" is translated`, () => { @@ -85,6 +93,19 @@ for (const locale of ['es', 'ru']) { }); } + test(`${locale}: Mapped Installations' empty note is translated on the analyst card`, () => { + inLocale(locale, () => { + for (const caveat of installationNotes) { + const notes = notesFor('military-installations', caveat); + assert.ok(notes.length > 0, 'the note is shown'); + assert.doesNotMatch( + notes.join(' | '), + /mapped sites|retrying|Overpass timed out|Zoom in/, + ); + } + }); + }); + test(`${locale}: Transit's empty note is translated on the analyst card`, () => { inLocale(locale, () => { for (const caveat of transitCoverage) { From 4515c5146aa09b01cc81d7e9bad0cfaa05b58600 Mon Sep 17 00:00:00 2001 From: daikaginza Date: Sat, 17 Oct 2026 07:28:26 +0700 Subject: [PATCH 17/84] fix(analyst): keep the Mapped Installations empty note English getStats().statusMessage was translated inside the layer, and the analyst uses it as the empty note it returns to the model, so an empty military-installations query carried Spanish or Russian text in an English tool result. Report installationFeedback() as English again; the displays translate it by its shape. --- src/data/installationFeedback.js | 2 +- src/layers/installations/controls.js | 44 +---- .../installationFeedbackLocale.test.mjs | 160 ++++++++++++------ 3 files changed, 116 insertions(+), 90 deletions(-) diff --git a/src/data/installationFeedback.js b/src/data/installationFeedback.js index 13e92c8b99..4dc1858ddf 100644 --- a/src/data/installationFeedback.js +++ b/src/data/installationFeedback.js @@ -1,6 +1,6 @@ import { msg } from '../i18n/marker.js'; -// layers/installations/controls.js translates describeInstallationFeedback(). +// installationFeedback() is English data; ui/statusText.js shows it translated. const REASONS = Object.freeze({ rate_limited: msg('Overpass rate-limited'), timeout: msg('Overpass timed out'), diff --git a/src/layers/installations/controls.js b/src/layers/installations/controls.js index 2fa31e59ef..608d6efbfc 100644 --- a/src/layers/installations/controls.js +++ b/src/layers/installations/controls.js @@ -1,37 +1,11 @@ import * as Cesium from 'cesium'; -import { describeInstallationFeedback } from '../../data/installationFeedback.js'; +import { installationFeedback } from '../../data/installationFeedback.js'; import { LAYER_ID, DISTANCE_PREFILTER_MARGIN_M, ANCHOR_REFRESH_M, } from './policy.js'; -import { formatNumber, t, tn } from '../../i18n/index.js'; - -// installationFeedback.js is shared with the HUD (src/loadingFeedback.js) and -// hands back msg()-marked English plus values; getStats translates them here. -function localizeInstallationFeedback(feedback) { - if (feedback.text !== undefined) { - const values = {}; - if (feedback.reason !== undefined) values.reason = t(feedback.reason); - if (feedback.seconds !== undefined) values.seconds = feedback.seconds; - return t(feedback.text, values); - } - const { count, km } = feedback; - if (km) { - const kmText = formatNumber(km); - return count === 0 - ? t('No mapped sites within {km} km of the contact', { km: kmText }) - : tn( - count, - '{count} mapped site within {km} km of the contact', - '{count} mapped sites within {km} km of the contact', - { km: kmText }, - ); - } - return count === 0 - ? t('No mapped sites in view') - : tn(count, '{count} mapped site in view', '{count} mapped sites in view'); -} +import { t } from '../../i18n/index.js'; export function createControls({ state: layerState, services, parts, source }) { const methods = { @@ -252,13 +226,13 @@ export function createControls({ state: layerState, services, parts, source }) { retryAt: layerState.retryAt, retrying: layerState.loading && Boolean(layerState.failureReason), failureReason: layerState.failureReason, - statusMessage: localizeInstallationFeedback( - describeInstallationFeedback({ - ...layerState, - count: layerState.lastUpdate ? mappedCount : undefined, - retrying: layerState.loading && Boolean(layerState.failureReason), - }), - ), + // English data: it is also the analyst's empty note to the model. + // Displays translate it by its shape (ui/statusText.js). + statusMessage: installationFeedback({ + ...layerState, + count: layerState.lastUpdate ? mappedCount : undefined, + retrying: layerState.loading && Boolean(layerState.failureReason), + }), loadingLabel: layerState.loading ? t('loading mapped installation context') : '', diff --git a/src/layers/installations/installationFeedbackLocale.test.mjs b/src/layers/installations/installationFeedbackLocale.test.mjs index cf4e758a33..7dac443510 100644 --- a/src/layers/installations/installationFeedbackLocale.test.mjs +++ b/src/layers/installations/installationFeedbackLocale.test.mjs @@ -1,6 +1,10 @@ +// getStats().statusMessage is English data (it is also the analyst's empty +// note to the model); the displays show it in the UI language through +// translateStatusPiece (ui/statusText.js). import test from 'node:test'; import assert from 'node:assert/strict'; -import { setLocale, translateKnown } from '../../i18n/index.js'; +import { setLocale, t, tn, translateKnown } from '../../i18n/index.js'; +import { translateStatusPiece } from '../../ui/statusText.js'; import { createControls } from './controls.js'; function stats(state) { @@ -13,67 +17,115 @@ function stats(state) { }).methods.getStats(); } -for (const locale of ['es', 'ru']) { - test(`${locale}: installation feedback is in the UI language`, () => { - setLocale(locale); - const empty = stats({ status: 'empty', lastUpdate: 1 }).statusMessage; - assert.notEqual(empty, 'No mapped sites in view'); - const found = stats({ +function inLocale(locale, run) { + setLocale(locale); + try { + run(); + } finally { + setLocale('en'); + } +} + +// Each layer state, the English statusMessage it reports, and how the UI +// shows it. A retry a minute out reads "60s" (rounded up). +const cases = [ + [ + { status: 'empty', lastUpdate: 1 }, + 'No mapped sites in view', + () => t('No mapped sites in view'), + ], + [ + { status: 'ready', lastUpdate: 1, records: [{ kind: 'installation' }, { kind: 'installation' }], - }).statusMessage; - assert.notEqual(found, '2 mapped sites in view'); - const tiles = stats({ - status: 'unavailable', - failureReason: 'tiles_unavailable', - }).statusMessage; - assert.notEqual(tiles, 'Map tiles temporarily unavailable'); - const retry = stats({ + }, + '2 mapped sites in view', + () => tn(2, '{count} mapped site in view', '{count} mapped sites in view'), + ], + [ + { + status: 'empty', + lastUpdate: 1, + wide: true, + coverage: { kind: 'subject', radiusM: 25000 }, + }, + 'No mapped sites within 25 km of the contact', + () => t('No mapped sites within {km} km of the contact', { km: '25' }), + ], + [ + { + status: 'ready', + lastUpdate: 1, + wide: true, + coverage: { kind: 'subject', radiusM: 25000 }, + records: [{ kind: 'installation' }], + }, + '1 mapped site within 25 km of the contact', + () => + tn( + 1, + '{count} mapped site within {km} km of the contact', + '{count} mapped sites within {km} km of the contact', + { km: '25' }, + ), + ], + [ + { status: 'unavailable', failureReason: 'tiles_unavailable' }, + 'Map tiles temporarily unavailable', + () => t('Map tiles temporarily unavailable'), + ], + [ + { status: 'unavailable', failureReason: 'names_unavailable', - retryAt: Date.now() + 5000, - }).statusMessage; - assert.doesNotMatch(retry, /^Mapped names temporarily unavailable/); - for (const text of [ - 'Too many mapped sites in view to list them all', - 'Installation context unavailable', - ]) { - assert.notEqual(translateKnown(text), text); - } + get retryAt() { + return Date.now() + 60_000; + }, + }, + 'Mapped names temporarily unavailable — retrying in 60s', + () => + t('{reason} — retrying in {seconds}s', { + reason: t('Mapped names temporarily unavailable'), + seconds: 60, + }), + ], + [ + { status: 'zoom-in' }, + 'Zoom in to search mapped installations', + () => t('Zoom in to search mapped installations'), + ], +]; + +for (const locale of ['es', 'ru']) { + test(`${locale}: installation statusMessage stays English data`, () => { + inLocale(locale, () => { + for (const [state, english] of cases) + assert.equal(stats(state).statusMessage, english); + }); + }); + + test(`${locale}: installation statusMessage is shown in the UI language`, () => { + inLocale(locale, () => { + for (const [state, english, shown] of cases) { + const shownText = translateStatusPiece(stats(state).statusMessage); + assert.notEqual(shownText, english); + assert.equal(shownText, shown()); + } + for (const text of [ + 'Too many mapped sites in view to list them all', + 'Installation context unavailable', + ]) { + assert.notEqual(translateKnown(text), text); + } + }); }); } test('en: installation feedback keeps its English wording', () => { setLocale('en'); - assert.equal( - stats({ status: 'empty', lastUpdate: 1 }).statusMessage, - 'No mapped sites in view', - ); - assert.equal( - stats({ - status: 'ready', - lastUpdate: 1, - records: [{ kind: 'installation' }], - }).statusMessage, - '1 mapped site in view', - ); - assert.equal( - stats({ - status: 'ready', - lastUpdate: 1, - wide: true, - coverage: { kind: 'subject', radiusM: 25000 }, - records: [{ kind: 'installation' }, { kind: 'installation' }], - }).statusMessage, - '2 mapped sites within 25 km of the contact', - ); - assert.equal( - stats({ - status: 'unavailable', - failureReason: 'names_unavailable', - retryAt: Date.now() + 5000, - }).statusMessage, - 'Mapped names temporarily unavailable — retrying in 5s', - ); + for (const [state, english] of cases) { + assert.equal(stats(state).statusMessage, english); + assert.equal(translateStatusPiece(english), english); + } }); From e2651bb0942f96b678faca19a577b01dedf86d76 Mon Sep 17 00:00:00 2001 From: daikaginza Date: Sat, 17 Oct 2026 07:58:56 +0700 Subject: [PATCH 18/84] fix(i18n): build the status piece shapes once and cover one site in view statusPatternText runs on every row render; join the shape lists at module scope instead of on each call. Restore the singular in-view case to the installation feedback locale test. --- .../installations/installationFeedbackLocale.test.mjs | 5 +++++ src/ui/statusText.js | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/layers/installations/installationFeedbackLocale.test.mjs b/src/layers/installations/installationFeedbackLocale.test.mjs index 7dac443510..f85a0b3ae5 100644 --- a/src/layers/installations/installationFeedbackLocale.test.mjs +++ b/src/layers/installations/installationFeedbackLocale.test.mjs @@ -34,6 +34,11 @@ const cases = [ 'No mapped sites in view', () => t('No mapped sites in view'), ], + [ + { status: 'ready', lastUpdate: 1, records: [{ kind: 'installation' }] }, + '1 mapped site in view', + () => tn(1, '{count} mapped site in view', '{count} mapped sites in view'), + ], [ { status: 'ready', diff --git a/src/ui/statusText.js b/src/ui/statusText.js index b241abdbff..12d2025cc6 100644 --- a/src/ui/statusText.js +++ b/src/ui/statusText.js @@ -255,12 +255,12 @@ const MAPPED_SITE_PATTERNS = [ ], ]; +// Every status piece shape, in matching order. +const STATUS_SHAPES = [...STATUS_PIECE_PATTERNS, ...MAPPED_SITE_PATTERNS]; + /** A status piece by its shape in the UI language, or null. */ function statusPatternText(piece) { - for (const [pattern, format] of [ - ...STATUS_PIECE_PATTERNS, - ...MAPPED_SITE_PATTERNS, - ]) { + for (const [pattern, format] of STATUS_SHAPES) { const match = pattern.exec(piece); if (match) return format(match); } From 7d8ad93126589af6c93699547ea2d8a2de188ef1 Mon Sep 17 00:00:00 2001 From: daikaginza Date: Sun, 18 Oct 2026 14:35:07 +0700 Subject: [PATCH 19/84] docs(changelog): add the #1210 entry --- changelog.d/1210-installations-note-english.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog.d/1210-installations-note-english.md diff --git a/changelog.d/1210-installations-note-english.md b/changelog.d/1210-installations-note-english.md new file mode 100644 index 0000000000..e8fccd4add --- /dev/null +++ b/changelog.d/1210-installations-note-english.md @@ -0,0 +1,3 @@ +- Return the Mapped Installations status (site counts, Overpass retries) to the + voice analyst in English; the Layers panel, the nearby-search toast and the + awareness panel translate it where they show it (daikaginza, #1210). From 015bf25a799782f5287199278c6b50d4bebf2252 Mon Sep 17 00:00:00 2001 From: Renzo Will Date: Fri, 16 Oct 2026 06:08:45 +1000 Subject: [PATCH 20/84] feat(transit): add Cairns and Adelaide Metro; mode hints for TransLink MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - translink-cairns: TransLink CNS vehicle positions (keyless, CC BY 4.0, same open-data page as SEQ). - adelaide-metro: Adelaide Metro GTFS-R vehicle positions (keyless, CC BY 4.0 per the data.sa.gov.au catalogue). Its gateway negotiates on Accept and returns base64 protobuf as JSON for the proxy's default list, so the feed asks for application/x-google-protobuf. - TransLink route ids now resolve rail (station-pair codes), the Gold Coast light rail (L1) and ferries (F*, SMBI); buses, Brisbane Metro and the SHUT rail-replacement bus stay on the bus default. Adelaide trains, trams and the SeaLink ferry resolve from its static route list. Both rule sets checked against the operators' routes.txt. - Credits: "Translink, Department of Transport and Main Roads" and "Adelaide Metro – Department for Infrastructure and Transport, South Australia", each with its CC BY 4.0 link (generated per feed by transitFeedCredit). DATA_SOURCES rows follow the transit row style. Co-Authored-By: Claude Opus 5.5 (1M context) --- DATA_SOURCES.md | 5 +- scripts/format-scope.json | 1 + src/data/transitFeeds.js | 97 ++++++++++++++++- src/data/transitFeedsAustralia.test.mjs | 139 ++++++++++++++++++++++++ 4 files changed, 239 insertions(+), 3 deletions(-) create mode 100644 src/data/transitFeedsAustralia.test.mjs diff --git a/DATA_SOURCES.md b/DATA_SOURCES.md index a4035f1754..62dc3d6c81 100644 --- a/DATA_SOURCES.md +++ b/DATA_SOURCES.md @@ -85,7 +85,8 @@ How to read this: | **Metro Transit** (Metropolitan Council) | Transit layer live vehicles, Minneapolis–St Paul | Metro Transit / Metropolitan Council open realtime vehicle data, used for the live view; published for developer use and not against their use. | Attribution to Metro Transit / Metropolitan Council (courtesy text) | | **OVapi / Stichting OpenGeo** | Transit layer live vehicles, Netherlands | OVapi / Stichting OpenGeo open realtime vehicle data, used for the live view; published for developer use and not against their use. The client sends a User-Agent and conditional requests. | Attribution to OVapi / Stichting OpenGeo (courtesy text) | | **Entur** (api.entur.io) | Transit layer live vehicles, Norway | Entur open realtime vehicle data, used for the live view; published for developer use and not against their use. The client sends the `ET-Client-Name` identifying header. | Attribution to Entur (courtesy text) | -| **TransLink** (Queensland Government) | Transit layer live vehicles, South East Queensland | TransLink / Queensland Government open realtime vehicle data, used for the live view; published for developer use and not against their use. | Attribution to TransLink / Queensland Government (courtesy text) | +| **TransLink** (Queensland Government) | Transit layer live vehicles, South East Queensland and Cairns | TransLink / Queensland Government open realtime vehicle data, used for the live view; published for developer use and not against their use. | Attribution to Translink, Department of Transport and Main Roads (courtesy text) | +| **Adelaide Metro** (gtfs.adelaidemetro.com.au) | Transit layer live vehicles, Adelaide | Adelaide Metro / Department for Infrastructure and Transport (South Australia) open realtime vehicle data, used for the live view; published for developer use and not against their use. | Attribution to Adelaide Metro – Department for Infrastructure and Transport, South Australia (courtesy text) | | **HSL** (realtime.hsl.fi) | Transit layer live vehicles, Helsinki | HSL (Helsinki Region Transport) open realtime vehicle data, used for the live view; published for developer use and not against their use. | Attribution to HSL (Helsinki Region Transport) (courtesy text) | | **TTC** (bustime.ttc.ca) | Transit layer live vehicles, Toronto — surface vehicles (buses and streetcars) only | Toronto Transit Commission BusTime open realtime vehicle data, published through City of Toronto Open Data and used for the live view. The subway publishes no vehicle positions, so Lines 1/2/4 are absent rather than inferred. | Attribution to Toronto Transit Commission — City of Toronto Open Data, under the Open Government Licence – Toronto | | **MiWay** (miapp.ca) | Transit layer live vehicles, Mississauga ON | MiWay open realtime vehicle data, published by the City of Mississauga under its Open Data Terms of Use, used for the live view. The licence is revocable and asks that the Terms of Use link travel with the data. | Attribution to MiWay — City of Mississauga Open Data, linked to the Terms of Use | @@ -179,7 +180,7 @@ The optional Local ADS-B layer and the broadcast-FM receiver use radio you recei - **City of Toronto RESCU cameras.** Keyless. The camera list is the City's public `tmcearthcameras.json` on `opendata.toronto.ca` (dataset "Traffic Cameras", Transportation Services), served as JSONP and unwrapped with an anchored pattern. This is the municipal network the Ontario 511 pack does not carry: downtown arterials plus the Gardiner, DVP, Allen and Lake Shore. The list publishes no frame URL, so frame URLs are BUILT from the documented `CameraImages/loc####.jpg` convention and a strictly-digits camera number, pinning the frame proxy to the portal origin by construction; the list fetch refuses redirects and bounds the body it buffers. Frames are fetched at request time and never stored or redistributed. The dataset publishes no camera facing: the `D1`-`D4` fields are the directions of the *comparison* images (static reference stills captured in 2016 under a different path), not a bearing for the live pan-tilt-zoom frame, so headings use the shared id-hash fallback at low confidence and are corrected with the in-app calibration gizmo. A camera that is temporarily out of service still answers 200 with a byte-identical "Image Unavailable" placeholder rather than an error (about 6% of the network at any moment), so such a camera reads as healthy; the frame it shows is the agency's, not a synthesized one. The licence requires the attribution statement above. Disable with `CCTV_TORONTO_ENABLED=0`. - **Autostrada del Brennero (A22) webcams.** Keyless. The camera list is one request to the Open Data Hub tourism API (`tourism.api.opendatahub.com/v1/WebcamInfo?source=a22`), run by NOI Techpark in South Tyrol, which republishes Autobrennero's own list of 13 motorway webcams with coordinates and kilometre markers. Frames are the operator's stills on `www.autobrennero.it/WebCamImg/km.jpg`, refreshed about once a minute, and only the exact image for each camera's kilometre is registered. The feed names no bearing, so headings use the id-hash fallback at low confidence. The road climbs from about 20 m in the Po valley to about 1,370 m at the Brenner Pass, so each camera's ground elevation comes from a per-kilometre table sampled from the Copernicus GLO-90 DEM (via Open-Meteo's elevation API); a camera not in the table uses a 200 m prior. The Open Data Hub tags every record CC0 (`ClosedData: false`, Autobrennero as licence holder), but that tag is the aggregator's metadata and Autobrennero publishes no terms of its own for the images, so they are credited to the operator as a courtesy and are not redistributed. Frames are fetched at request time and never stored. Disable with `CCTV_A22_ENABLED=0`. - **Camera frame content.** Public camera frames can contain people, vehicles and license plates, and the camera layer does nothing with them beyond putting them on the map. A successful upstream response is relayed as the provider served it: nothing in the camera pipeline blurs, redacts, enhances or restores it, and nothing there runs face, plate or object detection or otherwise recognises or classifies what is in the picture. (The ALPR layer described below maps where plate-reader cameras are, from locations contributors tagged in OpenStreetMap; it reads nothing from any camera frame.) When an upstream has no frame for a camera, what you see instead is a Google Street View still or the app's own placeholder card; the panel's source badge names which of them you are looking at, and a refresh that fails after a frame has arrived leaves the last good picture on screen rather than replacing it. The browser resamples each frame for display: onto a fixed 1920x1080 surface for the camera's projection plane in the scene, and onto a 192x108 canvas for the small ambient card. That scaling is the only change made to the picture, and the only pixels the camera layer reads back are a 64x36 downscale hashed to tell whether the picture has changed. Live streams are piped through; the still path reads the image into memory to pass it on — TxDOT wraps its JPEG in a JSON envelope, which is decoded there — and no frame is written to disk (the disk cache, `.gev-cache/`, holds feed JSON for other layers and never camera imagery). Outside that pipeline, the voice assistant is the one feature that sends imagery anywhere: when it answers a question about what is in view it may attach a downscaled screenshot of the rendered scene — including any camera plane on screen — to the request it sends to the voice model. Frames are fetched only from server-registered camera URLs — a client cannot hand the proxy a URL (see [SECURITY.md](SECURITY.md)). What the app does stays inside the line README draws: no named-person search, no face recognition, no tracking individuals. -- **Transit (GTFS-Realtime).** The proxy requests only registered operator feeds, validates redirects, bounds responses, and uses conditional requests, short snapshot caching and failure backoff. All sixteen registered regions are live-enabled; each can be disabled independently. Vehicles use delayed playback between reports, with report age and waiting states shown separately. Session-local selected trails are available for every feed. MBTA additionally retains up to 15 minutes of recently observed positions in the running proxy, so available history can survive a browser reload; server restart clears it. History reads never fetch upstream, and other feeds have no proxy retention. Nothing is archived to disk or collected in the background. Operator text credits are included as a courtesy and do not imply endorsement. Heights are aligned to work with Google 3D tiles; subway markers are shown at street level because these feeds do not supply depth. The TTC feed is BusTime, the surface system: it carries buses and streetcars and no subway at all. About four in ten of its vehicles report no route at all (unassigned or deadheading), and those are shown with the feed default rather than a route-established mode. It sends no ETag or Last-Modified, so its conditional requests fall through to the ordinary snapshot cache. Three Golden Horseshoe neighbours run alongside it — MiWay, Hamilton HSR and Durham Region Transit — each bus-only and each polled only near its own region. Durham Region Transit publishes no bearing on any vehicle, so those sprites take their heading from observed movement like any other feed that omits it. Guelph, Kingston and Barrie extend the same pattern eastward and north. Hamilton, Guelph, Burlington and YRT publish route ids that are not the number on the vehicle, so those entries carry a route-name table taken from each operator’s own published GTFS; any id missing from a table renders unchanged rather than blank. A label is never invented: YRT runs a route `9101` that appears nowhere in its published routes, so it stays as the feed sends it. Burlington’s is the one that cannot be shortcut: `351` is route 1 while `3510` is route 10, so the table is a real join rather than a trimmed prefix. GO Transit / Metrolinx is deliberately absent: its REALTIME feed requires an API key issued by manual review, which the keyless admission rule excludes (its static schedule download is keyless, but carries no vehicle positions). Barrie and YRT/Viva each invite acceptance of their licence through a form, and each licence also states that using the data is itself acceptance; this deployment relies on that clause, which is recorded in both entries. Grand River Transit in Waterloo is absent for a different reason: it answers, but its feed header was months stale and it publishes no per-vehicle timestamps, so it would render vehicles that look live and are not. Ottawa’s OC Transpo falls to the same keyless admission rule as GO Transit — its realtime feed requires an API key. London Transit and Thunder Bay Transit publish vehicle positions over plain HTTP with no HTTPS endpoint available. Every other Ontario system — Brampton, Oakville, Niagara, Milton, Windsor, Greater Sudbury, UP Express and a dozen smaller operators — publishes static GTFS schedules only, with no realtime vehicle positions to register. Between the nine included and these exclusions, every Ontario realtime vehicle-position feed catalogued in the Mobility Database is accounted for. +- **Transit (GTFS-Realtime).** The proxy requests only registered operator feeds, validates redirects, bounds responses, and uses conditional requests, short snapshot caching and failure backoff. All eighteen registered regions are live-enabled; each can be disabled independently. The Australian feeds (TransLink South East Queensland and Cairns, Adelaide Metro) are keyless and published under CC BY 4.0; the passage each rests on is quoted in `terms` in `src/data/transitFeeds.js`. Vehicles use delayed playback between reports, with report age and waiting states shown separately. Session-local selected trails are available for every feed. MBTA additionally retains up to 15 minutes of recently observed positions in the running proxy, so available history can survive a browser reload; server restart clears it. History reads never fetch upstream, and other feeds have no proxy retention. Nothing is archived to disk or collected in the background. Operator text credits are included as a courtesy and do not imply endorsement. Heights are aligned to work with Google 3D tiles; subway markers are shown at street level because these feeds do not supply depth. The TTC feed is BusTime, the surface system: it carries buses and streetcars and no subway at all. About four in ten of its vehicles report no route at all (unassigned or deadheading), and those are shown with the feed default rather than a route-established mode. It sends no ETag or Last-Modified, so its conditional requests fall through to the ordinary snapshot cache. Three Golden Horseshoe neighbours run alongside it — MiWay, Hamilton HSR and Durham Region Transit — each bus-only and each polled only near its own region. Durham Region Transit publishes no bearing on any vehicle, so those sprites take their heading from observed movement like any other feed that omits it. Guelph, Kingston and Barrie extend the same pattern eastward and north. Hamilton, Guelph, Burlington and YRT publish route ids that are not the number on the vehicle, so those entries carry a route-name table taken from each operator’s own published GTFS; any id missing from a table renders unchanged rather than blank. A label is never invented: YRT runs a route `9101` that appears nowhere in its published routes, so it stays as the feed sends it. Burlington’s is the one that cannot be shortcut: `351` is route 1 while `3510` is route 10, so the table is a real join rather than a trimmed prefix. GO Transit / Metrolinx is deliberately absent: its REALTIME feed requires an API key issued by manual review, which the keyless admission rule excludes (its static schedule download is keyless, but carries no vehicle positions). Barrie and YRT/Viva each invite acceptance of their licence through a form, and each licence also states that using the data is itself acceptance; this deployment relies on that clause, which is recorded in both entries. Grand River Transit in Waterloo is absent for a different reason: it answers, but its feed header was months stale and it publishes no per-vehicle timestamps, so it would render vehicles that look live and are not. Ottawa’s OC Transpo falls to the same keyless admission rule as GO Transit — its realtime feed requires an API key. London Transit and Thunder Bay Transit publish vehicle positions over plain HTTP with no HTTPS endpoint available. Every other Ontario system — Brampton, Oakville, Niagara, Milton, Windsor, Greater Sudbury, UP Express and a dozen smaller operators — publishes static GTFS schedules only, with no realtime vehicle positions to register. Between the nine included and these exclusions, every Ontario realtime vehicle-position feed catalogued in the Mobility Database is accounted for. - **Radio Browser.** `/api/radio/stations` discovers official API mirrors, makes bounded and coalesced healthy/geolocated HTTPS-station queries, caches the normalized public-domain directory for 45 minutes, and may serve the last good catalog for up to seven days during an outage. Refreshes must meet minimum accepted-query and station coverage before replacing a warm catalog; schema-valid responses whose rows all fail the product's health policy do not count as successful queries. A usable partial cold catalog is explicitly `DEGRADED`, and non-array or empty successful payloads are rejected atomically. Individual structurally malformed rows are skipped rather than failing the whole query; the response carries their bounded `rejectedStationCount` (at most 10,000), which the client adds to its own rejected rows and reports as degraded coverage without discarding the accepted generation. Every directory and click-count request rejects redirects, validates all resolved addresses as globally routable (including reserved/documentation IPv4 and special/non-global IPv6 exclusions), and pins the TLS connection to a validated address. Only MP3/AAC non-HLS directory rows with public HTTPS stream targets are returned; favicons are intentionally omitted. Pressing play connects one browser audio element directly to the selected broadcaster and calls the directory's click counter through known-ID-only `POST /api/radio/click/:uuid`. GEV never proxies, caches, records, bundles, or redistributes audio. Radio Browser supplies station-level tags, not dependable current-song or upcoming-program metadata, so Radio filtering never claims either. Direct playback exposes the listener's IP address to the broadcaster, whose own stream terms apply. - **TomTom Traffic.** Optional and BYOK: without `TOMTOM_API_KEY` the traffic layer runs its built-in simulation and no TomTom data (or attribution) appears. With a key, flow vector tiles are fetched through the server-side `/api/tomtom` proxy (120 s cache + a daily tile-budget governor — `TOMTOM_DAILY_TILE_BUDGET`, default 6,000 — sized so a 31-day month stays inside TomTom's 200K monthly free allowance; still a configurable application safety ceiling, not a guarantee; TomTom's [current pricing](https://docs.tomtom.com/pricing/) lists 200K free tile requests per month) and the "Traffic flow data © TomTom" credit is registered in the Data attribution popover the moment live mode activates. TomTom data is served live and cached only transiently (≤120 s TTL under `.gev-cache/`, gitignored) — it is not bundled or redistributed. One 23 KB point-in-time tile snapshot is committed as a decode-test fixture (`src/data/fixtures/`, © TomTom, never served to the app). - **Routing (OSRM / FOSSGIS).** `/api/route` proxies the public OSRM instances FOSSGIS e.V. runs for the OpenStreetMap community (car, bike, foot profiles). They are keyless and intended for fair, interactive use — the proxy rate-limits clients (60/min, 200/min total), caps route span and response size, caches each route for 10 minutes, and identifies itself in the User-Agent. Heavy or automated use must run its own OSRM. Routes are computed from OpenStreetMap data (ODbL); the Directions layer and voice routes never redistribute them. A route the router cannot find is reported as such; the Directions layer draws nothing in that case, and voice routes fall back to a clearly labeled straight line. diff --git a/scripts/format-scope.json b/scripts/format-scope.json index 2d1593a0e7..bcc35dd31f 100644 --- a/scripts/format-scope.json +++ b/scripts/format-scope.json @@ -766,6 +766,7 @@ "server/providers/transitHistory.test.mjs", "src/data/transitFeeds.js", "src/data/transitFeeds.test.mjs", + "src/data/transitFeedsAustralia.test.mjs", "src/data/transitProxy.js", "src/data/transitProxy.test.mjs", "src/data/gtfsRealtime.js", diff --git a/src/data/transitFeeds.js b/src/data/transitFeeds.js index b8476a6ee8..bcbf213e5c 100644 --- a/src/data/transitFeeds.js +++ b/src/data/transitFeeds.js @@ -376,6 +376,54 @@ function burlingtonRouteLabel(routeId) { return BURLINGTON_ROUTE_NAMES[routeId] || routeId; } +/** + * TransLink (Queensland) route ids are `-`. Rail lines are two + * two-letter station codes (`BRBN`, `SHCL`), ferries are `F` plus the + * Southern Moreton Bay Islands service `SMBI`, and the Gold Coast light rail + * is `L1`. `SHUT` is the rail-replacement bus. Everything else is a bus, left + * to the feed default so movement plausibility treats it as a guess. + * @param {string|null} routeId + * @returns {string} + */ +function translinkRouteMode(routeId) { + if (!routeId) return 'unknown'; + const route = routeId.replace(/-\d+$/, ''); + if (/^F\d+$/.test(route) || route === 'SMBI') return 'ferry'; + if (route === 'L1') return 'tram'; + if (/^[A-Z]{4}$/.test(route) && route !== 'SHUT') return 'rail'; + return 'unknown'; +} + +/** Adelaide Metro train and tram route ids, from its static routes.txt. */ +const ADELAIDE_RAIL_ROUTES = new Set([ + 'BEL', + 'FLNDRS', + 'GAW', + 'GAWC', + 'GRNG', + 'NOAR', + 'OSBORN', + 'OUTHA', + 'PTDOCK', + 'SALIS', + 'SEAFRD', +]); +const ADELAIDE_TRAM_ROUTES = new Set(['BTANIC', 'FESTVL', 'GLNELG']); + +/** + * Adelaide Metro route ids are the line codes; all-letter bus routes exist + * (`INDSTA`), so trains and trams are listed rather than pattern-matched. + * @param {string|null} routeId + * @returns {string} + */ +function adelaideMetroRouteMode(routeId) { + if (!routeId) return 'unknown'; + if (ADELAIDE_RAIL_ROUTES.has(routeId)) return 'rail'; + if (ADELAIDE_TRAM_ROUTES.has(routeId)) return 'tram'; + if (routeId === 'SEALNK') return 'ferry'; + return 'unknown'; +} + /** * Registry of feeds. Order is presentation order in the stats/credit text. * `loadRadiusKm` is the distance from `center` inside which the feed is polled. @@ -522,7 +570,7 @@ export const TRANSIT_FEED_REGISTRY = Object.freeze([ url: 'https://gtfsrt.api.translink.com.au/api/realtime/seq/VehiclePositions', license: 'CC BY 4.0', licenseUrl: 'https://translink.com.au/about-translink/open-data', - attribution: 'TransLink — Queensland Government (CC BY 4.0)', + attribution: 'Translink, Department of Transport and Main Roads', defaultEnabled: true, terms: Object.freeze({ quote: @@ -530,6 +578,53 @@ export const TRANSIT_FEED_REGISTRY = Object.freeze([ note: 'No key, no stated rate limit, no caching rule. Logos and network imagery need separate approval, so the credit is text only.', }), defaultMode: 'bus', + routeMode: translinkRouteMode, + }), + Object.freeze({ + id: 'translink-cairns', + name: 'TransLink', + operator: 'TransLink (Queensland Government)', + region: 'Cairns, Australia', + center: Object.freeze({ lat: -16.9186, lon: 145.7781 }), + loadRadiusKm: 60, + url: 'https://gtfsrt.api.translink.com.au/api/realtime/CNS/VehiclePositions', + license: 'CC BY 4.0', + licenseUrl: 'https://translink.com.au/about-translink/open-data', + attribution: 'Translink, Department of Transport and Main Roads', + defaultEnabled: true, + terms: Object.freeze({ + quote: + 'Our data is licensed under a Creative Commons Attribution 4.0 International License. Authentication is not required to use the feed.', + note: 'The same open-data page lists Cairns (CNS) vehicle positions beside South East Queensland; same terms, text-only credit.', + }), + defaultMode: 'bus', + routeMode: translinkRouteMode, + }), + Object.freeze({ + id: 'adelaide-metro', + name: 'Adelaide Metro', + operator: + 'Adelaide Metro (Department for Infrastructure and Transport, South Australia)', + region: 'Adelaide, Australia', + center: Object.freeze({ lat: -34.9285, lon: 138.6007 }), + loadRadiusKm: 80, + url: 'https://gtfs.adelaidemetro.com.au/v1/realtime/vehicle_positions', + // The gateway negotiates on Accept: the proxy's default list gets + // application/json carrying base64 protobuf; its own type gets raw bytes. + headers: Object.freeze({ Accept: 'application/x-google-protobuf' }), + license: 'CC BY 4.0', + licenseUrl: + 'https://data.sa.gov.au/data/dataset/adelaide-metro-real-time-passenger-information', + attribution: + 'Adelaide Metro – Department for Infrastructure and Transport, South Australia', + defaultEnabled: true, + terms: Object.freeze({ + quote: + 'Adelaide Metro provides Real-Time information in SIRI and GTFS-R format', + note: 'Quoted from the data.sa.gov.au catalogue entry "Adelaide Metro Real-Time Passenger Information", published by the Department for Infrastructure and Transport under Creative Commons Attribution 4.0. The feed needs no key (its API description declares no security scheme) and is marked BETA, subject to change. adelaidemetro.com.au refuses automated readers (HTTP 403).', + }), + defaultMode: 'bus', + routeMode: adelaideMetroRouteMode, }), Object.freeze({ id: 'ttc-toronto', diff --git a/src/data/transitFeedsAustralia.test.mjs b/src/data/transitFeedsAustralia.test.mjs new file mode 100644 index 0000000000..decf32baca --- /dev/null +++ b/src/data/transitFeedsAustralia.test.mjs @@ -0,0 +1,139 @@ +import { readFileSync } from 'node:fs'; +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { transitFeedCredit } from './dataCredits.js'; +import { transitUpstreamHeaders } from './transitProxy.js'; +import { + getTransitFeed, + publicTransitCatalog, + transitFeedsInRange, + transitModeFor, + transitModeResolved, +} from './transitFeeds.js'; + +// Route ids below are as published in the live feeds and the operators' +// static routes.txt (checked 16 Oct 2026). + +test('Australian feeds are keyless, routable and cover their own city only', () => { + const seq = getTransitFeed('translink-seq'); + const cairns = getTransitFeed('translink-cairns'); + const adelaide = getTransitFeed('adelaide-metro'); + assert.equal( + cairns.url, + 'https://gtfsrt.api.translink.com.au/api/realtime/CNS/VehiclePositions', + ); + assert.equal( + adelaide.url, + 'https://gtfs.adelaidemetro.com.au/v1/realtime/vehicle_positions', + ); + for (const feed of [seq, cairns]) { + assert.equal(feed.headers, undefined, `${feed.id} needs no extra header`); + } + for (const feed of [seq, cairns, adelaide]) { + assert.equal(feed.license, 'CC BY 4.0'); + } + const ids = (lat, lon) => transitFeedsInRange(lat, lon).map((f) => f.id); + assert.deepEqual(ids(-27.4698, 153.0251), ['translink-seq']); + assert.deepEqual(ids(-16.9186, 145.7781), ['translink-cairns']); + assert.deepEqual(ids(-34.9285, 138.6007), ['adelaide-metro']); + assert.deepEqual(ids(-37.8136, 144.9631), [], 'Melbourne has no feed'); +}); + +test('Adelaide is asked for its own protobuf type, or its gateway answers base64 JSON', () => { + // Offered the default Accept list (application/x-protobuf, ..., */*), the + // Adelaide Metro gateway replies application/json carrying the protobuf as + // base64, which the decoder rejects. Its own media type gets raw protobuf. + const adelaide = getTransitFeed('adelaide-metro'); + assert.deepEqual(Object.keys(adelaide.headers), ['Accept']); + const headers = transitUpstreamHeaders(adelaide); + assert.equal(headers.Accept, 'application/x-google-protobuf'); + assert.equal(headers['Accept-Encoding'], 'gzip'); + assert.match(headers['User-Agent'], /gods-eye-view/); +}); + +test('TransLink route ids resolve rail, light rail and ferries; buses stay a default', () => { + const seq = getTransitFeed('translink-seq'); + const cases = [ + ['BRBN-5187', 'rail'], + ['SHCL-5187', 'rail'], + ['RPIP-5201', 'rail'], + ['L1-5029', 'tram'], + ['F1-4055', 'ferry'], + ['F23-4055', 'ferry'], + ['F50-4430', 'ferry'], + ['SMBI-3779', 'ferry'], + ]; + for (const [routeId, mode] of cases) { + assert.equal(transitModeFor(seq, routeId), mode, routeId); + assert.equal(transitModeResolved(seq, routeId), true, routeId); + } + // Buses, Brisbane Metro and the rail-replacement shuttle are buses by the + // feed default, so movement plausibility does not treat them as known. + for (const routeId of ['600', '250-5169', 'M1-4949', 'SHUT-5213', null]) { + assert.equal(transitModeFor(seq, routeId), 'bus', String(routeId)); + assert.equal(transitModeResolved(seq, routeId), false, String(routeId)); + } + const cairns = getTransitFeed('translink-cairns'); + assert.equal(transitModeFor(cairns, 'C111-5061'), 'bus'); + assert.equal(transitModeResolved(cairns, 'C111-5061'), false); +}); + +test('Adelaide Metro route ids resolve trains, trams and the SeaLink ferry', () => { + const adelaide = getTransitFeed('adelaide-metro'); + const cases = [ + ['BEL', 'rail'], + ['GAWC', 'rail'], + ['OUTHA', 'rail'], + ['SEAFRD', 'rail'], + ['PTDOCK', 'rail'], + ['BTANIC', 'tram'], + ['GLNELG', 'tram'], + ['FESTVL', 'tram'], + ['SEALNK', 'ferry'], + ]; + for (const [routeId, mode] of cases) { + assert.equal(transitModeFor(adelaide, routeId), mode, routeId); + assert.equal(transitModeResolved(adelaide, routeId), true, routeId); + } + // All-letter bus routes exist (INDSTA/INDSTB), so letters alone are not rail. + for (const routeId of ['100', 'G10', 'H33C', 'INDSTA', 'T721', null]) { + assert.equal(transitModeFor(adelaide, routeId), 'bus', String(routeId)); + assert.equal( + transitModeResolved(adelaide, routeId), + false, + String(routeId), + ); + } +}); + +test('Australian feeds credit the operator and department as text', () => { + const credit = (id) => + transitFeedCredit(publicTransitCatalog().find((feed) => feed.id === id)) + .html; + for (const id of ['translink-seq', 'translink-cairns']) { + assert.match( + credit(id), + /^Transit \(Translink, Department of Transport and Main Roads\): ]*>CC BY 4\.0<\/a>$/, + ); + } + assert.match( + credit('adelaide-metro'), + /^Transit \(Adelaide Metro – Department for Infrastructure and Transport, South Australia\): ]*>CC BY 4\.0<\/a>$/, + ); +}); + +test('DATA_SOURCES documents the Australian feeds in the transit row style', () => { + const rows = readFileSync( + new URL('../../DATA_SOURCES.md', import.meta.url), + 'utf8', + ).split('\n'); + const translink = rows.find((line) => line.startsWith('| **TransLink**')); + assert.match(translink, /South East Queensland and Cairns/); + const adelaide = rows.find((line) => line.startsWith('| **Adelaide Metro**')); + assert.ok(adelaide, 'Adelaide Metro row exists'); + for (const row of [translink, adelaide]) { + assert.match(row, /open realtime vehicle data/); + assert.match(row, /published for developer use and not against their use/); + assert.doesNotMatch(row, /licen[cs]e|CC BY|terms/i); + } +}); From 55cca5f8de688d5d1e2aa427ac41322d685a6ef7 Mon Sep 17 00:00:00 2001 From: Renzo Will Date: Fri, 16 Oct 2026 06:29:41 +1000 Subject: [PATCH 21/84] docs: record the Australian transit feeds in CURRENT-STATE and CHANGELOG Co-Authored-By: Claude Opus 5.5 (1M context) --- docs/CURRENT-STATE.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 7668235500..95f0fa518f 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -3927,7 +3927,7 @@ its criteria cannot be silently ignored. | Traffic | Selectable TomTom / OpenStreetMap / Hybrid roads; optional TomTom flow (BYOK) | `src/data/traffic.js` | browser-direct OpenFreeMap tiles; `/api/tomtom` for flow | viewport-driven; capped tile cache | | CCTV | Austin + Caltrans (CA) + TfL London + Ontario 511 + Fintraffic (FI) + DriveBC (BC) + TxDOT (TX) + Estonia (Tallinn, Tarktee) + Live Traffic NSW + Open Calgary Open Data + Statens vegvesen (NO, stills + live HLS, Kartverket ground heights) + King County (WA) Open Data + WSDOT (WA) Open Data + NYC DOT TMC (opt-in) + City of Toronto RESCU + Catalonia (Servei Català de Trànsit) + Hong Kong Transport Department + FL511 (FL, opt-in) + Freeway Bureau, MOTC (Taiwan) + Autostrada del Brennero (IT, A22 stills) + Street View fallback | `src/data/cctv.js` | `/api/cctv` | 10s (active) | | Radio | Radio Browser (public-domain station directory) | `src/data/radio.js` | `/api/radio/stations`, `/api/radio/click/:uuid` | 45 min directory refresh | -| Transit 🚌 | Operator GTFS-Realtime VehiclePositions (7 keyless regions, `src/data/transitFeeds.js`) | `src/layers/transit/` via `src/app/layers/transit.js` | `/api/transit` | 15s (poll + delayed playback) | +| Transit 🚌 | Operator GTFS-Realtime VehiclePositions (18 keyless regions, `src/data/transitFeeds.js`) | `src/layers/transit/` via `src/app/layers/transit.js` | `/api/transit` | 15s (poll + delayed playback) | | Bikeshare 🚲 | GBFS (Lyft + BCycle + Social Bicycles + PBSC incl. Bike Share Toronto, Bike Itaú (Brazil), Bicing (Barcelona) and seven other Spanish cities + Urban Sharing, Entur, JCDecaux (Lillestrøm, Valencia, Seville) + nextbike (AMBici)) | `src/data/bikeshare.js` | `/api/gbfs` | 60s | | Directions 🧭 | OSRM on FOSSGIS servers (OpenStreetMap) | `src/data/directions.js` | `/api/route` (`steps=1`) | on placement / mode change | | Datacenters ▣ | OSM extract (bundled) | `src/data/infrastructure.js` | — | static | @@ -4357,12 +4357,15 @@ Transit is off by default, and share links use token `j`. The movement panel ord places Transit directly after Street Traffic and before Bike Share. Cameras and utilities retain their own groups. The layer polls registered feeds near the camera every 15 seconds, below a 3,000 km altitude -gate. Sixteen keyless regions are available: Boston, Austin, Minneapolis–St Paul, -Helsinki, the Netherlands, Norway, South East Queensland, and nine in +gate. Eighteen keyless regions are available: Boston, Austin, Minneapolis–St Paul, +Helsinki, the Netherlands, Norway, South East Queensland, Cairns, Adelaide, and nine in Ontario — Toronto (TTC surface vehicles; the subway publishes no positions), MiWay, Hamilton HSR, Durham Region, YRT/Viva, Guelph, Burlington, Barrie and Kingston. Mode silhouettes identify buses, trams, subways, trains, ferries and unclassified vehicles. +TransLink route ids resolve rail, Gold Coast light rail and ferries; Adelaide +Metro route ids resolve trains, trams and the SeaLink ferry. Other routes in +those feeds keep the feed's bus default. Retained transit history uses the same outlier quarantine as live observations and preserves the active live bracket. Rejected reports do not publish route or mode From ce4c086076fe75243dcbf267024fbc5997c41312 Mon Sep 17 00:00:00 2001 From: Renzo Will Date: Sat, 17 Oct 2026 07:13:39 +1000 Subject: [PATCH 22/84] docs: move the changelog entry into changelog.d per the new fragment rule Co-Authored-By: Claude Opus 5.5 (1M context) --- changelog.d/1169-australian-transit.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 changelog.d/1169-australian-transit.md diff --git a/changelog.d/1169-australian-transit.md b/changelog.d/1169-australian-transit.md new file mode 100644 index 0000000000..1d6a836f0a --- /dev/null +++ b/changelog.d/1169-australian-transit.md @@ -0,0 +1,8 @@ +- Transit adds two keyless Australian GTFS-Realtime feeds: TransLink Cairns + and Adelaide Metro (marked BETA by its operator), both CC BY 4.0 with text + credits. TransLink vehicles now show trains, Gold Coast light rail and + ferries by route id instead of all appearing as buses; Adelaide Metro trains, + trams and the SeaLink ferry are identified the same way. Adelaide's gateway + returns base64 protobuf inside JSON unless asked for + `application/x-google-protobuf`, so that feed sends its own Accept header + (willrenzo39, #1169). From 4c58c72d454eafc37cb869f42d171de4333b293f Mon Sep 17 00:00:00 2001 From: Renzo Will Date: Sun, 1 Nov 2026 20:12:50 +1000 Subject: [PATCH 23/84] docs(readme): list Cairns and Adelaide in the Transit row Co-Authored-By: Claude Opus 5.5 (1M context) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac135360fd..0018c4e7ef 100644 --- a/README.md +++ b/README.md @@ -403,7 +403,7 @@ Twenty layers and map sources. **Eighteen have a keyless path.** Some offer addi | 📷 **Mapped ALPR Cameras** | License-plate-reader camera locations tagged by OpenStreetMap contributors, loaded one city-sized view at a time, with **SHOW NEAREST**. Locations and tags only: no plate data, no video | OpenStreetMap (incl. DeFlock mapping) | 🟢 | | 📷 **Street Level** | Street-level photos behind one panel, one chip per provider: coverage on the streets, image cones, an embedded viewer with full-screen **EXPAND**. Mapillary, Google Street View, KartaView and Panoramax | Mapillary · Google · KartaView · Panoramax | 🟢 KartaView, Panoramax · 🟡 Mapillary token · 🔴 Google Maps key | | 📻 **Radio** | Geolocated world radio with an **analog tuner** — drag the needle across up to 750 stations and the globe flies to each broadcaster | Radio Browser / broadcasters | 🟢 | -| 🚌 **Transit** | Live buses, trams, metros, trains and ferries with delayed playback between reports, selected-vehicle trails, and mode-coloured DETECT labels — Boston, Austin, Minneapolis, Helsinki, the Netherlands, Norway, South East Queensland, and nine in Ontario: Toronto (surface vehicles; the subway publishes no positions), Mississauga, Hamilton, Durham Region, York Region, Guelph, Burlington, Barrie and Kingston | Operator GTFS-Realtime feeds | 🟢 | +| 🚌 **Transit** | Live buses, trams, metros, trains and ferries with delayed playback between reports, selected-vehicle trails, and mode-coloured DETECT labels — Boston, Austin, Minneapolis, Helsinki, the Netherlands, Norway, South East Queensland, Cairns, Adelaide, and nine in Ontario: Toronto (surface vehicles; the subway publishes no positions), Mississauga, Hamilton, Durham Region, York Region, Guelph, Burlington, Barrie and Kingston | Operator GTFS-Realtime feeds | 🟢 | | 🚲 **Bikeshare** | Live station availability | GBFS | 🟢 | | 🧭 **Directions** | Click A and B on the globe for a street-following drive, walk or cycle route draped on the terrain with turn-by-turn steps — then FLY the camera along it. No key, no geocoder, no mic | OSRM on FOSSGIS servers (OpenStreetMap) | 🟢 | | 🔥 **Active Fires** | Live NASA FIRMS detections, trailing 24h | NASA FIRMS | 🟡 | From a0f70da1d22751408bae039e7379ce9de9bb853c Mon Sep 17 00:00:00 2001 From: Said Turksever Date: Tue, 3 Nov 2026 16:09:47 +0000 Subject: [PATCH 24/84] docs: complete review bookkeeping for #808 --- changelog.d/808-cctv-focus-nearest-point.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog.d/808-cctv-focus-nearest-point.md diff --git a/changelog.d/808-cctv-focus-nearest-point.md b/changelog.d/808-cctv-focus-nearest-point.md new file mode 100644 index 0000000000..1c9a691a12 --- /dev/null +++ b/changelog.d/808-cctv-focus-nearest-point.md @@ -0,0 +1,3 @@ +- Add a CCTV control method to select the catalog camera nearest an explicit + WGS84 point, optionally flying to it. Viewer-nearest navigation uses the same + coordinate lookup (Kevin Rajan, #808). From 5d28d614e07197a69bfecaa3f1818ff7916ac166 Mon Sep 17 00:00:00 2001 From: German Khokhlov Date: Fri, 13 Nov 2026 18:46:27 +0400 Subject: [PATCH 25/84] i18n: generate zh-Hant from zh-CN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit zh-Hant is the zh-CN text in Traditional characters, but contributors still translated it by hand from `--missing zh-Hant`, and a model asked for Traditional Chinese writes Taiwan vocabulary (影片, 伺服器, 載入). `npm run i18n -- --zh-hant` now rewrites zh-Hant.json from zh-CN.json with OpenCC s2tw (opencc-js 1.4.2, cn -> tw, characters only), then the fixed list of characters it picks wrongly. The check that `npm test` runs fails when zh-Hant differs from that conversion, naming the key, and `--missing zh-Hant` points to the command instead of printing a template. The conversion reproduces every one of the 3346 entries on main. 25 keys were out of zh-CN order and move; no value changes. The converter loads on first use, so a copy of the script without node_modules (stale-index.test.mjs) still extracts messages. --- docs/CURRENT-STATE.md | 4 +- docs/I18N.md | 2 + docs/TRANSLATORS.md | 2 + docs/translations/zh-Hant.md | 16 +++-- package-lock.json | 8 +++ package.json | 1 + scripts/i18n.mjs | 129 +++++++++++++++++++++++++++++++--- src/i18n/catalog.test.mjs | 56 +++++++++++++++ src/i18n/locales/zh-Hant.json | 50 ++++++------- 9 files changed, 230 insertions(+), 38 deletions(-) diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 6073b5c842..e5ebea3e2a 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -5096,7 +5096,9 @@ Shipped locales: **en** (source and fallback), **ar**, **de**, **es**, **fr**, * - **Gate.** `npm run i18n` (and `src/i18n/catalog.test.mjs` under `npm test`) extracts every message and fails on missing, empty, unused, placeholder-mismatched, still-English (plural forms included) or - wrongly-shaped plural entries. + wrongly-shaped plural entries. `zh-Hant` is generated from `zh-CN` + (`npm run i18n -- --zh-hant`: OpenCC `s2tw` through `opencc-js`, then a + fixed list of character corrections), and the gate fails when it differs. - **Not translated by design:** layer ids, share-link and hash parameters, API fields, voice tool schemas, provider names, feed data (callsigns, vessel and station names) and attribution. diff --git a/docs/I18N.md b/docs/I18N.md index bacfdc509e..1326790e12 100644 --- a/docs/I18N.md +++ b/docs/I18N.md @@ -104,6 +104,8 @@ npm run i18n -- --prune # drop entries whose English no longer exists Changing the English changes the key: the old translation goes unused and the new text shows as missing. Add the translation to every `src/i18n/locales/.json` (or ask a translator), prune, and run `npm test`; it fails until every language is complete. +Do not translate `zh-Hant`: it is generated. After `zh-CN`, run `npm run i18n -- --zh-hant` (see [zh-Hant.md](./translations/zh-Hant.md)). + To see a language, open the app with `?lang=ru`, or use the language picker (the globe button in the bottom-right corner). An empty translation is reported, and so is one left as the English, plural forms included. When English is right on purpose (a code such as CRT, a product name), list it under the language in `src/i18n/same-as-english.json`. diff --git a/docs/TRANSLATORS.md b/docs/TRANSLATORS.md index a1e1083797..48acab2420 100644 --- a/docs/TRANSLATORS.md +++ b/docs/TRANSLATORS.md @@ -36,6 +36,8 @@ npm run i18n -- --prune # drop entries the code no longer uses Changing English text changes its key: the old translation becomes unused and the new text shows as missing. Translate it and prune. +Do not translate `zh-Hant`: it is generated. Translate `zh-CN`, then run `npm run i18n -- --zh-hant` (see [zh-Hant.md](./translations/zh-Hant.md)). + ## Fixing a translation Edit `src/i18n/locales/.json` and run `npm run i18n`. To see your change, open the app with `?lang=`. diff --git a/docs/translations/zh-Hant.md b/docs/translations/zh-Hant.md index d44c510c4a..9b58ba3479 100644 --- a/docs/translations/zh-Hant.md +++ b/docs/translations/zh-Hant.md @@ -2,16 +2,24 @@ Catalog: `src/i18n/locales/zh-Hant.json`. General rules: [TRANSLATORS.md](../TRANSLATORS.md). -`zh-Hant` is the Simplified Chinese catalog (`zh-CN`, credited to abiyeenzo, #914, and EDIT-Aeterna, #979) written in Traditional characters with OpenCC character conversion. Wording and terminology are the same as in `zh-CN`: change a term in [zh-CN.md](./zh-CN.md) and the `zh-CN` catalog first, then convert. Only the script differs. +**Do not translate or edit this catalog: it is generated.** `zh-Hant` is the Simplified Chinese catalog (`zh-CN`, credited to abiyeenzo, #914, and EDIT-Aeterna, #979) written in Traditional characters. Wording and terminology are the same as in `zh-CN`; only the script differs. To add or change an entry, edit [zh-CN.md](./zh-CN.md) and the `zh-CN` catalog, then run: -After `s2tw` conversion, fix the characters OpenCC picks wrongly: 年曆史 → 年歷史, 下遊 → 下游, 並道 → 併道, 發佈 → 發布, 公佈 → 公布, 控制檯 → 控制台, and 周 → 週 where it means a week (1 週/秒). +```sh +npm run i18n -- --zh-hant # rewrite zh-Hant.json from zh-CN.json +``` + +`npm test` fails when `zh-Hant.json` differs from the conversion of `zh-CN.json`, naming the entry, and `npm run i18n -- --missing zh-Hant` points to this command instead of printing a template. + +The command converts with OpenCC `s2tw` ([opencc-js](https://github.com/nk2028/opencc-js), `cn` → `tw`), which changes characters only. Never `s2twp`: it also swaps in Taiwan vocabulary (影片, 伺服器, 載入, 圖示), which this catalog does not use. After the conversion it fixes the characters OpenCC picks wrongly here: 年曆史 → 年歷史, 下遊 → 下游, 並道 → 併道, 發佈 → 發布, 公佈 → 公布, 控制檯 → 控制台, and 周 → 週 where it means a week (1 週/秒). The list is `ZH_HANT_CORRECTIONS` in `scripts/i18n.mjs`; when the conversion picks another wrong character, add the pair there and run the command. + +An entry `zh-CN` keeps in English on purpose needs the same line under `zh-Hant` in `src/i18n/same-as-english.json`. ## Style -- Follow [zh-CN.md](./zh-CN.md) for wording, punctuation, spacing, units and the glossary, written in Traditional characters. +- Wording, punctuation, spacing, units and the glossary are those of [zh-CN.md](./zh-CN.md), written in Traditional characters. - Relative-time placeholders may already include 前. In `LIVE · updated {age}`, the caller supplies the complete relative age; do not append another 前. - The picker displays 中文(繁體) / Chinese (Traditional); explicit Hans tags select Simplified Chinese. ## Plurals -`Intl.PluralRules('zh-Hant')` uses only `other`. Keep the measure words of the `zh-CN` entry: 「{count} 架飛機」、「{count} 艘船」. +`Intl.PluralRules('zh-Hant')` uses only `other`. The measure words come from the `zh-CN` entry: 「{count} 架飛機」、「{count} 艘船」. diff --git a/package-lock.json b/package-lock.json index df28aba4b9..6b2fe1823f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,6 +32,7 @@ "@vue/test-utils": "^2.5.1", "flag-icons": "7.5.0", "happy-dom": "^20.14.6", + "opencc-js": "1.4.2", "prettier": "3.9.6", "puppeteer": "^25.16.0", "sharp": "^0.35.4", @@ -2976,6 +2977,13 @@ "node": ">= 0.8" } }, + "node_modules/opencc-js": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/opencc-js/-/opencc-js-1.4.2.tgz", + "integrity": "sha512-EdcspgdROiCCZDM+jZR6Pa670xW+EW2QhctPBQ8gRjg6lrx4IHEl+2s+kt5izk/TkxVRgdWuFgaGkaEdIUfdaw==", + "dev": true, + "license": "MIT AND Apache-2.0" + }, "node_modules/pako": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", diff --git a/package.json b/package.json index c1476342d8..efc50f0b59 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "@vue/test-utils": "^2.5.1", "flag-icons": "7.5.0", "happy-dom": "^20.14.6", + "opencc-js": "1.4.2", "prettier": "3.9.6", "puppeteer": "^25.16.0", "sharp": "^0.35.4", diff --git a/scripts/i18n.mjs b/scripts/i18n.mjs index c424666a29..01321605ac 100644 --- a/scripts/i18n.mjs +++ b/scripts/i18n.mjs @@ -3,17 +3,21 @@ // npm run i18n check every catalog and find unmarked UI text // npm run i18n -- --prune also drop entries the code no longer uses // npm run i18n -- --missing ru print what ru lacks, as JSON to translate +// npm run i18n -- --zh-hant rewrite zh-Hant from zh-CN (see toZhHant) // // A translation left as the English fails unless src/i18n/same-as-english.json -// lists it. +// lists it. zh-Hant is not translated: it is generated from zh-CN, and the +// check fails when it differs. // // Messages are the English literals passed to t(), tn() and msg() in src/, // plus the markup opted in with data-i18n* in index.html and the Vue views. // It also lists UI text that is not marked at all (see findUnmarked). import { existsSync, readFileSync, writeFileSync } from 'node:fs'; import { execFileSync } from 'node:child_process'; +import { createRequire } from 'node:module'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; +import { isDeepStrictEqual } from 'node:util'; const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'); const LOCALES_DIR = path.join(ROOT, 'src/i18n/locales'); @@ -618,16 +622,123 @@ export function missingTemplate(locale, catalog, messages) { return out; } +// zh-Hant is zh-CN in Traditional characters (docs/translations/zh-Hant.md): +// the same wording, only the script differs. OpenCC s2tw (opencc-js, cn → tw) +// converts characters only; s2twp would also swap in Taiwan vocabulary +// (影片, 伺服器, 載入), which the catalog does not use. +const ZH_HANT = 'zh-Hant'; +const ZH_HANT_SOURCE = 'zh-CN'; +const ZH_HANT_COMMAND = 'npm run i18n -- --zh-hant'; + +// Characters s2tw picks wrongly in this text, replaced after the conversion. +const ZH_HANT_CORRECTIONS = [ + ['年曆史', '年歷史'], + ['下遊', '下游'], + ['並道', '併道'], + ['發佈', '發布'], + ['公佈', '公布'], + ['控制檯', '控制台'], + // 周 as a week: the time-lapse speed in weeks per second. + [' 周/秒', ' 週/秒'], +]; + +let s2tw; + +/** zh-CN text in Traditional characters, as zh-Hant shows it. */ +export function toZhHant(text) { + // Loaded on first use: extracting messages needs no converter, and a copy + // of this script without node_modules (stale-index.test.mjs) still runs. + s2tw ??= createRequire(import.meta.url)('opencc-js/cn2t').Converter({ + from: 'cn', + to: 'tw', + }); + return ZH_HANT_CORRECTIONS.reduce( + (out, [wrong, right]) => out.replaceAll(wrong, right), + s2tw(text), + ); +} + +/** The zh-Hant catalog for a zh-CN catalog: the same keys in the same order. */ +export function zhHantCatalog(zhCN) { + const convert = (entry) => { + if (typeof entry === 'string') return toZhHant(entry); + if (entry && typeof entry === 'object') + return Object.fromEntries( + Object.entries(entry).map(([category, form]) => [ + category, + convert(form), + ]), + ); + return entry; + }; + return Object.fromEntries( + Object.entries(zhCN).map(([text, entry]) => [text, convert(entry)]), + ); +} + +/** + * Where a zh-Hant catalog is not the conversion of the zh-CN one. + * @returns {string[]} One error per entry, naming its key. + */ +export function checkZhHant(zhCN, zhHant) { + const expected = zhHantCatalog(zhCN); + const fix = `zh-Hant is generated: edit ${ZH_HANT_SOURCE}, then run ${ZH_HANT_COMMAND}`; + const errors = []; + for (const [text, entry] of Object.entries(expected)) { + if (!Object.hasOwn(zhHant, text)) + errors.push(`"${text}" is in ${ZH_HANT_SOURCE} but not here. ${fix}`); + else if (!isDeepStrictEqual(zhHant[text], entry)) + errors.push( + `"${text}" is ${JSON.stringify(zhHant[text])}, not ${ZH_HANT_SOURCE} converted (${JSON.stringify(entry)}). ${fix}`, + ); + } + for (const text of Object.keys(zhHant)) { + if (!Object.hasOwn(expected, text)) + errors.push(`"${text}" is not in ${ZH_HANT_SOURCE}. ${fix}`); + } + if (!errors.length) { + const order = Object.keys(expected); + const keys = Object.keys(zhHant); + const at = order.findIndex((text, i) => keys[i] !== text); + if (at >= 0) + errors.push( + `entries leave the ${ZH_HANT_SOURCE} order at "${order[at]}": run ${ZH_HANT_COMMAND}`, + ); + } + return errors; +} + +const serialize = (catalog) => `${JSON.stringify(catalog, null, 2)}\n`; + +/** Rewrite zh-Hant.json as the conversion of zh-CN.json. */ +export function writeZhHant() { + const catalog = zhHantCatalog(readCatalog(ZH_HANT_SOURCE)); + writeFileSync(catalogPath(ZH_HANT), serialize(catalog)); + return Object.keys(catalog).length; +} + function main(args) { const messages = extractMessages(); const missingFor = args.includes('--missing') ? args[args.indexOf('--missing') + 1] : null; + if (missingFor?.toLowerCase() === ZH_HANT.toLowerCase()) { + console.error( + `${ZH_HANT} is generated, not translated: add the entries to ${ZH_HANT_SOURCE} (npm run i18n -- --missing ${ZH_HANT_SOURCE}), then run ${ZH_HANT_COMMAND}`, + ); + return 1; + } if (missingFor) { const out = missingTemplate(missingFor, readCatalog(missingFor), messages); console.log(JSON.stringify(out, null, 2)); return 0; } + if (args.includes('--zh-hant')) { + const count = writeZhHant(); + console.log( + `${ZH_HANT}: wrote ${count} entries converted from ${ZH_HANT_SOURCE}`, + ); + } let failed = false; for (const locale of shippedLocales()) { let catalog = readCatalog(locale); @@ -636,10 +747,7 @@ function main(args) { catalog = Object.fromEntries( Object.entries(catalog).filter(([text]) => messages.has(text)), ); - writeFileSync( - catalogPath(locale), - `${JSON.stringify(catalog, null, 2)}\n`, - ); + writeFileSync(catalogPath(locale), serialize(catalog)); console.log(`${locale}: pruned ${stale.length} unused entries`); } else if (stale.length) { failed = true; @@ -648,11 +756,16 @@ function main(args) { ); for (const text of stale) console.log(` ${JSON.stringify(text)}`); } + // shippedLocales() is sorted, so --prune has already pruned zh-CN. + if (locale === ZH_HANT) + errors.push(...checkZhHant(readCatalog(ZH_HANT_SOURCE), catalog)); if (missing.length) { failed = true; - console.log( - `${locale}: ${missing.length} missing (npm run i18n -- --missing ${locale}):`, - ); + const fill = + locale === ZH_HANT + ? `add them to ${ZH_HANT_SOURCE}, then ${ZH_HANT_COMMAND}` + : `npm run i18n -- --missing ${locale}`; + console.log(`${locale}: ${missing.length} missing (${fill}):`); for (const text of missing) console.log(` ${JSON.stringify(text)} ${messages.get(text).where}`); } diff --git a/src/i18n/catalog.test.mjs b/src/i18n/catalog.test.mjs index 8107a86e96..9b6bb5d9b4 100644 --- a/src/i18n/catalog.test.mjs +++ b/src/i18n/catalog.test.mjs @@ -3,13 +3,16 @@ import assert from 'node:assert/strict'; import { checkCatalog, + checkZhHant, extractMessages, findUnmarked, markedTemplate, readCatalog, shippedLocales, + toZhHant, unmarkedMarkup, unmarkedScript, + zhHantCatalog, } from '../../scripts/i18n.mjs'; import { LOCALES } from './locale.js'; @@ -36,6 +39,59 @@ for (const locale of shippedLocales()) { }); } +test('zh-Hant is zh-CN converted to Traditional characters (npm run i18n -- --zh-hant)', () => { + assert.deepEqual( + checkZhHant(readCatalog('zh-CN'), readCatalog('zh-Hant')), + [], + ); +}); + +test('toZhHant converts characters, not vocabulary, and fixes what s2tw picks wrongly', () => { + // s2twp would write 影片, 伺服器 and 載入; zh-Hant keeps the zh-CN words. + assert.equal(toZhHant('视频'), '視頻'); + assert.equal(toZhHant('服务器'), '服務器'); + assert.equal(toZhHant('加载'), '加載'); + assert.equal(toZhHant('50 年历史'), '50 年歷史'); + assert.equal(toZhHant('发布于 {date}'), '發布於 {date}'); + assert.equal(toZhHant('1 周/秒'), '1 週/秒'); +}); + +test('checkZhHant names each entry that is not the conversion of zh-CN', () => { + const zhCN = { + Video: '视频', + Server: '服务器', + '{count} ships': { other: '{count} 艘船' }, + }; + const generated = zhHantCatalog(zhCN); + assert.deepEqual(generated, { + Video: '視頻', + Server: '服務器', + '{count} ships': { other: '{count} 艘船' }, + }); + assert.deepEqual(checkZhHant(zhCN, generated), []); + + const fix = + 'zh-Hant is generated: edit zh-CN, then run npm run i18n -- --zh-hant'; + const { Server, ...withoutServer } = generated; + assert.deepEqual( + checkZhHant(zhCN, { + ...withoutServer, + Video: '影片', + '{count} ships': { other: '{count} 艘船隻' }, + Extra: '多餘', + }), + [ + `"Video" is "影片", not zh-CN converted ("視頻"). ${fix}`, + `"Server" is in zh-CN but not here. ${fix}`, + `"{count} ships" is {"other":"{count} 艘船隻"}, not zh-CN converted ({"other":"{count} 艘船"}). ${fix}`, + `"Extra" is not in zh-CN. ${fix}`, + ], + ); + assert.deepEqual(checkZhHant(zhCN, { Server, ...withoutServer }), [ + 'entries leave the zh-CN order at "Video": run npm run i18n -- --zh-hant', + ]); +}); + test('every UI string is marked for translation or kept on purpose (npm run i18n)', () => { assert.deepEqual( findUnmarked().map(({ where, text }) => `${where} ${text}`), diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json index fd201af367..55874fcd80 100644 --- a/src/i18n/locales/zh-Hant.json +++ b/src/i18n/locales/zh-Hant.json @@ -612,6 +612,7 @@ "Cyclone advisories unavailable": "氣旋公告不可用", "Cyclone data unavailable": "氣旋數據不可用", "Potential tropical cyclone": "潛在熱帶氣旋", + "Post-tropical cyclone": "後熱帶氣旋", "Hurricane": "颶風", "Tropical storm": "熱帶風暴", "Tropical depression": "熱帶低壓", @@ -707,11 +708,15 @@ "Merge onto {road}": "併入 {road}", "maneuver|Merge": "併道", "Take the ramp on the {direction} onto {road}": "{direction}駛入匝道,進入 {road}", + "Take the ramp {direction} onto {road}": "{direction}駛入匝道,進入 {road}", "Take the ramp on the {direction}": "{direction}駛入匝道", + "Take the ramp {direction}": "{direction}駛入匝道", "Take the ramp onto {road}": "駛入匝道,進入 {road}", "Take the ramp": "駛入匝道", "Take the exit on the {direction} onto {road}": "從出口{direction}駛出,進入 {road}", + "Take the exit {direction} onto {road}": "從出口{direction}駛出,進入 {road}", "Take the exit on the {direction}": "從出口{direction}駛出", + "Take the exit {direction}": "從出口{direction}駛出", "Take the exit onto {road}": "從出口駛出,進入 {road}", "Take the exit": "從出口駛出", "At the roundabout, take the {exit} exit onto {road}": "在環島從{exit}出口駛出,進入 {road}", @@ -1599,6 +1604,9 @@ "LIVE SIGNALS": "實時信號", "CCTV layer unavailable": "CCTV 圖層不可用", "Link copied!": "鏈接已複製!", + "Link shared": "鏈接已分享", + "This share link can't be opened": "無法打開此分享鏈接", + "Shared vessel is unavailable": "分享的船舶不可用", "Copy failed": "複製失敗", "Return map to straight-down view": "將地圖恢復為垂直俯視", "Tilt map to oblique view": "將地圖傾斜至斜視角", @@ -1952,6 +1960,8 @@ "ORBIT": "環繞", "Location not found": "未找到位置", "Search failed": "搜索失敗", + "Check the spelling and press Enter to search again.": "請檢查拼寫,然後按 Enter 重新搜索。", + "Press Enter to try again.": "按 Enter 重試。", "Detailed outline unavailable": "無法獲取詳細輪廓", "Fly to a POI first": "請先飛往一個 POI", "Reset to full globe view": "重置為完整地球視圖", @@ -2977,16 +2987,6 @@ "Search": "搜索", "More": "更多", "Panels": "面板", - "Post-tropical cyclone": "後熱帶氣旋", - "Take the ramp {direction} onto {road}": "{direction}駛入匝道,進入 {road}", - "Take the ramp {direction}": "{direction}駛入匝道", - "Take the exit {direction} onto {road}": "從出口{direction}駛出,進入 {road}", - "Take the exit {direction}": "從出口{direction}駛出", - "Link shared": "鏈接已分享", - "This share link can't be opened": "無法打開此分享鏈接", - "Shared vessel is unavailable": "分享的船舶不可用", - "Check the spelling and press Enter to search again.": "請檢查拼寫,然後按 Enter 重新搜索。", - "Press Enter to try again.": "按 Enter 重試。", "Recent speech": "最近語音", "Voice Settings": "語音設置", "Preview": "預覽", @@ -3025,8 +3025,19 @@ "other": "{count} 個地標" }, "S2 Underground publishes these KMZ products to GitHub. New uploads are detected within seconds and replace the previous edition automatically. Click a marker for its report.": "S2 Underground 在 GitHub 發布這些 KMZ 產品。新上傳的內容會在數秒內被檢測到,並自動替換舊版本。點擊標記查看報告。", - "routing busy — too many routes at once": "路線服務繁忙:同時請求的路線過多", - "route proxy error": "路線代理出錯", + "fire confidence filter|All": "全部", + "fire confidence filter|Nominal+": "中+", + "fire confidence filter|High": "高", + "Every detection — many of the strongest fires are rated low confidence": "所有火點探測——許多強度最高的火點被評為低置信度", + "Nominal and high confidence detections": "中、高置信度的火點探測", + "High confidence detections only": "僅高置信度的火點探測", + "Fire intensity (FRP)": "火勢強度(FRP)", + "≥ {value} MW": "≥ {value} MW", + "Confidence": "置信度", + "Minimum fire radiative power, megawatts": "最小火輻射功率(兆瓦)", + "fire intensity filter|All": "全部", + "Detection confidence": "探測置信度", + "{shown} of {total} shown": "顯示 {shown} / {total}", "{lower} to {upper}": "{lower} 至 {upper}", "Up to {upper}": "最高 {upper}", "From {lower}": "最低 {lower}", @@ -3039,6 +3050,8 @@ "Prohibited": "禁區", "Restricted": "限制區", "Prohibited & Restricted Airspace": "禁區與限制區空域", + "routing busy — too many routes at once": "路線服務繁忙:同時請求的路線過多", + "route proxy error": "路線代理出錯", "AUTHORING": "創作", "Create and edit scenes": "創建和編輯場景", "SCENE": "場景", @@ -3064,19 +3077,6 @@ "Download this scene as JSON or an asset bundle": "將此場景下載為 JSON 或資源包", "Left panels": "左側面板", "Right panels": "右側面板", - "fire confidence filter|All": "全部", - "fire confidence filter|Nominal+": "中+", - "fire confidence filter|High": "高", - "Every detection — many of the strongest fires are rated low confidence": "所有火點探測——許多強度最高的火點被評為低置信度", - "Nominal and high confidence detections": "中、高置信度的火點探測", - "High confidence detections only": "僅高置信度的火點探測", - "Fire intensity (FRP)": "火勢強度(FRP)", - "≥ {value} MW": "≥ {value} MW", - "Confidence": "置信度", - "Minimum fire radiative power, megawatts": "最小火輻射功率(兆瓦)", - "fire intensity filter|All": "全部", - "Detection confidence": "探測置信度", - "{shown} of {total} shown": "顯示 {shown} / {total}", "UTILITIES": "工具", "Exit cockpit to fly to a drawing": "請先退出座艙,再飛往已繪製的形狀", "Directions, drawing and your own files": "路線導航、繪製和你自己的文件", From 4c5fbd3223e58c392a9c7e5effb0e16e8e9e3933 Mon Sep 17 00:00:00 2001 From: German Khokhlov Date: Fri, 13 Nov 2026 18:47:10 +0400 Subject: [PATCH 26/84] Changelog fragment for #1699 --- changelog.d/1699-zh-hant-generated.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelog.d/1699-zh-hant-generated.md diff --git a/changelog.d/1699-zh-hant-generated.md b/changelog.d/1699-zh-hant-generated.md new file mode 100644 index 0000000000..81710dc300 --- /dev/null +++ b/changelog.d/1699-zh-hant-generated.md @@ -0,0 +1,4 @@ +- Generate the Traditional Chinese catalog instead of translating it: + `npm run i18n -- --zh-hant` writes `zh-Hant` from `zh-CN` with OpenCC `s2tw` + and its character corrections, and `npm test` fails, naming the key, when + `zh-Hant` is edited by hand (German, @gekh, #1699). From 209b135ff10d1621e49fee764e9c26fc91796413 Mon Sep 17 00:00:00 2001 From: German Khokhlov Date: Fri, 13 Nov 2026 18:50:34 +0400 Subject: [PATCH 27/84] i18n: plural forms and contexts the catalogs could only work around MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The last translation review left four kinds of problem it could only reword around in the catalogs. They are fixed in the code now, and the catalogs go back to natural wording. - Counts shown with plain t() are tn() plurals: the wildlife count, the Data Library "Showing {shown} of {total}", the News time window (which offers 1 h) and the GhostMaps event age (which offers 1 day). The English keys stay; the catalogs get real forms, as in "Última 1 h" and "Últimas 24 h", or "1 Tag" and "7 Tage". - The bridge radar range and ring spacing are tn() plurals too. The spacing is fractional at the short ranges, and Intl.PluralRules gives 0.75 and 1.5 their own form: ru "0,75 МОР. МИЛИ", "12 МОР. МИЛЬ". - Street level no longer passes "the view centre" or "this spot" as {place}: each case has a message of its own, so a preposition no longer meets a phrase in the wrong case. The progress line had the same leak and showed the English phrase. - Latest, FOCUS, CONFIRMED and "{label} · COURSE {heading}°" are split with a context where one key served two places: the News heading, the orbital site status, the Wildlife chip and a ship's course. "CURRENTLY OVER" ended in a preposition that a country name in the nominative cannot follow in uk, de, it and pt. It reads "under the satellite" there now, as ru already did. I18N.md gains the two rules behind these fixes. --- docs/I18N.md | 3 +- docs/translations/ru.md | 2 +- docs/translations/uk.md | 2 +- src/i18n/locales/ar.json | 100 ++++++++++++++++-- src/i18n/locales/de.json | 62 ++++++++--- src/i18n/locales/es.json | 70 ++++++++++-- src/i18n/locales/fr.json | 70 ++++++++++-- src/i18n/locales/he.json | 70 ++++++++++-- src/i18n/locales/it.json | 72 ++++++++++--- src/i18n/locales/ja.json | 50 +++++++-- src/i18n/locales/pt.json | 74 ++++++++++--- src/i18n/locales/ru.json | 80 ++++++++++++-- src/i18n/locales/sv.json | 60 +++++++++-- src/i18n/locales/uk.json | 82 +++++++++++--- src/i18n/locales/zh-CN.json | 50 +++++++-- src/i18n/locales/zh-Hant.json | 50 +++++++-- src/i18n/same-as-english.json | 1 + src/layers/ghostMaps/index.js | 11 +- src/layers/ghostMaps/lifecycle.test.mjs | 30 ++++++ .../launches/missionStatus.i18n.test.mjs | 35 ++++++ .../wildlifeSightings/acquisition.test.mjs | 28 ++++- src/layers/wildlifeSightings/controls.js | 14 ++- .../wildlifeSightings/ownership.test.mjs | 4 +- src/ui/cockpitBridge.test.mjs | 40 +++++++ src/ui/cockpitInstruments.js | 7 +- src/ui/cockpitOrbitalFocus.test.mjs | 8 ++ src/ui/cockpitOrbitalSignals.js | 3 +- src/ui/cockpitPresence.test.mjs | 14 +++ src/ui/cockpitTrackingController.js | 4 +- src/ui/news/NewsFeed.vue | 45 ++++++-- src/ui/newsPanel.test.mjs | 50 +++++++++ src/ui/views/panels/CockpitRadar.vue | 4 +- .../views/panels/DataLibraryDialog.test.mjs | 14 +++ src/ui/views/panels/DataLibraryDialog.vue | 16 ++- src/voice/gevActions.js | 2 + src/voice/speech.js | 43 ++++++-- src/voice/speech.test.mjs | 50 ++++++++- 37 files changed, 1124 insertions(+), 196 deletions(-) diff --git a/docs/I18N.md b/docs/I18N.md index bacfdc509e..d0584920f2 100644 --- a/docs/I18N.md +++ b/docs/I18N.md @@ -87,7 +87,8 @@ menu.onChoose = (code) => switchLocale(code); // switched in place and stored (i - **Pass literals.** `t('Close')`, not `t(label)` (unless `label` holds a `msg()` value) and never a template literal with `${…}`. - **Use placeholders, not concatenation.** `t('Flying to {place}…', { place })`, not `t('Flying to') + ' ' + place`. Word order differs between languages. -- **Use `tn()` for counts**, not `count === 1 ? … : …`. Russian has three forms. +- **A placeholder takes a name, not a phrase.** When code has no name to pass and would fall back to a phrase ("the view centre", "this spot"), give that case a message of its own: `t('{source} at the view centre', { source })`. Other languages put a phrase in a different case after a preposition, which a name in its nominative form cannot follow. +- **Use `tn()` for counts**, not `count === 1 ? … : …`. Russian has three forms. That includes a number the English writes with a symbol or abbreviation, so both English forms read the same (`tn(hours, 'Last {hours} h', 'Last {hours} h', { hours })`): other languages inflect the words around it («Última 1 h», «Últimas 24 h»). Fractions have a form of their own too (ru «0,75 МОР. МИЛИ»). - **Translate the label, not the value.** Layer ids, enums, share-link parameters, API fields, voice tool schemas and feed data (callsigns, vessel and place names) stay as they are; translate only the text shown for them. - **No `t()` at module top level.** Keep the English in `msg()` and call `t()` when rendering. - **Numbers and dates** go through `formatNumber`, `formatDate`, `formatRelativeTime` and `formatUtcDayMonth` from `src/i18n/index.js`, which follow the active language. diff --git a/docs/translations/ru.md b/docs/translations/ru.md index a44935b716..9073cec3d7 100644 --- a/docs/translations/ru.md +++ b/docs/translations/ru.md @@ -8,7 +8,7 @@ Catalog: `src/i18n/locales/ru.json`. General rules: [TRANSLATORS.md](../TRANSLAT - Sentence case, not Title Case: "Live Flights" → «Рейсы в реальном времени». - Quotes inside Russian text are «ёлочки». Write ё where it belongs: её, ещё, всё. - In short labels, a standard abbreviation with a period beats a wrapped line: НЕОПРЕД., СЛЕД. -- Units: км, м, км/ч, м/с, уз (knots), фт (feet), ч, мин, с; in UPPERCASE text КМ, М, КМ/С, УЗ, ФТ. MW is МВт in any case. `°` and `%` stay. +- Units: км, м, км/ч, м/с, уз (knots), фт (feet), ч, мин, с; in UPPERCASE text КМ, М, КМ/С, УЗ, ФТ. MW is МВт in any case. `°` and `%` stay. Nautical miles on the bridge radar are «мор. миля», a noun that follows the count: «3 МОР. МИЛИ», «12 МОР. МИЛЬ», «0,75 МОР. МИЛИ». ## Plurals diff --git a/docs/translations/uk.md b/docs/translations/uk.md index 673748f420..cf2ab6373c 100644 --- a/docs/translations/uk.md +++ b/docs/translations/uk.md @@ -12,7 +12,7 @@ Translation source: meirm (#312). - The apostrophe is always ʼ (U+02BC): обʼєкт, звʼязок, памʼять. Not ' or ’. - Quotes inside Ukrainian text are «ялинки»; a button or layer name inside a sentence goes in them: Увімкніть «Вуличні знімки». - In short labels, a standard abbreviation with a period beats a wrapped line: ПОПЕР., ДАЛЬН., КАЛІБР. -- Units: км, м, км/год, м/с, вуз (knots), фт (feet), год, хв, с, МГц, дБ, гПа; in UPPERCASE text КМ, М, КМ/С, ВУЗ, ФТ. MW is МВт in any case. `°` and `%` stay. Decimal comma in coordinates written as text: 28,2710° пн. ш. +- Units: км, м, км/год, м/с, вуз (knots), фт (feet), год, хв, с, МГц, дБ, гПа; in UPPERCASE text КМ, М, КМ/С, ВУЗ, ФТ. Nautical miles on the bridge radar are «мор. миля», a noun that follows the count: «3 МОР. МИЛІ», «12 МОР. МИЛЬ», «0,75 МОР. МИЛІ». MW is МВт in any case. `°` and `%` stay. Decimal comma in coordinates written as text: 28,2710° пн. ш. - Coordinates: пн. ш. / пд. ш. / сх. д. / зх. д.; the HUD hemisphere letters are Пн, Пд, Сх, Зх. ## Plurals diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index 46a29dc2f4..bb52515ab8 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -77,8 +77,22 @@ "{severity} only": "{severity} فقط", "All categories": "كل الفئات", "Reading the news…": "جارٍ قراءة الأخبار…", - "News, last {hours} hours": "الأخبار، الساعات الأخيرة: {hours}", - "Last {hours} h": "آخر {hours} س", + "News, last {hours} hours": { + "zero": "الأخبار، آخر {hours} ساعة", + "one": "الأخبار، آخر ساعة ({hours})", + "two": "الأخبار، آخر ساعتين ({hours})", + "few": "الأخبار، آخر {hours} ساعات", + "many": "الأخبار، آخر {hours} ساعة", + "other": "الأخبار، آخر {hours} ساعة" + }, + "Last {hours} h": { + "zero": "آخر {hours} ساعة", + "one": "آخر ساعة ({hours})", + "two": "آخر ساعتين ({hours})", + "few": "آخر {hours} ساعات", + "many": "آخر {hours} ساعة", + "other": "آخر {hours} ساعة" + }, "Time window": "الفترة الزمنية", "Conflicts": "النزاعات", "Local": "محلي", @@ -87,9 +101,23 @@ "Hotspots": "بؤر ساخنة", "Severity": "الخطورة", "Category": "الفئة", - "Nothing reported near here in the last {hours} h": "لم يُبلَّغ عن شيء قريب من هنا في آخر {hours} س", + "Nothing reported near here in the last {hours} h": { + "zero": "لم يُبلَّغ عن شيء قريب من هنا في آخر {hours} ساعة", + "one": "لم يُبلَّغ عن شيء قريب من هنا في آخر ساعة ({hours})", + "two": "لم يُبلَّغ عن شيء قريب من هنا في آخر ساعتين ({hours})", + "few": "لم يُبلَّغ عن شيء قريب من هنا في آخر {hours} ساعات", + "many": "لم يُبلَّغ عن شيء قريب من هنا في آخر {hours} ساعة", + "other": "لم يُبلَّغ عن شيء قريب من هنا في آخر {hours} ساعة" + }, "Latest news": "آخر الأخبار", - "No news matches these filters in the last {hours} h": "لا أخبار تطابق هذه المرشحات في آخر {hours} س", + "No news matches these filters in the last {hours} h": { + "zero": "لا أخبار تطابق هذه المرشحات في آخر {hours} ساعة", + "one": "لا أخبار تطابق هذه المرشحات في آخر ساعة ({hours})", + "two": "لا أخبار تطابق هذه المرشحات في آخر ساعتين ({hours})", + "few": "لا أخبار تطابق هذه المرشحات في آخر {hours} ساعات", + "many": "لا أخبار تطابق هذه المرشحات في آخر {hours} ساعة", + "other": "لا أخبار تطابق هذه المرشحات في آخر {hours} ساعة" + }, "Load older news": "تحميل أخبار أقدم", "How to read the map": "كيف تقرأ الخريطة", "Colour: severity · icon: type of event": "اللون: الخطورة · الرمز: نوع الحدث", @@ -259,7 +287,14 @@ "ALTITUDE": "الارتفاع", "CONTACT": "الهدف", "CONTACTS · 250 KM": "الأهداف · 250 كم", - "RINGS {spacing} NM": "الحلقات كل {spacing} ميل بحري", + "RINGS {spacing} NM": { + "zero": "الحلقات كل {spacing} ميل بحري", + "one": "الحلقات كل ميل بحري ({spacing})", + "two": "الحلقات كل ميلين بحريين ({spacing})", + "few": "الحلقات كل {spacing} أميال بحرية", + "many": "الحلقات كل {spacing} ميلًا بحريًا", + "other": "الحلقات كل {spacing} ميل بحري" + }, "{count} CONTACTS": { "zero": "لا أهداف ({count})", "one": "هدف واحد ({count})", @@ -388,7 +423,14 @@ "ROUTE DATA UNAVAILABLE": "بيانات المسار غير متاحة", "CONTACT NAVIGATION OFF": "التنقل بين الأهداف متوقف", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "تبقى غرفة القيادة مع السفينة المحددة", - "{range} NM": "{range} ميل بحري", + "{range} NM": { + "zero": "{range} ميل بحري", + "one": "ميل بحري واحد ({range})", + "two": "ميلان بحريان ({range})", + "few": "{range} أميال بحرية", + "many": "{range} ميلًا بحريًا", + "other": "{range} ميل بحري" + }, "AIS DESTINATION · CREW REPORTED": "وجهة AIS · أبلغ عنها الطاقم", "FROM": "من", "TO": "إلى", @@ -472,6 +514,7 @@ "Current style: {style} — click for next": "النمط الحالي: {style} — انقر للتالي", "TRACK ACQUIRED": "تم التقاط الهدف", "{label} · COURSE {heading}°": "{label} · المسار {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · المسار {heading}°", "{label} · HEADING {heading}°": "{label} · الاتجاه {heading}°", "{label} · NO HEADING": "{label} · لا اتجاه", "{label} · NADIR VIEW": "{label} · عرض باتجاه النظير", @@ -673,6 +716,7 @@ "NEAREST": "الأقرب", "CCTV camera": "كاميرا CCTV", "FOCUS": "تركيز", + "site status|FOCUS": "تركيز", "COVERAGE OFF": "التغطية متوقفة", "AUTO HOP OFF": "التنقل التلقائي متوقف", "PROJECTION ON": "الإسقاط مفعّل", @@ -1063,6 +1107,7 @@ "awaiting first AIS message…": "بانتظار أول رسالة AIS…", "EST. DOWNRANGE": "تقدير على امتداد المسار", "CONFIRMED": "مؤكَّد", + "sightings filter|CONFIRMED": "مؤكَّدة", "PAD / RTLS": "منصة الإطلاق / RTLS", "Pick a shape, then click the map.": "اختر شكلًا، ثم انقر على الخريطة.", "Enter to place the pin, Esc to cancel.": "Enter لوضع الدبوس، وEsc للإلغاء.", @@ -2544,6 +2589,7 @@ "Observed history": "سجل الأرصاد", "Later observation": "رصد لاحق", "Latest": "الأحدث", + "news list|Latest": "الأحدث", "Newest frame per product": "أحدث إطار لكل منتج", "Replay observed history": "إعادة تشغيل سجل الأرصاد", "Imagery on Esri · Google 3D returns when cleared": "الصور على Esri · تعود Google 3D عند المسح", @@ -3716,7 +3762,14 @@ "Photo of {name}": "صورة {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "المشاهدات في نطاق العرض: {count}", + "{count} sightings in view": { + "zero": "{count} مشاهدة في نطاق العرض", + "one": "مشاهدة واحدة ({count}) في نطاق العرض", + "two": "مشاهدتان ({count}) في نطاق العرض", + "few": "{count} مشاهدات في نطاق العرض", + "many": "{count} مشاهدة في نطاق العرض", + "other": "{count} مشاهدة في نطاق العرض" + }, "Close sighting": "إغلاق المشاهدة", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "حياة برية شوهدت خلال 48 ساعة (الحيتان 7 أيام). يوضح اللون ورمز الشارة المجموعة التصنيفية. تُعرض الأنواع الحساسة في خلايا بحجم 0.2° فقط؛ وتُقرّب مشاهدات الثدييات البحرية في بحر ساليش عبر Acartia إلى 0.01°. ليست إحصاءً شاملًا.", "Open {name} on iNaturalist": "فتح {name} على iNaturalist", @@ -3727,20 +3780,37 @@ "{days}d": "{days} ي", "All markers": "كل العلامات", "Show markers of every age": "عرض العلامات من جميع الأعمار", - "Maximum event age: {days}d; undated markers are kept": "الحد الأقصى لعمر الحدث: {days} ي؛ تبقى العلامات غير المؤرخة ظاهرة", + "Maximum event age: {days}d; undated markers are kept": { + "zero": "الحد الأقصى لعمر الحدث: {days} يوم؛ تبقى العلامات غير المؤرخة ظاهرة", + "one": "الحد الأقصى لعمر الحدث: يوم واحد ({days})؛ تبقى العلامات غير المؤرخة ظاهرة", + "two": "الحد الأقصى لعمر الحدث: يومان ({days})؛ تبقى العلامات غير المؤرخة ظاهرة", + "few": "الحد الأقصى لعمر الحدث: {days} أيام؛ تبقى العلامات غير المؤرخة ظاهرة", + "many": "الحد الأقصى لعمر الحدث: {days} يومًا؛ تبقى العلامات غير المؤرخة ظاهرة", + "other": "الحد الأقصى لعمر الحدث: {days} يوم؛ تبقى العلامات غير المؤرخة ظاهرة" + }, "event age filter|All": "الكل", "Event age": "عمر الحدث", - "Event age: {days}d · undated kept": "عمر الحدث: {days} ي · غير المؤرخة تبقى ظاهرة", + "Event age: {days}d · undated kept": { + "zero": "عمر الحدث: {days} يوم · غير المؤرخة تبقى ظاهرة", + "one": "عمر الحدث: يوم واحد ({days}) · غير المؤرخة تبقى ظاهرة", + "two": "عمر الحدث: يومان ({days}) · غير المؤرخة تبقى ظاهرة", + "few": "عمر الحدث: {days} أيام · غير المؤرخة تبقى ظاهرة", + "many": "عمر الحدث: {days} يومًا · غير المؤرخة تبقى ظاهرة", + "other": "عمر الحدث: {days} يوم · غير المؤرخة تبقى ظاهرة" + }, "Close camera preview": "إغلاق معاينة الكاميرا", "Refresh map still": "تحديث صورة الخريطة الثابتة", "The map still uses a separate request and may show a different moment.": "تستخدم صورة الخريطة طلبًا منفصلًا وقد تعرض لحظة مختلفة.", "Video plays from Québec 511, which sees your IP address.": "يُشغَّل الفيديو من Québec 511، الذي يرى عنوان IP الخاص بك.", "Press OPEN to load the photo": "اضغط «فتح» لتحميل الصورة", "Captured {month}": "التُقطت في {month}", - "this spot": "هذا الموضع", "the view centre": "مركز العرض", "{source} at {place}": "{source} في {place}", + "{source} at this spot": "{source} في هذا الموضع", + "{source} at the view centre": "{source} في مركز العرض", "Street level at {place}": "مستوى الشارع في {place}", + "Street level at this spot": "مستوى الشارع في هذا الموضع", + "Street level at the view centre": "مستوى الشارع في مركز العرض", "Switching map": "جارٍ تبديل الخريطة", "Opening imagery": "جارٍ فتح الصور", "Street View is ready: press {open} to load it": "Street View جاهز: اضغط «{open}» لتحميله", @@ -3832,6 +3902,7 @@ "{source} imagery could not be opened": "تعذّر فتح صور {source}", "{place} has no position to look for imagery at": "{place}: لا موضع للبحث عن الصور فيه", "No {source} imagery near {place}": "لا توجد صور {source} قرب {place}", + "No {source} imagery near the view centre": "لا توجد صور {source} قرب مركز العرض", "{reason} (filters on: {filters})": "{reason} (المرشحات المفعّلة: {filters})", "tiles unavailable": "البلاطات غير متاحة", "zoom in to load this layer": "قرّب لتحميل هذه الطبقة", @@ -3952,6 +4023,13 @@ "REMOVE ALL": "إزالة الكل", "Confirm: remove every added entry from Data Layers": "تأكيد: إزالة كل الإدخالات المُضافة من طبقات البيانات", "Remove every added entry from Data Layers": "إزالة كل الإدخالات المُضافة من طبقات البيانات", - "Showing {shown} of {total}": "عرض {shown} من {total}", + "Showing {shown} of {total}": { + "zero": "عرض {shown} من {total}", + "one": "عرض {shown} من {total}", + "two": "عرض {shown} من {total}", + "few": "عرض {shown} من {total}", + "many": "عرض {shown} من {total}", + "other": "عرض {shown} من {total}" + }, "BROWSE DATA LIBRARY": "تصفّح مكتبة البيانات" } diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index ca668a74e9..ecf4592093 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -65,8 +65,14 @@ "{severity} only": "Nur {severity}", "All categories": "Alle Kategorien", "Reading the news…": "Nachrichten werden gelesen…", - "News, last {hours} hours": "Nachrichten, letzte {hours} h", - "Last {hours} h": "Letzte {hours} h", + "News, last {hours} hours": { + "one": "Nachrichten der letzten {hours} Stunde", + "other": "Nachrichten der letzten {hours} Stunden" + }, + "Last {hours} h": { + "one": "Letzte {hours} h", + "other": "Letzte {hours} h" + }, "Time window": "Zeitraum", "Conflicts": "Konflikte", "Local": "Lokal", @@ -75,9 +81,15 @@ "Hotspots": "Brennpunkte", "Severity": "Schweregrad", "Category": "Kategorie", - "Nothing reported near here in the last {hours} h": "In den letzten {hours} h nichts in der Nähe gemeldet", + "Nothing reported near here in the last {hours} h": { + "one": "In der letzten {hours} h nichts in der Nähe gemeldet", + "other": "In den letzten {hours} h nichts in der Nähe gemeldet" + }, "Latest news": "Neueste Nachrichten", - "No news matches these filters in the last {hours} h": "Keine Nachrichten der letzten {hours} h passen zu diesen Filtern", + "No news matches these filters in the last {hours} h": { + "one": "Keine Nachrichten der letzten {hours} h passen zu diesen Filtern", + "other": "Keine Nachrichten der letzten {hours} h passen zu diesen Filtern" + }, "Load older news": "Ältere Nachrichten laden", "How to read the map": "So liest man die Karte", "Colour: severity · icon: type of event": "Farbe: Schweregrad · Symbol: Art des Ereignisses", @@ -198,6 +210,7 @@ "Previous — prior visited contact in the 250 km window": "Zurück: zuvor besuchter Kontakt im 250-km-Fenster", "PREVIOUS": "ZURÜCK", "FOCUS": "FOKUS", + "site status|FOCUS": "FOKUS", "Next — nearest unvisited contact in the 250 km window": "Weiter: nächstgelegener unbesuchter Kontakt im 250-km-Fenster", "NEXT": "WEITER", "Open-source mapped/observed context. Missing broadcasts, unloaded map areas, or unmapped sites are not evidence of absence.": "Kontext aus offenen Quellen, kartiert/beobachtet. Fehlende Funksignale, nicht geladene Kartenbereiche oder nicht kartierte Standorte sind kein Beleg für Abwesenheit.", @@ -302,7 +315,7 @@ "ORBITAL VELOCITY": "BAHNGESCHWINDIGKEIT", "SUB-SATELLITE POINT": "SUBSATELLITENPUNKT", "NORTH UP": "NORDEN OBEN", - "CURRENTLY OVER": "AKTUELL ÜBER", + "CURRENTLY OVER": "UNTER DEM SATELLITEN", "{division}, {country}": "{division}, {country}", "{region} · near {place}": "{region} · nahe {place}", "NORAD {id}": "NORAD {id}", @@ -559,7 +572,10 @@ "ROUTE DATA UNAVAILABLE": "ROUTENDATEN NICHT VERFÜGBAR", "CONTACT NAVIGATION OFF": "KONTAKTNAVIGATION AUS", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "DIE BRÜCKE BLEIBT BEIM GEWÄHLTEN SCHIFF", - "{range} NM": "{range} SM", + "{range} NM": { + "one": "{range} SM", + "other": "{range} SM" + }, "AIS DESTINATION · CREW REPORTED": "AIS-ZIEL · VON DER BESATZUNG GEMELDET", "DEST {bearing}": "DEST {bearing}", "Disable cockpit weather effects": "Cockpit-Wettereffekte deaktivieren", @@ -605,6 +621,7 @@ "Reclassify as TR-3B": "Als TR-3B umklassifizieren", "TRACK ACQUIRED": "TRACK ERFASST", "{label} · COURSE {heading}°": "{label} · KURS {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · KURS {heading}°", "{label} · HEADING {heading}°": "{label} · STEUERKURS {heading}°", "{label} · NO HEADING": "{label} · KEIN STEUERKURS", "{label} · NADIR VIEW": "{label} · NADIRANSICHT", @@ -836,7 +853,10 @@ "Contact cockpit summary": "Cockpit-Zusammenfassung des Kontakts", "CONTACT": "KONTAKT", "CONTACTS · 250 KM": "KONTAKTE · 250 KM", - "RINGS {spacing} NM": "RINGE {spacing} SM", + "RINGS {spacing} NM": { + "one": "RINGE {spacing} SM", + "other": "RINGE {spacing} SM" + }, "{count} CONTACTS": { "one": "{count} KONTAKT", "other": "{count} KONTAKTE" @@ -2404,6 +2424,7 @@ "Observed history": "Beobachteter Verlauf", "Later observation": "Spätere Beobachtung", "Latest": "Neueste", + "news list|Latest": "Neueste", "Newest frame per product": "Neuester Frame je Produkt", "Replay observed history": "Beobachteten Verlauf abspielen", "Imagery on Esri · Google 3D returns when cleared": "Bilder auf Esri · nach LÖSCHEN wieder Google 3D", @@ -3132,6 +3153,7 @@ "Left panels": "Linke Bereiche", "Right panels": "Rechte Bereiche", "CONFIRMED": "BESTÄTIGT", + "sightings filter|CONFIRMED": "BESTÄTIGT", "PAD / RTLS": "STARTPLATZ / RTLS", "fire confidence filter|All": "Alle", "fire confidence filter|Nominal+": "Mittel+", @@ -3392,7 +3414,10 @@ "Photo of {name}": "Foto von {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "Beobachtungen im Bild: {count}", + "{count} sightings in view": { + "one": "{count} Beobachtung im Bild", + "other": "{count} Beobachtungen im Bild" + }, "Close sighting": "Beobachtung schließen", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "In den letzten 48 h beobachtete Wildtiere (Wale 7 Tage). Farbe und Symbol der Markierung zeigen die Artengruppe. Empfindliche Arten erscheinen nur als 0,2°-Zellen; Acartia-Meldungen zu Meeressäugern aus der Salish-See werden auf 0,01° gerundet. Keine Bestandszählung.", "Open {name} on iNaturalist": "{name} auf iNaturalist öffnen", @@ -3403,20 +3428,29 @@ "{days}d": "{days} T", "All markers": "Alle Markierungen", "Show markers of every age": "Markierungen jeden Alters anzeigen", - "Maximum event age: {days}d; undated markers are kept": "Maximales Ereignisalter: {days} T; undatierte Markierungen bleiben erhalten", + "Maximum event age: {days}d; undated markers are kept": { + "one": "Maximales Ereignisalter: {days} Tag; undatierte Markierungen bleiben erhalten", + "other": "Maximales Ereignisalter: {days} Tage; undatierte Markierungen bleiben erhalten" + }, "event age filter|All": "Alle", "Event age": "Ereignisalter", - "Event age: {days}d · undated kept": "Ereignisalter: {days} T · undatierte bleiben", + "Event age: {days}d · undated kept": { + "one": "Ereignisalter: {days} Tag · undatierte bleiben", + "other": "Ereignisalter: {days} Tage · undatierte bleiben" + }, "Close camera preview": "Kameravorschau schließen", "Refresh map still": "Kartenstandbild aktualisieren", "The map still uses a separate request and may show a different moment.": "Das Kartenstandbild wird separat abgerufen und kann einen anderen Moment zeigen.", "Video plays from Québec 511, which sees your IP address.": "Das Video wird von Québec 511 abgespielt; die IP-Adresse ist für diesen Anbieter sichtbar.", "Press OPEN to load the photo": "Auf ÖFFNEN klicken, um das Foto zu laden", "Captured {month}": "Aufgenommen im {month}", - "this spot": "diese Stelle", "the view centre": "die Bildmitte", "{source} at {place}": "{source}: {place}", + "{source} at this spot": "{source} an dieser Stelle", + "{source} at the view centre": "{source} in der Bildmitte", "Street level at {place}": "Straßenebene: {place}", + "Street level at this spot": "Straßenebene an dieser Stelle", + "Street level at the view centre": "Straßenebene in der Bildmitte", "Switching map": "Karte wird gewechselt", "Opening imagery": "Bilder werden geöffnet", "Street View is ready: press {open} to load it": "Street View ist bereit: Auf {open} klicken, um es zu laden", @@ -3508,6 +3542,7 @@ "{source} imagery could not be opened": "Bilder von {source} konnten nicht geöffnet werden", "{place} has no position to look for imagery at": "{place} hat keine Position, an der nach Bildern gesucht werden kann", "No {source} imagery near {place}": "Keine Bilder von {source} in der Nähe von {place}", + "No {source} imagery near the view centre": "Keine Bilder von {source} in der Nähe der Bildmitte", "{reason} (filters on: {filters})": "{reason} (aktive Filter: {filters})", "tiles unavailable": "Kacheln nicht verfügbar", "zoom in to load this layer": "hineinzoomen, um diese Ebene zu laden", @@ -3604,6 +3639,9 @@ "REMOVE ALL": "ALLE ENTFERNEN", "Confirm: remove every added entry from Data Layers": "Bestätigen: alle hinzugefügten Einträge aus Datenebenen entfernen", "Remove every added entry from Data Layers": "Alle hinzugefügten Einträge aus Datenebenen entfernen", - "Showing {shown} of {total}": "{shown} von {total} angezeigt", + "Showing {shown} of {total}": { + "one": "{shown} von {total} angezeigt", + "other": "{shown} von {total} angezeigt" + }, "BROWSE DATA LIBRARY": "DATENBIBLIOTHEK DURCHSUCHEN" } diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index 2a374d7ecb..c56f52f3aa 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -68,8 +68,16 @@ "{severity} only": "Solo {severity}", "All categories": "Todas las categorías", "Reading the news…": "Leyendo las noticias…", - "News, last {hours} hours": "Noticias desde hace {hours} h", - "Last {hours} h": "Desde hace {hours} h", + "News, last {hours} hours": { + "one": "Noticias de la última {hours} hora", + "many": "Noticias de las últimas {hours} de horas", + "other": "Noticias de las últimas {hours} horas" + }, + "Last {hours} h": { + "one": "Última {hours} h", + "many": "Últimas {hours} h", + "other": "Últimas {hours} h" + }, "Time window": "Periodo", "Conflicts": "Conflictos", "Local": "Local", @@ -78,9 +86,17 @@ "Hotspots": "Focos", "Severity": "Gravedad", "Category": "Categoría", - "Nothing reported near here in the last {hours} h": "No hay noticias cerca de aquí desde hace {hours} h", + "Nothing reported near here in the last {hours} h": { + "one": "No hay noticias cerca de aquí en la última {hours} h", + "many": "No hay noticias cerca de aquí en las últimas {hours} h", + "other": "No hay noticias cerca de aquí en las últimas {hours} h" + }, "Latest news": "Últimas noticias", - "No news matches these filters in the last {hours} h": "Desde hace {hours} h no hay noticias que coincidan con estos filtros", + "No news matches these filters in the last {hours} h": { + "one": "En la última {hours} h no hay noticias que coincidan con estos filtros", + "many": "En las últimas {hours} h no hay noticias que coincidan con estos filtros", + "other": "En las últimas {hours} h no hay noticias que coincidan con estos filtros" + }, "Load older news": "Cargar noticias anteriores", "How to read the map": "Cómo leer el mapa", "Colour: severity · icon: type of event": "Color: gravedad · icono: tipo de suceso", @@ -139,7 +155,11 @@ "ALTITUDE": "ALTITUD", "CONTACT": "CONTACTO", "CONTACTS · 250 KM": "CONTACTOS · 250 KM", - "RINGS {spacing} NM": "ANILLOS {spacing} MN", + "RINGS {spacing} NM": { + "one": "ANILLOS {spacing} MN", + "many": "ANILLOS {spacing} MN", + "other": "ANILLOS {spacing} MN" + }, "{count} CONTACTS": { "one": "{count} CONTACTO", "many": "{count} DE CONTACTOS", @@ -266,7 +286,11 @@ "ROUTE DATA UNAVAILABLE": "DATOS DE RUTA NO DISPONIBLES", "CONTACT NAVIGATION OFF": "NAVEGACIÓN DE CONTACTOS DESACTIVADA", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "EL PUENTE PERMANECE EN EL BUQUE SELECCIONADO", - "{range} NM": "{range} MN", + "{range} NM": { + "one": "{range} MN", + "many": "{range} MN", + "other": "{range} MN" + }, "AIS DESTINATION · CREW REPORTED": "DESTINO AIS · NOTIFICADO POR LA TRIPULACIÓN", "FROM": "DESDE", "TO": "HACIA", @@ -352,6 +376,7 @@ "Current style: {style} — click for next": "Estilo actual: {style} — haz clic para el siguiente", "TRACK ACQUIRED": "RASTREO ADQUIRIDO", "{label} · COURSE {heading}°": "{label} · RUMBO {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · RUMBO {heading}°", "{label} · HEADING {heading}°": "{label} · PROA {heading}°", "{label} · NO HEADING": "{label} · PROA N/D", "{label} · NADIR VIEW": "{label} · VISTA AL NADIR", @@ -546,6 +571,7 @@ "NEAREST": "MÁS CERCANA", "CCTV camera": "Cámara CCTV", "FOCUS": "ENFOCAR", + "site status|FOCUS": "ENFOCADO", "COVERAGE OFF": "COBERTURA DESACTIVADA", "AUTO HOP OFF": "SALTO AUTO: NO", "PROJECTION ON": "PROYECCIÓN ACTIVADA", @@ -899,6 +925,7 @@ "awaiting first AIS message…": "esperando el primer mensaje AIS…", "EST. DOWNRANGE": "DIST. ESTIMADA", "CONFIRMED": "CONFIRMADA", + "sightings filter|CONFIRMED": "CONFIRMADAS", "PAD / RTLS": "PLATAFORMA / RTLS", "MISSION CONTROL · FIRST LAUNCH": "CENTRO DE MANDO · PRIMER INICIO", "Choose your first view": "Elige tu primera vista", @@ -1669,6 +1696,7 @@ "Observed history": "Historial observado", "Later observation": "Observación posterior", "Latest": "Último", + "news list|Latest": "Últimas", "Newest frame per product": "Fotograma más reciente por producto", "Replay observed history": "Reproducir el historial observado", "S on another day replaces it · × unpins": "S en otro día lo reemplaza · × quita la fijación", @@ -3473,7 +3501,11 @@ "Photo of {name}": "Foto de {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "Avistamientos a la vista: {count}", + "{count} sightings in view": { + "one": "{count} avistamiento a la vista", + "many": "{count} de avistamientos a la vista", + "other": "{count} avistamientos a la vista" + }, "Close sighting": "Cerrar avistamiento", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "Fauna y flora observadas en las últimas 48 h (cetáceos 7 días). El color y el símbolo de la insignia indican el grupo taxonómico. Las especies sensibles solo se muestran en celdas de 0,2°; los informes de mamíferos marinos de Acartia en el mar de Salish se redondean a 0,01°. No es un censo.", "Open {name} on iNaturalist": "Abrir {name} en iNaturalist", @@ -3484,20 +3516,31 @@ "{days}d": "{days} d", "All markers": "Todos los marcadores", "Show markers of every age": "Mostrar marcadores de cualquier antigüedad", - "Maximum event age: {days}d; undated markers are kept": "Antigüedad máxima: {days} d; se conservan los marcadores sin fecha", + "Maximum event age: {days}d; undated markers are kept": { + "one": "Antigüedad máxima: {days} día; se conservan los marcadores sin fecha", + "many": "Antigüedad máxima: {days} de días; se conservan los marcadores sin fecha", + "other": "Antigüedad máxima: {days} días; se conservan los marcadores sin fecha" + }, "event age filter|All": "Todos", "Event age": "Antigüedad", - "Event age: {days}d · undated kept": "Antigüedad: {days} d · se conservan los marcadores sin fecha", + "Event age: {days}d · undated kept": { + "one": "Antigüedad: {days} día · se conservan los marcadores sin fecha", + "many": "Antigüedad: {days} de días · se conservan los marcadores sin fecha", + "other": "Antigüedad: {days} días · se conservan los marcadores sin fecha" + }, "Close camera preview": "Cerrar vista previa de la cámara", "Refresh map still": "Actualizar imagen fija del mapa", "The map still uses a separate request and may show a different moment.": "La imagen del mapa usa una solicitud independiente y puede mostrar otro momento.", "Video plays from Québec 511, which sees your IP address.": "El vídeo se reproduce desde Québec 511, que ve tu dirección IP.", "Press OPEN to load the photo": "Pulsa ABRIR para cargar la foto", "Captured {month}": "Capturada en {month}", - "this spot": "este punto", "the view centre": "el centro de la vista", "{source} at {place}": "{source} en {place}", + "{source} at this spot": "{source} en este punto", + "{source} at the view centre": "{source} en el centro de la vista", "Street level at {place}": "A pie de calle en {place}", + "Street level at this spot": "A pie de calle en este punto", + "Street level at the view centre": "A pie de calle en el centro de la vista", "Switching map": "Cambiando de mapa", "Opening imagery": "Abriendo imágenes", "Street View is ready: press {open} to load it": "Street View está listo: pulsa {open} para cargarlo", @@ -3589,6 +3632,7 @@ "{source} imagery could not be opened": "No se pudieron abrir las imágenes de {source}", "{place} has no position to look for imagery at": "{place} no tiene una posición donde buscar imágenes", "No {source} imagery near {place}": "No hay imágenes de {source} cerca de {place}", + "No {source} imagery near the view centre": "No hay imágenes de {source} cerca del centro de la vista", "{reason} (filters on: {filters})": "{reason} (filtros activos: {filters})", "tiles unavailable": "teselas no disponibles", "Environment": "Medio ambiente", @@ -3671,7 +3715,11 @@ "switch on a dataset to load features": "activa un conjunto de datos para cargar elementos", "Data Library at a glance": "La biblioteca de datos de un vistazo", "Map features": "Elementos del mapa", - "Showing {shown} of {total}": "Mostrando {shown} de {total}", + "Showing {shown} of {total}": { + "one": "Mostrando {shown} de {total}", + "many": "Mostrando {shown} de {total}", + "other": "Mostrando {shown} de {total}" + }, "Datasets": "Conjuntos de datos", "Themes": "Temas", "zoom in to load this layer": "acércate para cargar esta capa", diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 98633538b2..4d68abcdde 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -68,8 +68,16 @@ "{severity} only": "{severity} uniquement", "All categories": "Toutes les catégories", "Reading the news…": "Lecture des actualités…", - "News, last {hours} hours": "Actualités sur {hours} h", - "Last {hours} h": "Sur {hours} h", + "News, last {hours} hours": { + "one": "Actualités de la dernière {hours} heure", + "many": "Actualités des dernières {hours} d'heures", + "other": "Actualités des dernières {hours} heures" + }, + "Last {hours} h": { + "one": "Dernière {hours} h", + "many": "Dernières {hours} h", + "other": "Dernières {hours} h" + }, "Time window": "Période", "Conflicts": "Conflits", "Local": "Local", @@ -78,9 +86,17 @@ "Hotspots": "Foyers", "Severity": "Gravité", "Category": "Catégorie", - "Nothing reported near here in the last {hours} h": "Rien de signalé près d'ici en {hours} h", + "Nothing reported near here in the last {hours} h": { + "one": "Rien de signalé près d'ici cette dernière {hours} h", + "many": "Rien de signalé près d'ici ces dernières {hours} h", + "other": "Rien de signalé près d'ici ces dernières {hours} h" + }, "Latest news": "Dernières actualités", - "No news matches these filters in the last {hours} h": "Aucune actualité ne correspond à ces filtres sur {hours} h", + "No news matches these filters in the last {hours} h": { + "one": "Aucune actualité de la dernière {hours} h ne correspond à ces filtres", + "many": "Aucune actualité des dernières {hours} h ne correspond à ces filtres", + "other": "Aucune actualité des dernières {hours} h ne correspond à ces filtres" + }, "Load older news": "Charger des actualités plus anciennes", "How to read the map": "Comment lire la carte", "Colour: severity · icon: type of event": "Couleur : gravité · icône : type d'événement", @@ -584,6 +600,7 @@ "Previous — prior visited contact in the 250 km window": "Précédent — contact visité précédemment dans la fenêtre de 250 km", "PREVIOUS": "PRÉC.", "FOCUS": "CENTRER", + "site status|FOCUS": "VISÉ", "Next — nearest unvisited contact in the 250 km window": "Suivant — contact non visité le plus proche dans la fenêtre de 250 km", "NEXT": "SUIV.", "Named areas ({n})": "Zones nommées ({n})", @@ -1832,7 +1849,11 @@ "ROUTE DATA UNAVAILABLE": "DONNÉES DE ROUTE INDISPONIBLES", "CONTACT NAVIGATION OFF": "NAVIGATION DES CONTACTS DÉSACTIVÉE", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "LA PASSERELLE RESTE SUR LE NAVIRE SÉLECTIONNÉ", - "{range} NM": "{range} NM", + "{range} NM": { + "one": "{range} NM", + "many": "{range} NM", + "other": "{range} NM" + }, "AIS DESTINATION · CREW REPORTED": "DESTINATION AIS · DÉCLARÉE PAR L'ÉQUIPAGE", "DEST {bearing}": "DEST {bearing}", "Disable cockpit weather effects": "Désactiver les effets météo du cockpit", @@ -1880,6 +1901,7 @@ "Reclassify as TR-3B": "Reclasser en TR-3B", "TRACK ACQUIRED": "PISTE ACQUISE", "{label} · COURSE {heading}°": "{label} · ROUTE {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · ROUTE {heading}°", "{label} · HEADING {heading}°": "{label} · CAP {heading}°", "{label} · NO HEADING": "{label} · SANS CAP", "{label} · NADIR VIEW": "{label} · VUE AU NADIR", @@ -2152,6 +2174,7 @@ "Observed history": "Historique des observations", "Later observation": "Observation suivante", "Latest": "Dernière", + "news list|Latest": "Dernières", "Newest frame per product": "Image la plus récente par produit", "Replay observed history": "Rejouer l'historique des observations", "Imagery on Esri · Google 3D returns when cleared": "Sur Esri · EFFACER rétablit Google 3D", @@ -2880,7 +2903,11 @@ "Contact cockpit summary": "Résumé cockpit du contact", "CONTACT": "CONTACT", "CONTACTS · 250 KM": "CONTACTS · 250 KM", - "RINGS {spacing} NM": "CERCLES {spacing} NM", + "RINGS {spacing} NM": { + "one": "CERCLES {spacing} NM", + "many": "CERCLES {spacing} NM", + "other": "CERCLES {spacing} NM" + }, "{count} CONTACTS": { "one": "{count} CONTACT", "many": "{count} DE CONTACTS", @@ -3207,6 +3234,7 @@ "Left panels": "Panneaux de gauche", "Right panels": "Panneaux de droite", "CONFIRMED": "CONFIRMÉE", + "sightings filter|CONFIRMED": "CONFIRMÉES", "PAD / RTLS": "PAS DE TIR / RTLS", "fire confidence filter|All": "Toutes", "fire confidence filter|Nominal+": "Nominale+", @@ -3473,7 +3501,11 @@ "Photo of {name}": "Photo : {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "Observations dans la vue : {count}", + "{count} sightings in view": { + "one": "{count} observation dans la vue", + "many": "{count} d'observations dans la vue", + "other": "{count} observations dans la vue" + }, "Close sighting": "Fermer l'observation", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "Faune observée au cours des dernières 48 h (cétacés 7 jours). La couleur et le pictogramme du badge indiquent le groupe taxonomique. Les espèces sensibles sont limitées à des cellules de 0,2° ; les signalements de mammifères marins en mer des Salish provenant d'Acartia sont arrondis à 0,01°. Pas un recensement.", "Open {name} on iNaturalist": "Ouvrir {name} sur iNaturalist", @@ -3484,20 +3516,31 @@ "{days}d": "{days} j", "All markers": "Tous les marqueurs", "Show markers of every age": "Afficher les marqueurs de tout âge", - "Maximum event age: {days}d; undated markers are kept": "Ancienneté maximale : {days} j ; marqueurs sans date conservés", + "Maximum event age: {days}d; undated markers are kept": { + "one": "Ancienneté maximale : {days} j ; marqueurs sans date conservés", + "many": "Ancienneté maximale : {days} j ; marqueurs sans date conservés", + "other": "Ancienneté maximale : {days} j ; marqueurs sans date conservés" + }, "event age filter|All": "Tous", "Event age": "Ancienneté", - "Event age: {days}d · undated kept": "Ancienneté : {days} j · marqueurs sans date conservés", + "Event age: {days}d · undated kept": { + "one": "Ancienneté : {days} j · marqueurs sans date conservés", + "many": "Ancienneté : {days} j · marqueurs sans date conservés", + "other": "Ancienneté : {days} j · marqueurs sans date conservés" + }, "Close camera preview": "Fermer l'aperçu de la caméra", "Refresh map still": "Actualiser l'image fixe sur la carte", "The map still uses a separate request and may show a different moment.": "L'image fixe de la carte utilise une requête distincte et peut montrer un autre moment.", "Video plays from Québec 511, which sees your IP address.": "La vidéo est lue depuis Québec 511, qui voit votre adresse IP.", "Press OPEN to load the photo": "Appuyez sur OUVRIR pour charger la photo", "Captured {month}": "Prise en {month}", - "this spot": "cet endroit", "the view centre": "le centre de la vue", "{source} at {place}": "{source} : {place}", + "{source} at this spot": "{source} à cet endroit", + "{source} at the view centre": "{source} au centre de la vue", "Street level at {place}": "Niveau rue : {place}", + "Street level at this spot": "Niveau rue à cet endroit", + "Street level at the view centre": "Niveau rue au centre de la vue", "Switching map": "Changement de carte", "Opening imagery": "Ouverture des images", "Street View is ready: press {open} to load it": "Street View est prêt : appuyez sur {open} pour le charger", @@ -3589,6 +3632,7 @@ "{source} imagery could not be opened": "Impossible d'ouvrir les images de {source}", "{place} has no position to look for imagery at": "{place} n'a pas de position où chercher des images", "No {source} imagery near {place}": "Aucune image {source} près de {place}", + "No {source} imagery near the view centre": "Aucune image {source} près du centre de la vue", "{reason} (filters on: {filters})": "{reason} (filtres actifs : {filters})", "tiles unavailable": "tuiles indisponibles", "zoom in to load this layer": "zoomez pour charger cette couche", @@ -3691,6 +3735,10 @@ "REMOVE ALL": "TOUT RETIRER", "Confirm: remove every added entry from Data Layers": "Confirmer : retirer du panneau Couches toutes les entrées ajoutées", "Remove every added entry from Data Layers": "Retirer du panneau Couches toutes les entrées ajoutées", - "Showing {shown} of {total}": "Affichées : {shown} sur {total}", + "Showing {shown} of {total}": { + "one": "{shown} sur {total} affichée", + "many": "{shown} sur {total} affichées", + "other": "{shown} sur {total} affichées" + }, "BROWSE DATA LIBRARY": "PARCOURIR LA BIBLIOTHÈQUE DE DONNÉES" } diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index 335515fb47..29c275d90a 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -478,6 +478,7 @@ "PREVIOUS": "הקודם", "Previous — prior visited contact in the 250 km window": "הקודם — מגע שכבר ביקרת בו בחלון של 250 ק\"מ", "FOCUS": "התמקד", + "site status|FOCUS": "במוקד", "NEXT": "הבא", "Next — nearest unvisited contact in the 250 km window": "הבא — המגע הקרוב ביותר שלא ביקרת בו בחלון של 250 ק\"מ", "Named areas ({n})": "אזורים בעלי שם ({n})", @@ -832,6 +833,7 @@ "ORBIT REPLAY · {mission}": "שחזור מסלול · {mission}", "PAUSED · {title}": "מושהה · {title}", "CONFIRMED": "מאושר", + "sightings filter|CONFIRMED": "מאושרות", "PAD / RTLS": "כן שיגור / RTLS", "UNSPECIFIED": "לא צוין", "{value} KM DOWNRANGE": "{value} ק\"מ לאורך המסלול", @@ -1268,7 +1270,11 @@ "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "חיות בר נצפו ב-48 השעות האחרונות (לווייתנים · 7 ימים). הצבע וגליף התג מציגים את קבוצת הטקסון. מינים רגישים מוצגים כתאי 0.2° בלבד; דיווחי יונקי הים של Salish Sea דרך Acartia מעוגלים ל-0.01°. אינו מפקד אוכלוסין.", "iNaturalist contributors · Acartia {count} (Salish Sea) · licences per record": "תורמי iNaturalist · Acartia {count} (Salish Sea) · רישיונות לכל רשומה", "iNaturalist contributors · licences per record": "תורמי iNaturalist · רישיונות לכל רשומה", - "{count} sightings in view": "{count} תצפיות בתצוגה", + "{count} sightings in view": { + "one": "{count} תצפית בתצוגה", + "two": "{count} תצפיות בתצוגה", + "other": "{count} תצפיות בתצוגה" + }, "Zoom in for local sightings": "התקרב לתצפיות מקומיות", "No recent sightings in view": "אין תצפיות אחרונות בתצוגה", "Acartia feed unavailable": "פיד Acartia אינו זמין", @@ -1737,6 +1743,7 @@ "SOURCE STATUS UNAVAILABLE": "מצב המקור אינו זמין", "TRACK ACQUIRED": "המעקב ננעל", "{label} · COURSE {heading}°": "{label} · מהלך {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · מהלך {heading}°", "Context could not restore every layer; try again": "ההקשר לא שיחזר את כל השכבות; נסה שוב", "No selected data layers": "אין שכבות נתונים נבחרות", "{count} data layers could not be cleared": { @@ -1998,6 +2005,7 @@ "Later observation": "תצפית מאוחרת", "Newest frame per product": "השקופית החדשה לכל מוצר", "Latest": "האחרונה", + "news list|Latest": "האחרונות", "Replay observed history": "הצגת ההיסטוריה הנצפית שוב", "Imagery on Esri · Google 3D returns when cleared": "צילומים ב-Esri · Google 3D חוזר כשמנקים", "Point the camera at the ground to use the view": "כוון את המצלמה אל הקרקע כדי להשתמש בתצוגה", @@ -3238,9 +3246,17 @@ "event age filter|All": "הכול", "{days}d": "{days} ימ׳", "Show markers of every age": "הצגת סמנים בכל גיל", - "Maximum event age: {days}d; undated markers are kept": "גיל אירוע מרבי: {days} ימ׳; סמנים ללא תאריך נשמרים", + "Maximum event age: {days}d; undated markers are kept": { + "one": "גיל אירוע מרבי: {days} יום; סמנים ללא תאריך נשמרים", + "two": "גיל אירוע מרבי: {days} ימים; סמנים ללא תאריך נשמרים", + "other": "גיל אירוע מרבי: {days} ימים; סמנים ללא תאריך נשמרים" + }, "All markers": "כל הסמנים", - "Event age: {days}d · undated kept": "גיל האירוע: {days} ימ׳ · ללא תאריך נשמרים", + "Event age: {days}d · undated kept": { + "one": "גיל האירוע: {days} יום · ללא תאריך נשמרים", + "two": "גיל האירוע: {days} ימים · ללא תאריך נשמרים", + "other": "גיל האירוע: {days} ימים · ללא תאריך נשמרים" + }, "30-DAY MISSION INDEX UNAVAILABLE": "רשימת המשימות ל-30 יום אינה זמינה", "STATIONS": "תחנות", "Crewed stations and the craft that visit them": "תחנות מאוישות והחלליות המבקרות בהן", @@ -3276,7 +3292,11 @@ "LIVE AIS": "AIS חי", "CONTACT NAVIGATION OFF": "ניווט המגעים כבוי", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "הגשר נשאר עם האונייה הנבחרת", - "{range} NM": "{range} NM", + "{range} NM": { + "one": "{range} NM", + "two": "{range} NM", + "other": "{range} NM" + }, "AIS DESTINATION · CREW REPORTED": "יעד AIS · דווח על ידי הצוות", "FWD": "קדימה", "AFT": "אחורה", @@ -3295,10 +3315,13 @@ "Video plays from Québec 511, which sees your IP address.": "הווידאו זורם מ-Québec 511, שרואה את כתובת ה-IP שלך.", "Press OPEN to load the photo": "לחץ על \"פתח\" כדי לטעון את התמונה", "Captured {month}": "צולם ב-{month}", - "this spot": "המקום הזה", "the view centre": "מרכז התצוגה", "{source} at {place}": "{source}: {place}", + "{source} at this spot": "{source} במקום הזה", + "{source} at the view centre": "{source} במרכז התצוגה", "Street level at {place}": "צילומי רחוב: {place}", + "Street level at this spot": "צילומי רחוב במקום הזה", + "Street level at the view centre": "צילומי רחוב במרכז התצוגה", "Switching map": "מחליף מפה", "Opening imagery": "פותח צילומים", "Street View is ready: press {open} to load it": "Street View מוכן: לחץ על \"{open}\" כדי לטעון אותו", @@ -3358,7 +3381,11 @@ "Zoom in (+)": "התקרבות (+)", "Zoom to the imaging sensor swath": "זום אל רצועת הסריקה של חיישן הצילום", "SENSOR": "חיישן", - "RINGS {spacing} NM": "טבעות {spacing} NM", + "RINGS {spacing} NM": { + "one": "טבעות {spacing} NM", + "two": "טבעות {spacing} NM", + "other": "טבעות {spacing} NM" + }, "{count} CONTACTS": { "one": "{count} מגע", "two": "{count} מגעים", @@ -3504,20 +3531,36 @@ "{severity} and above": "{severity} ומעלה", "{severity} only": "{severity} בלבד", "All categories": "כל הקטגוריות", - "Last {hours} h": "{hours} שע׳ אחורה", + "Last {hours} h": { + "one": "השעה האחרונה ({hours})", + "two": "{hours} שע׳ אחרונות", + "other": "{hours} שע׳ אחרונות" + }, "News from {area}": "חדשות מ-{area}", "Within {km} km of the view centre": "בטווח {km} ק\"מ ממרכז התצוגה", "Reading the news…": "קורא את החדשות…", - "News, last {hours} hours": "חדשות, {hours} שע׳ אחורה", + "News, last {hours} hours": { + "one": "חדשות, השעה האחרונה ({hours})", + "two": "חדשות, {hours} השעות האחרונות", + "other": "חדשות, {hours} השעות האחרונות" + }, "Time window": "חלון זמן", "News sections": "מדורי חדשות", "Hotspots": "מוקדים", "Severity": "חומרה", "Category": "קטגוריה", "Zoom in to see local news": "התקרב כדי לראות חדשות מקומיות", - "Nothing reported near here in the last {hours} h": "לא דווח דבר בסביבה בחלון של {hours} שע׳", + "Nothing reported near here in the last {hours} h": { + "one": "לא דווח דבר בסביבה בשעה האחרונה ({hours})", + "two": "לא דווח דבר בסביבה ב־{hours} השעות האחרונות", + "other": "לא דווח דבר בסביבה ב־{hours} השעות האחרונות" + }, "Latest news": "חדשות אחרונות", - "No news matches these filters in the last {hours} h": "אין חדשות התואמות למסננים אלה בחלון של {hours} שע׳", + "No news matches these filters in the last {hours} h": { + "one": "אין חדשות התואמות למסננים אלה בשעה האחרונה ({hours})", + "two": "אין חדשות התואמות למסננים אלה ב־{hours} השעות האחרונות", + "other": "אין חדשות התואמות למסננים אלה ב־{hours} השעות האחרונות" + }, "Load older news": "טעינת חדשות ישנות יותר", "How to read the map": "איך לקרוא את המפה", "Colour: severity · icon: type of event": "צבע: חומרה · סמל: סוג האירוע", @@ -3589,6 +3632,7 @@ "{source} imagery could not be opened": "לא ניתן היה לפתוח את הצילומים של {source}", "{place} has no position to look for imagery at": "ל-{place} אין מיקום לחיפוש צילומים", "No {source} imagery near {place}": "אין צילומים של {source} ליד {place}", + "No {source} imagery near the view centre": "אין צילומים של {source} ליד מרכז התצוגה", "{reason} (filters on: {filters})": "{reason} (מסננים פעילים: {filters})", "tiles unavailable": "האריחים אינם זמינים", "zoom in to load this layer": "התקרב כדי לטעון את השכבה הזאת", @@ -3691,6 +3735,10 @@ "REMOVE ALL": "הסרת הכול", "Confirm: remove every added entry from Data Layers": "אישור: הסרת כל הפריטים שנוספו משכבות נתונים", "Remove every added entry from Data Layers": "הסרת כל הפריטים שנוספו משכבות נתונים", - "Showing {shown} of {total}": "מוצגים {shown} מתוך {total}", + "Showing {shown} of {total}": { + "one": "מוצג {shown} מתוך {total}", + "two": "מוצגים {shown} מתוך {total}", + "other": "מוצגים {shown} מתוך {total}" + }, "BROWSE DATA LIBRARY": "עיון בספריית הנתונים" } diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index c6127b3fb4..10094a30ef 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -68,8 +68,16 @@ "{severity} only": "Solo {severity}", "All categories": "Tutte le categorie", "Reading the news…": "Lettura delle notizie…", - "News, last {hours} hours": "Notizie, periodo in ore: {hours}", - "Last {hours} h": "Periodo: {hours} h", + "News, last {hours} hours": { + "one": "Notizie dell'ultima {hours} ora", + "many": "Notizie delle ultime {hours} di ore", + "other": "Notizie delle ultime {hours} ore" + }, + "Last {hours} h": { + "one": "Ultima {hours} h", + "many": "Ultime {hours} h", + "other": "Ultime {hours} h" + }, "Time window": "Periodo", "Conflicts": "Conflitti", "Local": "Locale", @@ -78,9 +86,17 @@ "Hotspots": "Focolai", "Severity": "Gravità", "Category": "Categoria", - "Nothing reported near here in the last {hours} h": "Nessuna segnalazione qui vicino · periodo: {hours} h", + "Nothing reported near here in the last {hours} h": { + "one": "Nessuna segnalazione qui vicino nell'ultima {hours} h", + "many": "Nessuna segnalazione qui vicino nelle ultime {hours} h", + "other": "Nessuna segnalazione qui vicino nelle ultime {hours} h" + }, "Latest news": "Ultime notizie", - "No news matches these filters in the last {hours} h": "Nessuna notizia corrisponde a questi filtri · periodo: {hours} h", + "No news matches these filters in the last {hours} h": { + "one": "Nessuna notizia dell'ultima {hours} h corrisponde a questi filtri", + "many": "Nessuna notizia delle ultime {hours} h corrisponde a questi filtri", + "other": "Nessuna notizia delle ultime {hours} h corrisponde a questi filtri" + }, "Load older news": "Carica notizie precedenti", "How to read the map": "Come leggere la mappa", "Colour: severity · icon: type of event": "Colore: gravità · icona: tipo di evento", @@ -584,6 +600,7 @@ "Previous — prior visited contact in the 250 km window": "Precedente — contatto visitato in precedenza nella finestra di 250 km", "PREVIOUS": "PREC", "FOCUS": "FOCUS", + "site status|FOCUS": "FOCUS", "Next — nearest unvisited contact in the 250 km window": "Successivo — contatto non visitato più vicino nella finestra di 250 km", "NEXT": "SUCC", "Named areas ({n})": "Aree con nome ({n})", @@ -941,7 +958,7 @@ "ORBITAL VELOCITY": "VELOCITÀ ORBITALE", "SUB-SATELLITE POINT": "PUNTO SUBSATELLITARE", "NORTH UP": "NORD IN ALTO", - "CURRENTLY OVER": "ATTUALMENTE SOPRA", + "CURRENTLY OVER": "SOTTO IL SATELLITE", "{division}, {country}": "{division}, {country}", "{region} · near {place}": "{region} · vicino a {place}", "NORAD {id}": "NORAD {id}", @@ -1832,7 +1849,11 @@ "ROUTE DATA UNAVAILABLE": "DATI ROTTA NON DISPONIBILI", "CONTACT NAVIGATION OFF": "NAVIGAZIONE CONTATTI DISATTIVATA", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "LA PLANCIA RESTA SULLA NAVE SELEZIONATA", - "{range} NM": "{range} MN", + "{range} NM": { + "one": "{range} MN", + "many": "{range} MN", + "other": "{range} MN" + }, "AIS DESTINATION · CREW REPORTED": "DESTINAZIONE AIS · DICHIARATA DALL'EQUIPAGGIO", "DEST {bearing}": "DEST {bearing}", "Disable cockpit weather effects": "Disattiva gli effetti meteo del cockpit", @@ -1880,6 +1901,7 @@ "Reclassify as TR-3B": "Riclassifica come TR-3B", "TRACK ACQUIRED": "TRACCIA ACQUISITA", "{label} · COURSE {heading}°": "{label} · ROTTA {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · ROTTA {heading}°", "{label} · HEADING {heading}°": "{label} · PRUA {heading}°", "{label} · NO HEADING": "{label} · PRUA N/D", "{label} · NADIR VIEW": "{label} · VISTA AL NADIR", @@ -2152,6 +2174,7 @@ "Observed history": "Storico osservato", "Later observation": "Osservazione successiva", "Latest": "Più recente", + "news list|Latest": "Più recenti", "Newest frame per product": "Fotogramma più recente per prodotto", "Replay observed history": "Rivedi lo storico osservato", "Imagery on Esri · Google 3D returns when cleared": "Immagini su Esri · Google 3D torna con CANCELLA", @@ -2880,7 +2903,11 @@ "Contact cockpit summary": "Riepilogo contatto del cockpit", "CONTACT": "CONTATTO", "CONTACTS · 250 KM": "CONTATTI · 250 KM", - "RINGS {spacing} NM": "CERCHI {spacing} MN", + "RINGS {spacing} NM": { + "one": "CERCHI {spacing} MN", + "many": "CERCHI {spacing} MN", + "other": "CERCHI {spacing} MN" + }, "{count} CONTACTS": { "one": "{count} CONTATTO", "many": "{count} DI CONTATTI", @@ -3207,6 +3234,7 @@ "Left panels": "Pannelli a sinistra", "Right panels": "Pannelli a destra", "CONFIRMED": "CONFERMATA", + "sightings filter|CONFIRMED": "CONFERMATE", "PAD / RTLS": "RAMPA / RTLS", "fire confidence filter|All": "Tutti", "fire confidence filter|Nominal+": "Nominale+", @@ -3473,7 +3501,11 @@ "Photo of {name}": "Foto di {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "Avvistamenti nella vista: {count}", + "{count} sightings in view": { + "one": "{count} avvistamento nella vista", + "many": "{count} di avvistamenti nella vista", + "other": "{count} avvistamenti nella vista" + }, "Close sighting": "Chiudi avvistamento", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "Fauna osservata nelle ultime 48 h (cetacei 7 giorni). Colore e simbolo del contrassegno indicano il gruppo tassonomico. Le specie sensibili sono mostrate solo in celle di 0,2°; le segnalazioni di mammiferi marini di Acartia nel mar dei Salish sono arrotondate a 0,01°. Non è un censimento.", "Open {name} on iNaturalist": "Apri {name} su iNaturalist", @@ -3484,20 +3516,31 @@ "{days}d": "{days} g", "All markers": "Tutti i marcatori", "Show markers of every age": "Mostra i marcatori di qualsiasi età", - "Maximum event age: {days}d; undated markers are kept": "Età massima degli eventi: {days} g; marcatori senza data mantenuti", + "Maximum event age: {days}d; undated markers are kept": { + "one": "Età massima degli eventi: {days} giorno; marcatori senza data mantenuti", + "many": "Età massima degli eventi: {days} di giorni; marcatori senza data mantenuti", + "other": "Età massima degli eventi: {days} giorni; marcatori senza data mantenuti" + }, "event age filter|All": "Tutti", "Event age": "Età degli eventi", - "Event age: {days}d · undated kept": "Età degli eventi: {days} g · senza data mantenuti", + "Event age: {days}d · undated kept": { + "one": "Età degli eventi: {days} giorno · senza data mantenuti", + "many": "Età degli eventi: {days} di giorni · senza data mantenuti", + "other": "Età degli eventi: {days} giorni · senza data mantenuti" + }, "Close camera preview": "Chiudi anteprima della telecamera", "Refresh map still": "Aggiorna immagine fissa sulla mappa", "The map still uses a separate request and may show a different moment.": "L'immagine sulla mappa usa una richiesta separata e può mostrare un momento diverso.", "Video plays from Québec 511, which sees your IP address.": "Il video viene riprodotto da Québec 511, che vede il tuo indirizzo IP.", "Press OPEN to load the photo": "Premi APRI per caricare la foto", "Captured {month}": "Scattata: {month}", - "this spot": "questo punto", "the view centre": "il centro della vista", "{source} at {place}": "{source}: {place}", + "{source} at this spot": "{source} in questo punto", + "{source} at the view centre": "{source} al centro della vista", "Street level at {place}": "Vista stradale: {place}", + "Street level at this spot": "Vista stradale in questo punto", + "Street level at the view centre": "Vista stradale al centro della vista", "Switching map": "Cambio mappa", "Opening imagery": "Apertura delle immagini", "Street View is ready: press {open} to load it": "Street View è pronto: premi {open} per caricarlo", @@ -3589,6 +3632,7 @@ "{source} imagery could not be opened": "Impossibile aprire le immagini di {source}", "{place} has no position to look for imagery at": "{place} non ha una posizione in cui cercare immagini", "No {source} imagery near {place}": "Nessuna immagine di {source} vicino a {place}", + "No {source} imagery near the view centre": "Nessuna immagine di {source} vicino al centro della vista", "{reason} (filters on: {filters})": "{reason} (filtri attivi: {filters})", "tiles unavailable": "tile non disponibili", "zoom in to load this layer": "ingrandisci per caricare questo livello", @@ -3691,6 +3735,10 @@ "REMOVE ALL": "RIMUOVI TUTTO", "Confirm: remove every added entry from Data Layers": "Conferma: rimuovi da Livelli dati tutte le voci aggiunte", "Remove every added entry from Data Layers": "Rimuovi da Livelli dati tutte le voci aggiunte", - "Showing {shown} of {total}": "Mostrati: {shown} su {total}", + "Showing {shown} of {total}": { + "one": "{shown} di {total} mostrata", + "many": "{shown} di {total} mostrate", + "other": "{shown} di {total} mostrate" + }, "BROWSE DATA LIBRARY": "ESPLORA LIBRERIA DATI" } diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index 62c517f217..c3bc088f89 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -62,8 +62,12 @@ "{severity} only": "{severity}のみ", "All categories": "すべてのカテゴリ", "Reading the news…": "ニュースを読み込み中…", - "News, last {hours} hours": "直近{hours}時間のニュース", - "Last {hours} h": "直近{hours}時間", + "News, last {hours} hours": { + "other": "直近{hours}時間のニュース" + }, + "Last {hours} h": { + "other": "直近{hours}時間" + }, "Time window": "期間", "Conflicts": "紛争", "Local": "ローカル", @@ -72,9 +76,13 @@ "Hotspots": "ホットスポット", "Severity": "深刻度", "Category": "カテゴリ", - "Nothing reported near here in the last {hours} h": "直近{hours}時間、この付近の報道はありません", + "Nothing reported near here in the last {hours} h": { + "other": "直近{hours}時間、この付近の報道はありません" + }, "Latest news": "最新ニュース", - "No news matches these filters in the last {hours} h": "直近{hours}時間で条件に合うニュースはありません", + "No news matches these filters in the last {hours} h": { + "other": "直近{hours}時間で条件に合うニュースはありません" + }, "Load older news": "以前のニュースを読み込む", "How to read the map": "地図の見方", "Colour: severity · icon: type of event": "色:深刻度 · アイコン:出来事の種類", @@ -564,6 +572,7 @@ "Previous — prior visited contact in the 250 km window": "前へ:250 km圏内で直前に訪れたコンタクト", "PREVIOUS": "前へ", "FOCUS": "フォーカス", + "site status|FOCUS": "フォーカス", "Next — nearest unvisited contact in the 250 km window": "次へ:250 km圏内で最も近い未訪問のコンタクト", "NEXT": "次へ", "Named areas ({n})": "名前付きエリア({n})", @@ -1776,7 +1785,9 @@ "ROUTE DATA UNAVAILABLE": "経路データなし", "CONTACT NAVIGATION OFF": "コンタクトナビゲーション オフ", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "ブリッジは選択中の船舶に固定", - "{range} NM": "{range}海里", + "{range} NM": { + "other": "{range}海里" + }, "AIS DESTINATION · CREW REPORTED": "AIS目的地 · 乗組員入力", "DEST {bearing}": "目的地 {bearing}", "Disable cockpit weather effects": "コックピットの天候エフェクトを無効にする", @@ -1822,6 +1833,7 @@ "Reclassify as TR-3B": "TR-3Bに再分類", "TRACK ACQUIRED": "追跡開始", "{label} · COURSE {heading}°": "{label} · 対地針路 {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · 対地針路 {heading}°", "{label} · HEADING {heading}°": "{label} · 船首方位 {heading}°", "{label} · NO HEADING": "{label} · 船首方位なし", "{label} · NADIR VIEW": "{label} · 直下視", @@ -2078,6 +2090,7 @@ "Observed history": "観測履歴", "Later observation": "次の観測", "Latest": "最新", + "news list|Latest": "最新", "Newest frame per product": "プロダクトごとの最新フレーム", "Replay observed history": "観測履歴を再生", "Imagery on Esri · Google 3D returns when cleared": "画像はEsri上に表示 · 消去するとGoogle 3Dに戻ります", @@ -2730,7 +2743,9 @@ "Contact cockpit summary": "コンタクトのコックピット概要", "CONTACT": "コンタクト", "CONTACTS · 250 KM": "コンタクト · 250 km", - "RINGS {spacing} NM": "距離環 {spacing}海里", + "RINGS {spacing} NM": { + "other": "距離環 {spacing}海里" + }, "{count} CONTACTS": { "other": "コンタクト {count}件" }, @@ -3057,6 +3072,7 @@ "Left panels": "左パネル", "Right panels": "右パネル", "CONFIRMED": "確認済み", + "sightings filter|CONFIRMED": "確認済み", "PAD / RTLS": "射場 / RTLS", "fire confidence filter|All": "すべて", "fire confidence filter|Nominal+": "中以上", @@ -3311,7 +3327,9 @@ "Photo of {name}": "{name}の写真", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "表示範囲に{count}件の目撃情報", + "{count} sightings in view": { + "other": "表示範囲に{count}件の目撃情報" + }, "Close sighting": "目撃情報を閉じる", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "過去48時間以内に観察された野生生物(クジラ類は7日間)。色とバッジのアイコンは分類群を表します。保護が必要な種は0.2°のセルとしてのみ表示し、セイリッシュ海のAcartiaによる海生哺乳類の目撃情報は0.01°に丸めます。個体数調査ではありません。", "Open {name} on iNaturalist": "iNaturalistで{name}を開く", @@ -3322,20 +3340,27 @@ "{days}d": "{days}日", "All markers": "すべてのマーカー", "Show markers of every age": "日付にかかわらずすべてのマーカーを表示", - "Maximum event age: {days}d; undated markers are kept": "イベントの最大経過日数:{days}日。日付のないマーカーは保持", + "Maximum event age: {days}d; undated markers are kept": { + "other": "イベントの最大経過日数:{days}日。日付のないマーカーは保持" + }, "event age filter|All": "すべて", "Event age": "経過日数", - "Event age: {days}d · undated kept": "経過日数:{days}日以内 · 日付なしは保持", + "Event age: {days}d · undated kept": { + "other": "経過日数:{days}日以内 · 日付なしは保持" + }, "Close camera preview": "カメラのプレビューを閉じる", "Refresh map still": "地図上の静止画を更新", "The map still uses a separate request and may show a different moment.": "地図上の静止画は別のリクエストで取得されるため、異なる時点を表示する場合があります。", "Video plays from Québec 511, which sees your IP address.": "動画はQuébec 511から再生され、お使いのIPアドレスはQuébec 511側から見えます。", "Press OPEN to load the photo": "[開く]を押して写真を読み込む", "Captured {month}": "{month}撮影", - "this spot": "この地点", "the view centre": "表示中心", "{source} at {place}": "{place}の{source}", + "{source} at this spot": "この地点の{source}", + "{source} at the view centre": "表示中心の{source}", "Street level at {place}": "{place}のストリートレベル", + "Street level at this spot": "この地点のストリートレベル", + "Street level at the view centre": "表示中心のストリートレベル", "Switching map": "地図を切り替え中", "Opening imagery": "画像を開いています", "Street View is ready: press {open} to load it": "ストリートビューの準備ができました:[{open}]を押して読み込んでください", @@ -3427,6 +3452,7 @@ "{source} imagery could not be opened": "{source}の画像を開けませんでした", "{place} has no position to look for imagery at": "{place}には画像を探す位置がありません", "No {source} imagery near {place}": "{place}の近くに{source}の画像はありません", + "No {source} imagery near the view centre": "表示中心の近くに{source}の画像はありません", "{reason} (filters on: {filters})": "{reason}(有効なフィルター:{filters})", "tiles unavailable": "タイルを利用できません", "zoom in to load this layer": "ズームインしてこのレイヤーを読み込む", @@ -3517,6 +3543,8 @@ "REMOVE ALL": "すべて削除", "Confirm: remove every added entry from Data Layers": "確認:追加したすべての項目をデータレイヤーから削除", "Remove every added entry from Data Layers": "追加したすべての項目をデータレイヤーから削除", - "Showing {shown} of {total}": "{total}件中{shown}件を表示", + "Showing {shown} of {total}": { + "other": "{total}件中{shown}件を表示" + }, "BROWSE DATA LIBRARY": "データライブラリを見る" } diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index 5d3cfb253c..fb8de411ee 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -68,8 +68,16 @@ "{severity} only": "Apenas {severity}", "All categories": "Todas as categorias", "Reading the news…": "Lendo as notícias…", - "News, last {hours} hours": "Notícias de até {hours} h atrás", - "Last {hours} h": "Até {hours} h atrás", + "News, last {hours} hours": { + "one": "Notícias da última {hours} hora", + "many": "Notícias das últimas {hours} de horas", + "other": "Notícias das últimas {hours} horas" + }, + "Last {hours} h": { + "one": "Última {hours} h", + "many": "Últimas {hours} h", + "other": "Últimas {hours} h" + }, "Time window": "Período", "Conflicts": "Conflitos", "Local": "Local", @@ -78,9 +86,17 @@ "Hotspots": "Focos", "Severity": "Gravidade", "Category": "Categoria", - "Nothing reported near here in the last {hours} h": "Nada noticiado aqui perto desde {hours} h atrás", + "Nothing reported near here in the last {hours} h": { + "one": "Nada noticiado aqui perto na última {hours} h", + "many": "Nada noticiado aqui perto nas últimas {hours} h", + "other": "Nada noticiado aqui perto nas últimas {hours} h" + }, "Latest news": "Últimas notícias", - "No news matches these filters in the last {hours} h": "Nenhuma notícia de até {hours} h atrás corresponde a estes filtros", + "No news matches these filters in the last {hours} h": { + "one": "Nenhuma notícia da última {hours} h corresponde a estes filtros", + "many": "Nenhuma notícia das últimas {hours} h corresponde a estes filtros", + "other": "Nenhuma notícia das últimas {hours} h corresponde a estes filtros" + }, "Load older news": "Carregar notícias anteriores", "How to read the map": "Como ler o mapa", "Colour: severity · icon: type of event": "Cor: gravidade · ícone: tipo de evento", @@ -584,6 +600,7 @@ "Previous — prior visited contact in the 250 km window": "Anterior — contato visitado anteriormente na janela de 250 km", "PREVIOUS": "ANT.", "FOCUS": "FOCAR", + "site status|FOCUS": "EM FOCO", "Next — nearest unvisited contact in the 250 km window": "Próximo — contato não visitado mais próximo na janela de 250 km", "NEXT": "PRÓX.", "Named areas ({n})": "Áreas com nome ({n})", @@ -939,7 +956,7 @@ "ORBITAL VELOCITY": "VELOCIDADE ORBITAL", "SUB-SATELLITE POINT": "PONTO SUBSATÉLITE", "NORTH UP": "NORTE PARA CIMA", - "CURRENTLY OVER": "SOBREVOANDO AGORA", + "CURRENTLY OVER": "SOB O SATÉLITE", "{division}, {country}": "{division}, {country}", "{region} · near {place}": "{region} · perto de {place}", "NORAD {id}": "NORAD {id}", @@ -1832,7 +1849,11 @@ "ROUTE DATA UNAVAILABLE": "DADOS DE ROTA INDISPONÍVEIS", "CONTACT NAVIGATION OFF": "NAVEGAÇÃO DE CONTATOS DESLIGADA", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "O PASSADIÇO PERMANECE NA EMBARCAÇÃO SELECIONADA", - "{range} NM": "{range} MN", + "{range} NM": { + "one": "{range} MN", + "many": "{range} MN", + "other": "{range} MN" + }, "AIS DESTINATION · CREW REPORTED": "DESTINO AIS · INFORMADO PELA TRIPULAÇÃO", "DEST {bearing}": "DEST {bearing}", "Disable cockpit weather effects": "Desativar efeitos de clima na cabine", @@ -1879,7 +1900,8 @@ "Restore real aircraft": "Restaurar a aeronave real", "Reclassify as TR-3B": "Reclassificar como TR-3B", "TRACK ACQUIRED": "RASTRO ADQUIRIDO", - "{label} · COURSE {heading}°": "{label} · RUMO {heading}°", + "{label} · COURSE {heading}°": "{label} · CURSO {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · RUMO {heading}°", "{label} · HEADING {heading}°": "{label} · PROA {heading}°", "{label} · NO HEADING": "{label} · SEM PROA", "{label} · NADIR VIEW": "{label} · VISTA AO NADIR", @@ -2152,6 +2174,7 @@ "Observed history": "Histórico observado", "Later observation": "Observação posterior", "Latest": "Mais recente", + "news list|Latest": "Mais recentes", "Newest frame per product": "Quadro mais recente por produto", "Replay observed history": "Reproduzir o histórico observado", "Imagery on Esri · Google 3D returns when cleared": "Imagens sobre o Esri · LIMPAR restaura o Google 3D", @@ -2882,7 +2905,11 @@ "Contact cockpit summary": "Resumo do contato na cabine", "CONTACT": "CONTATO", "CONTACTS · 250 KM": "CONTATOS · 250 KM", - "RINGS {spacing} NM": "ANÉIS {spacing} MN", + "RINGS {spacing} NM": { + "one": "ANÉIS {spacing} MN", + "many": "ANÉIS {spacing} MN", + "other": "ANÉIS {spacing} MN" + }, "{count} CONTACTS": { "one": "{count} CONTATO", "many": "{count} DE CONTATOS", @@ -3207,6 +3234,7 @@ "Left panels": "Painéis à esquerda", "Right panels": "Painéis à direita", "CONFIRMED": "CONFIRMADA", + "sightings filter|CONFIRMED": "CONFIRMADOS", "PAD / RTLS": "PLATAFORMA / RTLS", "fire confidence filter|All": "Todas", "fire confidence filter|Nominal+": "Nominal+", @@ -3473,7 +3501,11 @@ "Photo of {name}": "Foto de {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "Avistamentos na vista: {count}", + "{count} sightings in view": { + "one": "{count} avistamento na vista", + "many": "{count} de avistamentos na vista", + "other": "{count} avistamentos na vista" + }, "Close sighting": "Fechar avistamento", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "Vida selvagem observada nas últimas 48 h (cetáceos 7 dias). A cor e o símbolo do emblema indicam o grupo taxonômico. Espécies sensíveis aparecem apenas em células de 0,2°; os relatos de mamíferos marinhos do mar de Salish via Acartia são arredondados para 0,01°. Não é um censo.", "Open {name} on iNaturalist": "Abrir {name} no iNaturalist", @@ -3484,20 +3516,31 @@ "{days}d": "{days} d", "All markers": "Todos os marcadores", "Show markers of every age": "Mostrar marcadores de qualquer idade", - "Maximum event age: {days}d; undated markers are kept": "Idade máxima do evento: {days} d; marcadores sem data são mantidos", + "Maximum event age: {days}d; undated markers are kept": { + "one": "Idade máxima do evento: {days} dia; marcadores sem data são mantidos", + "many": "Idade máxima do evento: {days} de dias; marcadores sem data são mantidos", + "other": "Idade máxima do evento: {days} dias; marcadores sem data são mantidos" + }, "event age filter|All": "Todos", "Event age": "Idade do evento", - "Event age: {days}d · undated kept": "Idade do evento: {days} d · sem data mantidos", + "Event age: {days}d · undated kept": { + "one": "Idade do evento: {days} dia · sem data mantidos", + "many": "Idade do evento: {days} de dias · sem data mantidos", + "other": "Idade do evento: {days} dias · sem data mantidos" + }, "Close camera preview": "Fechar prévia da câmera", "Refresh map still": "Atualizar imagem fixa no mapa", "The map still uses a separate request and may show a different moment.": "A imagem no mapa usa uma solicitação separada e pode mostrar outro momento.", "Video plays from Québec 511, which sees your IP address.": "O vídeo é reproduzido a partir do Québec 511, que vê o seu endereço IP.", "Press OPEN to load the photo": "Clique em ABRIR para carregar a foto", "Captured {month}": "Capturada em {month}", - "this spot": "este ponto", "the view centre": "o centro da vista", "{source} at {place}": "{source}: {place}", + "{source} at this spot": "{source} neste ponto", + "{source} at the view centre": "{source} no centro da vista", "Street level at {place}": "Nível da rua: {place}", + "Street level at this spot": "Nível da rua neste ponto", + "Street level at the view centre": "Nível da rua no centro da vista", "Switching map": "Mudando de mapa", "Opening imagery": "Abrindo imagens", "Street View is ready: press {open} to load it": "O Street View está pronto: clique em {open} para carregar", @@ -3589,6 +3632,7 @@ "{source} imagery could not be opened": "Não foi possível abrir as imagens de {source}", "{place} has no position to look for imagery at": "{place} não tem uma posição para buscar imagens", "No {source} imagery near {place}": "Nenhuma imagem de {source} perto de {place}", + "No {source} imagery near the view centre": "Nenhuma imagem de {source} perto do centro da vista", "{reason} (filters on: {filters})": "{reason} (filtros ativos: {filters})", "tiles unavailable": "blocos indisponíveis", "zoom in to load this layer": "aproxime o zoom para carregar esta camada", @@ -3691,6 +3735,10 @@ "REMOVE ALL": "REMOVER TUDO", "Confirm: remove every added entry from Data Layers": "Confirmar: remover de \"Camadas de dados\" todas as entradas adicionadas", "Remove every added entry from Data Layers": "Remover de \"Camadas de dados\" todas as entradas adicionadas", - "Showing {shown} of {total}": "Mostrando {shown} de {total}", + "Showing {shown} of {total}": { + "one": "Mostrando {shown} de {total}", + "many": "Mostrando {shown} de {total}", + "other": "Mostrando {shown} de {total}" + }, "BROWSE DATA LIBRARY": "EXPLORAR BIBLIOTECA DE DADOS" } diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index ef8b144e53..15934dd40c 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -71,8 +71,18 @@ "{severity} only": "Только: {severity}", "All categories": "Все категории", "Reading the news…": "Читаем новости…", - "News, last {hours} hours": "Новости за последние {hours} ч", - "Last {hours} h": "За {hours} ч", + "News, last {hours} hours": { + "one": "Новости за последний {hours} час", + "few": "Новости за последние {hours} часа", + "many": "Новости за последние {hours} часов", + "other": "Новости за последние {hours} часа" + }, + "Last {hours} h": { + "one": "За {hours} ч", + "few": "За {hours} ч", + "many": "За {hours} ч", + "other": "За {hours} ч" + }, "Time window": "Период", "Conflicts": "Конфликты", "Local": "Местные", @@ -81,9 +91,19 @@ "Hotspots": "Горячие точки", "Severity": "Тяжесть", "Category": "Категория", - "Nothing reported near here in the last {hours} h": "За последние {hours} ч поблизости ничего не сообщалось", + "Nothing reported near here in the last {hours} h": { + "one": "За последний {hours} ч поблизости ничего не сообщалось", + "few": "За последние {hours} ч поблизости ничего не сообщалось", + "many": "За последние {hours} ч поблизости ничего не сообщалось", + "other": "За последние {hours} ч поблизости ничего не сообщалось" + }, "Latest news": "Последние новости", - "No news matches these filters in the last {hours} h": "За последние {hours} ч нет новостей по этим фильтрам", + "No news matches these filters in the last {hours} h": { + "one": "За последний {hours} ч нет новостей по этим фильтрам", + "few": "За последние {hours} ч нет новостей по этим фильтрам", + "many": "За последние {hours} ч нет новостей по этим фильтрам", + "other": "За последние {hours} ч нет новостей по этим фильтрам" + }, "Load older news": "Загрузить более ранние новости", "How to read the map": "Как читать карту", "Colour: severity · icon: type of event": "Цвет: тяжесть · значок: тип события", @@ -179,6 +199,7 @@ "Previous — prior visited contact in the 250 km window": "Назад — предыдущий посещённый контакт в радиусе 250 км", "PREVIOUS": "ПРЕД.", "FOCUS": "ФОКУС", + "site status|FOCUS": "ФОКУС", "Next — nearest unvisited contact in the 250 km window": "Далее — ближайший непосещённый контакт в радиусе 250 км", "NEXT": "СЛЕД.", "Open-source mapped/observed context. Missing broadcasts, unloaded map areas, or unmapped sites are not evidence of absence.": "Контекст из открытых источников. Отсутствие трансляций, незагруженные области карты или неотмеченные объекты — не доказательство отсутствия.", @@ -346,6 +367,7 @@ "Cancel replay": "Отменить повтор", "EST. DOWNRANGE": "РАСЧЁТ ПО ТРАССЕ", "CONFIRMED": "ПОДТВЕРЖДЕНО", + "sightings filter|CONFIRMED": "ПОДТВЕРЖДЕНО", "PAD / RTLS": "ПЛОЩАДКА / RTLS", "PLANNED · ": "ПЛАН · ", "SUPPLIED TRAJECTORY POINTS": "ПРЕДОСТАВЛЕННЫЕ ТОЧКИ ТРАЕКТОРИИ", @@ -545,7 +567,12 @@ "ROUTE DATA UNAVAILABLE": "ДАННЫЕ МАРШРУТА НЕДОСТУПНЫ", "CONTACT NAVIGATION OFF": "НАВИГАЦИЯ ПО КОНТАКТАМ ВЫКЛЮЧЕНА", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "МОСТИК ОСТАЁТСЯ НА ВЫБРАННОМ СУДНЕ", - "{range} NM": "{range} МОР. МИЛ.", + "{range} NM": { + "one": "{range} МОР. МИЛЯ", + "few": "{range} МОР. МИЛИ", + "many": "{range} МОР. МИЛЬ", + "other": "{range} МОР. МИЛИ" + }, "AIS DESTINATION · CREW REPORTED": "ПУНКТ НАЗНАЧЕНИЯ AIS · УКАЗАН ЭКИПАЖЕМ", "DEST {bearing}": "НАЗН. {bearing}", "Disable cockpit weather effects": "Выключить погодные эффекты кабины", @@ -591,6 +618,7 @@ "Select flight {title}": "Выбрать рейс {title}", "TRACK ACQUIRED": "ЦЕЛЬ ЗАХВАЧЕНА", "{label} · COURSE {heading}°": "{label} · ПУТЕВОЙ УГОЛ {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · ПУТЕВОЙ УГОЛ {heading}°", "{label} · HEADING {heading}°": "{label} · КУРС {heading}°", "{label} · NO HEADING": "{label} · НЕТ КУРСА", "{label} · NADIR VIEW": "{label} · ВИД В НАДИР", @@ -842,7 +870,12 @@ "EXIT BRIDGE": "ВЫЙТИ С МОСТИКА", "EXIT ORBIT": "ВЫЙТИ С ОРБИТЫ", "CONTACTS · 250 KM": "КОНТАКТЫ · 250 КМ", - "RINGS {spacing} NM": "КОЛЬЦА {spacing} МОР. МИЛ.", + "RINGS {spacing} NM": { + "one": "КОЛЬЦА {spacing} МОР. МИЛЯ", + "few": "КОЛЬЦА {spacing} МОР. МИЛИ", + "many": "КОЛЬЦА {spacing} МОР. МИЛЬ", + "other": "КОЛЬЦА {spacing} МОР. МИЛИ" + }, "{count} CONTACTS": { "one": "{count} КОНТАКТ", "few": "{count} КОНТАКТА", @@ -1699,6 +1732,7 @@ "Observed history": "История наблюдений", "Later observation": "Более позднее наблюдение", "Latest": "Последние", + "news list|Latest": "Последние", "Newest frame per product": "Самый свежий кадр каждого продукта", "Replay observed history": "Воспроизвести историю наблюдений", "S on another day replaces it · × unpins": "S в другой день заменяет его · × открепляет", @@ -3554,7 +3588,12 @@ "Photo of {name}": "Фото: {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "Наблюдений в кадре: {count}", + "{count} sightings in view": { + "one": "{count} наблюдение в кадре", + "few": "{count} наблюдения в кадре", + "many": "{count} наблюдений в кадре", + "other": "{count} наблюдения в кадре" + }, "Close sighting": "Закрыть наблюдение", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "Наблюдения живой природы за 48 ч (китообразные — 7 дней). Цвет и символ значка обозначают таксономическую группу. Уязвимые виды показаны только ячейками 0,2°; сообщения Acartia о морских млекопитающих моря Селиш округлены до 0,01°. Это не учёт численности.", "Open {name} on iNaturalist": "Открыть {name} в iNaturalist", @@ -3565,20 +3604,33 @@ "{days}d": "{days} дн.", "All markers": "Все метки", "Show markers of every age": "Показать метки любого возраста", - "Maximum event age: {days}d; undated markers are kept": "Максимальный возраст события: {days} дн.; метки без даты остаются", + "Maximum event age: {days}d; undated markers are kept": { + "one": "Максимальный возраст события: {days} дн.; метки без даты остаются", + "few": "Максимальный возраст события: {days} дн.; метки без даты остаются", + "many": "Максимальный возраст события: {days} дн.; метки без даты остаются", + "other": "Максимальный возраст события: {days} дн.; метки без даты остаются" + }, "event age filter|All": "Все", "Event age": "Возраст события", - "Event age: {days}d · undated kept": "Возраст события: {days} дн. · метки без даты остаются", + "Event age: {days}d · undated kept": { + "one": "Возраст события: {days} дн. · метки без даты остаются", + "few": "Возраст события: {days} дн. · метки без даты остаются", + "many": "Возраст события: {days} дн. · метки без даты остаются", + "other": "Возраст события: {days} дн. · метки без даты остаются" + }, "Close camera preview": "Закрыть просмотр камеры", "Refresh map still": "Обновить кадр на карте", "The map still uses a separate request and may show a different moment.": "Кадр на карте запрашивается отдельно и может показывать другой момент.", "Video plays from Québec 511, which sees your IP address.": "Видео воспроизводится с Québec 511, который видит ваш IP-адрес.", "Press OPEN to load the photo": "Нажмите ОТКРЫТЬ, чтобы загрузить снимок", "Captured {month}": "Снято: {month}", - "this spot": "эта точка", "the view centre": "центр вида", "{source} at {place}": "{source}: {place}", + "{source} at this spot": "{source} в этой точке", + "{source} at the view centre": "{source} в центре вида", "Street level at {place}": "Уличные снимки: {place}", + "Street level at this spot": "Уличные снимки в этой точке", + "Street level at the view centre": "Уличные снимки в центре вида", "Switching map": "Смена карты", "Opening imagery": "Открытие снимков", "Street View is ready: press {open} to load it": "Просмотр улиц готов: нажмите {open}, чтобы загрузить", @@ -3670,6 +3722,7 @@ "{source} imagery could not be opened": "Не удалось открыть снимки {source}", "{place} has no position to look for imagery at": "У места «{place}» нет координат для поиска снимков", "No {source} imagery near {place}": "Нет снимков {source} рядом с местом «{place}»", + "No {source} imagery near the view centre": "Нет снимков {source} рядом с центром вида", "{reason} (filters on: {filters})": "{reason} (включены фильтры: {filters})", "tiles unavailable": "тайлы недоступны", "Environment": "Окружающая среда", @@ -3758,7 +3811,12 @@ "switch on a dataset to load features": "включите набор данных, чтобы загрузить объекты", "Data Library at a glance": "Библиотека данных вкратце", "Map features": "Объекты на карте", - "Showing {shown} of {total}": "Показано {shown} из {total}", + "Showing {shown} of {total}": { + "one": "Показано {shown} из {total}", + "few": "Показано {shown} из {total}", + "many": "Показано {shown} из {total}", + "other": "Показано {shown} из {total}" + }, "Datasets": "Наборы данных", "Themes": "Темы", "zoom in to load this layer": "приблизьте, чтобы загрузить этот слой", diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index 87c66ef3f7..e124eeae90 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -67,18 +67,30 @@ "{severity} and above": "{severity} och uppåt", "{severity} only": "Endast ”{severity}”", "All categories": "Alla kategorier", - "Last {hours} h": "Senaste {hours} h", + "Last {hours} h": { + "one": "Senaste {hours} h", + "other": "Senaste {hours} h" + }, "Reading the news…": "Läser in nyheterna …", - "News, last {hours} hours": "Nyheter, senaste {hours} h", + "News, last {hours} hours": { + "one": "Nyheter, senaste {hours} h", + "other": "Nyheter, senaste {hours} h" + }, "Time window": "Tidsfönster", "News sections": "Nyhetssektioner", "Hotspots": "Oroshärdar", "Severity": "Allvarlighetsgrad", "Category": "Kategori", "Zoom in to see local news": "Zooma in för att se lokala nyheter", - "Nothing reported near here in the last {hours} h": "Inget rapporterat i närheten senaste {hours} h", + "Nothing reported near here in the last {hours} h": { + "one": "Inget rapporterat i närheten senaste {hours} h", + "other": "Inget rapporterat i närheten senaste {hours} h" + }, "Latest news": "Senaste nyheterna", - "No news matches these filters in the last {hours} h": "Inga nyheter matchar filtren senaste {hours} h", + "No news matches these filters in the last {hours} h": { + "one": "Inga nyheter matchar filtren senaste {hours} h", + "other": "Inga nyheter matchar filtren senaste {hours} h" + }, "Load older news": "Ladda äldre nyheter", "How to read the map": "Så läses kartan", "Colour: severity · icon: type of event": "Färg: allvarlighetsgrad · ikon: typ av händelse", @@ -198,6 +210,7 @@ "Previous — prior visited contact in the 250 km window": "Förra – senast besökta kontakt inom 250 km", "PREVIOUS": "FÖRRA", "FOCUS": "FOKUS", + "site status|FOCUS": "FOKUS", "Next — nearest unvisited contact in the 250 km window": "Nästa – närmaste obesökta kontakt inom 250 km", "NEXT": "NÄSTA", "Open-source mapped/observed context. Missing broadcasts, unloaded map areas, or unmapped sites are not evidence of absence.": "Kartlagd/observerad kontext från öppna källor. Uteblivna sändningar, kartområden som inte har laddats eller platser som inte är kartlagda bevisar inte att något saknas.", @@ -565,6 +578,7 @@ "Reclassify as TR-3B": "Klassa om som TR-3B", "TRACK ACQUIRED": "SPÅR LÅST", "{label} · COURSE {heading}°": "{label} · FÄRDRIKTNING {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · FÄRDRIKTNING {heading}°", "Context could not restore every layer; try again": "Läget ”Kontext” kunde inte återställa alla lager – försök igen", "No selected data layers": "Inga valda datalager", "{count} data layers could not be cleared": { @@ -2326,6 +2340,7 @@ "Observed history": "Observerad historik", "Later observation": "Senare observation", "Latest": "Senaste", + "news list|Latest": "Senaste", "Newest frame per product": "Senaste bildruta per produkt", "Replay observed history": "Spela upp observerad historik", "Imagery on Esri · Google 3D returns when cleared": "Bilder på Esri · Google 3D återkommer när de rensas", @@ -3049,6 +3064,7 @@ "Left panels": "Vänstra paneler", "Right panels": "Högra paneler", "CONFIRMED": "BEKRÄFTAD", + "sightings filter|CONFIRMED": "BEKRÄFTADE", "PAD / RTLS": "RAMP / RTLS", "fire confidence filter|All": "Alla", "fire confidence filter|Nominal+": "Normal+", @@ -3309,7 +3325,10 @@ "Photo of {name}": "Foto av {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "Observationer i vyn: {count}", + "{count} sightings in view": { + "one": "{count} observation i vyn", + "other": "{count} observationer i vyn" + }, "Close sighting": "Stäng observationen", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "Djur, växter och svampar observerade de senaste 48 h (valar 7 d). Färg och symbol visar artgruppen. Känsliga arter visas bara som rutor på 0,2°; rapporter om marina däggdjur i Salish Sea via Acartia avrundas till 0,01°. Ingen inventering.", "Open {name} on iNaturalist": "Öppna {name} på iNaturalist", @@ -3320,20 +3339,29 @@ "{days}d": "{days} d", "All markers": "Alla markörer", "Show markers of every age": "Visa markörer oavsett ålder", - "Maximum event age: {days}d; undated markers are kept": "Högsta ålder på händelser: {days} d; markörer utan datum behålls", + "Maximum event age: {days}d; undated markers are kept": { + "one": "Högsta ålder på händelser: {days} d; markörer utan datum behålls", + "other": "Högsta ålder på händelser: {days} d; markörer utan datum behålls" + }, "event age filter|All": "Alla", "Event age": "Händelsernas ålder", - "Event age: {days}d · undated kept": "Händelsernas ålder: {days} d · utan datum behålls", + "Event age: {days}d · undated kept": { + "one": "Händelsernas ålder: {days} d · utan datum behålls", + "other": "Händelsernas ålder: {days} d · utan datum behålls" + }, "Close camera preview": "Stäng förhandsvisningen av kameran", "Refresh map still": "Uppdatera stillbilden på kartan", "The map still uses a separate request and may show a different moment.": "Stillbilden på kartan hämtas separat och kan visa ett annat ögonblick.", "Video plays from Québec 511, which sees your IP address.": "Videon spelas upp från Québec 511, som ser din IP-adress.", "Press OPEN to load the photo": "Tryck på ÖPPNA för att ladda fotot", "Captured {month}": "Tagen {month}", - "this spot": "den här platsen", "the view centre": "vyns mitt", "{source} at {place}": "{source} vid {place}", + "{source} at this spot": "{source} på den här platsen", + "{source} at the view centre": "{source} i vyns mitt", "Street level at {place}": "Gatunivå vid {place}", + "Street level at this spot": "Gatunivå på den här platsen", + "Street level at the view centre": "Gatunivå i vyns mitt", "Switching map": "Byter karta", "Opening imagery": "Öppnar bilder", "Street View is ready: press {open} to load it": "Street View är redo: tryck på {open} för att ladda den", @@ -3367,7 +3395,10 @@ "LIVE AIS": "LIVE-AIS", "CONTACT NAVIGATION OFF": "KONTAKTNAVIGERING AV", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "BRYGGAN STANNAR PÅ DET VALDA FARTYGET", - "{range} NM": "{range} NM", + "{range} NM": { + "one": "{range} NM", + "other": "{range} NM" + }, "AIS DESTINATION · CREW REPORTED": "AIS-DESTINATION · ANGIVEN AV BESÄTTNINGEN", "{label} · NADIR VIEW": "{label} · NADIRVY", "SITES STANDBY": "PLATSER I VÄNTLÄGE", @@ -3446,7 +3477,10 @@ "Zoom in (+)": "Zooma in (+)", "Zoom to the imaging sensor swath": "Zooma till sensorns avbildningsstråk", "SENSOR": "SENSOR", - "RINGS {spacing} NM": "RINGAR {spacing} NM", + "RINGS {spacing} NM": { + "one": "RINGAR {spacing} NM", + "other": "RINGAR {spacing} NM" + }, "{count} CONTACTS": { "one": "{count} KONTAKT", "other": "{count} KONTAKTER" @@ -3500,6 +3534,7 @@ "{source} imagery could not be opened": "Bilder från {source} kunde inte öppnas", "{place} has no position to look for imagery at": "{place} har ingen position att söka efter bilder vid", "No {source} imagery near {place}": "Inga bilder från {source} nära {place}", + "No {source} imagery near the view centre": "Inga bilder från {source} nära vyns mitt", "{reason} (filters on: {filters})": "{reason} (aktiva filter: {filters})", "1 h/s": "1 h/s", "1 d/s": "1 d/s", @@ -3604,6 +3639,9 @@ "REMOVE ALL": "TA BORT ALLA", "Confirm: remove every added entry from Data Layers": "Bekräfta: ta bort alla tillagda poster från Datalager", "Remove every added entry from Data Layers": "Ta bort alla tillagda poster från Datalager", - "Showing {shown} of {total}": "Visar {shown} av {total}", + "Showing {shown} of {total}": { + "one": "Visar {shown} av {total}", + "other": "Visar {shown} av {total}" + }, "BROWSE DATA LIBRARY": "BLÄDDRA I DATABIBLIOTEKET" } diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index 4b079ac0a9..defb9bc7dc 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -71,8 +71,18 @@ "{severity} only": "Лише {severity}", "All categories": "Усі категорії", "Reading the news…": "Читаємо новини…", - "News, last {hours} hours": "Новини за {hours} год", - "Last {hours} h": "За {hours} год", + "News, last {hours} hours": { + "one": "Новини за останню {hours} годину", + "few": "Новини за останні {hours} години", + "many": "Новини за останні {hours} годин", + "other": "Новини за останні {hours} години" + }, + "Last {hours} h": { + "one": "За {hours} год", + "few": "За {hours} год", + "many": "За {hours} год", + "other": "За {hours} год" + }, "Time window": "Період", "Conflicts": "Конфлікти", "Local": "Місцеві", @@ -81,9 +91,19 @@ "Hotspots": "Гарячі точки", "Severity": "Тяжкість", "Category": "Категорія", - "Nothing reported near here in the last {hours} h": "За {hours} год поблизу нічого не повідомлялося", + "Nothing reported near here in the last {hours} h": { + "one": "За останню {hours} год поблизу нічого не повідомлялося", + "few": "За останні {hours} год поблизу нічого не повідомлялося", + "many": "За останні {hours} год поблизу нічого не повідомлялося", + "other": "За останні {hours} год поблизу нічого не повідомлялося" + }, "Latest news": "Останні новини", - "No news matches these filters in the last {hours} h": "За {hours} год немає новин за цими фільтрами", + "No news matches these filters in the last {hours} h": { + "one": "За останню {hours} год немає новин за цими фільтрами", + "few": "За останні {hours} год немає новин за цими фільтрами", + "many": "За останні {hours} год немає новин за цими фільтрами", + "other": "За останні {hours} год немає новин за цими фільтрами" + }, "Load older news": "Завантажити давніші новини", "How to read the map": "Як читати карту", "Colour: severity · icon: type of event": "Колір: тяжкість · значок: тип події", @@ -594,6 +614,7 @@ "Previous — prior visited contact in the 250 km window": "Назад — попередній переглянутий контакт у радіусі 250 км", "PREVIOUS": "НАЗАД", "FOCUS": "ФОКУС", + "site status|FOCUS": "ФОКУС", "Next — nearest unvisited contact in the 250 km window": "Далі — найближчий ще не переглянутий контакт у радіусі 250 км", "NEXT": "ДАЛІ", "Named areas ({n})": "Іменовані зони ({n})", @@ -956,7 +977,7 @@ "ORBITAL VELOCITY": "ОРБІТАЛЬНА ШВИДКІСТЬ", "SUB-SATELLITE POINT": "ПІДСУПУТНИКОВА ТОЧКА", "NORTH UP": "ПІВНІЧ УГОРІ", - "CURRENTLY OVER": "ЗАРАЗ НАД", + "CURRENTLY OVER": "ПІД СУПУТНИКОМ", "{division}, {country}": "{division}, {country}", "{region} · near {place}": "{region} · поблизу: {place}", "NORAD {id}": "NORAD {id}", @@ -1859,7 +1880,12 @@ "ROUTE DATA UNAVAILABLE": "ДАНІ МАРШРУТУ НЕДОСТУПНІ", "CONTACT NAVIGATION OFF": "НАВІГАЦІЮ КОНТАКТАМИ ВИМКНЕНО", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "МІСТОК ЗАЛИШАЄТЬСЯ НА ВИБРАНОМУ СУДНІ", - "{range} NM": "{range} МОР. МИЛ.", + "{range} NM": { + "one": "{range} МОР. МИЛЯ", + "few": "{range} МОР. МИЛІ", + "many": "{range} МОР. МИЛЬ", + "other": "{range} МОР. МИЛІ" + }, "AIS DESTINATION · CREW REPORTED": "ПРИЗНАЧЕННЯ AIS · ВКАЗАНО ЕКІПАЖЕМ", "DEST {bearing}": "ПРИЗН. {bearing}", "Disable cockpit weather effects": "Вимкнути погодні ефекти кабіни", @@ -1908,6 +1934,7 @@ "Reclassify as TR-3B": "Перекласифікувати як TR-3B", "TRACK ACQUIRED": "ТРЕК ЗАХОПЛЕНО", "{label} · COURSE {heading}°": "{label} · ШЛЯХОВИЙ КУТ {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · ШЛЯХОВИЙ КУТ {heading}°", "{label} · HEADING {heading}°": "{label} · КУРС {heading}°", "{label} · NO HEADING": "{label} · НЕМАЄ КУРСУ", "{label} · NADIR VIEW": "{label} · ВИГЛЯД У НАДИР", @@ -2188,6 +2215,7 @@ "Observed history": "Історія спостережень", "Later observation": "Наступне спостереження", "Latest": "Останні", + "news list|Latest": "Останні", "Newest frame per product": "Найсвіжіший кадр кожного продукту", "Replay observed history": "Відтворити історію спостережень", "Imagery on Esri · Google 3D returns when cleared": "Підкладка: Esri · скидання поверне Google 3D", @@ -2954,7 +2982,12 @@ "Contact cockpit summary": "Зведення контакту в кабіні", "CONTACT": "КОНТАКТ", "CONTACTS · 250 KM": "КОНТАКТИ · 250 КМ", - "RINGS {spacing} NM": "КІЛЬЦЯ {spacing} МОР. МИЛ.", + "RINGS {spacing} NM": { + "one": "КІЛЬЦЯ {spacing} МОР. МИЛЯ", + "few": "КІЛЬЦЯ {spacing} МОР. МИЛІ", + "many": "КІЛЬЦЯ {spacing} МОР. МИЛЬ", + "other": "КІЛЬЦЯ {spacing} МОР. МИЛІ" + }, "{count} CONTACTS": { "one": "{count} КОНТАКТ", "few": "{count} КОНТАКТИ", @@ -3295,6 +3328,7 @@ "Left panels": "Ліві панелі", "Right panels": "Праві панелі", "CONFIRMED": "ПІДТВЕРДЖЕНО", + "sightings filter|CONFIRMED": "ПІДТВЕРДЖЕНО", "PAD / RTLS": "МІСЦЕ ЗАПУСКУ / RTLS", "Name of {name}": "Назва: {name}", "Change the colour of {name}": "Змінити колір: {name}", @@ -3554,7 +3588,12 @@ "Photo of {name}": "Фото {name}", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "Спостережень у кадрі: {count}", + "{count} sightings in view": { + "one": "{count} спостереження в кадрі", + "few": "{count} спостереження в кадрі", + "many": "{count} спостережень у кадрі", + "other": "{count} спостереження в кадрі" + }, "Close sighting": "Закрити спостереження", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "Спостереження живої природи за 48 год (китоподібні — 7 днів). Колір і символ значка позначають таксономічну групу. Вразливі види показано лише комірками 0,2°; повідомлення Acartia про морських ссавців моря Селіш округлено до 0,01°. Не перепис.", "Open {name} on iNaturalist": "Відкрити {name} в iNaturalist", @@ -3565,20 +3604,33 @@ "{days}d": "{days} дн", "All markers": "Усі мітки", "Show markers of every age": "Показати мітки будь-якого віку", - "Maximum event age: {days}d; undated markers are kept": "Максимальний вік події: {days} дн; мітки без дати залишаються", + "Maximum event age: {days}d; undated markers are kept": { + "one": "Максимальний вік події: {days} дн; мітки без дати залишаються", + "few": "Максимальний вік події: {days} дн; мітки без дати залишаються", + "many": "Максимальний вік події: {days} дн; мітки без дати залишаються", + "other": "Максимальний вік події: {days} дн; мітки без дати залишаються" + }, "event age filter|All": "Усі", "Event age": "Вік події", - "Event age: {days}d · undated kept": "Вік події: {days} дн · мітки без дати залишаються", + "Event age: {days}d · undated kept": { + "one": "Вік події: {days} дн · мітки без дати залишаються", + "few": "Вік події: {days} дн · мітки без дати залишаються", + "many": "Вік події: {days} дн · мітки без дати залишаються", + "other": "Вік події: {days} дн · мітки без дати залишаються" + }, "Close camera preview": "Закрити перегляд камери", "Refresh map still": "Оновити кадр на карті", "The map still uses a separate request and may show a different moment.": "Кадр на карті запитується окремо та може показувати інший момент.", "Video plays from Québec 511, which sees your IP address.": "Відео відтворюється з Québec 511, який бачить вашу IP-адресу.", "Press OPEN to load the photo": "Натисніть «ВІДКРИТИ», щоб завантажити фото", "Captured {month}": "Знято: {month}", - "this spot": "це місце", "the view centre": "центр карти", "{source} at {place}": "{source}: {place}", + "{source} at this spot": "{source} у цьому місці", + "{source} at the view centre": "{source} у центрі карти", "Street level at {place}": "Вуличні знімки: {place}", + "Street level at this spot": "Вуличні знімки в цьому місці", + "Street level at the view centre": "Вуличні знімки в центрі карти", "Switching map": "Перемикання карти", "Opening imagery": "Відкриття знімків", "Street View is ready: press {open} to load it": "Перегляд вулиць готовий: натисніть «{open}», щоб завантажити", @@ -3670,6 +3722,7 @@ "{source} imagery could not be opened": "Не вдалося відкрити знімки {source}", "{place} has no position to look for imagery at": "Для місця «{place}» немає координат для пошуку знімків", "No {source} imagery near {place}": "Немає знімків {source} поблизу: {place}", + "No {source} imagery near the view centre": "Немає знімків {source} поблизу центру карти", "{reason} (filters on: {filters})": "{reason} (увімкнено фільтри: {filters})", "tiles unavailable": "тайли недоступні", "zoom in to load this layer": "наблизьте карту, щоб завантажити цей шар", @@ -3778,6 +3831,11 @@ "REMOVE ALL": "ВИДАЛИТИ ВСЕ", "Confirm: remove every added entry from Data Layers": "Підтвердити: видалити всі додані записи з «Шарів даних»", "Remove every added entry from Data Layers": "Видалити всі додані записи з «Шарів даних»", - "Showing {shown} of {total}": "Показано {shown} з {total}", + "Showing {shown} of {total}": { + "one": "Показано {shown} з {total}", + "few": "Показано {shown} з {total}", + "many": "Показано {shown} з {total}", + "other": "Показано {shown} з {total}" + }, "BROWSE DATA LIBRARY": "ВІДКРИТИ БІБЛІОТЕКУ ДАНИХ" } diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json index 8311259cd4..0ca6af0f44 100644 --- a/src/i18n/locales/zh-CN.json +++ b/src/i18n/locales/zh-CN.json @@ -62,8 +62,12 @@ "{severity} only": "仅{severity}", "All categories": "所有类别", "Reading the news…": "正在读取新闻…", - "News, last {hours} hours": "最近 {hours} 小时的新闻", - "Last {hours} h": "最近 {hours} 小时", + "News, last {hours} hours": { + "other": "最近 {hours} 小时的新闻" + }, + "Last {hours} h": { + "other": "最近 {hours} 小时" + }, "Time window": "时间范围", "Conflicts": "冲突", "Local": "本地", @@ -72,9 +76,13 @@ "Hotspots": "热点", "Severity": "严重程度", "Category": "类别", - "Nothing reported near here in the last {hours} h": "最近 {hours} 小时附近无报道", + "Nothing reported near here in the last {hours} h": { + "other": "最近 {hours} 小时附近无报道" + }, "Latest news": "最新新闻", - "No news matches these filters in the last {hours} h": "最近 {hours} 小时没有符合这些筛选条件的新闻", + "No news matches these filters in the last {hours} h": { + "other": "最近 {hours} 小时没有符合这些筛选条件的新闻" + }, "Load older news": "加载更早的新闻", "How to read the map": "如何解读地图", "Colour: severity · icon: type of event": "颜色:严重程度 · 图标:事件类型", @@ -563,6 +571,7 @@ "Previous — prior visited contact in the 250 km window": "上一个:250 km 范围内先前访问过的目标", "PREVIOUS": "上一个", "FOCUS": "聚焦", + "site status|FOCUS": "聚焦", "Next — nearest unvisited contact in the 250 km window": "下一个:250 km 范围内最近的未访问目标", "NEXT": "下一个", "Named areas ({n})": "已命名区域({n})", @@ -929,6 +938,7 @@ "Cancel replay": "取消回放", "EST. DOWNRANGE": "预估落点距离", "CONFIRMED": "已确认", + "sightings filter|CONFIRMED": "已确认", "PAD / RTLS": "发射台 / RTLS", "PLANNED · ": "计划 · ", "SUPPLIED TRAJECTORY POINTS": "提供的轨迹点", @@ -1750,7 +1760,9 @@ "ROUTE DATA UNAVAILABLE": "航线数据不可用", "CONTACT NAVIGATION OFF": "目标导航已关闭", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "驾驶台保持在所选船舶上", - "{range} NM": "{range} 海里", + "{range} NM": { + "other": "{range} 海里" + }, "AIS DESTINATION · CREW REPORTED": "AIS 目的地 · 船员申报", "DEST {bearing}": "目的地 {bearing}", "Disable cockpit weather effects": "停用座舱天气效果", @@ -1796,6 +1808,7 @@ "Reclassify as TR-3B": "重新归类为 TR-3B", "TRACK ACQUIRED": "已获取航迹", "{label} · COURSE {heading}°": "{label} · 对地航向 {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · 对地航向 {heading}°", "{label} · HEADING {heading}°": "{label} · 船首向 {heading}°", "{label} · NO HEADING": "{label} · 无船首向", "{label} · NADIR VIEW": "{label} · 天底视图", @@ -2048,6 +2061,7 @@ "Observed history": "观测历史", "Later observation": "较晚观测", "Latest": "最新", + "news list|Latest": "最新", "Newest frame per product": "每个产品的最新一帧", "Replay observed history": "回放观测历史", "Imagery on Esri · Google 3D returns when cleared": "影像显示在 Esri 底图上 · 清除后恢复 Google 3D", @@ -2629,7 +2643,9 @@ "Contact cockpit summary": "目标座舱摘要", "CONTACT": "目标", "CONTACTS · 250 KM": "目标 · 250 km", - "RINGS {spacing} NM": "距标圈 {spacing} 海里", + "RINGS {spacing} NM": { + "other": "距标圈 {spacing} 海里" + }, "{count} CONTACTS": { "other": "{count} 个目标" }, @@ -3311,7 +3327,9 @@ "Photo of {name}": "{name} 的照片", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "视野内有 {count} 次目击", + "{count} sightings in view": { + "other": "视野内有 {count} 次目击" + }, "Close sighting": "关闭目击记录", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "近 48 小时内观察到的野生生物(鲸类为 7 天)。颜色与徽章图标表示分类群。敏感物种仅以 0.2° 网格显示;Acartia 提供的萨利希海海洋哺乳动物目击位置四舍五入到 0.01°。并非种群普查。", "Open {name} on iNaturalist": "在 iNaturalist 上打开 {name}", @@ -3322,20 +3340,27 @@ "{days}d": "{days} 天", "All markers": "所有标记", "Show markers of every age": "显示所有时间的标记", - "Maximum event age: {days}d; undated markers are kept": "仅显示 {days} 天内的事件;保留无日期标记", + "Maximum event age: {days}d; undated markers are kept": { + "other": "仅显示 {days} 天内的事件;保留无日期标记" + }, "event age filter|All": "全部", "Event age": "事件时间", - "Event age: {days}d · undated kept": "事件时间:{days} 天内 · 保留无日期标记", + "Event age: {days}d · undated kept": { + "other": "事件时间:{days} 天内 · 保留无日期标记" + }, "Close camera preview": "关闭摄像头预览", "Refresh map still": "刷新地图静止画面", "The map still uses a separate request and may show a different moment.": "地图静止画面通过单独的请求获取,可能显示不同的时刻。", "Video plays from Québec 511, which sees your IP address.": "视频从 Québec 511 播放,Québec 511 会看到你的 IP 地址。", "Press OPEN to load the photo": "点击“打开”加载照片", "Captured {month}": "拍摄于 {month}", - "this spot": "此处", "the view centre": "视野中心", "{source} at {place}": "{place} 的 {source}", + "{source} at this spot": "此处的 {source}", + "{source} at the view centre": "视图中心的 {source}", "Street level at {place}": "{place} 的街景", + "Street level at this spot": "此处的街景", + "Street level at the view centre": "视图中心的街景", "Switching map": "正在切换地图", "Opening imagery": "正在打开影像", "Street View is ready: press {open} to load it": "街景已就绪:点击“{open}”加载", @@ -3427,6 +3452,7 @@ "{source} imagery could not be opened": "无法打开 {source} 影像", "{place} has no position to look for imagery at": "{place} 没有可查找影像的位置", "No {source} imagery near {place}": "{place} 附近没有 {source} 影像", + "No {source} imagery near the view centre": "视图中心附近没有 {source} 影像", "{reason} (filters on: {filters})": "{reason}(已开启筛选:{filters})", "tiles unavailable": "瓦片不可用", "zoom in to load this layer": "放大以加载此图层", @@ -3517,6 +3543,8 @@ "REMOVE ALL": "全部移除", "Confirm: remove every added entry from Data Layers": "确认:从数据图层中移除所有已添加条目", "Remove every added entry from Data Layers": "从数据图层中移除所有已添加条目", - "Showing {shown} of {total}": "显示 {shown} / {total}", + "Showing {shown} of {total}": { + "other": "显示 {shown} / {total}" + }, "BROWSE DATA LIBRARY": "浏览数据资源库" } diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json index fd201af367..543caa2518 100644 --- a/src/i18n/locales/zh-Hant.json +++ b/src/i18n/locales/zh-Hant.json @@ -62,8 +62,12 @@ "{severity} only": "僅{severity}", "All categories": "所有類別", "Reading the news…": "正在讀取新聞…", - "News, last {hours} hours": "最近 {hours} 小時的新聞", - "Last {hours} h": "最近 {hours} 小時", + "News, last {hours} hours": { + "other": "最近 {hours} 小時的新聞" + }, + "Last {hours} h": { + "other": "最近 {hours} 小時" + }, "Time window": "時間範圍", "Conflicts": "衝突", "Local": "本地", @@ -72,9 +76,13 @@ "Hotspots": "熱點", "Severity": "嚴重程度", "Category": "類別", - "Nothing reported near here in the last {hours} h": "最近 {hours} 小時附近無報道", + "Nothing reported near here in the last {hours} h": { + "other": "最近 {hours} 小時附近無報道" + }, "Latest news": "最新新聞", - "No news matches these filters in the last {hours} h": "最近 {hours} 小時沒有符合這些篩選條件的新聞", + "No news matches these filters in the last {hours} h": { + "other": "最近 {hours} 小時沒有符合這些篩選條件的新聞" + }, "Load older news": "加載更早的新聞", "How to read the map": "如何解讀地圖", "Colour: severity · icon: type of event": "顏色:嚴重程度 · 圖標:事件類型", @@ -563,6 +571,7 @@ "Previous — prior visited contact in the 250 km window": "上一個:250 km 範圍內先前訪問過的目標", "PREVIOUS": "上一個", "FOCUS": "聚焦", + "site status|FOCUS": "聚焦", "Next — nearest unvisited contact in the 250 km window": "下一個:250 km 範圍內最近的未訪問目標", "NEXT": "下一個", "Named areas ({n})": "已命名區域({n})", @@ -924,6 +933,7 @@ "Cancel replay": "取消回放", "EST. DOWNRANGE": "預估落點距離", "CONFIRMED": "已確認", + "sightings filter|CONFIRMED": "已確認", "PAD / RTLS": "發射臺 / RTLS", "PLANNED · ": "計劃 · ", "SUPPLIED TRAJECTORY POINTS": "提供的軌跡點", @@ -1742,7 +1752,9 @@ "ROUTE DATA UNAVAILABLE": "航線數據不可用", "CONTACT NAVIGATION OFF": "目標導航已關閉", "THE BRIDGE STAYS WITH THE SELECTED VESSEL": "駕駛臺保持在所選船舶上", - "{range} NM": "{range} 海里", + "{range} NM": { + "other": "{range} 海里" + }, "AIS DESTINATION · CREW REPORTED": "AIS 目的地 · 船員申報", "DEST {bearing}": "目的地 {bearing}", "Disable cockpit weather effects": "停用座艙天氣效果", @@ -1788,6 +1800,7 @@ "Reclassify as TR-3B": "重新歸類為 TR-3B", "TRACK ACQUIRED": "已獲取航跡", "{label} · COURSE {heading}°": "{label} · 對地航向 {heading}°", + "vessel|{label} · COURSE {heading}°": "{label} · 對地航向 {heading}°", "{label} · HEADING {heading}°": "{label} · 船首向 {heading}°", "{label} · NO HEADING": "{label} · 無船首向", "{label} · NADIR VIEW": "{label} · 天底視圖", @@ -2038,6 +2051,7 @@ "Observed history": "觀測歷史", "Later observation": "較晚觀測", "Latest": "最新", + "news list|Latest": "最新", "Newest frame per product": "每個產品的最新一幀", "Replay observed history": "回放觀測歷史", "Imagery on Esri · Google 3D returns when cleared": "影像顯示在 Esri 底圖上 · 清除後恢復 Google 3D", @@ -2619,7 +2633,9 @@ "Contact cockpit summary": "目標座艙摘要", "CONTACT": "目標", "CONTACTS · 250 KM": "目標 · 250 km", - "RINGS {spacing} NM": "距標圈 {spacing} 海里", + "RINGS {spacing} NM": { + "other": "距標圈 {spacing} 海里" + }, "{count} CONTACTS": { "other": "{count} 個目標" }, @@ -3311,7 +3327,9 @@ "Photo of {name}": "{name} 的照片", "Acartia": "Acartia", "CC BY 4.0": "CC BY 4.0", - "{count} sightings in view": "視野內有 {count} 次目擊", + "{count} sightings in view": { + "other": "視野內有 {count} 次目擊" + }, "Close sighting": "關閉目擊記錄", "Wildlife observed within 48 h (whales 7 d). Color and badge glyph show the taxon group. Sensitive species are shown only as 0.2° cells; Salish Sea marine mammal reports via Acartia are rounded to 0.01°. Not a census.": "近 48 小時內觀察到的野生生物(鯨類為 7 天)。顏色與徽章圖標表示分類群。敏感物種僅以 0.2° 網格顯示;Acartia 提供的薩利希海海洋哺乳動物目擊位置四捨五入到 0.01°。並非種群普查。", "Open {name} on iNaturalist": "在 iNaturalist 上打開 {name}", @@ -3322,20 +3340,27 @@ "{days}d": "{days} 天", "All markers": "所有標記", "Show markers of every age": "顯示所有時間的標記", - "Maximum event age: {days}d; undated markers are kept": "僅顯示 {days} 天內的事件;保留無日期標記", + "Maximum event age: {days}d; undated markers are kept": { + "other": "僅顯示 {days} 天內的事件;保留無日期標記" + }, "event age filter|All": "全部", "Event age": "事件時間", - "Event age: {days}d · undated kept": "事件時間:{days} 天內 · 保留無日期標記", + "Event age: {days}d · undated kept": { + "other": "事件時間:{days} 天內 · 保留無日期標記" + }, "Close camera preview": "關閉攝像頭預覽", "Refresh map still": "刷新地圖靜止畫面", "The map still uses a separate request and may show a different moment.": "地圖靜止畫面通過單獨的請求獲取,可能顯示不同的時刻。", "Video plays from Québec 511, which sees your IP address.": "視頻從 Québec 511 播放,Québec 511 會看到你的 IP 地址。", "Press OPEN to load the photo": "點擊“打開”加載照片", "Captured {month}": "拍攝於 {month}", - "this spot": "此處", "the view centre": "視野中心", "{source} at {place}": "{place} 的 {source}", + "{source} at this spot": "此處的 {source}", + "{source} at the view centre": "視圖中心的 {source}", "Street level at {place}": "{place} 的街景", + "Street level at this spot": "此處的街景", + "Street level at the view centre": "視圖中心的街景", "Switching map": "正在切換地圖", "Opening imagery": "正在打開影像", "Street View is ready: press {open} to load it": "街景已就緒:點擊“{open}”加載", @@ -3427,6 +3452,7 @@ "{source} imagery could not be opened": "無法打開 {source} 影像", "{place} has no position to look for imagery at": "{place} 沒有可查找影像的位置", "No {source} imagery near {place}": "{place} 附近沒有 {source} 影像", + "No {source} imagery near the view centre": "視圖中心附近沒有 {source} 影像", "{reason} (filters on: {filters})": "{reason}(已開啟篩選:{filters})", "tiles unavailable": "瓦片不可用", "zoom in to load this layer": "放大以加載此圖層", @@ -3517,6 +3543,8 @@ "REMOVE ALL": "全部移除", "Confirm: remove every added entry from Data Layers": "確認:從數據圖層中移除所有已添加條目", "Remove every added entry from Data Layers": "從數據圖層中移除所有已添加條目", - "Showing {shown} of {total}": "顯示 {shown} / {total}", + "Showing {shown} of {total}": { + "other": "顯示 {shown} / {total}" + }, "BROWSE DATA LIBRARY": "瀏覽數據資源庫" } diff --git a/src/i18n/same-as-english.json b/src/i18n/same-as-english.json index 1ab9b364f0..c975d3ccb1 100644 --- a/src/i18n/same-as-english.json +++ b/src/i18n/same-as-english.json @@ -685,6 +685,7 @@ "FLIR", "FM MHZ", "FOCUS", + "site status|FOCUS", "FOV", "FOV {value}°", "FT", diff --git a/src/layers/ghostMaps/index.js b/src/layers/ghostMaps/index.js index 79971c7155..1a2f35433d 100644 --- a/src/layers/ghostMaps/index.js +++ b/src/layers/ghostMaps/index.js @@ -762,9 +762,12 @@ export function createGhostMapsLayer({ title: days === null ? t('Show markers of every age') - : t('Maximum event age: {days}d; undated markers are kept', { - days: formatNumber(days), - }), + : tn( + days, + 'Maximum event age: {days}d; undated markers are kept', + 'Maximum event age: {days}d; undated markers are kept', + { days: formatNumber(days) }, + ), active: days === _ageDays, onClick: () => setAgeDays(days), })), @@ -799,7 +802,7 @@ export function createGhostMapsLayer({ }; }), legend: [], - info: `${_ageDays === null ? t('All markers') : t('Event age: {days}d · undated kept', { days: formatNumber(_ageDays) })} · ${info}`, + info: `${_ageDays === null ? t('All markers') : tn(_ageDays, 'Event age: {days}d · undated kept', 'Event age: {days}d · undated kept', { days: formatNumber(_ageDays) })} · ${info}`, infoTitle: t( 'S2 Underground publishes these KMZ products to GitHub. New uploads are detected within seconds and replace the previous edition automatically. Click a marker for its report.', ), diff --git a/src/layers/ghostMaps/lifecycle.test.mjs b/src/layers/ghostMaps/lifecycle.test.mjs index ae9f639114..72ec485700 100644 --- a/src/layers/ghostMaps/lifecycle.test.mjs +++ b/src/layers/ghostMaps/lifecycle.test.mjs @@ -1,6 +1,7 @@ import assert from 'node:assert/strict'; import test from 'node:test'; import * as Cesium from 'cesium'; +import { setLocale } from '../../i18n/index.js'; import { createGhostMapsLayer } from './index.js'; import { GHOSTMAPS_PRODUCTS, GHOSTMAPS_LATEST_DROP } from './catalog.js'; @@ -248,6 +249,35 @@ test('age controls default to seven days and widening restores filtered and expi assert.equal(ageChip(layer, null).active, true); }); +test('the event age agrees with its number of days', async (t) => { + t.after(() => setLocale('en')); + const { layer, viewer } = fixture(t, { reports: [{ name: 'Undated' }] }); + await layer.update(viewer); + const info = () => + layer.getRowControls().info.split(' · ').slice(0, 2).join(' · '); + assert.equal( + ageChip(layer, 1).title, + 'Maximum event age: 1d; undated markers are kept', + ); + setLocale('de'); + assert.equal( + ageChip(layer, 1).title, + 'Maximales Ereignisalter: 1 Tag; undatierte Markierungen bleiben erhalten', + ); + assert.equal( + ageChip(layer, 7).title, + 'Maximales Ereignisalter: 7 Tage; undatierte Markierungen bleiben erhalten', + ); + assert.equal(info(), 'Ereignisalter: 7 Tage · undatierte bleiben'); + await ageChip(layer, 1).onClick(); + assert.equal(info(), 'Ereignisalter: 1 Tag · undatierte bleiben'); + setLocale('es'); + assert.equal( + info(), + 'Antigüedad: 1 día · se conservan los marcadores sin fecha', + ); +}); + test('age preferences persist independently of product choices and reject invalid storage', async (t) => { const values = new Map([['gev.ghostmaps.products', '["cip"]']]); const storage = { diff --git a/src/layers/launches/missionStatus.i18n.test.mjs b/src/layers/launches/missionStatus.i18n.test.mjs index 8826d0d36e..7d3b2e572b 100644 --- a/src/layers/launches/missionStatus.i18n.test.mjs +++ b/src/layers/launches/missionStatus.i18n.test.mjs @@ -69,3 +69,38 @@ test('the mission panel translates only the fallback status', (t) => { assert.equal(shownStatus(UNKNOWN_LAUNCH_STATUS), 'Desconocido'); assert.equal(shownStatus('Launch Successful'), 'Launch Successful'); }); + +test('a confirmed landing position is worded apart from the CONFIRMED sightings chip', (t) => { + t.after(() => setLocale('en')); + const position = () => + createPanel({ + state: { + _selectedLaunchId: 'mission-1', + _launches: [ + { + id: 'mission-1', + name: 'Example', + status: 'Launch Successful', + payloads: [], + recoveryStages: [ + { + name: 'B1080', + endpoint: { lat: 28.41, lon: -80.6, accuracy: 'CONFIRMED' }, + }, + ], + }, + ], + _replayTracks: new Map(), + }, + parts: { + overlays: { shortMissionLabel: (name) => name }, + policyHelpers: { missionPathPresentation: () => ({}) }, + replay: { presentReplay: () => ({}) }, + }, + }).presentMission().stages[0].position; + assert.match(position(), / · CONFIRMED$/); + // One landing, singular: sv BEKRÄFTAD, where the sightings chip says + // BEKRÄFTADE. + setLocale('sv'); + assert.match(position(), / · BEKRÄFTAD$/); +}); diff --git a/src/layers/wildlifeSightings/acquisition.test.mjs b/src/layers/wildlifeSightings/acquisition.test.mjs index b4ac47813b..cbc02f04c3 100644 --- a/src/layers/wildlifeSightings/acquisition.test.mjs +++ b/src/layers/wildlifeSightings/acquisition.test.mjs @@ -542,7 +542,7 @@ test('retention never revives an incumbent card after the observation window exp test('all heights and the sampled fallback use the same sightings-in-view count label', () => { const h = harness(); h.state.renderedRows = [sighting]; - assert.equal(h.layer.getStats().countLabel, '1 sightings in view'); + assert.equal(h.layer.getStats().countLabel, '1 sighting in view'); h.state.sightingCount = 2000; assert.equal(h.layer.getStats().count, 2000); assert.equal( @@ -560,6 +560,32 @@ test('all heights and the sampled fallback use the same sightings-in-view count } }); +test('the sightings count takes the plural form of its number', (t) => { + t.after(() => setLocale('en')); + const h = harness(); + const label = (count) => { + h.state.sightingCount = count; + return h.layer.getStats().countLabel; + }; + setLocale('ru'); + assert.equal(label(1), '1 наблюдение в кадре'); + assert.equal(label(3), '3 наблюдения в кадре'); + assert.equal(label(5), '5 наблюдений в кадре'); + setLocale('de'); + assert.equal(label(1), '1 Beobachtung im Bild'); + assert.equal(label(2000), '2.000 Beobachtungen im Bild'); +}); + +test('the CONFIRMED chip names the sightings, apart from a confirmed launch landing', (t) => { + t.after(() => setLocale('en')); + const h = harness(); + assert.equal(h.chip('quality-confirmed').label, 'CONFIRMED'); + setLocale('sv'); + assert.equal(h.chip('quality-confirmed').label, 'BEKRÄFTADE'); + setLocale('es'); + assert.equal(h.chip('quality-confirmed').label, 'CONFIRMADAS'); +}); + test('a stale fallback with a failed-refresh deadline remains DEGRADED, retryable and dated to the cached data', async () => { const h = harness({ getSnapshotDetail: async () => ({ diff --git a/src/layers/wildlifeSightings/controls.js b/src/layers/wildlifeSightings/controls.js index ced04364f4..3c99c2e802 100644 --- a/src/layers/wildlifeSightings/controls.js +++ b/src/layers/wildlifeSightings/controls.js @@ -1,4 +1,4 @@ -import { t, formatNumber, translateKnown } from '../../i18n/index.js'; +import { t, tn, formatNumber, translateKnown } from '../../i18n/index.js'; import { msg } from '../../i18n/marker.js'; import { translateFeedError } from '../../ui/statusText.js'; import { wildlifeIconicGroup } from './model.js'; @@ -137,7 +137,8 @@ export function createControls({ state, services, parts }) { const chips = [ chip({ id: WILDLIFE_CONFIRMED_CHIP_ID, - label: t('CONFIRMED'), + // The sightings, plural; a launch landing is CONFIRMED alone. + label: t('CONFIRMED', { context: 'sightings filter' }), title: t('Show only community-confirmed (research-grade) sightings'), params: { confirmed: confirmedFailed ? state.confirmed : !state.confirmed, @@ -214,9 +215,12 @@ export function createControls({ state, services, parts }) { stale: state.stale, loading, refreshing, - countLabel: t('{count} sightings in view', { - count: formatNumber(count), - }), + countLabel: tn( + count, + '{count} sighting in view', + '{count} sightings in view', + { count: formatNumber(count) }, + ), loadingLabel: loading ? t('loading...') : refreshing diff --git a/src/layers/wildlifeSightings/ownership.test.mjs b/src/layers/wildlifeSightings/ownership.test.mjs index e118a87bc3..cdc6e6148f 100644 --- a/src/layers/wildlifeSightings/ownership.test.mjs +++ b/src/layers/wildlifeSightings/ownership.test.mjs @@ -1987,7 +1987,7 @@ test('unavailable grids fail closed to visible sampled sprites without a global assert.equal(h.clicks.collection.values[0].id, 'wildlife:inat:1'); assert.ok(h.clicks.collection.values[0].width * 0.5 >= 8); assert.equal(h.layer.getStats().count, 1); - assert.match(h.layer.getStats().countLabel, /sightings in view/); + assert.equal(h.layer.getStats().countLabel, '1 sighting in view'); assert.equal(h.layer.getStats().partial, undefined); assert.equal(layerFeedState(h.layer.getStats()), 'degraded'); assert.match(h.layer.getStats().error, /Malformed iNaturalist grid response/); @@ -2024,7 +2024,7 @@ test('an oversized view coarsens to a complete grid within the six-tile cap', as await h.update(); assert.equal(h.clicks.collection.values.length, 1); assert.equal(h.clicks.collection.values[0].id, 'wildlife:inat:1'); - assert.match(h.layer.getStats().countLabel, /sightings in view/); + assert.match(h.layer.getStats().countLabel, /sightings? in view/); assert.equal(layerFeedState(h.layer.getStats()), 'nominal'); h.layer.destroy(); }); diff --git a/src/ui/cockpitBridge.test.mjs b/src/ui/cockpitBridge.test.mjs index b58e53684a..d327ef023b 100644 --- a/src/ui/cockpitBridge.test.mjs +++ b/src/ui/cockpitBridge.test.mjs @@ -7,6 +7,7 @@ import assert from 'node:assert/strict'; import { createPinia } from 'pinia'; import { createApp, defineComponent, h, nextTick } from 'vue'; import { CockpitViewController } from './cockpitController.js'; +import { setLocale } from '../i18n/index.js'; import { useCockpitStore } from './stores/cockpit.js'; import CockpitView from './views/CockpitView.vue'; import ContextView from './views/ContextView.vue'; @@ -355,6 +356,33 @@ test('the bridge radar shows nearby ships without its own and steps its range', assert.ok(!$('#cockpit-radar') || $('#cockpit-radar').hidden); }); +test('the radar range and ring spacing agree with their distance (ru)', async (t) => { + const { $, cockpit } = fixture(t); + t.after(() => setLocale('en')); + setLocale('ru'); + cockpit.enter(); + await settle(); + const shown = () => [ + $('#cockpit-radar-range').textContent.trim(), + $('.cockpit-radar-rings').textContent.trim(), + ]; + // The ring spacing is a fraction at the short ranges: Intl.PluralRules + // gives 0.75 and 1.5 the form of their own. + const expected = [ + ['3 МОР. МИЛИ', 'КОЛЬЦА 0,75 МОР. МИЛИ'], + ['6 МОР. МИЛЬ', 'КОЛЬЦА 1,5 МОР. МИЛИ'], + ['12 МОР. МИЛЬ', 'КОЛЬЦА 3 МОР. МИЛИ'], + ['24 МОР. МИЛИ', 'КОЛЬЦА 6 МОР. МИЛЬ'], + ]; + for (const [index, labels] of expected.entries()) { + if (index) { + $('#cockpit-radar-range').click(); + await settle(); + } + assert.deepEqual(shown(), labels); + } +}); + test('contact navigation does not jump ship from the bridge', async (t) => { const { cockpit, navigations } = fixture(t); cockpit.enter(); @@ -1201,6 +1229,18 @@ test('a ship with no true heading is held, and labelled, on its course', async ( signals.some(([, , , detail]) => /COURSE 095°/.test(detail)), JSON.stringify(signals), ); + // A ship's course has a word of its own: pt RUMO, an aircraft's CURSO. + t.after(() => setLocale('en')); + setLocale('pt'); + signals.length = 0; + cockpit.exit(); + await settle(); + cockpit.enter(); + await settle(); + assert.ok( + signals.some(([, , , detail]) => /· RUMO 095°$/.test(detail)), + JSON.stringify(signals), + ); }); test('both entries name the subject the same way', async () => { diff --git a/src/ui/cockpitInstruments.js b/src/ui/cockpitInstruments.js index c5e9863cd2..ed4d22f6c7 100644 --- a/src/ui/cockpitInstruments.js +++ b/src/ui/cockpitInstruments.js @@ -1,5 +1,5 @@ /** Instrument values, routes and vision controls for the Cockpit controller. */ -import { formatNumber, t } from '../i18n/index.js'; +import { formatNumber, t, tn } from '../i18n/index.js'; import { COCKPIT_VISION_MODES, normalizeCockpitVisionMode, @@ -379,7 +379,10 @@ export function updateRadar(info) { ); this.publishRadar({ ...picture, - rangeLabel: t('{range} NM', { range: formatNumber(rangeNm) }), + // A plural, as the ring spacing is: ru «3 МОР. МИЛИ», «12 МОР. МИЛЬ». + rangeLabel: tn(rangeNm, '{range} NM', '{range} NM', { + range: formatNumber(rangeNm), + }), }); } diff --git a/src/ui/cockpitOrbitalFocus.test.mjs b/src/ui/cockpitOrbitalFocus.test.mjs index f7b18e22bc..6a190363d1 100644 --- a/src/ui/cockpitOrbitalFocus.test.mjs +++ b/src/ui/cockpitOrbitalFocus.test.mjs @@ -13,6 +13,7 @@ import { createPinia } from 'pinia'; import { createApp, defineComponent, h, nextTick } from 'vue'; import * as Cesium from 'cesium'; import { CockpitViewController } from './cockpitController.js'; +import { setLocale, t as translate } from '../i18n/index.js'; import { useCockpitStore } from './stores/cockpit.js'; import { useHudStore } from './stores/hud.js'; import CockpitView from './views/CockpitView.vue'; @@ -534,6 +535,13 @@ test('a site row turns the camera onto it, holds it, and reads its off-nadir ang assert.match(held.className, /^track actionable$/); assert.match(held.detail, /^FOCUS · BASE · OFF-NADIR/); assert.equal(siteRow(scene, 'alpha').getAttribute('aria-label'), 'Release the camera from Camp Alpha'); + // The held site's FOCUS is a status, worded apart from the FOCUS command. + t.after(() => setLocale('en')); + setLocale('es'); + await refreshRows(scene); + const heldEs = rows(scene).find((row) => row.target?.id === SITES.alpha.id); + assert.match(heldEs.detail, /^ENFOCADO · /); + assert.equal(translate('FOCUS'), 'ENFOCAR', 'the command keeps its verb'); }); test('another site row switches the focus; the held site row ends it', async (t) => { diff --git a/src/ui/cockpitOrbitalSignals.js b/src/ui/cockpitOrbitalSignals.js index c01bd56a2b..04f3a1fc17 100644 --- a/src/ui/cockpitOrbitalSignals.js +++ b/src/ui/cockpitOrbitalSignals.js @@ -132,7 +132,8 @@ function siteRows(info, { settled = true } = {}) { }), }); const words = [installationClassLabel(site.class), angle]; - if (focused) words.unshift(t('FOCUS')); + // A status, not the FOCUS command: es «ENFOCADO», not «ENFOCAR». + if (focused) words.unshift(t('FOCUS', { context: 'site status' })); return { key: `site:${site.id}`, // The held site reads as the subject does. diff --git a/src/ui/cockpitPresence.test.mjs b/src/ui/cockpitPresence.test.mjs index f9ddcd24bb..b20a9377fc 100644 --- a/src/ui/cockpitPresence.test.mjs +++ b/src/ui/cockpitPresence.test.mjs @@ -7,6 +7,7 @@ import assert from 'node:assert/strict'; import { createPinia } from 'pinia'; import { createApp, defineComponent, h, nextTick } from 'vue'; import { CockpitViewController } from './cockpitController.js'; +import { setLocale } from '../i18n/index.js'; import { useCockpitStore } from './stores/cockpit.js'; import CockpitView from './views/CockpitView.vue'; import ContextView from './views/ContextView.vue'; @@ -255,3 +256,16 @@ test('entering asks for a panel layout before Vue shows the cards', async (t) => await new Promise((resolve) => setTimeout(resolve, 50)); assert.deepEqual(laid, ['context', 'signals']); }); + +test('an aircraft is acquired on its CURSO in Portuguese; a ship keeps RUMO', async (t) => { + const { cockpit } = fixture(t); + t.after(() => setLocale('en')); + setLocale('pt'); + const signals = []; + cockpit.pushCockpitSignal = (...args) => signals.push(args); + cockpit.enter(); + await nextTick(); + const acquired = signals.find(([key]) => key === 'track'); + assert.ok(acquired, JSON.stringify(signals)); + assert.equal(acquired[3], 'UAL123 · CURSO 092°'); +}); diff --git a/src/ui/cockpitTrackingController.js b/src/ui/cockpitTrackingController.js index 0694411497..c3e6802148 100644 --- a/src/ui/cockpitTrackingController.js +++ b/src/ui/cockpitTrackingController.js @@ -326,9 +326,11 @@ export function enter({ kind = null } = {}) { 'track', t('TRACK ACQUIRED'), // A ship with no true heading is held on its course over ground; one - // with neither is named without a direction. + // with neither is named without a direction. A ship's course has a + // word of its own: pt «RUMO», where an aircraft's is «CURSO». info.trackSource === 'course' ? t('{label} · COURSE {heading}°', { + context: 'vessel', label: info.name, heading: trackHeading, }) diff --git a/src/ui/news/NewsFeed.vue b/src/ui/news/NewsFeed.vue index 47e55c10f0..4c608f0fbd 100644 --- a/src/ui/news/NewsFeed.vue +++ b/src/ui/news/NewsFeed.vue @@ -1,6 +1,6 @@