Merge branch 'Htylol-split-commits' into devel

4ae817e3 · Mikhail Tergoev · ff153ea2 · 8defcff2 · 4ae817e3 · 4ae817e3
Commit 4ae817e3 authored Sep 13, 2024 by Mikhail Tergoev
23 changed files
--- 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-04 13:16+0300\n"
+        "POT-Creation-Date: 2024-09-13 02:43+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"
@@ -68,6 +68,18 @@ msgstr  ""
 msgid   "Edit database file for"
 msgstr  ""
+msgid   "Settings user.conf"
+msgstr  ""
+msgid   "Settings for user.conf"
+msgstr  ""
+msgid   "Open directory"
+msgstr  ""
+msgid   "Open directory with <b>.ppdb</b> file"
+msgstr  ""
 msgid   "Enable vkBasalt by default to improve graphics in games running on "
        "Vulkan. (The HOME hotkey disables vkbasalt)"
 msgstr  ""
@@ -107,12 +119,6 @@ msgstr  ""
 msgid   "Run file ..."
 msgstr  ""
-msgid   "Disable"
-msgstr  ""
-msgid   "Enable"
-msgstr  ""
 msgid   "Create shortcut..."
 msgstr  ""
@@ -131,27 +137,12 @@ msgstr  ""
 msgid   "Change language"
 msgstr  ""
-msgid   "Edit user.conf"
-msgstr  ""
 msgid   "Scripts from backup"
 msgstr  ""
 msgid   "Credits"
 msgstr  ""
-msgid   "Change mirror to"
-msgstr  ""
-msgid   "Change branch to"
-msgstr  ""
-msgid   "Change start gui"
-msgstr  ""
-msgid   "steam covers download"
-msgstr  ""
 msgid   "Create prefix backup"
 msgstr  ""
@@ -357,6 +348,15 @@ msgstr  ""
 msgid   "CHANGELOG"
 msgstr  ""
+msgid   "WINEFILE"
+msgstr  ""
+msgid   "TASKMGR"
+msgstr  ""
+msgid   "FORCE EXIT"
+msgstr  ""
 msgid   "Check new version WINE..."
 msgstr  ""
@@ -567,13 +567,6 @@ msgid   "Limiting the number of CPU cores is useful for Unity games (It is "
        "recommended to set the value equal to 8)"
 msgstr  ""
-msgid   "Choose a graphics card to run the game (in user.conf)"
-msgstr  ""
-msgid   "Select which video card will be used to run the game (used for all "
-        "running games and programs in PortProton)"
-msgstr  ""
 msgid   "Forcibly select the OpenGL version for the game"
 msgstr  ""
@@ -594,12 +587,6 @@ msgstr  ""
 msgid   "Fixes encoding issues in legacy software"
 msgstr  ""
-msgid   "Choice wine audio driver"
-msgstr  ""
-msgid   "Fixes sound popling if choice alsa"
-msgstr  ""
 msgid   "EDIT DB"
 msgstr  ""
@@ -827,6 +814,12 @@ msgid   "AMD FidelityFX - CAS is designed to dramatically improve texture "
        "set value = 100)"
 msgstr  ""
+msgid   "RESET"
+msgstr  ""
+msgid   "Restore default settings for"
+msgstr  ""
 msgid   "DISABLE"
 msgstr  ""
@@ -965,9 +958,10 @@ msgstr  ""
 msgid   "Show temperature in Fahrenheit"
 msgstr  ""
-msgid   "Show if GPU is throttling based on Power, current, temp or \"other"
+msgid   "Show if GPU is throttling based on Power, current, temp or "
-        "\" (Only shows if throttling is currently happening). Currently "
+        "\"other\" (Only shows if throttling is currently happening). "
-        "disabled by default for Nvidia as it causes lag on 3000 series"
+        "Currently disabled by default for Nvidia as it causes lag on 3000 "
+        "series"
 msgstr  ""
 msgid   "Same as throttling_status but displays throttling in the frametime "
@@ -1004,15 +998,15 @@ msgid   "Enabling fps limitation with MANGOHUD tools built into PortProton "
        "(Keys <b>L_SHIFT + F1</b> Toggles fps limitation)"
 msgstr  ""
-msgid   "Disable MangoHud and go to the previous menu"
-msgstr  ""
 msgid   "PREVIEW CHANGES"
 msgstr  ""
 msgid   "Start vkcube for preview changes"
 msgstr  ""
+msgid   "Disable MangoHud and go to the previous menu"
+msgstr  ""
 msgid   "Use DirectX12 for dgVoodoo2. Doesnt always work better. (Working "
        "only on newest and stable dxvk/vkd3d) (Direct3D and Glide settings)"
 msgstr  ""
@@ -1181,12 +1175,6 @@ msgid   "Integer scale factor of the emulated hardware mouse cursor. 0: "
        "Glide settings)"
 msgstr  ""
-msgid   "RESET"
-msgstr  ""
-msgid   "Restore default settings for"
-msgstr  ""
 msgid   "Disable dgVoodoo2 and go to the previous menu"
 msgstr  ""
@@ -1255,17 +1243,14 @@ msgid   "Force use sdl videodriver x11, works with BACKEND SDL. (Default is "
        "wayland)"
 msgstr  ""
-msgid   "Fixes artifacts on AMD and Intel video cards. (Use only when "
-        "necessary)."
-msgstr  ""
 msgid   "Change settings gamescope for"
 msgstr  ""
+#, sh-format
 msgid   "<b>Gamescope is not detected on the system, to install it, run the "
        "command in the terminal:\\n flatpak install -y runtime/org."
-        "freedesktop.Platform.VulkanLayer.gamescope/x86_64/23.08\\n (Can be "
+        "freedesktop.Platform.VulkanLayer.gamescope/x86_64/"
-        "selected and copied)</b>"
+        "${GAMESCOPE_VERSION}\\n (Can be selected and copied)</b>"
 msgstr  ""
 msgid   "<b>Gamescope is not detected on the system, please contact the "
@@ -1362,6 +1347,72 @@ msgstr  ""
 msgid   "Disable GameScope and go to the previous menu"
 msgstr  ""
+msgid   "Disable"
+msgstr  ""
+msgid   "Enable"
+msgstr  ""
+msgid   "Change settings for"
+msgstr  ""
+msgid   "Change mirror to"
+msgstr  ""
+msgid   "Depending on which mirror is selected, updates will be downloaded "
+        "from there."
+msgstr  ""
+msgid   "Change branch to"
+msgstr  ""
+msgid   "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."
+msgstr  ""
+msgid   "Change start gui to"
+msgstr  ""
+msgid   "When using PANED in the game start menu, additional buttons are "
+        "located on one large page; if NOTEBOOK, then they are divided into "
+        "several."
+msgstr  ""
+msgid   "steam covers download"
+msgstr  ""
+msgid   "If downloading steam covers is enabled, they will be downloaded and "
+        "created. (Disablement is provided in cases where their downloading "
+        "is unavailable for some reason)"
+msgstr  ""
+msgid   "Choose a graphics card to run the game"
+msgstr  ""
+msgid   "Select which video card will be used to run the game (used for all "
+        "running games and programs in PortProton)"
+msgstr  ""
+msgid   "Choice wine audio driver"
+msgstr  ""
+msgid   "Fixes sound popling if choice alsa"
+msgstr  ""
+msgid   "Choice gui themes"
+msgstr  ""
+msgid   "Allows you to select a theme for PortProton"
+msgstr  ""
+msgid   "SETTINGS USER.CONF"
+msgstr  ""
+msgid   "Open the <b>user.conf</b> settings file in a system text editor to "
+        "view and change variables manually"
+msgstr  ""
 msgid   "The shortcut will be created in the PortProton directory."
 msgstr  ""
@@ -1471,6 +1522,9 @@ msgstr  ""
 msgid   "Mirror changed to:"
 msgstr  ""
+msgid   "Do you actually want to change the scripts version to:"
+msgstr  ""
 msgid   "Branch changed to:"
 msgstr  ""
@@ -1486,6 +1540,9 @@ msgstr  ""
 msgid   "EDIT USER CONFIG"
 msgstr  ""
+msgid   "BACK"
+msgstr  ""
 msgid   "SAVE"
 msgstr  ""
@@ -1515,8 +1572,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"
+        "of this software and associated documentation files (the "
-        "\"), to deal\n"
+        "\"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 "

--- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.mo
+++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.mo
--- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po
+++ b/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-09-04 13:16+0300\n"
+"POT-Creation-Date: 2024-09-12 02:37+0500\n"
-"PO-Revision-Date: 2024-07-16 11:59+0300\n"
+"PO-Revision-Date: 2024-09-12 02:40+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -73,6 +73,18 @@ 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"
+msgid "Settings for user.conf"
+msgstr "Configuración user.conf"
+msgid "Open directory"
+msgstr "directorio abierto"
+msgid "Open directory with <b>.ppdb</b> file"
+msgstr "Abrir directorio con el archivo <b>.ppdb</b>"
 msgid ""
 "Enable vkBasalt by default to improve graphics in games running on Vulkan. "
 "(The HOME hotkey disables vkbasalt)"
@@ -103,12 +115,11 @@ msgstr "GENERAL"
 msgid "SETTINGS"
 msgstr "AJUSTES"
-#, fuzzy
 msgid "MAIN MENU"
-msgstr "MAIN"
+msgstr "MENÚ PRINCIPAL"
 msgid "Main menu"
-msgstr ""
+msgstr "menú principal"
 msgid "DEBUG"
 msgstr "DEPURAR"
@@ -122,12 +133,6 @@ msgstr "INICIAR"
 msgid "Run file ..."
 msgstr "Ejecutar archivo ..."
-msgid "Disable"
-msgstr ""
-msgid "Enable"
-msgstr ""
 msgid "Create shortcut..."
 msgstr "Crear acceso directo..."
@@ -146,27 +151,12 @@ msgstr "Lista de cambios"
 msgid "Change language"
 msgstr "Cambiar idioma"
-msgid "Edit user.conf"
-msgstr "Editar user.conf"
 msgid "Scripts from backup"
 msgstr "Scripts desde la copia de seguridad"
 msgid "Credits"
 msgstr "Creadores"
-msgid "Change mirror to"
-msgstr "Cambiar el espejo a"
-msgid "Change branch to"
-msgstr "Cambiar rama a"
-msgid "Change start gui"
-msgstr "Cambiar la interfaz gráfica de inicio"
-msgid "steam covers download"
-msgstr ""
 msgid "Create prefix backup"
 msgstr "Crear una copia de seguridad del prefijo"
@@ -307,13 +297,11 @@ msgstr ""
 "¿Realmente deseas reinstalar PortProton?\\nPara esto, se requerirá una "
 "conexión a Internet."
-#, fuzzy
 msgid "Please wait for update PortProton"
-msgstr "Actualizar PortProton"
+msgstr "Espere la actualización PortProton"
-#, fuzzy
 msgid "Failed updating PortProton!"
-msgstr "Actualizar PortProton"
+msgstr "¡Error al actualizar PortProton!"
 msgid ""
 "More than one DB file found for the application being launched.\\nSelect the "
@@ -400,6 +388,15 @@ msgstr "Por favor, espera. Instalando el"
 msgid "CHANGELOG"
 msgstr "LISTA DE CAMBIOS"
+msgid "WINEFILE"
+msgstr "WINEFILE"
+msgid "TASKMGR"
+msgstr "GESTOR DE TAREAS"
+msgid "FORCE EXIT"
+msgstr "FORZAR SALIDA"
 msgid "Check new version WINE..."
 msgstr "Comprobar nueva versión de WINE..."
@@ -433,6 +430,8 @@ msgstr "Forzar el uso del protocolo DirectInput en lugar de XInput"
 msgid ""
 "Enable experemental native Wayland support (need special wine build to work)"
 msgstr ""
+"Habilite el soporte experimental nativo de Wayland (necesita una compilación "
+"de vino especial para funcionar)"
 msgid ""
 "Do not use in-process synchronization primitives based on eventfd. (It is "
@@ -709,16 +708,6 @@ msgstr ""
 "Limitar el número de núcleos de CPU es útil para los juegos de Unity (se "
 "recomienda establecer el valor igual a 8)"
-msgid "Choose a graphics card to run the game (in user.conf)"
-msgstr "Elige una tarjeta gráfica para ejecutar el juego (en user.conf)"
-msgid ""
-"Select which video card will be used to run the game (used for all running "
-"games and programs in PortProton)"
-msgstr ""
-"Selecciona qué tarjeta de vídeo se utilizará para ejecutar el juego (se "
-"utiliza para todos los juegos y programas en ejecución en PortProton)"
 msgid "Forcibly select the OpenGL version for the game"
 msgstr "Seleccionar forzosamente la versión de OpenGL para el juego"
@@ -744,12 +733,6 @@ msgstr "Forzar cierta configuración regional para una aplicación:"
 msgid "Fixes encoding issues in legacy software"
 msgstr "Soluciona problemas de codificación en software heredado"
-msgid "Choice wine audio driver"
-msgstr ""
-msgid "Fixes sound popling if choice alsa"
-msgstr ""
 msgid "EDIT DB"
 msgstr "CONFIGURACIÓN"
@@ -1026,6 +1009,13 @@ msgstr ""
 "de rendimiento. (Para juegos más antiguos, se recomienda establecer el valor "
 "en 100)"
+msgid "RESET"
+msgstr "RESET"
+msgid "Restore default settings for"
+msgstr ""
+"Restore default settings for (Restaurar configuraciones predeterminadas para)"
 msgid "DISABLE"
 msgstr "DESACTIVAR "
@@ -1228,15 +1218,15 @@ msgstr ""
 "Activación de la limitación de fps con las herramientas MANGOHUD integradas "
 "en PortProton (Teclas <b>L_SHIFT + F1</b> Activa la limitación de fps)"
-msgid "Disable MangoHud and go to the previous menu"
-msgstr "Desactivar MangoHud y volver al menú anterior"
 msgid "PREVIEW CHANGES"
 msgstr "VISTA PREVIA"
 msgid "Start vkcube for preview changes"
 msgstr "Iniciar vkcube para previsualizar los cambios"
+msgid "Disable MangoHud and go to the previous menu"
+msgstr "Desactivar MangoHud y volver al menú anterior"
 msgid ""
 "Use DirectX12 for dgVoodoo2. Doesnt always work better. (Working only on "
 "newest and stable dxvk/vkd3d) (Direct3D and Glide settings)"
@@ -1529,13 +1519,6 @@ msgstr ""
 "calculado a partir de la aplicación y resolución forzada. (Configuraciones "
 "de Direct3D y Glide)"
-msgid "RESET"
-msgstr "RESET"
-msgid "Restore default settings for"
-msgstr ""
-"Restore default settings for (Restaurar configuraciones predeterminadas para)"
 msgid "Disable dgVoodoo2 and go to the previous menu"
 msgstr ""
 "Disable dgVoodoo2 and go to the previous menu (Deshabilitar dgVoodoo2 y "
@@ -1638,24 +1621,20 @@ msgstr ""
 "Forzar el uso del controlador de video SDL x11, funciona con el backend SDL. "
 "(Por defecto es Wayland)."
-msgid ""
-"Fixes artifacts on AMD and Intel video cards. (Use only when necessary)."
-msgstr ""
-"Corrige artefactos en tarjetas de video AMD e Intel. (Usar solo cuando sea "
-"necesario)."
 msgid "Change settings gamescope for"
 msgstr "Cambiar ajustes gamescope para"
+#, sh-format
 msgid ""
 "<b>Gamescope is not detected on the system, to install it, run the command "
 "in the terminal:\\n flatpak install -y runtime/org.freedesktop.Platform."
-"VulkanLayer.gamescope/x86_64/23.08\\n (Can be selected and copied)</b>"
+"VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n (Can be selected and "
+"copied)</b>"
 msgstr ""
 " <b>Gamescope no se detecta en el sistema, para instalarlo, ejecute el "
 "comando en el terminal:\\n flatpak install -y runtime/org.freedesktop."
-"Platform.VulkanLayer.gamescope/x86_64/23.08\\n (Se puede seleccionar y "
+"Platform.VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n (Se puede "
-"copiar)</b>."
+"seleccionar y copiar)</b>."
 msgid ""
 "<b>Gamescope is not detected on the system, please contact the manufacturer "
@@ -1783,6 +1762,91 @@ msgstr ""
 msgid "Disable GameScope and go to the previous menu"
 msgstr "Desactivar GameScope e ir al menú anterior"
+msgid "Disable"
+msgstr "Desactivar"
+msgid "Enable"
+msgstr "Permitir"
+msgid "Change settings for"
+msgstr "Cambiar la configuración de"
+msgid "Change mirror to"
+msgstr "Cambiar el espejo a"
+msgid ""
+"Depending on which mirror is selected, updates will be downloaded from there."
+msgstr ""
+"Dependiendo del espejo seleccionado, las actualizaciones se descargarán "
+"desde allí."
+msgid "Change branch to"
+msgstr "Cambiar rama a"
+msgid ""
+"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."
+msgstr ""
+"Dependiendo de la versión de los scripts, PortProton recibirá primero los "
+"últimos cambios (la rama DEVEL), la rama STABLE se actualiza más tarde y es "
+"estable."
+msgid "Change start gui to"
+msgstr "Cambiar la interfaz gráfica de inicio a"
+msgid ""
+"When using PANED in the game start menu, additional buttons are located on "
+"one large page; if NOTEBOOK, then they are divided into several."
+msgstr ""
+"Cuando se usa PANED en el menú de inicio del juego, los botones adicionales "
+"se encuentran en una página grande; si CUADERNO, entonces se dividen en "
+"varios."
+msgid "steam covers download"
+msgstr "descargar portadas de steam"
+msgid ""
+"If downloading steam covers is enabled, they will be downloaded and created. "
+"(Disablement is provided in cases where their downloading is unavailable for "
+"some reason)"
+msgstr ""
+"Si la descarga de portadas de Steam está habilitada, se descargarán y "
+"crearán. (La desactivación se proporciona en los casos en que su descarga no "
+"esté disponible por algún motivo)"
+msgid "Choose a graphics card to run the game"
+msgstr "Elige una tarjeta gráfica para ejecutar el juego"
+msgid ""
+"Select which video card will be used to run the game (used for all running "
+"games and programs in PortProton)"
+msgstr ""
+"Selecciona qué tarjeta de vídeo se utilizará para ejecutar el juego (se "
+"utiliza para todos los juegos y programas en ejecución en PortProton)"
+msgid "Choice wine audio driver"
+msgstr "Controlador de audio de vino elegido"
+msgid "Fixes sound popling if choice alsa"
+msgstr "Corrige el sonido estallido de elección alsa alsa"
+msgid "Choice gui themes"
+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"
+msgstr "AJUSTES USUARIO.CONF"
+msgid ""
+"Open the <b>user.conf</b> settings file in a system text editor to view and "
+"change variables manually"
+msgstr ""
+"Abre el archivo de configuración <b>user.conf</b> en un editor de texto del "
+"sistema para ver y cambiar las variables manualmente"
 msgid "The shortcut will be created in the PortProton directory."
 msgstr "El acceso directo se creará en el directorio de PortProton."
@@ -1827,10 +1891,10 @@ msgid "using wine:"
 msgstr "usando vino:"
 msgid "Libraries"
-msgstr ""
+msgstr "Bibliotecas"
 msgid "Information"
-msgstr ""
+msgstr "Información"
 msgid "Select fonts to install in prefix:"
 msgstr "Seleccionar fuentes para instalar en prefijo:"
@@ -1841,19 +1905,17 @@ msgstr "Cambiar la configuración del prefijo:"
 msgid "PREFIX MANAGER"
 msgstr "GESTOR DE PREFIJOS"
-#, fuzzy
 msgid "FORCE INSTALL"
-msgstr "SALIDA FORZADA"
+msgstr "INSTALACIÓN FORZADA"
 msgid "Installation with forced redownload of libraries"
-msgstr ""
+msgstr "Instalación con recarga forzada de bibliotecas."
-#, fuzzy
 msgid "INSTALL"
-msgstr "INSTALADO"
+msgstr "INSTALAR"
 msgid "Standard installation."
-msgstr ""
+msgstr "Instalación estándar."
 msgid "DLLS"
 msgstr "DLLS"
@@ -1862,12 +1924,11 @@ msgid "FONTS"
 msgstr "FUENTES"
 msgid "Attention working version of vulkan not detected!"
-msgstr ""
+msgstr "¡Atención, no se detectó la versión funcional de vulkan!"
-#, fuzzy
 msgid "It is recommended to run games in OpenGL (low performance possible)!"
 msgstr ""
-"Se recomienda ejecutar los juegos en\\ OpenGL (bajo rendimiento posible)!"
+"¡Se recomienda ejecutar juegos en OpenGL (es posible un rendimiento bajo)!"
 msgid ""
 "PortProton was launched in creation mode PortProton.log and it is "
@@ -1913,23 +1974,29 @@ msgstr "¿Realmente desea eliminar PortProton?"
 msgid "Mirror changed to:"
 msgstr "Espejo cambiado a:"
+msgid "Do you actually want to change the scripts version to:"
+msgstr "¿Realmente desea cambiar la versión de los scripts a:"
 msgid "Branch changed to:"
 msgstr "Rama cambiada a:"
 msgid "Cover downloads are disabled"
-msgstr ""
+msgstr "Las descargas de portadas están deshabilitadas."
 msgid "Cover downloads are enabled"
-msgstr ""
+msgstr "Las descargas de portadas están habilitadas."
 msgid "Gui start changed to:"
 msgstr "Inicio Gui cambiado a:"
 msgid "EDIT USER CONFIG"
-msgstr ""
+msgstr "EDITAR CONFIGURACIÓN DE USUARIO"
+msgid "BACK"
+msgstr "ATRÁS"
 msgid "SAVE"
-msgstr ""
+msgstr "AHORRAR"
 #, sh-format
 msgid ""
@@ -2026,9 +2093,8 @@ msgstr ""
 msgid "ABOUT PORTPROTON"
 msgstr ""
-#, fuzzy
 msgid "AUTORS"
-msgstr "EMULADORES"
+msgstr ""
 msgid "LICENSE"
 msgstr ""
@@ -2042,11 +2108,11 @@ msgstr ""
 msgid "THIRD PARTY LIBRARIES"
 msgstr ""
-#~ msgid "WINEFILE"
+#~ msgid ""
-#~ msgstr "WINEFILE"
+#~ "Fixes artifacts on AMD and Intel video cards. (Use only when necessary)."
+#~ msgstr ""
-#~ msgid "TASKMGR"
+#~ "Corrige artefactos en tarjetas de video AMD e Intel. (Usar solo cuando "
-#~ msgstr "GESTOR DE TAREAS"
+#~ "sea necesario)."
 #, sh-format
 #~ msgid "Add arguments for GAMESCOPE:"

--- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo
+++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo
--- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
+++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-04 13:16+0300\n"
+"POT-Creation-Date: 2024-09-12 02:37+0500\n"
-"PO-Revision-Date: 2024-08-26 14:07+0300\n"
+"PO-Revision-Date: 2024-09-12 02:39+0500\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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
 "X-Generator: Poedit 3.4.4\n"
 msgid ""
@@ -73,6 +73,18 @@ msgstr "Основные настройки"
 msgid "Edit database file for"
 msgstr "Редактировать файл настроек для"
+msgid "Settings user.conf"
+msgstr "Настройки user.conf"
+msgid "Settings for user.conf"
+msgstr "Настройки для user.conf"
+msgid "Open directory"
+msgstr "Открыть папку"
+msgid "Open directory with <b>.ppdb</b> file"
+msgstr "Открывает папку с <b>.ppdb</b> файлом"
 msgid ""
 "Enable vkBasalt by default to improve graphics in games running on Vulkan. "
 "(The HOME hotkey disables vkbasalt)"
@@ -121,12 +133,6 @@ msgstr "ЗАПУСТИТЬ"
 msgid "Run file ..."
 msgstr "Запустить файл..."
-msgid "Disable"
-msgstr "Выключить"
-msgid "Enable"
-msgstr "Включить"
 msgid "Create shortcut..."
 msgstr "Создать ярлык..."
@@ -145,27 +151,12 @@ msgstr "История изменений"
 msgid "Change language"
 msgstr "Сменить язык"
-msgid "Edit user.conf"
-msgstr "Редактировать user.conf"
 msgid "Scripts from backup"
 msgstr "Откатить версию скриптов"
 msgid "Credits"
 msgstr "Авторы и благодарности"
-msgid "Change mirror to"
-msgstr "Сменить зеркало на"
-msgid "Change branch to"
-msgstr "Сменить версию на"
-msgid "Change start gui"
-msgstr "Изменить интерфейс запуска"
-msgid "steam covers download"
-msgstr "скачивание обложек для steam"
 msgid "Create prefix backup"
 msgstr "Создать резервную копию префикса"
@@ -393,6 +384,15 @@ msgstr "Пожалуйста, подождите. Устанавливается
 msgid "CHANGELOG"
 msgstr "ИЗМЕНЕНИЯ"
+msgid "WINEFILE"
+msgstr "ФАЙЛОВЫЙ МЕНЕДЖЕР"
+msgid "TASKMGR"
+msgstr "ДИСПЕТЧЕР ЗАДАЧ"
+msgid "FORCE EXIT"
+msgstr "ПРИНУДИТЕЛЬНЫЙ ВЫХОД"
 msgid "Check new version WINE..."
 msgstr "Проверяем новые версии WINE..."
@@ -714,16 +714,6 @@ msgstr ""
 "Ограничение количества ядер процессора. Полезно, например, для игр на движке "
 "Unity, для которого рекомендуется установить значение равное 8"
-msgid "Choose a graphics card to run the game (in user.conf)"
-msgstr "Выбрать видеокарту для запуска игры (в user.conf)"
-msgid ""
-"Select which video card will be used to run the game (used for all running "
-"games and programs in PortProton)"
-msgstr ""
-"Выбор видеокарты для запуска игры (используется для всех запущенных игр и "
-"программ в PortProton)"
 msgid "Forcibly select the OpenGL version for the game"
 msgstr "Принудительно выбрать версию OpenGL для игры"
@@ -749,12 +739,6 @@ msgstr ""
 "Исправляет кодировку в устаревших приложениях. Необходимо, например, для "
 "запуска старых графических новелл (Chaos;Head)"
-msgid "Choice wine audio driver"
-msgstr "Выбрать звуковой драйвер (в user.conf)"
-msgid "Fixes sound popling if choice alsa"
-msgstr "Выбор alsa исправляет заикание звука"
 msgid "EDIT DB"
 msgstr "НАСТРОЙКИ"
@@ -1033,6 +1017,12 @@ msgstr ""
 "потерей производительности (для старых игр рекомендуется устанавливать "
 "значение 50-100 в зависимости от разрешения экрана)"
+msgid "RESET"
+msgstr "СБРОС"
+msgid "Restore default settings for"
+msgstr "Восстановить настройки по умолчанию"
 msgid "DISABLE"
 msgstr "ОТКЛЮЧИТЬ"
@@ -1239,15 +1229,15 @@ msgstr ""
 "Включить лимит FPS с помощью MANGOHUD (сочетание <b>L_SHIFT + F1</b> "
 "переключает лимиты)"
-msgid "Disable MangoHud and go to the previous menu"
-msgstr "Отключить MangoHud и перейти в предыдущее меню"
 msgid "PREVIEW CHANGES"
 msgstr "ПРЕДПРОСМОТР"
 msgid "Start vkcube for preview changes"
 msgstr "Запустить vkcube для предпросмотра изменений"
+msgid "Disable MangoHud and go to the previous menu"
+msgstr "Отключить MangoHud и перейти в предыдущее меню"
 msgid ""
 "Use DirectX12 for dgVoodoo2. Doesnt always work better. (Working only on "
 "newest and stable dxvk/vkd3d) (Direct3D and Glide settings)"
@@ -1500,12 +1490,6 @@ msgstr ""
 "Задать вручную размер курсора в игре, если при увеличении изображения "
 "увеличивается курсор (Direct3D + Glide)"
-msgid "RESET"
-msgstr "СБРОС"
-msgid "Restore default settings for"
-msgstr "Восстановить настройки по умолчанию"
 msgid "Disable dgVoodoo2 and go to the previous menu"
 msgstr "Отключить dgVoodoo2 и перейти в предыдущее меню"
@@ -1609,23 +1593,20 @@ msgstr ""
 "запуском), работает вместе с SDL BACKEND (используется по умолчанию в "
 "Wayland сессии)"
-msgid ""
-"Fixes artifacts on AMD and Intel video cards. (Use only when necessary)."
-msgstr ""
-"Устраняет артефакты на видеокартах AMD и Intel (использовать только при "
-"необходимости)"
 msgid "Change settings gamescope for"
 msgstr "Изменить настройки Gamescope для"
+#, sh-format
 msgid ""
 "<b>Gamescope is not detected on the system, to install it, run the command "
 "in the terminal:\\n flatpak install -y runtime/org.freedesktop.Platform."
-"VulkanLayer.gamescope/x86_64/23.08\\n (Can be selected and copied)</b>"
+"VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n (Can be selected and "
+"copied)</b>"
 msgstr ""
 "<b>Gamescope не найден в системе, для его установки выполните команду в "
 "терминале:\\n flatpak install -y runtime/org.freedesktop.Platform."
-"VulkanLayer.gamescope/x86_64/23.08\\n (можно выделить и скопировать)</b>"
+"VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n (можно выделить и "
+"скопировать)</b>"
 msgid ""
 "<b>Gamescope is not detected on the system, please contact the manufacturer "
@@ -1755,6 +1736,90 @@ msgstr ""
 msgid "Disable GameScope and go to the previous menu"
 msgstr "Отключить Gamescope и перейти в предыдущее меню"
+msgid "Disable"
+msgstr "Выключить"
+msgid "Enable"
+msgstr "Включить"
+msgid "Change settings for"
+msgstr "Изменить настройки для"
+msgid "Change mirror to"
+msgstr "Сменить зеркало на"
+msgid ""
+"Depending on which mirror is selected, updates will be downloaded from there."
+msgstr ""
+"В зависимости от того, какое выбрано зеркало, оттуда и будут загружаться "
+"обновления."
+msgid "Change branch to"
+msgstr "Сменить версию на"
+msgid ""
+"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."
+msgstr ""
+"В зависимости от версии скриптов, PortProton будет получать самые последнее "
+"изменения раньше всех (ветка DEVEL), ветка STABLE обновляется позже и "
+"является стабильной."
+msgid "Change start gui to"
+msgstr "Изменить интерфейс запуска на"
+msgid ""
+"When using PANED in the game start menu, additional buttons are located on "
+"one large page; if NOTEBOOK, then they are divided into several."
+msgstr ""
+"При использовании PANED в меню запуске игры дополнительные кнопки находятся "
+"на одной большой странице, если NOTEBOOK, то поделены на несколько."
+msgid "steam covers download"
+msgstr "скачивание обложек для steam"
+msgid ""
+"If downloading steam covers is enabled, they will be downloaded and created. "
+"(Disablement is provided in cases where their downloading is unavailable for "
+"some reason)"
+msgstr ""
+"Если скачивания обложек steam включено, то они будут загружаться и "
+"создаваться. (Отключение предусмотрено в тех случаях, когда их скачивание по "
+"каким-то причинам недоступно)"
+msgid "Choose a graphics card to run the game"
+msgstr "Выбрать видеокарту для запуска игры"
+msgid ""
+"Select which video card will be used to run the game (used for all running "
+"games and programs in PortProton)"
+msgstr ""
+"Выбор видеокарты для запуска игры (используется для всех запущенных игр и "
+"программ в PortProton)"
+msgid "Choice wine audio driver"
+msgstr "Выбрать звуковой драйвер"
+msgid "Fixes sound popling if choice alsa"
+msgstr "Выбор alsa исправляет заикание звука"
+msgid "Choice gui themes"
+msgstr "Выбор графической темы"
+msgid "Allows you to select a theme for PortProton"
+msgstr "Позволяет выбрать тему для PortProton"
+msgid "SETTINGS USER.CONF"
+msgstr "НАСТРОЙКИ USER.CONF"
+msgid ""
+"Open the <b>user.conf</b> settings file in a system text editor to view and "
+"change variables manually"
+msgstr ""
+"Открыть файл настроек <b>user.conf</b> в системном текстовом редакторе, "
+"чтобы просмотреть и изменить переменные вручную"
 msgid "The shortcut will be created in the PortProton directory."
 msgstr "Ярлык будет создан в каталоге PortProton."
@@ -1881,6 +1946,9 @@ msgstr "Вы действительно хотите удалить PortProton?"
 msgid "Mirror changed to:"
 msgstr "Зеркало для скачивания изменено на:"
+msgid "Do you actually want to change the scripts version to:"
+msgstr "Вы действительно хотите изменить версию скриптов на:"
 msgid "Branch changed to:"
 msgstr "Версия изменена на:"
@@ -1896,6 +1964,9 @@ msgstr "Интерфейс запуска изменён на:"
 msgid "EDIT USER CONFIG"
 msgstr "РЕДАКТИРОВАТЬ USER.CONF"
+msgid "BACK"
+msgstr "НАЗАД"
 msgid "SAVE"
 msgstr "СОХРАНИТЬ"
@@ -2073,6 +2144,15 @@ msgstr "ПРИСОЕДЕНИТЬСЯ"
 msgid "THIRD PARTY LIBRARIES"
 msgstr "БИБЛИОТЕКИ"
+#~ msgid "Open game folder"
+#~ msgstr "Открыть папку с игрой"
+#~ msgid ""
+#~ "Fixes artifacts on AMD and Intel video cards. (Use only when necessary)."
+#~ msgstr ""
+#~ "Устраняет артефакты на видеокартах AMD и Intel (использовать только при "
+#~ "необходимости)"
 #~ msgid ""
 #~ "Author:   Casro-Fidel (Mikhail Tergoev)\n"
 #~ "\n"
@@ -2132,12 +2212,6 @@ msgstr "БИБЛИОТЕКИ"
 #~ "Vuursteen\n"
 #~ "Akai\n"
-#~ msgid "WINEFILE"
-#~ msgstr "ФАЙЛОВЫЙ МЕНЕДЖЕР"
-#~ msgid "TASKMGR"
-#~ msgstr "ДИСПЕТЧЕР ЗАДАЧ"
 #~ msgid ""
 #~ "Forced use of 16bit screen mode. Solves the problem of launching old "
 #~ "games, such as Moto Racer."

--- a/data_from_portwine/scripts/add_in_steam.sh
+++ b/data_from_portwine/scripts/add_in_steam.sh
@@ -72,12 +72,12 @@ function setGameArt {
 		GAMEARTBASE="$( basename "$GAMEARTSOURCE" )"
 		GAMEARTDEST="${SGGRIDDIR}/${GAMEARTAPPID}${GAMEARTSUFFIX}.${GAMEARTBASE#*.}"  # path to filename in grid e.g. turns "/home/gaben/GamesArt/cs2_hero.png" into "~/.local/share/Steam/userdata/1234567/config/grid/4440654_hero.png"
-		if [ -n "$GAMEARTSOURCE" ]; then
+		if [[ -n "$GAMEARTSOURCE" ]] ; then
-			if [ -f "$GAMEARTDEST" ]; then
+			if [[ -f "$GAMEARTDEST" ]] ; then
 				rm "$GAMEARTDEST"
 			fi
-			if [ -f "$GAMEARTSOURCE" ]; then
+			if [[ -f "$GAMEARTSOURCE" ]] ; then
 				$GAMEARTCMD "$GAMEARTSOURCE" "$GAMEARTDEST"
 			fi
 		fi
@@ -143,12 +143,12 @@ function downloadArtFromSteamGridDB {
    SGDB_ENDPOINT_STR="${SEARCHENDPOINT}/$(echo "$SEARCHID" | awk '{print $1}' | paste -s -d, -)?"
-    [ -n "$SEARCHSTYLES" ] && SGDB_ENDPOINT_STR+="&styles=${SEARCHSTYLES}"
+    [[ -n "$SEARCHSTYLES" ]] && SGDB_ENDPOINT_STR+="&styles=${SEARCHSTYLES}"
-    [ -n "$SEARCHDIMS" ] && SGDB_ENDPOINT_STR+="&dimensions=${SEARCHDIMS}"
+    [[ -n "$SEARCHDIMS" ]] && SGDB_ENDPOINT_STR+="&dimensions=${SEARCHDIMS}"
-    [ -n "$SEARCHTYPES" ] && SGDB_ENDPOINT_STR+="&types=${SEARCHTYPES}"
+    [[ -n "$SEARCHTYPES" ]] && SGDB_ENDPOINT_STR+="&types=${SEARCHTYPES}"
-    [ -n "$SEARCHNSFW" ] && SGDB_ENDPOINT_STR+="&nsfw=${SEARCHNSFW}"
+    [[ -n "$SEARCHNSFW" ]] && SGDB_ENDPOINT_STR+="&nsfw=${SEARCHNSFW}"
-    [ -n "$SEARCHHUMOR" ] && SGDB_ENDPOINT_STR+="&humor=${SEARCHHUMOR}"
+    [[ -n "$SEARCHHUMOR" ]] && SGDB_ENDPOINT_STR+="&humor=${SEARCHHUMOR}"
-    [ -n "$SEARCHEPILEPSY" ] && SGDB_ENDPOINT_STR+="&epilepsy=${SEARCHEPILEPSY}"
+    [[ -n "$SEARCHEPILEPSY" ]] && SGDB_ENDPOINT_STR+="&epilepsy=${SEARCHEPILEPSY}"
    set -o pipefail
    RESPONSE=$(curl -H "Authorization: Bearer $SGDBAPIKEY" -s "$SGDB_ENDPOINT_STR" 2> >(grep -v "SSL_INIT"))
@@ -193,17 +193,17 @@ function downloadArtFromSteamGridDB {
            DLDST="${GRIDDLDIR}/${SGDBFILENAME}.${GRIDDLURL##*.}"
            STARTDL=1
-            if [ -f "$DLDST" ]; then
+            if [[ -f "$DLDST" ]] ; then
-                if [ "$SGDBHASFILE" == "backup" ]; then
+                if [[ "$SGDBHASFILE" == "backup" ]] ; then
                    BACKDIR="${GRIDDLDIR}/backup"
                    mkdir -p "$BACKDIR"
                    mv "$DLDST" "$BACKDIR"
-                elif [ "$SGDBHASFILE" == "replace" ]; then
+                elif [[ "$SGDBHASFILE" == "replace" ]] ; then
                    rm "$DLDST" 2>/dev/null
                fi
            fi
-            if [ "$STARTDL" -eq 1 ]; then
+            if [[ "$STARTDL" -eq 1 ]] ; then
 				filename="$(basename "$DLDST")"
                curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$DLSRC" -o "$DLDST" 2>&1 | \
                 tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \
@@ -217,7 +217,7 @@ function downloadArtFromSteamGridDB {
    done
 }
-if [ -f "$SCPATH" ]; then
+if [[ -f "$SCPATH" ]] ; then
 	cp "$SCPATH" "${SCPATH//.vdf}_${PROGNAME}_backup.vdf" 2>/dev/null
 	truncate -s-2 "$SCPATH"
 	OLDSET="$(grep -aPo '\x00[0-9]\x00\x02appid' "$SCPATH" | tail -n1 | tr -dc '0-9')"
@@ -231,11 +231,11 @@ fi
 function getSGDBGameIDFromTitle {
 	SGDBSEARCHNAME="$1"
-	if [ -n "$SGDBSEARCHNAME" ]; then
+	if [[ -n "$SGDBSEARCHNAME" ]] ; then
 		SGDBSEARCHENDPOINT="${BASESTEAMGRIDDBAPI}/search/autocomplete/${SGDBSEARCHNAME}"
 		SGDBSEARCHNAMERESP="$(curl -H "Authorization: Bearer $SGDBAPIKEY" -s "$SGDBSEARCHENDPOINT" 2>  >(grep -v "SSL_INIT") )"
 		if jq -e '.success' 1> /dev/null <<< "$SGDBSEARCHNAMERESP"; then
-			if [ "$(jq '.data | length' <<< "$SGDBSEARCHNAMERESP" )" -gt 0 ]; then
+			if [[ "$(jq '.data | length' <<< "$SGDBSEARCHNAMERESP" )" -gt 0 ]] ; then
 				SGDBSEARCH_FOUNDNAME="$(jq '.data[0].name' <<< "$SGDBSEARCHNAMERESP" )"
 				SGDBSEARCH_FOUNDGAID="$(jq '.data[0].id' <<< "$SGDBSEARCHNAMERESP" )"
@@ -280,10 +280,10 @@ function commandlineGetSteamGridDBArtwork {
 	done
 	# If we pass a name to search on and we get a Game ID back from SteamGridDB, set this as the ID to search for artwork on
-	if [ -n "$GSGDBA_SEARCHNAME" ]; then
+	if [[ -n "$GSGDBA_SEARCHNAME" ]] ; then
-		if [ -n "$GSGDBA_FILENAME" ]; then
+		if [[ -n "$GSGDBA_FILENAME" ]] ; then
 			GSGDBA_FOUNDGAMEID="$( getSGDBGameIDFromTitle "$GSGDBA_SEARCHNAME" )"
-			if [ -n "$GSGDBA_FOUNDGAMEID" ]; then
+			if [[ -n "$GSGDBA_FOUNDGAMEID" ]] ; then
 				GSGDBA_APPID="$GSGDBA_FOUNDGAMEID"
 				SGDBENDPOINTTYPE="game"
 			fi
@@ -327,7 +327,7 @@ NOSTSEARCHID=""  # ID to search for the SteamGridDB artwork on (either Steam App
 NOSTSEARCHFLAG="--nonsteam"  # Whether to search using a Steam AppID or SteamGridDB Game ID (will be set to --steam if we get an AppID)
 # Only add NOSTAPPNAME as fallback if we don't have an ID to search on, because commandlineGetSteamGridDBArtwork will prefer name over ID, so if we have to fall back to Non-Steam Name (i.e. no entered custom name) then only do so if we don't have an ID given
-if [ -n "$NOSTAPPNAME" ]; then
+if [[ -n "$NOSTAPPNAME" ]] ; then
 	NOSTSEARCHNAME="$NOSTAPPNAME"
 	NOSTSEARCHNAME="${NOSTSEARCHNAME// /_}"
 fi

--- a/data_from_portwine/scripts/clear_db.sh
+++ b/data_from_portwine/scripts/clear_db.sh
@@ -9,7 +9,7 @@ IFS=$'\n'
 unset DUPLICATE
 DUPLICATE="$(cat "$SELF_PATH/portwine_db/"* | grep -E ".exe" | grep '#' | uniq -D | sort -u)"
-if [[ ! -z "$DUPLICATE" ]] ; then
+if [[ -n "$DUPLICATE" ]] ; then
    for duplicate_db in $DUPLICATE ; do
        echo -e "\nDuplicate:"
        grep -E "$duplicate_db" "$SELF_PATH/portwine_db/"* | awk -F"portwine_db/" '{print $2}'

--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
--- a/data_from_portwine/scripts/portwine_db/Anno4.ppdb
+++ b/data_from_portwine/scripts/portwine_db/Anno4.ppdb
@@ -12,7 +12,7 @@ fi
 export PW_VULKAN_USE=1
 add_in_start_portwine () {
-    if [ -d "${WINEPREFIX}/drive_c/users/steamuser/AppData/Roaming/Ubisoft/Anno1404/Config/" ] ; then
+    if [[ -d "${WINEPREFIX}/drive_c/users/steamuser/AppData/Roaming/Ubisoft/Anno1404/Config/" ]] ; then
        sed -i 's/<DirectXVersion>0<\/DirectXVersion>/<DirectXVersion>9<\/DirectXVersion>/' "${WINEPREFIX}/drive_c/users/steamuser/AppData/Roaming/Ubisoft/Anno1404/Config/Engine.ini"
    fi
 }
--- a/data_from_portwine/scripts/portwine_db/Frozen Throne.ppdb
+++ b/data_from_portwine/scripts/portwine_db/Frozen Throne.ppdb
@@ -5,6 +5,6 @@
 ################################################
 export PW_VULKAN_USE=0
 export LAUNCH_PARAMETERS=""
-if [ -d "${PATH_TO_GAME}"/Movies ] ; then
+if [[ -d "${PATH_TO_GAME}"/Movies ]] ; then
    mv "${PATH_TO_GAME}"/Movies "${PATH_TO_GAME}"/Movies_bak
 fi
--- a/data_from_portwine/scripts/portwine_db/GalaxyClient.ppdb
+++ b/data_from_portwine/scripts/portwine_db/GalaxyClient.ppdb
@@ -13,7 +13,7 @@ export PW_WINE_USE="WINE_LG"
 add_in_start_portwine ()
 {
-if [ -e "${WINEPREFIX}/drive_c/users/${USER}/Local Settings/Application Data/GOG.com/Galaxy/Configuration/config.json" ] ; then
+if [[ -e "${WINEPREFIX}/drive_c/users/${USER}/Local Settings/Application Data/GOG.com/Galaxy/Configuration/config.json" ]] ; then
    sed -i 's/"featureOverlay" : true,/"featureOverlay" : false,/' "${WINEPREFIX}/drive_c/${USER}/Local Settings/Application Data/GOG.com/Galaxy/Configuration/config.json"
 fi
 }
--- a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher.ppdb
+++ b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher.ppdb
@@ -11,13 +11,13 @@
    export PW_USE_D3D_EXTRAS=0
    ## export DXVK_HUD=fps,devinfo
 #####################examples###########################
-while [ `pidof -s dotNetFx40_Full_x86_x64.exe` ] ; do
+while [[ $(pidof -s dotNetFx40_Full_x86_x64.exe) ]] ; do
-    if  [ $? -eq 0 ] ; then
+    if [[ $? -eq 0 ]] ; then
        sleep 1
    else
-        export dotnet_pids=`ps -ax | grep mscorsvw.exe | awk '{print $1}' | uniq`
+        dotnet_pids=$(ps -ax | grep mscorsvw.exe | awk '{print $1}' | uniq)
-        [ ! -z $dotnet_pids ]
+        export dotnet_pids
-        kill -n 9 $dotnet_pids
+        [[ -n "$dotnet_pids" ]] && kill -n 9 "$dotnet_pids"
        sleep 1
    fi
 done
--- a/data_from_portwine/scripts/portwine_db/gfclient.ppdb
+++ b/data_from_portwine/scripts/portwine_db/gfclient.ppdb
@@ -10,10 +10,10 @@ export WINEDLLOVERRIDES="gfclient0_msvc140=n;ucrtbase=b"
 #add_in_start_portwine () {
 #
 #while true; do
-#    if  [ -z "`pgrep GameforgeClient`" ]; then 
+#    if  [[ -z "`pgrep GameforgeClient`" ]] ; then 
 #        sleep 1
 #    else
-#        while [ ! -z "`pgrep GameforgeClient`" ] ; do
+#        while [[ -n "`pgrep GameforgeClient`" ]] ; do
 #                killall -s KILL gfservice.exe
 #        done
 #            sleep 1

--- a/data_from_portwine/scripts/portwine_db/medal-of-honor-allied-assault-war-chest.ppdb
+++ b/data_from_portwine/scripts/portwine_db/medal-of-honor-allied-assault-war-chest.ppdb
@@ -12,7 +12,7 @@ export MESA_EXTENSION_MAX_YEAR=2002
 export __GL_ExtensionStringVersion=17700
 add_in_start_portwine ()
 {
-if [ ! -e "$PATH_TO_GAME/0_Proton_PW_MoHAA" ] ; then
+if [[ ! -e "$PATH_TO_GAME/0_Proton_PW_MoHAA" ]] ; then
    touch "$PATH_TO_GAME/0_Proton_PW_MoHAA" && mv "$PATH_TO_GAME/main/newconfig.cfg" "$PATH_TO_GAME/main/newconfig.cfg.bak" && mv "$PATH_TO_GAME/main/configs/unnamedsoldier.cfg" "$PATH_TO_GAME/main/configs/unnamedsoldier.cfg.bak" && mv "$PATH_TO_GAME/mainta/newconfig.cfg" "$PATH_TO_GAME/mainta/newconfig.cfg.bak" && mv "$PATH_TO_GAME/mainta/configs/unnamedsoldier.cfg" "$PATH_TO_GAME/mainta/configs/unnamedsoldier.cfg.bak" && mv "$PATH_TO_GAME/maintt/newconfig.cfg" "$PATH_TO_GAME/maintt/newconfig.cfg.bak" && mv "$PATH_TO_GAME/maintt/configs/unnamedsoldier.cfg" "$PATH_TO_GAME/maintt/configs/unnamedsoldier.cfg.bak" &&
    echo '//
 // Video Card Family: NVidia GeForce

--- a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE
@@ -2,12 +2,12 @@
 # Author: chal55rus (Sergey P.), cefeiko, Castro-Fidel (linux-gaming.ru)
 ##########################################################################
 pw_shutdown_please () {
-    if [ "$PW_USE_RUNTIME" != 1 ]
+    if [[ "$PW_USE_RUNTIME" != 1 ]]
    then echo "PW_USE_RUNTIME: `echo $PW_USE_RUNTIME`"
    else
        sleep 10
        while true ; do
-            if  [ -z "`ps aux | grep -v grep | grep -wm 1 "$1" | awk '{print $2}'`" ] && [ ! -z "`pgrep wrap | head -n 1`" ]; then
+            if  [[ -z "`ps aux | grep -v grep | grep -wm 1 "$1" | awk '{print $2}'`" ]] && [[ -n "`pgrep wrap | head -n 1`" ]] ; then
                echo -e "PID "$1" not found"
                sleep 1
            else

--- a/data_from_portwine/scripts/pw_autoinstall/PW_OSU
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_OSU
@@ -12,7 +12,7 @@ export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files (x86)/OSU/osu!.ex
 if try_download "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
    pw_start_progress_bar_install_game "OSU!."
-    if  [ -f "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" ]; then
+    if  [[ -f "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" ]] ; then
        mv -f  "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!.exe"
    fi
    export portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/OSU/osu!.exe"

--- a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM
@@ -9,7 +9,7 @@ then
    pw_start_progress_bar_install_game "Steam."
    pw_kill_autostart steam.exe &
    pw_run "${PW_AUTOINSTALL_EXE}"
-    if [ -f "$WINEPREFIX/drive_c/Program Files (x86)/Steam/Steam.exe" ]
+    if [[ -f "$WINEPREFIX/drive_c/Program Files (x86)/Steam/Steam.exe" ]]
    then mv -f "$WINEPREFIX/drive_c/Program Files (x86)/Steam/Steam.exe" "$WINEPREFIX/drive_c/Program Files (x86)/Steam/steam.exe"
    fi
    portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Steam/steam.exe"

--- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB
@@ -7,7 +7,7 @@ export PW_VULKAN_USE=1
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/wos_client.exe"
 WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseabattle.com/download2 2>/dev/null | grep 'installer.exe' | awk -F'xsolla-launcher-update/' '{print $2}' | awk -F'/' '{print $1}')"
-[[ ! -z "$WOSB_VERSION" ]] && print_info "Found version: $WOSB_VERSION" || yad_error "Error while get version of WOSB INSTALLER."
+[[ -n "$WOSB_VERSION" ]] && print_info "Found version: $WOSB_VERSION" || yad_error "Error while get version of WOSB INSTALLER."
 start_portwine
 if try_download "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror

--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -98,7 +98,7 @@ unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_T
 unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
 unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
 unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
-unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR
+unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_COMMENT_DB
 export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
 rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
@@ -177,7 +177,7 @@ try_remove_file "${PW_TMPFS_PATH}/update_pfx_log"
 source "${USER_CONF}"
 # check PortProton theme
-if [[ ! -z "$GUI_THEME" ]] \
+if [[ -n "$GUI_THEME" ]] \
 && [[ -f "$PW_GUI_THEMES_PATH/$GUI_THEME.pptheme" ]]
 then
    # shellcheck source=/dev/null
@@ -247,7 +247,7 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
            export GAMESCOPE_INSTALLED="1"
        else
            print_error "gamescope - broken!"
-            if [[ -n $PW_DEBUG ]] ; then
+            if [[ -n "$PW_DEBUG" ]] ; then
                debug_timer --start
                timeout 5 gamescope --help
                debug_timer --end "gamescope"
@@ -258,13 +258,13 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
    fi
    if command -v vulkaninfo &>/dev/null ; then
-        if timeout 3 vulkaninfo --summary &> "${PW_TMPFS_PATH}/vulkaninfo.tmp" ; then
+        if timeout 3 vulkaninfo &> "${PW_TMPFS_PATH}/vulkaninfo.tmp" ; then
            VULKAN_DRIVER_NAME="$(grep -e 'driverName' "${PW_TMPFS_PATH}/vulkaninfo.tmp" | awk '{print$3}' | head -1)"
            GET_GPU_NAMES=$(awk -F '=' '/deviceName/{print $2}' "${PW_TMPFS_PATH}/vulkaninfo.tmp" | sed '/llvm/d'| sort -u | sed 's/^ //' | paste -sd '!')
            export VULKAN_DRIVER_NAME GET_GPU_NAMES
        else
            print_error "vulkaninfo - broken!"
-            if [[ -n $PW_DEBUG ]] ; then
+            if [[ -n "$PW_DEBUG" ]] ; then
                debug_timer --start
                timeout 5 vulkaninfo
                debug_timer --end "vulkaninfo"
@@ -284,7 +284,7 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
            export LSPCI_VGA
        else
            print_error "lspci - broken!"
-            if [[ -n $PW_DEBUG ]] ; then
+            if [[ -n "$PW_DEBUG" ]] ; then
                debug_timer --start
                timeout 5 lspci -vv
                debug_timer --end "lspci"
@@ -303,7 +303,7 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
            print_var PW_SCREEN_RESOLUTION PW_SCREEN_PRIMARY
        else
            print_error "xrandr - broken!"
-            if [[ -n $PW_DEBUG ]] ; then
+            if [[ -n "$PW_DEBUG" ]] ; then
                debug_timer --start
                timeout 5 xrandr --verbose
                debug_timer --end "xrandr"
@@ -327,7 +327,7 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
            unset LOCALE_LIST
            for LOCALE in $GET_LOCALE_LIST ; do
                if grep -e "$LOCALE" "${PW_TMPFS_PATH}/locale.tmp" &>/dev/null ; then
-                    if [[ ! -z "$LOCALE_LIST" ]]
+                    if [[ -n "$LOCALE_LIST" ]]
                    then LOCALE_LIST+="!$(grep -e "$LOCALE" "${PW_TMPFS_PATH}/locale.tmp")"
                    else LOCALE_LIST="$(grep -e "$LOCALE" "${PW_TMPFS_PATH}/locale.tmp")"
                    fi
@@ -336,7 +336,7 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
            export LOCALE_LIST
        else
            print_error "locale - broken!"
-            if [[ -n $PW_DEBUG ]] ; then
+            if [[ -n "$PW_DEBUG" ]] ; then
                debug_timer --start
                timeout 5 locale -a
                debug_timer --end "locale"
@@ -403,9 +403,11 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
    fi
 fi
+export SKIP_CHECK_UPDATES="1"
 [[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut
-if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then
+if [[ -n $(basename "${portwine_exe}" | grep .ppack) ]] ; then
    unset PW_SANDBOX_HOME_PATH
    pw_init_runtime
    if check_flatpak
@@ -538,11 +540,12 @@ case "${PW_VULKAN_USE}" in
    *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_LEGACY!$SORT_G_ZINK!$SORT_G_NINE!$SORT_OPENGL!$SORT_VULKAN" ;;
 esac
-if [[ ! -z "${PW_COMMENT_DB}" ]] ; then :
+if [[ -z "${PW_COMMENT_DB}" ]] ; then
-elif  [[ ! -z "${PORTPROTON_NAME}" ]] ; then
+    if [[ -n "${PORTPROTON_NAME}" ]] ; then
-    PW_COMMENT_DB="$(gettext "Launching") <b>${PORTPROTON_NAME}</b>"
+        PW_COMMENT_DB="$(gettext "Launching") <b>${PORTPROTON_NAME}</b>"
-else
+    else
-    PW_COMMENT_DB="$(gettext "Launching") <b>${PORTWINE_DB}</b>"
+        PW_COMMENT_DB="$(gettext "Launching") <b>${PORTWINE_DB}</b>"
+    fi
 fi
 if [[ $PW_WINE_USE == PROTON_LG ]] ; then
@@ -562,10 +565,17 @@ if [[ -z "${PORTWINE_DB_FILE}" ]] ; then
 fi
 if [[ -f "${portwine_exe}" ]] ; then
+    unset TAB_MAIN_MENU
+    if [[ "$RESTART_PP_USED" == "edit_db" ]] ; then
+        unset RESTART_PP_USED
+        gui_edit_db
+    elif [[ "$RESTART_PP_USED" == "userconf" ]] ; then
+        unset RESTART_PP_USED
+        gui_userconf
+    fi
    if [[ "${PW_GUI_DISABLED_CS}" != 1 ]] ; then
        pw_create_gui_png
-        grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop
+        if ! grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop ; then
-        if [[ "$?" != "0" ]] ; then
            PW_SHORTCUT="$(gettext "CREATE SHORTCUT")!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!$(gettext "Create shortcut for select file..."):100"
        else
            PW_SHORTCUT="$(gettext "DELETE SHORTCUT")!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!$(gettext "Delete shortcut for select file..."):98"
@@ -584,15 +594,17 @@ 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="   $(gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click_start 118"' \
+            --field="   $(gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click --start 118"' \
-            --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "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="   $(gettext "Settings user.conf")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Settings for user.conf")":"FBTN" '@bash -c "button_click --start 128"' \
-            --field="   MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)")":"FBTN" '@bash -c "button_click_start 122"' \
+            --field="   $(gettext "Open directory")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Open directory with <b>.ppdb</b> file")":"FBTN" '@bash -c "button_click --start open_game_folder"' \
-            --field="   dgVoodoo2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable dgVoodoo2 by default (This wrapper fixes many compatibility and rendering issues when running old games)")":"FBTN" '@bash -c "button_click_start 124"' \
+            --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "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="   GameScope"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable GameScope by default (Wayland micro compositor)")":"FBTN" '@bash -c "button_click_start 126"' \
+            --field="   MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)")":"FBTN" '@bash -c "button_click --start 122"' \
+            --field="   dgVoodoo2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable dgVoodoo2 by default (This wrapper fixes many compatibility and rendering issues when running old games)")":"FBTN" '@bash -c "button_click --start 124"' \
+            --field="   GameScope"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable GameScope by default (Wayland micro compositor)")":"FBTN" '@bash -c "button_click --start 126"' \
            2>/dev/null &
            if [[ "${PW_YAD_FORM_TAB}" == "1" ]] \
-            && [[ ! -z "${TAB_START}" ]]
+            && [[ -n "${TAB_START}" ]]
            then
                export TAB_START="2"
                unset PW_YAD_FORM_TAB
@@ -627,11 +639,13 @@ if [[ -f "${portwine_exe}" ]] ; then
            "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="${START_GUI_PANED_COLUMNS}" \
            --gui-type-layout="${START_GUI_TYPE_LAYOUT_PANED}" \
            --align-buttons --homogeneous-row --homogeneous-column \
-            --field="   $(gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click_start 118"' \
+            --field="   $(gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click --start 118"' \
-            --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "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="   $(gettext "Settings user.conf")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Settings for user.conf")":"FBTN" '@bash -c "button_click --start 128"' \
-            --field="   MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)")":"FBTN" '@bash -c "button_click_start 122"' \
+            --field="   $(gettext "Open directory")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Open directory with <b>.ppdb</b> file")":"FBTN" '@bash -c "button_click --start open_game_folder"' \
-            --field="   dgVoodoo2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable dgVoodoo2 by default (This wrapper fixes many compatibility and rendering issues when running old games)")":"FBTN" '@bash -c "button_click_start 124"' \
+            --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "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="   GameScope"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable GameScope by default (Wayland micro compositor)")":"FBTN" '@bash -c "button_click_start 126"' \
+            --field="   MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)")":"FBTN" '@bash -c "button_click --start 122"' \
+            --field="   dgVoodoo2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable dgVoodoo2 by default (This wrapper fixes many compatibility and rendering issues when running old games)")":"FBTN" '@bash -c "button_click --start 124"' \
+            --field="   GameScope"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable GameScope by default (Wayland micro compositor)")":"FBTN" '@bash -c "button_click --start 126"' \
            2>/dev/null &
            "${pw_yad}" --key=$KEY_START --paned \
@@ -645,16 +659,14 @@ if [[ -f "${portwine_exe}" ]] ; then
            --button="$(gettext "LAUNCH")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Run file ...")":106 2>/dev/null
            PW_YAD_SET="$?"
        fi
-        [[ ! -z "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in
+        [[ -n "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in
            128)
                    if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then
                        unset PW_YAD_FORM_TAB
                    fi
                    unset PW_NO_RESTART_PPDB PW_DISABLED_CREATE_DB KEY_START portwine_exe
-                    export SKIP_CHECK_UPDATES=1
-                    /usr/bin/env bash -c ${pw_full_command_line[*]} &
                    print_info "Restarting..."
-                    exit 0
+                    restart_pp
                    ;;
            1|252)
                    exit 0
@@ -666,31 +678,20 @@ if [[ -f "${portwine_exe}" ]] ; then
        portwine_launch
    fi
 else
-    export KEY="$RANDOM"
+    PW_ALL_DF="$(ls "${PORT_WINE_PATH}"/ | grep .desktop | grep -vE '(PortProton|readme)')"
+    if [[ -z "${PW_ALL_DF}" ]]
-    if [[ "$MIRROR" == "CLOUD" ]]
+    then export PW_GUI_SORT_TABS=(1 2 3 4 5)
-    then NEW_MIRROR="GITHUB"
+    else export PW_GUI_SORT_TABS=(2 3 4 5 1)
-    else NEW_MIRROR="CLOUD"
    fi
+    if [[ "$RESTART_PP_USED" == "userconf" ]] ; then
-    if [[ "$BRANCH" == "master" ]]
+        unset RESTART_PP_USED
-    then NEW_BRANCH="DEVEL"
+        gui_userconf
-    else NEW_BRANCH="STABLE"
    fi
-    if [[ "$DOWNLOAD_STEAM_GRID" == "1" ]]
+    export KEY="$RANDOM"
-    then NEW_STEAM_BEHAVIOR="$(gettext "Disable")"
-    else NEW_STEAM_BEHAVIOR="$(gettext "Enable")"
-    fi
    IFS=$'\n'
-    PW_ALL_DF="$(ls "${PORT_WINE_PATH}"/ | grep .desktop | grep -vE '(PortProton|readme)')"
+    PW_GENERATE_BUTTONS="--field=   $(gettext "Create shortcut...")!${PW_GUI_ICON_PATH}/find_48.svg!:FBTN%@bash -c \"button_click --normal pw_find_exe\"%"
-    if [[ -z "${PW_ALL_DF}" ]]
-    then PW_GUI_SORT_TABS=(1 2 3 4 5)
-    else PW_GUI_SORT_TABS=(2 3 4 5 1)
-    fi
-    PW_GENERATE_BUTTONS="--field=   $(gettext "Create shortcut...")!${PW_GUI_ICON_PATH}/find_48.svg!:FBTN%@bash -c \"button_click pw_find_exe\"%"
    for PW_DESKTOP_FILES in ${PW_ALL_DF} ; do
        if check_flatpak ; then
            PW_NAME_D_ICON="$(grep Exec "${PORT_WINE_PATH}/${PW_DESKTOP_FILES}" | awk -F'=' '{print $2}' |
@@ -712,25 +713,21 @@ else
    IFS="%"
    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[4]}" --form --columns="$MAIN_GUI_COLUMNS" --homogeneous-column \
-    --gui-type-layout=${MAIN_MENU_GUI_TYPE_LAYOUT} \
+    --gui-type-layout="${MAIN_MENU_GUI_TYPE_LAYOUT}" \
    --align-buttons --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null &
    IFS="$orig_IFS"
    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[3]}" --form --columns=3 --align-buttons --separator=";" --homogeneous-column \
-    --gui-type-layout=${MAIN_MENU_GUI_TYPE_LAYOUT} \
+    --gui-type-layout="${MAIN_MENU_GUI_TYPE_LAYOUT}" \
-    --field="   $(gettext "Reinstall PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \
+    --field="   $(gettext "Reinstall PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal gui_pw_reinstall_pp"' \
-    --field="   $(gettext "Remove PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
+    --field="   $(gettext "Remove PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal gui_rm_portproton"' \
-    --field="   $(gettext "Update PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
+    --field="   $(gettext "Update PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal gui_pw_update"' \
-    --field="   $(gettext "Changelog")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click open_changelog"' \
+    --field="   $(gettext "Changelog")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal open_changelog"' \
-    --field="   $(gettext "Change language")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_loc"' \
+    --field="   $(gettext "Change language")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal change_loc"' \
-    --field="   $(gettext "Edit user.conf")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \
+    --field="   $(gettext "Settings user.conf")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal 128"' \
-    --field="   $(gettext "Scripts from backup")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \
+    --field="   $(gettext "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 pw_start_cont_xterm"' \
+    --field="   Xterm"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal pw_start_cont_xterm"' \
-    --field="   $(gettext "Credits")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_credits"' \
+    --field="   $(gettext "Credits")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --normal gui_credits"' \
-    --field="   $(gettext "Change mirror to") $NEW_MIRROR"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_mirror"' \
-    --field="   $(gettext "Change branch to") $NEW_BRANCH"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_branch"' \
-    --field="   $(gettext "Change start gui")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_gui_start"' \
-    --field="   $NEW_STEAM_BEHAVIOR $(gettext "steam covers download")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_download_grid"' \
    2>/dev/null &
    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[2]}" --form --columns=3 --align-buttons --separator=";" \
@@ -738,77 +735,77 @@ else
    --field="   3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
    --field="   PREFIX  : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \
    --field="     WINE  : :CB" "$(combobox_fix "${PW_WINE_USE}" "${PW_DEFAULT_WINE_USE}")" \
-    --field="$(gettext "Create prefix backup")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"CFBTN" '@bash -c "button_click pw_create_prefix_backup"' \
+    --field="$(gettext "Create prefix backup")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"CFBTN" '@bash -c "button_click --normal pw_create_prefix_backup"' \
-    --field="   Winetricks"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run winetricks to install additional libraries to the selected prefix")":"FBTN" '@bash -c "button_click WINETRICKS"' \
+    --field="   Winetricks"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run winetricks to install additional libraries to the selected prefix")":"FBTN" '@bash -c "button_click --normal WINETRICKS"' \
-    --field="   $(gettext "Clear prefix")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Clear the prefix to fix problems")":"FBTN" '@bash -c "button_click gui_clear_pfx"' \
+    --field="   $(gettext "Clear prefix")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Clear the prefix to fix problems")":"FBTN" '@bash -c "button_click --normal gui_clear_pfx"' \
-    --field="   $(gettext "Get other Wine")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Open the menu to download other versions of WINE or PROTON")":"FBTN" '@bash -c "button_click gui_proton_downloader"' \
+    --field="   $(gettext "Get other Wine")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Open the menu to download other versions of WINE or PROTON")":"FBTN" '@bash -c "button_click --normal gui_proton_downloader"' \
-    --field="   $(gettext "Uninstaller")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run the program uninstaller built into wine")":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \
+    --field="   $(gettext "Uninstaller")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run the program uninstaller built into wine")":"FBTN" '@bash -c "button_click --normal gui_wine_uninstaller"' \
-    --field="   $(gettext "Prefix Manager")     "!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run winecfg to edit the settings of the selected prefix")":"FBTN" '@bash -c "button_click WINECFG"' \
+    --field="   $(gettext "Prefix Manager")     "!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run winecfg to edit the settings of the selected prefix")":"FBTN" '@bash -c "button_click --normal WINECFG"' \
-    --field="   $(gettext "File Manager")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine file manager")":"FBTN" '@bash -c "button_click WINEFILE"' \
+    --field="   $(gettext "File Manager")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine file manager")":"FBTN" '@bash -c "button_click --normal WINEFILE"' \
-    --field="   $(gettext "Command line")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine cmd")":"FBTN" '@bash -c "button_click WINECMD"' \
+    --field="   $(gettext "Command line")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine cmd")":"FBTN" '@bash -c "button_click --normal WINECMD"' \
-    --field="   $(gettext "Regedit")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine regedit")":"FBTN" '@bash -c "button_click WINEREG"' 1> "${PW_TMPFS_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
+    --field="   $(gettext "Regedit")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine regedit")":"FBTN" '@bash -c "button_click --normal WINEREG"' 1> "${PW_TMPFS_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[1]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll --homogeneous-column \
    --gui-type-layout="${MAIN_MENU_GUI_TYPE_LAYOUT}" \
-    --field="   Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"$(gettext "Emulator for Nintendo game consoles with high compatibility")":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \
+    --field="   Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"$(gettext "Emulator for Nintendo game consoles with high compatibility")":"FBTN" '@bash -c "button_click --normal PW_DOLPHIN"' \
-    --field="   MAME"!"$PW_GUI_ICON_PATH/mame.png"!"$(gettext "Multi-arcade emulator that allows you to play old arcade games")":"FBTN" '@bash -c "button_click PW_MAME"' \
+    --field="   MAME"!"$PW_GUI_ICON_PATH/mame.png"!"$(gettext "Multi-arcade emulator that allows you to play old arcade games")":"FBTN" '@bash -c "button_click --normal PW_MAME"' \
-    --field="   RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"$(gettext "Multi-platform frontend for emulators with extensive settings")":"FBTN" '@bash -c "button_click PW_RETROARCH"' \
+    --field="   RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"$(gettext "Multi-platform frontend for emulators with extensive settings")":"FBTN" '@bash -c "button_click --normal PW_RETROARCH"' \
-    --field="   PPSSPP Windows"!"$PW_GUI_ICON_PATH/ppsspp.png"!"$(gettext "Emulator for the PlayStation Portable (PSP) game console")":"FBTN" '@bash -c "button_click PW_PPSSPP"' \
+    --field="   PPSSPP Windows"!"$PW_GUI_ICON_PATH/ppsspp.png"!"$(gettext "Emulator for the PlayStation Portable (PSP) game console")":"FBTN" '@bash -c "button_click --normal PW_PPSSPP"' \
-    --field="   Citra"!"$PW_GUI_ICON_PATH/citra.png"!"$(gettext "Emulator for the Nintendo 3DS game console")":"FBTN" '@bash -c "button_click PW_CITRA"' \
+    --field="   Citra"!"$PW_GUI_ICON_PATH/citra.png"!"$(gettext "Emulator for the Nintendo 3DS game console")":"FBTN" '@bash -c "button_click --normal PW_CITRA"' \
-    --field="   Cemu"!"$PW_GUI_ICON_PATH/cemu.png"!"$(gettext "Emulator for the Wii U game console")":"FBTN" '@bash -c "button_click PW_CEMU"' \
+    --field="   Cemu"!"$PW_GUI_ICON_PATH/cemu.png"!"$(gettext "Emulator for the Wii U game console")":"FBTN" '@bash -c "button_click --normal PW_CEMU"' \
-    --field="   ePSXe"!"$PW_GUI_ICON_PATH/epsxe.png"!"$(gettext "Emulator for the PlayStation 1 game console with high compatibility")":"FBTN" '@bash -c "button_click PW_EPSXE"' \
+    --field="   ePSXe"!"$PW_GUI_ICON_PATH/epsxe.png"!"$(gettext "Emulator for the PlayStation 1 game console with high compatibility")":"FBTN" '@bash -c "button_click --normal PW_EPSXE"' \
-    --field="   Project64"!"$PW_GUI_ICON_PATH/project64.png"!"$(gettext "Emulator for the Nintendo 64 game console")":"FBTN" '@bash -c "button_click PW_PROJECT64"' \
+    --field="   Project64"!"$PW_GUI_ICON_PATH/project64.png"!"$(gettext "Emulator for the Nintendo 64 game console")":"FBTN" '@bash -c "button_click --normal PW_PROJECT64"' \
-    --field="   VBA-M"!"$PW_GUI_ICON_PATH/vba-m.png"!"$(gettext "Emulator for the Game Boy Advance game console")":"FBTN" '@bash -c "button_click PW_VBA-M"' \
+    --field="   VBA-M"!"$PW_GUI_ICON_PATH/vba-m.png"!"$(gettext "Emulator for the Game Boy Advance game console")":"FBTN" '@bash -c "button_click --normal PW_VBA-M"' \
-    --field="   Yabause"!"$PW_GUI_ICON_PATH/yabause.png"!"$(gettext "Emulator for the Sega Saturn game console")":"FBTN" '@bash -c "button_click PW_YABAUSE"' \
+    --field="   Yabause"!"$PW_GUI_ICON_PATH/yabause.png"!"$(gettext "Emulator for the Sega Saturn game console")":"FBTN" '@bash -c "button_click --normal PW_YABAUSE"' \
-    --field="   Xenia"!"$PW_GUI_ICON_PATH/xenia.png"!"$(gettext "Emulator for the Xbox 360 game console")":"FBTN" '@bash -c "button_click PW_XENIA"' \
+    --field="   Xenia"!"$PW_GUI_ICON_PATH/xenia.png"!"$(gettext "Emulator for the Xbox 360 game console")":"FBTN" '@bash -c "button_click --normal PW_XENIA"' \
-    --field="   FCEUX"!"$PW_GUI_ICON_PATH/fceux.png"!"$(gettext "Emulator for the Nintendo Entertainment System (NES or Dendy) game console")":"FBTN" '@bash -c "button_click PW_FCEUX"' \
+    --field="   FCEUX"!"$PW_GUI_ICON_PATH/fceux.png"!"$(gettext "Emulator for the Nintendo Entertainment System (NES or Dendy) game console")":"FBTN" '@bash -c "button_click --normal PW_FCEUX"' \
-    --field="   xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"$(gettext "Emulator for the Xbox game console")":"FBTN" '@bash -c "button_click PW_XEMU"' \
+    --field="   xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"$(gettext "Emulator for the Xbox game console")":"FBTN" '@bash -c "button_click --normal PW_XEMU"' \
-    --field="   Demul"!"$PW_GUI_ICON_PATH/demul.png"!"$(gettext "Emulator for the Sega Dreamcast game console")":"FBTN" '@bash -c "button_click PW_DEMUL"' 2>/dev/null &
+    --field="   Demul"!"$PW_GUI_ICON_PATH/demul.png"!"$(gettext "Emulator for the Sega Dreamcast game console")":"FBTN" '@bash -c "button_click --normal PW_DEMUL"' 2>/dev/null &
    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[0]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll --homogeneous-column \
    --gui-type-layout="${MAIN_MENU_GUI_TYPE_LAYOUT}" \
-    --field="   Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \
+    --field="   Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click --normal PW_LGC"' \
-    --field="   vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \
+    --field="   vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click --normal PW_VKPLAY"' \
-    --field="   Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click PW_BATTLE_NET"' \
+    --field="   Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click --normal PW_BATTLE_NET"' \
-    --field="   Epic Games Launcher"!"$PW_GUI_ICON_PATH/epicgames.png"!"":"FBTN" '@bash -c "button_click PW_EPIC"' \
+    --field="   Epic Games Launcher"!"$PW_GUI_ICON_PATH/epicgames.png"!"":"FBTN" '@bash -c "button_click --normal PW_EPIC"' \
-    --field="   GoG Galaxy Launcher"!"$PW_GUI_ICON_PATH/gog.png"!"":"FBTN" '@bash -c "button_click PW_GOG"' \
+    --field="   GoG Galaxy Launcher"!"$PW_GUI_ICON_PATH/gog.png"!"":"FBTN" '@bash -c "button_click --normal PW_GOG"' \
-    --field="   Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click PW_UBC"' \
+    --field="   Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click --normal PW_UBC"' \
-    --field="   EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \
+    --field="   EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click --normal PW_EVE"' \
-    --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \
+    --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click --normal PW_ROCKSTAR"' \
-    --field="   Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click  PW_GAMEFORGE"' \
+    --field="   Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click --normal  PW_GAMEFORGE"' \
-    --field="   World of Sea Battle (x64)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click PW_WOSB"' \
+    --field="   World of Sea Battle (x64)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click --normal PW_WOSB"' \
-    --field="   CALIBER"!"$PW_GUI_ICON_PATH/caliber.png"!"":"FBTN" '@bash -c "button_click PW_CALIBER"' \
+    --field="   CALIBER"!"$PW_GUI_ICON_PATH/caliber.png"!"":"FBTN" '@bash -c "button_click --normal PW_CALIBER"' \
-    --field="   Crossout"!"$PW_GUI_ICON_PATH/crossout.png"!"":"FBTN" '@bash -c "button_click PW_CROSSOUT"' \
+    --field="   Crossout"!"$PW_GUI_ICON_PATH/crossout.png"!"":"FBTN" '@bash -c "button_click --normal PW_CROSSOUT"' \
-    --field="   Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click PW_WARFRAME"' \
+    --field="   Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click --normal PW_WARFRAME"' \
-    --field="   Panzar"!"$PW_GUI_ICON_PATH/panzar.png"!"":"FBTN" '@bash -c "button_click PW_PANZAR"' \
+    --field="   Panzar"!"$PW_GUI_ICON_PATH/panzar.png"!"":"FBTN" '@bash -c "button_click --normal PW_PANZAR"' \
-    --field="   STALCRAFT"!"$PW_GUI_ICON_PATH/stalcraft.png"!"":"FBTN" '@bash -c "button_click PW_STALCRAFT"' \
+    --field="   STALCRAFT"!"$PW_GUI_ICON_PATH/stalcraft.png"!"":"FBTN" '@bash -c "button_click --normal PW_STALCRAFT"' \
-    --field="   CONTRACT WARS"!"$PW_GUI_ICON_PATH/cwc.png"!"":"FBTN" '@bash -c "button_click PW_CWC"' \
+    --field="   CONTRACT WARS"!"$PW_GUI_ICON_PATH/cwc.png"!"":"FBTN" '@bash -c "button_click --normal PW_CWC"' \
-    --field="   Stalker Online"!"$PW_GUI_ICON_PATH/so.png"!"":"FBTN" '@bash -c "button_click PW_SO"' \
+    --field="   Stalker Online"!"$PW_GUI_ICON_PATH/so.png"!"":"FBTN" '@bash -c "button_click --normal PW_SO"' \
-    --field="   Modern Warships"!"$PW_GUI_ICON_PATH/mw.png"!"":"FBTN" '@bash -c "button_click PW_MW"' \
+    --field="   Modern Warships"!"$PW_GUI_ICON_PATH/mw.png"!"":"FBTN" '@bash -c "button_click --normal PW_MW"' \
-    --field="   Metal War Online"!"$PW_GUI_ICON_PATH/mwo.png"!"":"FBTN" '@bash -c "button_click PW_MWO"' \
+    --field="   Metal War Online"!"$PW_GUI_ICON_PATH/mwo.png"!"":"FBTN" '@bash -c "button_click --normal PW_MWO"' \
-    --field="   Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \
+    --field="   Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click --normal PW_ANKAMA"' \
-    --field="   Indiegala Client"!"$PW_GUI_ICON_PATH/igclient.png"!"":"FBTN" '@bash -c "button_click PW_IGCLIENT"' \
+    --field="   Indiegala Client"!"$PW_GUI_ICON_PATH/igclient.png"!"":"FBTN" '@bash -c "button_click --normal PW_IGCLIENT"' \
-    --field="   Plarium Play"!"$PW_GUI_ICON_PATH/plariumplay.png"!"":"FBTN" '@bash -c "button_click PW_PLARIUM_PLAY"' \
+    --field="   Plarium Play"!"$PW_GUI_ICON_PATH/plariumplay.png"!"":"FBTN" '@bash -c "button_click --normal PW_PLARIUM_PLAY"' \
-    --field="   Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png"!"":"FBTN" '@bash -c "button_click PW_WGC"' \
+    --field="   Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png"!"":"FBTN" '@bash -c "button_click --normal PW_WGC"' \
-    --field="   OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \
+    --field="   OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click --normal PW_OSU"' \
-    --field="   ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click PW_ITCH"' \
+    --field="   ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click --normal PW_ITCH"' \
-    --field="   Steam (unstable)"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"' \
+    --field="   Steam (unstable)"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click --normal PW_STEAM"' \
-    --field="   Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' \
+    --field="   Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click --normal PW_POE"' \
-    --field="   Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' \
+    --field="   Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click --normal PW_GUILD_WARS_2"' \
-    --field="   HoYoPlay"!"$PW_GUI_ICON_PATH/hoyoplay.png"!"":"FBTN" '@bash -c "button_click PW_HO_YO_PLAY"' \
+    --field="   HoYoPlay"!"$PW_GUI_ICON_PATH/hoyoplay.png"!"":"FBTN" '@bash -c "button_click --normal PW_HO_YO_PLAY"' \
-    --field="   EA App (TEST)"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' \
+    --field="   EA App (TEST)"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click --normal PW_EAAPP"' \
-    --field="   Battle Of Space Raiders"!"$PW_GUI_ICON_PATH/bsr.png"!"":"FBTN" '@bash -c "button_click PW_BSR"' \
+    --field="   Battle Of Space Raiders"!"$PW_GUI_ICON_PATH/bsr.png"!"":"FBTN" '@bash -c "button_click --normal PW_BSR"' \
-    --field="   Black Desert Online (RU)"!"$PW_GUI_ICON_PATH/bdo.png"!"":"FBTN" '@bash -c "button_click PW_BDO"' \
+    --field="   Black Desert Online (RU)"!"$PW_GUI_ICON_PATH/bdo.png"!"":"FBTN" '@bash -c "button_click --normal PW_BDO"' \
-    --field="   Pulse Online"!"$PW_GUI_ICON_PATH/pulseonline.png"!"":"FBTN" '@bash -c "button_click PW_PULSE_ONLINE"' \
+    --field="   Pulse Online"!"$PW_GUI_ICON_PATH/pulseonline.png"!"":"FBTN" '@bash -c "button_click --normal PW_PULSE_ONLINE"' \
-    --field="   CatsLauncher (Front Edge)"!"$PW_GUI_ICON_PATH/catslauncher.png"!"":"FBTN" '@bash -c "button_click PW_CATSLAUNCHER"' \
+    --field="   CatsLauncher (Front Edge)"!"$PW_GUI_ICON_PATH/catslauncher.png"!"":"FBTN" '@bash -c "button_click --normal PW_CATSLAUNCHER"' \
-    --field="   Russian Fishing 4"!"$PW_GUI_ICON_PATH/rf4launcher.png"!"":"FBTN" '@bash -c "button_click PW_RUSSIAN_FISHING"' \
+    --field="   Russian Fishing 4"!"$PW_GUI_ICON_PATH/rf4launcher.png"!"":"FBTN" '@bash -c "button_click --normal PW_RUSSIAN_FISHING"' \
-    --field="   W3D Hub Launcher"!"$PW_GUI_ICON_PATH/w3dhub.png"!"":"FBTN" '@bash -c "button_click PW_W3D_HUB"' \
+    --field="   W3D Hub Launcher"!"$PW_GUI_ICON_PATH/w3dhub.png"!"":"FBTN" '@bash -c "button_click --normal PW_W3D_HUB"' \
-    --field="   Anomaly Zone"!"$PW_GUI_ICON_PATH/anomalyzone.png"!"":"FBTN" '@bash -c "button_click PW_ANOMALY_ZONE"' \
+    --field="   Anomaly Zone"!"$PW_GUI_ICON_PATH/anomalyzone.png"!"":"FBTN" '@bash -c "button_click --normal PW_ANOMALY_ZONE"' \
    2>/dev/null &
-    # --field="   Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"'
+    # --field="   Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click --normal PW_SWL"'
-    # --field="   Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"'
+    # --field="   Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click --normal PW_BETHESDA"'
-    # --field="   League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click PW_LOL"'
+    # --field="   League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click --normal PW_LOL"'
    export START_FROM_PP_GUI="1"
    if [[ -z ${TAB_MAIN_MENU} ]] ; then
@@ -842,7 +839,6 @@ else
        --tab="$(gettext "PORTPROTON SETTINGS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null
        YAD_STATUS="$?"
    fi
-    unset TAB_MAIN_MENU
    if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi
    pw_yad_set_form
@@ -865,7 +861,28 @@ if [[ -f "${PORTWINE_DB_FILE}" ]] ; then
    edit_db_from_gui PW_VULKAN_USE PW_WINE_USE PW_PREFIX_NAME
 fi
-[[ ! -z "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in
+[[ -n "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in
+    gui_pw_reinstall_pp|open_changelog|\
+    128|gui_pw_update|\
+    change_loc|gui_open_scripts_from_backup|\
+    gui_credits)
+        if [[ -z "${PW_ALL_DF}" ]] ; then
+            export TAB_MAIN_MENU="4"
+        else
+            export TAB_MAIN_MENU="5"
+        fi
+        ;;
+    gui_proton_downloader|WINETRICKS|\
+    116|pw_create_prefix_backup|\
+    gui_clear_pfx)
+        if [[ -z "${PW_ALL_DF}" ]] ; then
+            export TAB_MAIN_MENU="3"
+        else
+            export TAB_MAIN_MENU="4"
+        fi
+esac
+[[ -n "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in
    98) portwine_delete_shortcut ;;
    100) portwine_create_shortcut ;;
    DEBUG|102) portwine_start_debug ;;
@@ -889,11 +906,13 @@ fi
    change_branch) change_branch ;;
    change_gui_start) change_gui_start ;;
    change_download_grid) change_download_grid ;;
+    open_game_folder) open_game_folder ;;
    118) gui_edit_db ;;
    120) gui_vkbasalt ;;
    122) gui_mangohud ;;
    124) gui_dgvoodoo2 ;;
    126) gui_gamescope ;;
+    128) gui_userconf ;;
    pw_create_prefix_backup) pw_create_prefix_backup ;;
    gui_credits) gui_credits ;;
    pw_start_cont_xterm) pw_start_cont_xterm ;;

--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -125,7 +125,6 @@ export PW_GS_HDR_FORCE_OUTPUT="0"
 export PW_GS_HDR_FORCE_HEATMAP="0"
 export PW_GS_EXPOSE_WAYLAND="0"
 export PW_GS_REALTIME_SCHEDULING="0"
-export PW_GS_FIX_AMD_AND_INTEL="0"
 export PW_GS_BACKEND_SDL="0"
 export PW_GS_SDL_VIDEODRIVER_X11="0"
 export PW_GS_MANGOAPP="0"

--- a/data_from_portwine/themes/classic.pptheme
+++ b/data_from_portwine/themes/classic.pptheme
@@ -43,40 +43,17 @@ export START_GUI_TYPE_TEXT=0
 export START_GUI_TYPE_IMAGE=0
 export MAIN_MENU_GUI_TYPE_LAYOUT=0
+export YAD_INFO_GUI_TYPE_LAYOUT=5
-export VKBASALT_GUI_TYPE_LAYOUT_UP=5
+export PANED_GUI_TYPE_LAYOUT_UP=5
-export VKBASALT_GUI_TYPE_LAYOUT_DOWN=5
+export PANED_GUI_TYPE_LAYOUT_DOWN=5
-export VKBASALT_GUI_TYPE_TEXT_UP=0
+export PANED_GUI_TYPE_TEXT_UP=0
+export PANED_GUI_TYPE_TEXT_DOWN=0
-export MANGOHUD_GUI_TYPE_LAYOUT_UP=5
-export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=5
-export MANGOHUD_GUI_TYPE_TEXT_UP=0
-export MANGOHUD_GUI_TYPE_TEXT_DOWN=0
-export DGVOODOO2_GUI_TYPE_LAYOUT_UP=5
-export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=5
-export DGVOODOO2_GUI_TYPE_TEXT_UP=0
-export GAMESCOPE_GUI_TYPE_LAYOUT_UP=5
-export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=5
-export GAMESCOPE_GUI_TYPE_TEXT_UP=0
-export GAMESCOPE_GUI_TYPE_TEXT_DOWN=0
-export SETTINGS_BASE_GUI_TYPE_LAYOUT=0
-export SETTINGS_BASE_GUI_TYPE_TEXT=0
-export WINETRICKS_GUI_TYPE_LAYOUT=5
-export WINETRICKS_GUI_TYPE_TEXT=0
-export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=5
-export WINE_DOWNLOAD_GUI_TYPE_TEXT=0
-export SETTINGS_SHORTCUT_GUI_TYPE_BOX=5
-export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
-export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=0
-export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=0
-export YAD_INFO_GUI_TYPE_LAYOUT=5
+export NOTEBOOK_GUI_TYPE_BOX=5
+export NOTEBOOK_GUI_TYPE_LAYOUT=5
+export NOTEBOOK_GUI_TYPE_TEXT=0
+export NOTEBOOK_GUI_TYPE_IMAGE=0
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500
--- a/data_from_portwine/themes/compact.pptheme
+++ b/data_from_portwine/themes/compact.pptheme
@@ -46,40 +46,17 @@ export START_GUI_TYPE_TEXT=2
 export START_GUI_TYPE_IMAGE=2
 export MAIN_MENU_GUI_TYPE_LAYOUT=0
+export YAD_INFO_GUI_TYPE_LAYOUT=2
-export VKBASALT_GUI_TYPE_LAYOUT_UP=10
+export PANED_GUI_TYPE_LAYOUT_UP=10
-export VKBASALT_GUI_TYPE_LAYOUT_DOWN=5
+export PANED_GUI_TYPE_LAYOUT_DOWN=10
-export VKBASALT_GUI_TYPE_TEXT_UP=5
+export PANED_GUI_TYPE_TEXT_UP=5
+export PANED_GUI_TYPE_TEXT_DOWN=5
-export MANGOHUD_GUI_TYPE_LAYOUT_UP=10
-export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=10
-export MANGOHUD_GUI_TYPE_TEXT_UP=5
-export MANGOHUD_GUI_TYPE_TEXT_DOWN=5
-export DGVOODOO2_GUI_TYPE_LAYOUT_UP=10
-export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=10
-export DGVOODOO2_GUI_TYPE_TEXT_UP=5
-export GAMESCOPE_GUI_TYPE_LAYOUT_UP=10
-export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=10
-export GAMESCOPE_GUI_TYPE_TEXT_UP=5
-export GAMESCOPE_GUI_TYPE_TEXT_DOWN=5
-export SETTINGS_BASE_GUI_TYPE_LAYOUT=5
-export SETTINGS_BASE_GUI_TYPE_TEXT=2
-export WINETRICKS_GUI_TYPE_LAYOUT=5
-export WINETRICKS_GUI_TYPE_TEXT=2
-export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=5
-export WINE_DOWNLOAD_GUI_TYPE_TEXT=2
-export SETTINGS_SHORTCUT_GUI_TYPE_BOX=2
-export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
-export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=2
-export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=5
-export YAD_INFO_GUI_TYPE_LAYOUT=2
+export NOTEBOOK_GUI_TYPE_BOX=2
+export NOTEBOOK_GUI_TYPE_LAYOUT=5
+export NOTEBOOK_GUI_TYPE_TEXT=2
+export NOTEBOOK_GUI_TYPE_IMAGE=5
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500
--- a/data_from_portwine/themes/default.pptheme
+++ b/data_from_portwine/themes/default.pptheme
@@ -60,50 +60,21 @@ export START_GUI_TYPE_IMAGE=2 # значение для images
 # для основного меню
 export MAIN_MENU_GUI_TYPE_LAYOUT=0
-# для vkbasalt
-export VKBASALT_GUI_TYPE_LAYOUT_UP=20
-export VKBASALT_GUI_TYPE_LAYOUT_DOWN=10
-export VKBASALT_GUI_TYPE_TEXT_UP=10
-# для mangohud
-export MANGOHUD_GUI_TYPE_LAYOUT_UP=20
-export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=20
-export MANGOHUD_GUI_TYPE_TEXT_UP=10
-export MANGOHUD_GUI_TYPE_TEXT_DOWN=10
-# для dgvoodoo2
-export DGVOODOO2_GUI_TYPE_LAYOUT_UP=20
-export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=20
-export DGVOODOO2_GUI_TYPE_TEXT_UP=10
-# для gamescope
-export GAMESCOPE_GUI_TYPE_LAYOUT_UP=20
-export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=20
-export GAMESCOPE_GUI_TYPE_TEXT_UP=10
-export GAMESCOPE_GUI_TYPE_TEXT_DOWN=10
-# для основных настроек
-export SETTINGS_BASE_GUI_TYPE_LAYOUT=5
-export SETTINGS_BASE_GUI_TYPE_TEXT=2
-# для окна winetricks
-export WINETRICKS_GUI_TYPE_LAYOUT=5
-export WINETRICKS_GUI_TYPE_TEXT=2
-# для окна скачивания версий wine
-export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=5
-export WINE_DOWNLOAD_GUI_TYPE_TEXT=2
-# для создания ярлыков
-export SETTINGS_SHORTCUT_GUI_TYPE_BOX=2
-export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
-export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=2
-export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=5
 # для всплывающих окон по типу error, info, question
 export YAD_INFO_GUI_TYPE_LAYOUT=2
+# для vkbasalt, mangohud, dgvoodoo2, gamescope, userconf
+export PANED_GUI_TYPE_LAYOUT_UP=20
+export PANED_GUI_TYPE_LAYOUT_DOWN=20
+export PANED_GUI_TYPE_TEXT_UP=10
+export PANED_GUI_TYPE_TEXT_DOWN=10
+# для основных настроек, winetricks, для скачивания версий wine, для создания ярлыков
+export NOTEBOOK_GUI_TYPE_BOX=2
+export NOTEBOOK_GUI_TYPE_LAYOUT=5
+export NOTEBOOK_GUI_TYPE_TEXT=2
+export NOTEBOOK_GUI_TYPE_IMAGE=5
 # настройки индикатора прогресса
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500