mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-21 10:42:22 +00:00
Merge main into denis/iss-live-telemetry
Conflicts: the locale catalogs and package boundaries are three-way merges (no message changed differently on both sides); zh-Hant is regenerated from zh-CN. bhoteKoshiEmbeddedMedia.js keeps main's card counter and the branch's shared YouTube loader (youtubeApi.js), so the media file builds one script element fewer. The Cockpit briefing's LIVE tab and the orbital NADIR/RESET button are main's UiButton.
This commit is contained in:
commit
edbf3a234d
244 files changed
+11747
-1273
No files matched your search
@@ -4032,7 +4032,6 @@
|
||||
"Course to {code}: {course}": "{code}への針路: {course}",
|
||||
"Over {place}": "{place}上空",
|
||||
"Below": "直下",
|
||||
"Underneath": "真下",
|
||||
"Go to this shot. Double-click to rename.": "このショットへ移動。ダブルクリックで名前を変更。",
|
||||
"Move up": "上へ移動",
|
||||
"Move down": "下へ移動",
|
||||
@@ -4211,6 +4210,11 @@
|
||||
"Bilawal on {site}": "{site}のBilawal",
|
||||
"Bilawal's website": "Bilawalのウェブサイト",
|
||||
"BACK": "戻る",
|
||||
"Finding it…": "検索中…",
|
||||
"No reading at this time": "この時刻のデータなし",
|
||||
"Last reading · {age}": "最終データ・{age}",
|
||||
"Find it": "探す",
|
||||
"Underneath": "真下",
|
||||
"Open on YouTube": "YouTubeで開く",
|
||||
"Video plays from YouTube, which sees your IP address.": "動画は YouTube から再生され、YouTube にはあなたの IP アドレスが見えます。",
|
||||
"Automatic": "自動",
|
||||
|
||||
Reference in new issue
Block a user