From 6c08c16ff676ed70fc0dbd5d0372e0985416e4a8 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev <fidel@altlinux.org> Date: Thu, 18 Jan 2024 20:52:53 +0300 Subject: [PATCH] update lang and the choice of nvidia graphics card --- data_from_portwine/changelog_rus | 4 ++++ data_from_portwine/scripts/lang | 20 ++++++++++++++++++++ data_from_portwine/scripts/runlib | 5 +++++ data_from_portwine/scripts/start.sh | 8 ++++---- data_from_portwine/scripts/var | 2 +- 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index e19eb5f..b3fdb02 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- Рстория изменений: +###Scripts version 2245### Дата: 15.01.2024 / Размер скачиваемого обновления: 8 мегабайт +* улучшен функционал выбора видеокарты nvidia СЃ РіРёР±СЂРёРґРЅРѕР№ графикой +* небольшие улучшения переводов + ###Scripts version 2244### Дата: 14.01.2024 / Размер скачиваемого обновления: 8 мегабайт * обновлен PROTON_LG РґРѕ версии 8-25-2 (добавлены шрифты РёР· proton steam) * исправлено отображение версии скриптов после переустановки PortProton РёР· настроек самого PortProton diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 4c4289b..1487723 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -409,6 +409,17 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_demul="Рмулятор для РёРіСЂРѕРІРѕР№ консоли Sega Dreamcast" export loc_rpcs3="Рмулятор для РёРіСЂРѕРІРѕР№ консоли PlayStation 3" + export loc_prefix_manager_comp='Выберите компонент для установки РІ префикс:' + export loc_prefix_manager_font='Выберите шрифт для установки РІ префикс:' + export loc_prefix_manager_conf='Рзменить дополнительные настройки префикса:' + export loc_prefix_manager_wine='используя wine:' + + export loc_pm='МЕНЕДЖЕРПРЕФРРљРЎРђ' + export loc_pm_dlls='Р‘РБЛРОТЕКР' + export loc_pm_fonts='РЁР РФТЫ' + export loc_pm_settings='НАСТРОЙКР' + + elif [[ "${update_loc}" == "ENG" ]] ; then export loc_gui_pw_reinstall_pp="REINSTALL ${portname}" @@ -799,4 +810,13 @@ A brief instruction: export loc_demul="Emulator for the Sega Dreamcast game console" export loc_rpcs3="Emulator for the PlayStation 3 game console" + export loc_prefix_manager_comp='Select components to install in prefix:' + export loc_prefix_manager_font='Select fonts to install in prefix:' + export loc_prefix_manager_conf='Change config for prefix:' + export loc_prefix_manager_wine='using wine:' + export loc_pm='PREFIX MANAGER' + export loc_pm_dlls='DLLS' + export loc_pm_fonts='FONTS' + export loc_pm_settings='SETTINGS' + fi diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 33d3526..a73de57 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -214,6 +214,11 @@ start_portwine () { if [[ "${PW_GPU_USE}" != "disabled" ]] ; then export DXVK_FILTER_DEVICE_NAME="${PW_GPU_USE}" export VKD3D_FILTER_DEVICE_NAME="${PW_GPU_USE}" + if echo "${PW_GPU_USE}" | grep -i nvidia &>/dev/null ; then + if [[ -f "/usr/share/vulkan/icd.d/nvidia_icd.json" ]] ; then + export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/nvidia_icd.json" + fi + fi fi # if [[ "${PW_AMD_VULKAN_USE}" == "amdvlk" ]] ; then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index f5bd689..4b93cbf 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -330,19 +330,19 @@ pw_prefix_manager () { KEY_EDIT_MANAGER_GUI=$RANDOM "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=1 --list --checklist \ - --text="Select components to install in prefix: <b>\"${PW_PREFIX_NAME}\"</b>, using wine: <b>\"${PW_WINE_USE}\"</b>" \ + --text="${loc_prefix_manager_comp} <b>\"${PW_PREFIX_NAME}\"</b>, ${loc_prefix_manager_wine} <b>\"${PW_WINE_USE}\"</b>" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/dll_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null & "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=2 --list --checklist \ - --text="Select fonts to install in prefix: <b>\"${PW_PREFIX_NAME}\"</b>, using wine: <b>\"${PW_WINE_USE}\"</b>" \ + --text="${loc_prefix_manager_font} <b>\"${PW_PREFIX_NAME}\"</b>, ${loc_prefix_manager_wine} <b>\"${PW_WINE_USE}\"</b>" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/fonts_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null & "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=3 --list --checklist \ - --text="Change config for prefix: <b>\"${PW_PREFIX_NAME}\"</b>" \ + --text="${loc_prefix_manager_conf} <b>\"${PW_PREFIX_NAME}\"</b>" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null & "${pw_yad_v12_3}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=3 --width=900 --height=800 \ - --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "PREFIX MANAGER..." --tab-pos=bottom --tab="DLL" --tab="FONTS" --tab="SETTINGS" 2>/dev/null + --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "$loc_pm" --tab-pos=bottom --tab="$loc_pm_dlls" --tab="$loc_pm_fonts" --tab="$loc_pm_settings" 2>/dev/null YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then stop_portwine diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index c17eece..5e8a102 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2244 +#SCRIPTS_NEXT_VERSION=2245 ######################################################################## export PW_MANGOHUD=0 export DEFAULT_MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode -- 2.24.1