diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json index d2a8f800..43e1da2a 100644 --- a/assets/jsons/translations/de.json +++ b/assets/jsons/translations/de.json @@ -43,8 +43,8 @@ "button": "Erweiterter Start", "placeholder": "Weitere Argumente, bspw: --revert; --nowait" }, - "skipvr": "SteamVR überspringen", - "skipvr-description": "Verhindert, dass SteamVR automatisch mit Beat Saber geöffnet wird. Aktivieren Sie dies, wenn Sie eine andere VR-Laufzeit wie WiVRn oder Monado verwenden, mit der SteamVR interferieren könnte." + "skipsteam": "Steam überspringen", + "skipsteam-description": "Verhindert, dass Steam automatisch mit Beat Saber geöffnet wird. Aktivieren Sie dies, wenn Sie eine andere VR-Laufzeit wie WiVRn oder Monado verwenden, mit der SteamVR interferieren könnte." }, "maps": { "search-bar": { diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json index 820c9f27..c8d07655 100644 --- a/assets/jsons/translations/en.json +++ b/assets/jsons/translations/en.json @@ -43,8 +43,8 @@ "button": "Advanced launch", "placeholder": "Additional arguments ex: --revert; --nowait" }, - "skipvr": "Skip SteamVR", - "skipvr-description": "Stops SteamVR from opening automatically with Beat Saber, enable if you are using a different VR runtime like WiVRn or Monado that SteamVR may interfere with." + "skipsteam": "Skip Steam", + "skipsteam-description": "Stops Steam from opening automatically with Beat Saber, enable if you are using a different VR runtime like WiVRn or Monado that SteamVR may interfere with." }, "maps": { "search-bar": { diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json index 1889cfd6..c4dbd88e 100644 --- a/assets/jsons/translations/es.json +++ b/assets/jsons/translations/es.json @@ -53,8 +53,8 @@ "delete-maps": "Borrar mapas", "delete-duplicate-maps": "Borrar duplicados" }, - "skipvr": "Saltar SteamVR", - "skipvr-description": "Evita que SteamVR se abra automáticamente con Beat Saber, habilita esto si estás usando un runtime de VR diferente como WiVRn o Monado que SteamVR podría interferir." + "skipsteam": "Saltar Steam", + "skipsteam-description": "Evita que Steam se abra automáticamente con Beat Saber, habilita esto si estás usando un runtime de VR diferente como WiVRn o Monado que SteamVR podría interferir." }, "tabs": { "maps": { diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json index d00edaa2..7237a90d 100644 --- a/assets/jsons/translations/fr.json +++ b/assets/jsons/translations/fr.json @@ -43,8 +43,8 @@ "button": "Lancement avancé", "placeholder": "Arguments supplémentaires ex: --revert; --nowait" }, - "skipvr": "Ignorer SteamVR", - "skipvr-description": "Empêche SteamVR de s'ouvrir automatiquement avec Beat Saber, activez-le si vous utilisez un autre runtime VR comme WiVRn ou Monado avec lequel SteamVR pourrait interférer." + "skipsteam": "Ignorer Steam", + "skipsteam-description": "Empêche Steam de s'ouvrir automatiquement avec Beat Saber, activez-le si vous utilisez un autre runtime VR comme WiVRn ou Monado avec lequel SteamVR pourrait interférer." }, "maps": { "search-bar": { diff --git a/assets/jsons/translations/ja.json b/assets/jsons/translations/ja.json index 1fb0f2c6..b79b7acf 100644 --- a/assets/jsons/translations/ja.json +++ b/assets/jsons/translations/ja.json @@ -43,8 +43,8 @@ "button": "高度な起動", "placeholder": "追加引数 例:--revert; --nowait" }, - "skipvr": "SteamVRをスキップ", - "skipvr-description": "Beat Saberと一緒にSteamVRが自動的に開くのを防ぎます。SteamVRが干渉する可能性のあるWiVRnやMonadoなど、別のVRランタイムを使用している場合は有効にしてください。" + "skipsteam": "Steamをスキップ", + "skipsteam-description": "Beat Saberと一緒にSteamが自動的に開くのを防ぎます。SteamVRが干渉する可能性のあるWiVRnやMonadoなど、別のVRランタイムを使用している場合は有効にしてください。" }, "maps": { "search-bar": { diff --git a/assets/jsons/translations/ko.json b/assets/jsons/translations/ko.json index 921c42da..f1abdad3 100644 --- a/assets/jsons/translations/ko.json +++ b/assets/jsons/translations/ko.json @@ -43,8 +43,8 @@ "button": "고급 실행", "placeholder": "추가 인수 예: --revert; --nowait" }, - "skipvr": "Steam 실행 건너뛰기", - "skipvr-description": "Beat Saber와 함께 SteamVR이 자동으로 열리는 것을 방지합니다. SteamVR이 간섭할 수 있는 WiVRn 또는 Monado와 같은 다른 VR 런타임을 사용하는 경우 활성화하세요." + "skipsteam": "Steam 실행 건너뛰기", + "skipsteam-description": "Beat Saber와 함께 Steam이 자동으로 열리는 것을 방지합니다. SteamVR이 간섭할 수 있는 WiVRn 또는 Monado와 같은 다른 VR 런타임을 사용하는 경우 활성화하세요." }, "maps": { "search-bar": { diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json index 74d06eaa..1fc83da6 100644 --- a/assets/jsons/translations/ru.json +++ b/assets/jsons/translations/ru.json @@ -43,8 +43,8 @@ "button": "Расширенный запуск", "placeholder": "Параметры запуска, например: --revert; --nowait" }, - "skipvr": "Пропустить SteamVR", - "skipvr-description": "Предотвращает автоматическое открытие SteamVR с Beat Saber, включите, если вы используете другую VR-среду, такую как WiVRn или Monado, с которой SteamVR может мешать." + "skipsteam": "Пропустить Steam", + "skipsteam-description": "Предотвращает автоматическое открытие Steam с Beat Saber, включите, если вы используете другую VR-среду, такую как WiVRn или Monado, с которой SteamVR может мешать." }, "maps": { "search-bar": { diff --git a/assets/jsons/translations/zh-tw.json b/assets/jsons/translations/zh-tw.json index a615457f..97a44a72 100644 --- a/assets/jsons/translations/zh-tw.json +++ b/assets/jsons/translations/zh-tw.json @@ -43,8 +43,8 @@ "button": "高級啟動", "placeholder": "額外啟動參數,例如: --revert; --nowait" }, - "skipvr": "跳過 SteamVR", - "skipvr-description": "防止 SteamVR 與 Beat Saber 自動打開,如果您使用的是其他 VR 執行時,如 WiVRn 或 Monado,SteamVR 可能會干擾,請啟用此選項。" + "skipsteam": "跳過 Steam", + "skipsteam-description": "防止 Steam 與 Beat Saber 自動打開,如果您使用的是其他 VR 執行時,如 WiVRn 或 Monado,SteamVR 可能會干擾,請啟用此選項。" }, "maps": { "search-bar": { diff --git a/assets/jsons/translations/zh.json b/assets/jsons/translations/zh.json index 39ea1228..e603a09c 100644 --- a/assets/jsons/translations/zh.json +++ b/assets/jsons/translations/zh.json @@ -43,8 +43,8 @@ "button": "高级启动", "placeholder": "额外启动参数,例如: --revert; --nowait" }, - "skipvr": "跳过 SteamVR", - "skipvr-description": "防止 SteamVR 与 Beat Saber 自动打开,如果您使用的是其他 VR 运行时,如 WiVRn 或 Monado,SteamVR 可能会干扰,请启用此选项。" + "skipsteam": "跳过 Steam", + "skipsteam-description": "防止 Steam 与 Beat Saber 自动打开,如果您使用的是其他 VR 运行时,如 WiVRn 或 Monado,SteamVR 可能会干扰,请启用此选项。" }, "maps": { "search-bar": { diff --git a/src/main/services/bs-launcher/bs-launcher.service.ts b/src/main/services/bs-launcher/bs-launcher.service.ts index f8da8c7c..832b484e 100644 --- a/src/main/services/bs-launcher/bs-launcher.service.ts +++ b/src/main/services/bs-launcher/bs-launcher.service.ts @@ -106,7 +106,7 @@ export class BSLauncherService { desktop: params.desktopMode === "true", debug: params.debug === "true", additionalArgs: params.additionalArgs, - skipVR: params.skipVR === "true", + skipSteam: params.skipSteam === "true", }; return res; @@ -124,7 +124,7 @@ export class BSLauncherService { if(launchOptions.desktop){ res.desktopMode = "true"; } if(launchOptions.debug){ res.debug = "true"; } if(launchOptions.additionalArgs){ res.additionalArgs = launchOptions.additionalArgs; } - if(launchOptions.skipVR){ res.skipVR = "true"; } + if(launchOptions.skipSteam){ res.skipSteam = "true"; } return res; } @@ -241,7 +241,7 @@ type ShortcutParams = { desktopMode?: string; debug?: string; additionalArgs?: string[]; - skipVR?: string; + skipSteam?: string; version: string; versionName?: string; versionIno?: string; diff --git a/src/main/services/bs-launcher/steam-launcher.service.ts b/src/main/services/bs-launcher/steam-launcher.service.ts index 56d811e5..a6c11f77 100644 --- a/src/main/services/bs-launcher/steam-launcher.service.ts +++ b/src/main/services/bs-launcher/steam-launcher.service.ts @@ -77,10 +77,10 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto throw CustomError.fromError(new Error(`Path not exist : ${exePath}`), BSLaunchError.BS_NOT_FOUND); } - const skipVR: boolean = launchOptions.skipVR ?? false; + const skipSteam: boolean = launchOptions.skipSteam ?? false; // Open Steam if not running - if(!skipVR && !(await this.steam.steamRunning())){ + if(!skipSteam && !(await this.steam.steamRunning())){ obs.next({type: BSLaunchEvent.STEAM_LAUNCHING}); await this.steam.openSteam().then(() => { @@ -90,7 +90,7 @@ export class SteamLauncherService extends AbstractLauncherService implements Sto obs.next({type: BSLaunchWarning.UNABLE_TO_LAUNCH_STEAM}); }); } - else if (launchOptions.skipVR) { + else if (launchOptions.skipSteam) { obs.next({ type: BSLaunchEvent.SKIPPING_STEAM_LAUNCH}); } diff --git a/src/renderer/components/nav-bar/nav-bar-items/bs-version-item.component.tsx b/src/renderer/components/nav-bar/nav-bar-items/bs-version-item.component.tsx index 2d739b45..8c4b3f52 100644 --- a/src/renderer/components/nav-bar/nav-bar-items/bs-version-item.component.tsx +++ b/src/renderer/components/nav-bar/nav-bar-items/bs-version-item.component.tsx @@ -63,7 +63,7 @@ export function BsVersionItem(props: { version: BSVersion }) { oculus: !!configService.get(LaunchMods.OCULUS_MOD), desktop: !!configService.get(LaunchMods.DESKTOP_MOD), debug: !!configService.get(LaunchMods.DEBUG_MOD), - skipVR: !!configService.get(LaunchMods.SKIPVR_MOD), + skipSteam: !!configService.get(LaunchMods.SKIPSTEAM_MOD), }); return lastValueFrom(launch$).catch(() => {}); }; diff --git a/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx b/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx index a0895f91..bd84b713 100644 --- a/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx +++ b/src/renderer/components/version-viewer/slides/launch/launch-slide.component.tsx @@ -35,7 +35,7 @@ export function LaunchSlide({ version }: Props) { const [debugMode, setDebugMode] = useState(!!configService.get(LaunchMods.DEBUG_MOD)); const [advancedLaunch, setAdvancedLaunch] = useState(false); const [additionalArgsString, setAdditionalArgsString] = useState(configService.get("additionnal-args") || ""); - const [skipVRMode, setSkipVRMode] = useState(!!configService.get(LaunchMods.SKIPVR_MOD)); + const [skipSteamMode, setSkipSteamMode] = useState(!!configService.get(LaunchMods.SKIPSTEAM_MOD)); const versionDownloading = useObservable(() => bsDownloader.downloadingVersion$); const versionRunning = useObservable(() => bsLauncherService.versionRunning$); @@ -57,8 +57,8 @@ export function LaunchSlide({ version }: Props) { setOculusMode(value); } else if (mode === LaunchMods.DESKTOP_MOD) { setDesktopMode(value); - } else if (mode === LaunchMods.SKIPVR_MOD) { - setSkipVRMode(value); + } else if (mode === LaunchMods.SKIPSTEAM_MOD) { + setSkipSteamMode(value); } configService.set(mode, value); }; @@ -74,7 +74,7 @@ export function LaunchSlide({ version }: Props) { desktop: desktopMode, debug: debugMode, additionalArgs: advancedLaunch ? additionalArgs : [], - skipVR: skipVRMode, + skipSteam: skipSteamMode, }); return lastValueFrom(launch$).catch(() => {}); @@ -121,7 +121,7 @@ export function LaunchSlide({ version }: Props) {
- {advancedLaunch && !(version.oculus || version.metadata?.store === BsStore.OCULUS) && setMode(LaunchMods.SKIPVR_MOD, !skipVRMode)} active={skipVRMode} text="pages.version-viewer.launch-mods.skipvr" />} + {advancedLaunch && !(version.oculus || version.metadata?.store === BsStore.OCULUS) && setMode(LaunchMods.SKIPSTEAM_MOD, !skipSteamMode)} active={skipSteamMode} text="pages.version-viewer.launch-mods.skipsteam" />}
diff --git a/src/renderer/services/bs-launcher.service.ts b/src/renderer/services/bs-launcher.service.ts index cd130d8e..4361779d 100644 --- a/src/renderer/services/bs-launcher.service.ts +++ b/src/renderer/services/bs-launcher.service.ts @@ -51,7 +51,7 @@ export class BSLauncherService { desktop: this.config.get(LaunchMods.DESKTOP_MOD), debug: this.config.get(LaunchMods.DEBUG_MOD), additionalArgs: (this.config.get("additionnal-args") || "").split(";").map(arg => arg.trim()).filter(arg => arg.length > 0), - skipVR: this.config.get(LaunchMods.SKIPVR_MOD), + skipSteam: this.config.get(LaunchMods.SKIPSTEAM_MOD), } } @@ -129,5 +129,5 @@ export enum LaunchMods { OCULUS_MOD = "LAUNCH_OCULUS_MOD", DESKTOP_MOD = "LAUNCH_DESKTOP_MOD", DEBUG_MOD = "LAUNCH_DEBUG_MOD", - SKIPVR_MOD = "LAUNCH_SKIPVR_MOD", + SKIPSTEAM_MOD = "LAUNCH_SKIPSTEAM_MOD", } diff --git a/src/shared/models/bs-launch/launch-option.interface.ts b/src/shared/models/bs-launch/launch-option.interface.ts index f9ab218b..af972b23 100644 --- a/src/shared/models/bs-launch/launch-option.interface.ts +++ b/src/shared/models/bs-launch/launch-option.interface.ts @@ -7,5 +7,5 @@ export interface LaunchOption { debug?: boolean, additionalArgs?: string[], admin?: boolean, - skipVR?: boolean + skipSteam?: boolean }