mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 16:52:20 +00:00
Merge origin/main into german/navara
Conflict resolutions:
- src/main.js: upstream's PHOTON_URL place-search setting is read once at
module level and passed as geospatial: { endpoints: { photon } } by
createApplication(), so every engine start of the switch flow gets it; the
old single top-level createStandaloneApplication() call stays removed.
- src/layers/bikeshare/render/cesium/rendering.js: upstream's
publishedCapacity fix applied with this branch's
resolveCapacity(model, capacity, status) signature. The same fix is ported
to src/layers/bikeshare/render/navara.js (record.publishedCapacity, status
polls resolve from it), with a Navara regression test; upstream's
proxyRoute test imports the moved render/cesium/rendering.js.
- src/layers/traffic/flow.js: upstream's nextTask() yield and current()
check kept before the scene is taken from this branch's
_trafficScene?.() ?? _viewer?.scene with its missing-scene return.
- scripts/package-boundaries.json, scripts/format-scope.json: union of both
sides' file lists.
- src/voice/actionSchemas.test.mjs: both history comments kept, payload hash
recomputed for the merged schemas (Sentinel-2 map stack enum plus the
shorter layer alias hint).
- src/hudAltitudeDatum.test.mjs: this branch's engine-based IntelHUD
construction with upstream's placeLabels summary context.
This commit is contained in:
commit
1a1eef0e5c
494 files changed
+28358
-1361
No files matched your search
@@ -565,7 +565,7 @@
|
||||
"Radio volume": "مستوى صوت الراديو",
|
||||
"Radio off": "الراديو متوقف",
|
||||
"STATION SITE": "موقع المحطة",
|
||||
"Audio connects directly to the broadcaster after you press play. Your IP is visible to that broadcaster.": "يتصل التطبيق مباشرةً بمحطة البث بعد الضغط على «تشغيل»، فيظهر لها عنوان IP الخاص بك.",
|
||||
"Audio connects directly to the broadcaster when you press play, choose a station on the globe or ask voice to play. Your IP is visible to that broadcaster.": "يتصل التطبيق مباشرةً بمحطة البث عند الضغط على «تشغيل» أو اختيار محطة على الكرة الأرضية أو طلب التشغيل بالصوت، فيظهر لها عنوان IP الخاص بك.",
|
||||
"LOADING": "جارٍ التحميل",
|
||||
"DEGRADED": "متدهور",
|
||||
"STALE": "متقادم",
|
||||
@@ -1149,7 +1149,6 @@
|
||||
"OCEANIA": "أوقيانوسيا",
|
||||
"NORTHERN OCEANIC GRID": "الشبكة المحيطية الشمالية",
|
||||
"SOUTHERN OCEANIC GRID": "الشبكة المحيطية الجنوبية",
|
||||
"{state} {layers}": "{state}: {layers}",
|
||||
"view band|STREET": "شارع",
|
||||
"view band|CITY": "مدينة",
|
||||
"view band|METRO": "حضري",
|
||||
@@ -3141,14 +3140,10 @@
|
||||
"Sector": "القطاع",
|
||||
"Sonar sector width": "عرض قطاع السونار",
|
||||
"Draw on the world — click vertices, double-click or Enter to finish, Esc to cancel": "ارسم على العالم — انقر على الرؤوس، وانقر نقرًا مزدوجًا أو اضغط Enter للإنهاء، وEsc للإلغاء",
|
||||
"Shape": "الشكل",
|
||||
"Shape to draw": "الشكل المراد رسمه",
|
||||
"Area": "مساحة",
|
||||
"Line": "خط",
|
||||
"Pin": "دبوس",
|
||||
"Label (optional)": "التسمية (اختيارية)",
|
||||
"Label for the drawn shape": "تسمية الشكل المرسوم",
|
||||
"Colour of the drawn shape": "لون الشكل المرسوم",
|
||||
"Primary": "أساسي",
|
||||
"Amber": "كهرماني",
|
||||
"Cyan": "سماوي",
|
||||
@@ -3221,5 +3216,14 @@
|
||||
"Load scenes from an exported JSON file": "تحميل المشاهد من ملف JSON مُصدَّر",
|
||||
"Download the timing log of the last play": "تنزيل سجل توقيت آخر تشغيل",
|
||||
"Edit anchors, data packs and shot details": "تعديل نقاط الارتكاز وحزم البيانات وتفاصيل اللقطة",
|
||||
"Download this scene as JSON or an asset bundle": "تنزيل هذا المشهد بصيغة JSON أو حزمة موارد"
|
||||
"Download this scene as JSON or an asset bundle": "تنزيل هذا المشهد بصيغة JSON أو حزمة موارد",
|
||||
"Name of {name}": "اسم {name}",
|
||||
"Change the colour of {name}": "تغيير لون {name}",
|
||||
"Colour of {name}": "لون {name}",
|
||||
"Colour of the next shape": "لون الشكل التالي",
|
||||
"Drawn shapes": "الأشكال المرسومة",
|
||||
"Audio": "الصوت",
|
||||
"UTILITIES": "الأدوات",
|
||||
"Exit cockpit to fly to a drawing": "اخرج من القمرة للانتقال إلى رسم",
|
||||
"Directions, drawing and your own files": "الاتجاهات والرسم وملفاتك الخاصة"
|
||||
}
|
||||
Reference in new issue
Block a user