Merge branch 'Htylol-added-eval-3' into devel

data_from_portwine/changelog_en

@@ -3,7 +3,7 @@ You can help us in the development of the project on the website: https://linux-
 Changelog:
 
 ###Scripts version 2374### / Date: 12.11.2024 / Download update size: 4 megabytes
-* added test support for DLSS 3
+* added support for DLSS 3 for NVIDIA RTX 40XX
 * fixed gamescope (thanks to Htylol)
 * general optimization of scripts (thanks to Htylol)
 

data_from_portwine/changelog_ru

@@ -3,7 +3,7 @@
 История изменений:
 
 ###Scripts version 2374### / Дата: 12.11.2024 / Размер скачиваемого обновления: 4 мегабайт
-* добавлена тестовая поддержка DLSS 3
+* добавлена поддержка DLSS 3 для видеокарт NVIDIA RTX 40XX
 * исправлена работа gamescope (спасибо Htylol)
 * общая оптимизация скриптов (спасибо Htylol)
 

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-11-02 10:04+0500\n"
+        "POT-Creation-Date: 2024-11-13 08:17+0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -321,6 +321,9 @@ msgstr  ""
 msgid   "Do you want to installing recommended libraries in the new prefix:"
 msgstr  ""
 
+msgid   "Launched"
+msgstr  ""
+
 msgid   "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the "
         "missing package: <b>d3dadapter9</b>"
 msgstr  ""
@@ -1256,7 +1259,7 @@ msgid   "Force use sdl videodriver x11, works with BACKEND SDL. (Default is "
         "wayland)"
 msgstr  ""
 
-msgid   "If specified, sets a base output height to linearly scale the cursor "
+msgid   "if specified, sets a base output height to linearly scale the cursor "
         "against."
 msgstr  ""
 
@@ -1385,6 +1388,9 @@ msgid   "If downloading steam covers is enabled, they will be downloaded and "
         "is unavailable for some reason)"
 msgstr  ""
 
+msgid   "Recommended value"
+msgstr  ""
+
 msgid   "default"
 msgstr  ""
 
@@ -1394,13 +1400,10 @@ msgstr  ""
 msgid   "classic"
 msgstr  ""
 
-msgid   "dark"
-msgstr  ""
-
 msgid   "light"
 msgstr  ""
 
-msgid   "Recommended value"
+msgid   "dark"
 msgstr  ""
 
 msgid   "Choose a graphics card to run the game"

data_from_portwine/locales/es/LC_MESSAGES/PortProton.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-02 10:04+0500\n"
+"POT-Creation-Date: 2024-11-13 08:17+0500\n"
-"PO-Revision-Date: 2024-10-26 13:58+0500\n"
+"PO-Revision-Date: 2024-11-13 08:18+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -349,6 +349,9 @@ msgstr "OK"
 msgid "Do you want to installing recommended libraries in the new prefix:"
 msgstr "¿Quieres instalar las bibliotecas recomendadas en el nuevo prefijo:"
 
+msgid "Launched"
+msgstr "Lanzado"
+
 msgid ""
 "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing "
 "package: <b>d3dadapter9</b>"
@@ -1636,8 +1639,9 @@ msgstr ""
 "Forzar el uso del controlador de video SDL x11, funciona con el backend SDL. "
 "(Por defecto es Wayland)."
 
+#, fuzzy
 msgid ""
-"If specified, sets a base output height to linearly scale the cursor against."
+"if specified, sets a base output height to linearly scale the cursor against."
 msgstr ""
 "Si se especifica, establece una altura de salida base para escalar "
 "linealmente el cursor."
@@ -1810,6 +1814,9 @@ msgstr ""
 "crearán. (La desactivación se proporciona en los casos en que su descarga no "
 "esté disponible por algún motivo)"
 
+msgid "Recommended value"
+msgstr ""
+
 msgid "default"
 msgstr "por defecto"
 
@@ -1819,14 +1826,11 @@ msgstr "compacto"
 msgid "classic"
 msgstr "clásico"
 
-msgid "dark"
-msgstr "oscuro"
-
 msgid "light"
 msgstr "ligero"
 
-msgid "Recommended value"
+msgid "dark"
-msgstr ""
+msgstr "oscuro"
 
 msgid "Choose a graphics card to run the game"
 msgstr "Elige una tarjeta gráfica para ejecutar el juego"

data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-02 10:04+0500\n"
+"POT-Creation-Date: 2024-11-13 08:17+0500\n"
-"PO-Revision-Date: 2024-11-02 10:05+0500\n"
+"PO-Revision-Date: 2024-11-13 08:18+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ru_RU\n"
@@ -351,6 +351,9 @@ msgstr "OK"
 msgid "Do you want to installing recommended libraries in the new prefix:"
 msgstr "Хотите добавить рекомендуемые библиотеки в префикс:"
 
+msgid "Launched"
+msgstr "Запущено"
+
 msgid ""
 "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the missing "
 "package: <b>d3dadapter9</b>"
@@ -1615,8 +1618,9 @@ msgstr ""
 "запуском), работает вместе с SDL BACKEND (используется по умолчанию в "
 "Wayland сессии)"
 
+#, fuzzy
 msgid ""
-"If specified, sets a base output height to linearly scale the cursor against."
+"if specified, sets a base output height to linearly scale the cursor against."
 msgstr ""
 "Если указано, устанавливает базовую высоту вывода для линейного "
 "масштабирования курсора."
@@ -1788,6 +1792,9 @@ msgstr ""
 "создаваться. (Отключение предусмотрено в тех случаях, когда их скачивание по "
 "каким-то причинам недоступно)"
 
+msgid "Recommended value"
+msgstr "Рекомендуемое значение"
+
 msgid "default"
 msgstr "по умолчанию"
 
@@ -1797,14 +1804,11 @@ msgstr "компактная"
 msgid "classic"
 msgstr "классическая"
 
-msgid "dark"
-msgstr "тёмная"
-
 msgid "light"
 msgstr "светлая"
 
-msgid "Recommended value"
+msgid "dark"
-msgstr "Рекомендуемое значение"
+msgstr "тёмная"
 
 msgid "Choose a graphics card to run the game"
 msgstr "Выбрать видеокарту для запуска игры"
@@ -2246,6 +2250,9 @@ msgstr ""
 "--autoinstall и название того, что необходимо установить, указано в списке "
 "ниже:"
 
+#~ msgid "Running"
+#~ msgstr "Запущено"
+
 #~ msgid "Choice gui themes"
 #~ msgstr "Выбор графической темы"
 

data_from_portwine/scripts/functions_helper

@@ -1385,7 +1385,7 @@ get_and_set_reg_file () {
     if [[ $name_add_or_del == --add ]] ; then
         if [[ -z $find_block ]] ; then
             if [[ -n $name_for_new_block ]] ; then
-                sed -i '$a\\n'"$name_block\n" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg"
+                sed -i '$a\\n'"$name_block" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg"
                 find_file="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg"
                 find_line=$(wc -l "$find_file" | awk -F" " '{print $1}')
                 find_line=$(( find_line - 1 ))
@@ -1396,7 +1396,7 @@ get_and_set_reg_file () {
         fi
         if [[ $find_check_file == 1 ]] ; then
             print_info "Change $name_for_find_old to reg file"
-            sed -i "${find_number_line}s/$name_for_find.*/$name_for_find$name_for_set/" "$find_file"
+            sed -i "${find_number_line}s|$name_for_find.*|$name_for_find$name_for_set|" "$find_file"
         else
             print_info "Added $name_for_find_old to reg file"
             sed -i "$(( find_line + 1 ))a$name_for_find$name_for_set" "$find_file"
@@ -3318,7 +3318,7 @@ start_portwine () {
     if command -v systemd-inhibit &>/dev/null \
     && [[ "$GAMEMODERUN" != "1" ]]
     then
-        PW_INHIBIT_SLR="systemd-inhibit --mode=block --who=ru.linux_gaming.PortProton --why=${PW_NAME_DESKTOP_PROXY// /_}"
+        PW_INHIBIT_SLR="eval systemd-inhibit --mode=block --who=ru.linux_gaming.PortProton --why=\"${translations[Launched]} $PW_NAME_DESKTOP_PROXY\""
         print_info "Screensaver will be inhibit"
     fi
     pw_other_fixes
@@ -3874,7 +3874,7 @@ start_portwine () {
     if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" ]] \
     && [[ -z $(grep "Windows $PW_WINDOWS_VER" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg") ]]
     then
-        if [[ -n "${PW_WINDOWS_VER}" ]] \
+        if [[ -n $PW_WINDOWS_VER ]] \
         && [[ $(echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/') == "xp" ]]
         then
             export PW_WINDOWS_VER="xp64"
@@ -3886,12 +3886,12 @@ start_portwine () {
         echo "Set to win${PW_WINDOWS_VER}"
     fi
 
-    if [[ "$portwine_exe" == *-Shipping.exe ]] ; then
+    if [[ $portwine_exe == *-Shipping.exe ]] ; then
         echo "Disable EAC"
         [[ -z "$LAUNCH_PARAMETERS" ]] && export LAUNCH_PARAMETERS+=" -eac-nop-loaded "
     fi
 
-    if [[ "$PW_DINPUT_PROTOCOL" == "1" ]] ; then
+    if [[ $PW_DINPUT_PROTOCOL == "1" ]] ; then
         get_and_set_reg_file --add 'System\CurrentControlSet\Services\winebus' 'DisableHidraw' 'REG_DWORD' "0" "system"
         get_and_set_reg_file --add 'System\CurrentControlSet\Services\winebus' 'Enable SDL' 'REG_DWORD' "0" "system"
     else
@@ -3899,8 +3899,8 @@ start_portwine () {
         get_and_set_reg_file --add 'System\CurrentControlSet\Services\winebus' 'Enable SDL' 'REG_DWORD' "1" "system"
     fi
 
-    if [[ "$PW_WINE_DPI_VALUE" != "disabled" ]] ; then
+    if [[ $PW_WINE_DPI_VALUE != "disabled" ]] ; then
-        if [[ "$PW_WINE_DPI_VALUE" == "recommended" ]] ; then
+        if [[ $PW_WINE_DPI_VALUE == "recommended" ]] ; then
             PW_RECOMMENDED_DPI=$(recommend_dpi "${PW_SCREEN_RESOLUTION:5:8}")
             get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_RECOMMENDED_DPI" "user"
         else
@@ -3908,7 +3908,7 @@ start_portwine () {
         fi
     fi
 
-    if [[ "$PW_USE_NATIVE_WAYLAND" == "1" ]] ; then
+    if [[ $PW_USE_NATIVE_WAYLAND == "1" ]] ; then
         export PW_DISPLAY="env DISPLAY="
         export PW_USE_RUNTIME="0"
         get_and_set_reg_file --add 'Software\Wine\Drivers' 'Graphics' 'REG_SZ' "x11,wayland" "user"
@@ -3917,7 +3917,7 @@ start_portwine () {
         get_and_set_reg_file --delete 'Software\Wine\Drivers' 'Graphics'
     fi
 
-    if [[ "$PW_SOUND_DRIVER_USE" != "disabled" ]] ; then
+    if [[ $PW_SOUND_DRIVER_USE != "disabled" ]] ; then
         get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "$PW_SOUND_DRIVER_USE" "user"
     fi
 
@@ -3926,7 +3926,7 @@ start_portwine () {
         pw_tray_icon
     fi
 
-    if [[ "${PW_CHECK_AUTOINSTALL}" != "1" ]] ; then
+    if [[ $PW_CHECK_AUTOINSTALL != "1" ]] ; then
         pw_start_progress_bar_cover "${COVERS_PATH}/loading_${LANGUAGE_GIF}.gif"
     fi
     add_in_start_portwine