From b51913dc29dc8d35101b7663f1530e032ccb224f Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Wed, 23 Oct 2024 16:34:49 +0300
Subject: [PATCH] Scripts version 2365

---
 data_from_portwine/changelog_en               | 11 ++++++
 data_from_portwine/changelog_ru               | 11 ++++++
 data_from_portwine/locales/PortProton.pot     | 23 ++++++------
 .../locales/es/LC_MESSAGES/PortProton.po      | 13 ++++---
 .../locales/ru/LC_MESSAGES/PortProton.po      | 36 ++++++++-----------
 data_from_portwine/scripts/functions_helper   | 14 ++++----
 data_from_portwine/scripts/var                |  2 +-
 7 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en
index 02f72209..72215318 100755
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -2,6 +2,17 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2365### / Date: 23.10.2024 / Download update size: 4 megabytes
+* added translations for using system wine and downloading other versions of wine (thanks to Htylol)
+* improved title detection functionality for creating shortcuts (thanks to Htylol)
+* added check for duplicate shortcuts (thanks to Htylol)
+* added ZINK support for NVK (thanks to Htylol)
+* added automatic installation of games (thanks to Chal55rus):
+    *Broken Ranks
+    *DC Universe Online
+    * The Lord of the Rings Online
+* fixed link in the text when creating a log
+
 ###Scripts version 2364### / Date: 19.10.2024 / Download update size: 215 megabytes
 * updated PROTON_LG to version "9-16"
 * updated versions:
diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index 69231a16..73966163 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,6 +2,17 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2365### / Дата: 23.10.2024 / Размер скачиваемого обновления: 4 мегабайта
+* добавлены переводы для использования системного wine и скачивания других версий wine (спасибо Htylol)
+* улучшен функционал определения названия для создания ярлыков (спасибо Htylol)
+* добавлена проверка на дубликаты ярлыков (спасибо Htylol)
+* добавлена поддержка ZINK для NVK (спасибо Htylol)
+* добавлена автоустановка игр (спасибо Chal55rus):
+    * Broken Ranks
+    * DC Universe Online
+    * The Lord of the Rings Online
+* исправлена ссылка в тексте при создании лога
+
 ###Scripts version 2364### / Дата: 19.10.2024 / Размер скачиваемого обновления: 215 мегабайт
 * обновлен PROTON_LG до версии "9-16"
 * обновлены версии:
diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot
index dcabb6a1..34d85435 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-10-19 22:39+0500\n"
+        "POT-Creation-Date: 2024-10-23 14:40+0300\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"
@@ -44,10 +44,6 @@ msgstr  ""
 msgid   "Newest DXVK, VKD3D, D8VK (Vulkan v1.3+)"
 msgstr  ""
 
-msgid   "A higher number of duplicate desktop files were found for this file."
-        "\\nShould I delete the extra ones or not?"
-msgstr  ""
-
 msgid   "Gallium Nine (DirectX 9 for MESA)"
 msgstr  ""
 
@@ -69,9 +65,6 @@ msgstr  ""
 msgid   "Delete shortcut for select file..."
 msgstr  ""
 
-msgid   "Launching"
-msgstr  ""
-
 msgid   "Base settings"
 msgstr  ""
 
@@ -234,6 +227,9 @@ msgstr  ""
 msgid   "Downloading"
 msgstr  ""
 
+msgid   "Launching"
+msgstr  ""
+
 msgid   "day"
 msgstr  ""
 
@@ -1442,6 +1438,10 @@ msgstr  ""
 msgid   "Name"
 msgstr  ""
 
+msgid   "A higher number of duplicate desktop files were found for this file."
+        "\\nShould I delete the extra ones or not?"
+msgstr  ""
+
 msgid   "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?"
 msgstr  ""
 
@@ -1507,8 +1507,7 @@ msgid   "PortProton was launched in creation mode PortProton.log and it is "
         "successfully stored in the root directory of the port"
 msgstr  ""
 
-msgid   "To diagnose the problem, copy ALL of the log to discord server: "
-        "https://discord.gg/FTaheP99wE"
+msgid   "To diagnose the problem, copy ALL of the log to:"
 msgstr  ""
 
 msgid   "Please wait! After finishing the PortProton, click STOP."
@@ -1583,8 +1582,8 @@ msgid   "MIT License\n"
         "\n"
         "Permission is hereby granted, free of charge, to any person "
         "obtaining a copy\n"
-        "of this software and associated documentation files (the "
-        "\"Software\"), to deal\n"
+        "of this software and associated documentation files (the \"Software"
+        "\"), to deal\n"
         "in the Software without restriction, including without limitation "
         "the rights\n"
         "to use, copy, modify, merge, publish, distribute, sublicense, and/or "
diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po
index 02cc18a2..67cf873c 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-10-19 22:39+0500\n"
+"POT-Creation-Date: 2024-10-23 14:40+0300\n"
 "PO-Revision-Date: 2024-10-15 13:28+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -70,9 +70,6 @@ msgstr "ELIMINAR ACCESO DIRECTO"
 msgid "Delete shortcut for select file..."
 msgstr "Eliminar el acceso directo del archivo seleccionado..."
 
-msgid "Launching"
-msgstr "Lanzamiento"
-
 msgid "Base settings"
 msgstr "Configuración básica"
 
@@ -253,6 +250,9 @@ msgstr ""
 msgid "Downloading"
 msgstr "Descargando"
 
+msgid "Launching"
+msgstr "Lanzamiento"
+
 msgid "day"
 msgstr ""
 
@@ -1960,9 +1960,8 @@ msgstr ""
 "PortProton fue lanzado en modo de creación PortProton.log y se almacena "
 "correctamente en el directorio raíz del puerto"
 
-msgid ""
-"To diagnose the problem, copy ALL of the log to discord server: https://"
-"discord.gg/FTaheP99wE"
+#, fuzzy
+msgid "To diagnose the problem, copy ALL of the log to:"
 msgstr ""
 "Para diagnosticar el problema, copia TODO el log al servidor de discordia: "
 "https://discord.gg/FTaheP99wE"
diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
index 11b79972..4447cffe 100644
--- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
+++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-19 22:39+0500\n"
-"PO-Revision-Date: 2024-10-19 22:39+0500\n"
+"POT-Creation-Date: 2024-10-23 14:40+0300\n"
+"PO-Revision-Date: 2024-10-23 14:43+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ru_RU\n"
 "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"
-"X-Generator: Poedit 3.4.4\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.5\n"
 
 msgid ""
 "A running PortProton session was detected.\\nDo you want to end the previous "
@@ -61,13 +61,6 @@ msgstr "Скачать другие версии wine"
 msgid "CREATE SHORTCUT"
 msgstr "СОЗДАТЬ ЯРЛЫК"
 
-msgid ""
-"A higher number of duplicate desktop files were found for this file."
-"\\nShould I delete the extra ones or not?"
-msgstr ""
-"Для этого файла было обнаружено большее количество дубликатов\\nфайлов "
-"рабочего стола. Удалить лишние или нет?"
-
 msgid "Create shortcut for select file..."
 msgstr "Создать ярлык для выбранного файла..."
 
@@ -77,9 +70,6 @@ msgstr "УДАЛИТЬ ЯРЛЫК"
 msgid "Delete shortcut for select file..."
 msgstr "Удалить ярлык для выбранного файла..."
 
-msgid "Launching"
-msgstr "Запуск"
-
 msgid "Base settings"
 msgstr "Основные настройки"
 
@@ -259,6 +249,9 @@ msgstr ""
 msgid "Downloading"
 msgstr "Загружается"
 
+msgid "Launching"
+msgstr "Запуск"
+
 msgid "day"
 msgstr "день"
 
@@ -1855,6 +1848,11 @@ msgstr "Добавить ярлык в библиотеку STEAM"
 msgid "Name"
 msgstr "Имя"
 
+msgid ""
+"A higher number of duplicate desktop files were found for this file."
+"\\nShould I delete the extra ones or not?"
+msgstr "Найдены дубликаты создаваемого ярлыка.\\nУдалить лишние ярлыки?"
+
 msgid "For adding shortcut to STEAM, needed restart.\\n\\nRestart STEAM now?"
 msgstr ""
 "Для добавления ярлыка в STEAM требуется перезапуск.\\n\\nПерезапустить STEAM "
@@ -1931,12 +1929,8 @@ msgstr ""
 "Был запущен режим создания лога и лог успешно сохранён в корневом каталоге "
 "PortProton"
 
-msgid ""
-"To diagnose the problem, copy ALL of the log to discord server: https://"
-"discord.gg/FTaheP99wE"
-msgstr ""
-"Чтобы диагностировать проблему, скопируйте ВЕСЬ журнал на сервер Discord: "
-"https://discord.gg/FTaheP99wE"
+msgid "To diagnose the problem, copy ALL of the log to:"
+msgstr "Чтобы диагностировать проблему, скопируйте ВЕСЬ журнал на сайт:"
 
 msgid "Please wait! After finishing the PortProton, click STOP."
 msgstr "Пожалуйста, подождите! После завершения PortProton нажмите СТОП."
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index bcd4cf5a..e78de9ac 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -5802,7 +5802,7 @@ pw_prefix_manager () {
         try_remove_file  "${PW_TMPFS_PATH}/dll_list_tmp"
         while read PW_BOOL_IN_DLL_LIST ; do
             if [[ -z $(echo "${PW_BOOL_IN_DLL_LIST}" | grep -E 'd3d|directx9|dont_use|dxvk|vkd3d|galliumnine|faudio1|Foundation') ]] ; then
-                if grep "^$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{print $1}')$" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ; then
+                if grep ^$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{print $1}')$ "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ; then
                     echo -e "true\n$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{print $1}')\n$(echo ${PW_BOOL_IN_DLL_LIST} | awk '{ $1 = ""; print substr($0, 2) }')" >> "${PW_TMPFS_PATH}/dll_list_tmp"
                 else
                     echo -e "false\n$(echo "${PW_BOOL_IN_DLL_LIST}" | awk '{print $1}')\n$(echo ${PW_BOOL_IN_DLL_LIST} | awk '{ $1 = ""; print substr($0, 2) }')" >> "${PW_TMPFS_PATH}/dll_list_tmp"
@@ -5812,7 +5812,7 @@ pw_prefix_manager () {
         try_remove_file  "${PW_TMPFS_PATH}/fonts_list_tmp"
         while read PW_BOOL_IN_FONTS_LIST ; do
             if [[ -z $(echo "${PW_BOOL_IN_FONTS_LIST}" | grep -E 'dont_use') ]] ; then
-                if grep "^$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{print $1}')$" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ; then
+                if grep ^$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{print $1}')$ "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ; then
                     echo -e "true\n$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{print $1}')\n$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{ $1 = ""; print substr($0, 2) }')" >> "${PW_TMPFS_PATH}/fonts_list_tmp"
                 else
                     echo -e "false\n$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{print $1}')\n$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{ $1 = ""; print substr($0, 2) }')" >> "${PW_TMPFS_PATH}/fonts_list_tmp"
@@ -5822,7 +5822,7 @@ pw_prefix_manager () {
         try_remove_file  "${PW_TMPFS_PATH}/settings_list_tmp"
         while read PW_BOOL_IN_FONTS_LIST ; do
             if [[ -z $(echo "${PW_BOOL_IN_FONTS_LIST}" | grep -E 'vista|alldlls|autostart_|bad|good|win|videomemory|vd=|isolate_home') ]] ; then
-                if grep "^$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{print $1}')$" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ; then
+                if grep ^$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{print $1}')$ "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ; then
                     echo -e "true\n$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{print $1}')\n$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{ $1 = ""; print substr($0, 2) }')" >> "${PW_TMPFS_PATH}/settings_list_tmp"
                 else
                     echo -e "false\n$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{print $1}')\n$(echo "${PW_BOOL_IN_FONTS_LIST}" | awk '{ $1 = ""; print substr($0, 2) }')" >> "${PW_TMPFS_PATH}/settings_list_tmp"
@@ -5870,8 +5870,7 @@ pw_prefix_manager () {
         case "$YAD_STATUS" in
             1|252)
                 print_info "Nothing to do. Restarting PortProton..."
-                stop_portwine &
-                restart_pp
+                stop_portwine --restart
                 ;;
             0)
                 WT_FORCE=""
@@ -5903,8 +5902,7 @@ pw_prefix_manager () {
             gui_prefix_manager
         else
             print_info "Nothing to do. Restarting PortProton..."
-            stop_portwine &
-            restart_pp
+            stop_portwine --restart
         fi
     }
     gui_prefix_manager
@@ -5920,7 +5918,7 @@ portwine_start_debug () {
         "${translations[It is recommended to run games in OpenGL (low performance possible)!]}"
     fi
     echo "${translations[PortProton was launched in creation mode PortProton.log and it is successfully stored in the root directory of the port]}" > "${PORT_WINE_PATH}/PortProton.log"
-    echo "${translations[To diagnose the problem, copy ALL of the log to discord server: https://discord.gg/FTaheP99wE]}" >> "${PORT_WINE_PATH}/PortProton.log"
+    echo "${translations[To diagnose the problem, copy ALL of the log to:]} https://linux-gaming.ru/c/ppsup/12" >> "${PORT_WINE_PATH}/PortProton.log"
     echo "-------------------------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"
     echo "PortWINE version:" >> "${PORT_WINE_PATH}/PortProton.log"
     read install_ver < "${PORT_WINE_TMP_PATH}/PortProton_ver"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 0757bac9..ef2b4a67 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=2364
+#SCRIPTS_NEXT_VERSION=2365
 #SCRIPTS_STABLE_VERSION=2360
 ########################################################################
 export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET"