From 17a2a21efc2ab70454548fecdcad042d2ef57c4c Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 24 Sep 2024 13:37:06 +0300 Subject: [PATCH] Scripts version 2350 --- data_from_portwine/changelog_en | 12 ++++++++- data_from_portwine/changelog_ru | 12 ++++++++- data_from_portwine/locales/PortProton.pot | 11 +++++--- .../locales/es/LC_MESSAGES/PortProton.po | 17 +++++++++---- .../locales/ru/LC_MESSAGES/PortProton.po | 25 ++++++++++++------- data_from_portwine/scripts/functions_helper | 4 +-- .../scripts/pw_autoinstall/PW_CROSSOUT | 3 ++- data_from_portwine/scripts/start.sh | 6 ++--- 8 files changed, 64 insertions(+), 26 deletions(-) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 4f000a6d..2b156bf3 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,12 +2,22 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2350### / Date: 24.09.2024 / Download update size: 207 megabytes +* updated versions: + * DXVK_GIT "2.4-94" + * VKD3D_GIT "1.1-4191" +* added a translation cache, which greatly improves the responsiveness of the interface (thanks to Htylol) +* fixed launching shortcuts from special. symbols in the title (thanks to Htylol) +* limited number of characters for shortcut names in the "installed" tab (fixes overly wide menu) (thanks to Htylol) +* disabled decoration for HoYoPlay launcher (fixes window capacity) (thanks to Boria138) +* Crossout installation has been moved to a separate prefix and decoration for the launcher has been disabled (corrects the capacity in the window) + ###Scripts version 2349### / Date: 18.09.2024 / Download update size: 4 megabytes * fixed video driver path forwarding for future versions of ALT Linux (p11) ###Scripts version 2348### / Date: 17.09.2024 / Download update size: 4 megabytes * updated versions: - * DXVK_GIT "2.3.1-120" + * DXVK_GIT "2.4-41" * VKD3D_GIT "1.1-4110" ###Scripts version 2347### / Date: 16.09.2024 / Download update size: 4 megabytes diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index cd496587..83dd6d99 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,12 +2,22 @@ ----------------------------------------- История изменений: +###Scripts version 2350### / Дата: 24.09.2024 / Размер скачиваемого обновления: 207 мегабайт +* обновлены версии: + * DXVK_GIT "2.4-94" + * VKD3D_GIT "1.1-4191" +* добавлен кэш переводов, что сильно улучшает отзывчивость интерфейса (спасибо Htylol) +* исправлен запуск ярлыков со спец. символами в названии (спасибо Htylol) +* ограничено количество символов для названия ярлыков во вкладке "установленные" (исправляет чрезмерно широкое меню) (спасибо Htylol) +* отключена декорация для лончера HoYoPlay (исправляет вместимость в окне) (спасибо Boria138) +* установка Crossout вынесена в отдельный префикс и отключена декорация для лончера (исправляет вместимость в окне) + ###Scripts version 2349### / Дата: 18.09.2024 / Размер скачиваемого обновления: 4 мегабайт * исправлено определение путей видеодрайвера для будущих версий ALT Linux (p11) ###Scripts version 2348### / Дата: 17.09.2024 / Размер скачиваемого обновления: 4 мегабайт * обновлены версии: - * DXVK_GIT "2.3.1-120" + * DXVK_GIT "2.4-41" * VKD3D_GIT "1.1-4110" ###Scripts version 2347### / Дата: 16.09.2024 / Размер скачиваемого обновления: 4 мегабайт diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot index fdd23dd7..95af4327 100644 --- a/data_from_portwine/locales/PortProton.pot +++ b/data_from_portwine/locales/PortProton.pot @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2024-09-24 11:33+0300\n" + "POT-Creation-Date: 2024-09-24 13:23+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -68,7 +68,7 @@ msgstr "" msgid "Edit database file for" msgstr "" -msgid "Settings user.conf" +msgid "Global settings" msgstr "" msgid "Settings for user.conf" @@ -137,6 +137,9 @@ msgstr "" msgid "Change language" msgstr "" +msgid "Global settings (user.conf)" +msgstr "" + msgid "Scripts from backup" msgstr "" @@ -1351,7 +1354,7 @@ msgstr "" msgid "Enable" msgstr "" -msgid "Change settings for" +msgid "Change global settings" msgstr "" msgid "Change mirror to" @@ -1404,7 +1407,7 @@ msgstr "" msgid "Allows you to select a theme for PortProton" msgstr "" -msgid "SETTINGS USER.CONF" +msgid "GLOBAL SETTINGS (USER.CONF)" msgstr "" msgid "Open the user.conf settings file in a system text editor to " diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po index 267015fa..75fce4f2 100644 --- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-19 23:26+0500\n" +"POT-Creation-Date: 2024-09-24 13:23+0300\n" "PO-Revision-Date: 2024-09-19 23:35+0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -73,8 +73,9 @@ msgstr "Configuración básica" msgid "Edit database file for" msgstr "Editar archivo de base de datos para" -msgid "Settings user.conf" -msgstr "Configuración user.conf" +#, fuzzy +msgid "Global settings" +msgstr "Configuración básica" msgid "Settings for user.conf" msgstr "Configuración user.conf" @@ -151,6 +152,10 @@ msgstr "Lista de cambios" msgid "Change language" msgstr "Cambiar idioma" +#, fuzzy +msgid "Global settings (user.conf)" +msgstr "Configuración user.conf" + msgid "Scripts from backup" msgstr "Scripts desde la copia de seguridad" @@ -1772,7 +1777,8 @@ msgstr "Desactivar" msgid "Enable" msgstr "Permitir" -msgid "Change settings for" +#, fuzzy +msgid "Change global settings" msgstr "Cambiar la configuración de" msgid "Change mirror to" @@ -1841,7 +1847,8 @@ msgstr "Temas de interfaz gráfica de usuario elegidos" msgid "Allows you to select a theme for PortProton" msgstr "Le permite seleccionar un tema para PortProton" -msgid "SETTINGS USER.CONF" +#, fuzzy +msgid "GLOBAL SETTINGS (USER.CONF)" msgstr "AJUSTES USUARIO.CONF" msgid "" diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po index 11b08486..3f0d9288 100644 --- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-19 23:26+0500\n" +"POT-Creation-Date: 2024-09-24 13:23+0300\n" "PO-Revision-Date: 2024-09-19 23:32+0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "X-Generator: Poedit 3.4.4\n" msgid "" @@ -73,8 +73,9 @@ msgstr "Основные настройки" msgid "Edit database file for" msgstr "Редактировать файл настроек для" -msgid "Settings user.conf" -msgstr "Настройки user.conf" +#, fuzzy +msgid "Global settings" +msgstr "Глобальные настройки" msgid "Settings for user.conf" msgstr "Настройки для user.conf" @@ -151,6 +152,10 @@ msgstr "История изменений" msgid "Change language" msgstr "Сменить язык" +#, fuzzy +msgid "Global settings (user.conf)" +msgstr "Глобальные настройки (user.conf)" + msgid "Scripts from backup" msgstr "Откатить версию скриптов" @@ -1741,8 +1746,9 @@ msgstr "Выключить" msgid "Enable" msgstr "Включить" -msgid "Change settings for" -msgstr "Изменить настройки для" +#, fuzzy +msgid "Change global settings" +msgstr "Изменить глобальные настройки" msgid "Change mirror to" msgstr "Сменить зеркало на" @@ -1809,8 +1815,9 @@ msgstr "Выбор графической темы" msgid "Allows you to select a theme for PortProton" msgstr "Позволяет выбрать тему для PortProton" -msgid "SETTINGS USER.CONF" -msgstr "НАСТРОЙКИ USER.CONF" +#, fuzzy +msgid "GLOBAL SETTINGS (USER.CONF)" +msgstr "ГЛОБАЛЬНЫЕ НАСТРОЙКИ (USER.CONF)" msgid "" "Open the user.conf settings file in a system text editor to view and " diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 21433c91..f701b8d5 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -4891,7 +4891,7 @@ gui_userconf () { KEY_USERCONF_GUI=$RANDOM "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="1" --form --columns=2 --separator=" " --text-align=center \ - --text "${translations[Change settings for]} user.conf\n ${translations[NOTE: To display help for each item, simply hover your mouse over the text]}" \ + --text "${translations[Change global settings]} (edit user.conf)\n ${translations[NOTE: To display help for each item, simply hover your mouse over the text]}" \ --align-buttons --homogeneous-column --gui-type-text="${PANED_GUI_TYPE_TEXT_UP}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_UP}" \ --field=" ${translations[Change mirror to]} $NEW_MIRROR"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${translations[Depending on which mirror is selected, updates will be downloaded from there.]}":"FBTN" '@bash -c "button_click --userconf change_mirror"' \ --field=" ${translations[Change branch to]} $NEW_BRANCH"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${translations[Depending on the version of the scripts, PortProton will receive the latest changes first (the DEVEL branch), the STABLE branch is updated later and is stable.]}":"FBTN" '@bash -c "button_click --userconf change_branch"' \ @@ -4923,7 +4923,7 @@ gui_userconf () { 1> "${PW_TMPFS_PATH}/tmp_yad_userconf_set_cb" 2>/dev/null & "${pw_yad}" --key=$KEY_USERCONF_GUI --paned --sensitive \ - --title="${translations[SETTINGS USER.CONF]}" \ + --title="${translations[GLOBAL SETTINGS (USER.CONF)]}" \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --gui-type="settings-paned" \ --button="${translations[CANCEL THE CHANGES]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Cancel the current changes and return to the previous menu]}":1 \ diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT index 66d9c5d9..226e8b1d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/crossout.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Crossout" -# export PW_PREFIX_NAME=DOTNET +export PW_PREFIX_NAME="CROSSOUT" start_portwine if try_download "https://yupmaster.gaijinent.com/launcher/current.php?id=CrossoutLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror @@ -13,6 +13,7 @@ then pw_kill_autostart launcher.exe 3 & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Crossout/launcher.exe" + pw_run reg add "HKEY_CURRENT_USER\Software\Wine\X11 Driver" /v "Decorated" /t REG_SZ /d "N" /f pw_create_unique_exe "crossout_launcher_pp" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 6813e7e5..725c6b44 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -620,7 +620,7 @@ if [[ -f "${portwine_exe}" ]] ; then "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="${START_GUI_NOTEBOOK_COLUMNS}" --align-buttons --homogeneous-column \ --gui-type-layout="${START_GUI_TYPE_LAYOUT_NOTEBOOK}" \ --field=" ${translations[Base settings]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Edit database file for]} ${PORTWINE_DB}":"FBTN" '@bash -c "button_click --start 118"' \ - --field=" ${translations[Settings user.conf]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Settings for user.conf]}":"FBTN" '@bash -c "button_click --start 128"' \ + --field=" ${translations[Global settings]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Settings for user.conf]}":"FBTN" '@bash -c "button_click --start 128"' \ --field=" ${translations[Open directory]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Open directory with .ppdb file]}":"FBTN" '@bash -c "button_click --start open_game_folder"' \ --field=" vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)]}":"FBTN" '@bash -c "button_click --start 120"' \ --field=" MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)]}":"FBTN" '@bash -c "button_click --start 122"' \ @@ -665,7 +665,7 @@ if [[ -f "${portwine_exe}" ]] ; then --gui-type-layout="${START_GUI_TYPE_LAYOUT_PANED}" \ --align-buttons --homogeneous-row --homogeneous-column \ --field=" ${translations[Base settings]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Edit database file for]} ${PORTWINE_DB}":"FBTN" '@bash -c "button_click --start 118"' \ - --field=" ${translations[Settings user.conf]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Settings for user.conf]}":"FBTN" '@bash -c "button_click --start 128"' \ + --field=" ${translations[Global settings]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Settings for user.conf]}":"FBTN" '@bash -c "button_click --start 128"' \ --field=" ${translations[Open directory]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Open directory with .ppdb file]}":"FBTN" '@bash -c "button_click --start open_game_folder"' \ --field=" vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)]}":"FBTN" '@bash -c "button_click --start 120"' \ --field=" MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${translations[Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)]}":"FBTN" '@bash -c "button_click --start 122"' \ @@ -774,7 +774,7 @@ else --field=" ${translations[Update PortProton]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal gui_pw_update"' \ --field=" ${translations[Changelog]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal open_changelog"' \ --field=" ${translations[Change language]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal change_loc"' \ - --field=" ${translations[Settings user.conf]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal 128"' \ + --field=" ${translations[Global settings (user.conf)]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal 128"' \ --field=" ${translations[Scripts from backup]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal gui_open_scripts_from_backup"' \ --field=" Xterm"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal pw_start_cont_xterm"' \ --field=" ${translations[Credits]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal gui_credits"' \