update RU language

data_from_portwine/scripts/functions_helper

@@ -74,23 +74,26 @@ change_locale () {
 export -f change_locale
 
 generate_pot () {
-    LANGUAGES_LIST=(ru)
+    for lang in $LANGUAGES_LIST
-    for lang in "${LANGUAGES_LIST[@]}"
     do
-    echo "${lang}"
+        echo "${lang}"
-    mkdir -p "${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/"
+        mkdir -p "${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/"
-    LANG_PO="${PORT_WINE_PATH}/data/locales/"${lang}"/LC_MESSAGES/PortProton.po"
+        LANG_PO="${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/PortProton.po"
-    LANG_MO="${PORT_WINE_PATH}/data/locales/"${lang}"/LC_MESSAGES/PortProton.mo"
+        LANG_MO="${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/PortProton.mo"
-    TEMPLATE_POT="${PORT_WINE_PATH}/locales/PortProton.pot"
+        TEMPLATE_POT="${PORT_WINE_PATH}/data/locales/PortProton.pot"
-    xgettext --from-code=UTF-8 --language shell -i "${PORT_WINE_PATH}/data/scripts/start.sh" "${PORT_WINE_PATH}/data/scripts/setup.sh" "${PORT_WINE_PATH}/data/scripts/functions_helper"  -o $TEMPLATE_POT
+        xgettext --from-code=UTF-8 --language shell -i \
-    if [ -f "$LANG_PO" ]; then
+        "${PORT_WINE_PATH}/data/scripts/start.sh" \
-        echo "update $LANG_PO file"
+        "${PORT_WINE_PATH}/data/scripts/setup.sh" \
-        msgmerge --update $LANG_PO $TEMPLATE_POT
+        "${PORT_WINE_PATH}/data/scripts/functions_helper" \
-    else
+        -o "$TEMPLATE_POT"
-        echo "create $LANG_PO file"
+        if [[ -f "$LANG_PO" ]] ; then
-        msginit --input=$TEMPLATE_POT --locale="${lang}" --output=$LANG_PO
+            echo "update $LANG_PO file"
-    fi
+            msgmerge --update "$LANG_PO" "$TEMPLATE_POT"
-    msgfmt --output-file=$LANG_MO $LANG_PO
+        else
+            echo "create $LANG_PO file"
+            msginit --input="$TEMPLATE_POT" --locale="${lang}" --output="$LANG_PO"
+        fi
+        msgfmt --output-file="$LANG_MO" "$LANG_PO"
     done
 }
 export -f generate_pot
@@ -2658,7 +2661,16 @@ pw_gui_for_edit_db () {
     "${pw_yad_v13_0}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator="%" --columns=1 --scroll \
     --field="$(eval_gettext "Change the version of <b>WINDOWS</b> emulation")!$(eval_gettext "Changing the <b>WINDOWS</b> emulation version may be required to run older games. <b>WINDOWS</b> versions below 10 do not support new games with DirectX 12") :CB" "${ADD_WINVER_EDIT_DB}" \
     --field="$(eval_gettext "AUTOINSTALL WITH <b>WINETRICKS</b>")!$(eval_gettext "Automatically install with <b>WINETRICKS</b> additional libraries required to run the game/program. List of libraries separated by spaces") :CBE" "${PW_DLL_INSTALL}!vcrun2019 corefonts lucida" \
-    --field="$(eval_gettext "Forced to use/disable libraries")!$(eval_gettext "Forced to use/disable the library only for the given application. (There are examples in the drop-down list)") :CBE" "${WINEDLLOVERRIDES}!libglesv2=!d3dx9_36,d3dx9_42=n,b;mfc120=b,n" \
+    --field="$(eval_gettext "Forced to use/disable libraries")!$(eval_gettext "Forced to use/disable the library only for the given application. (There are examples in the drop-down list)
+
+A brief instruction:
+	* libraries are written <b>WITHOUT</b> the .dll file extension
+	* libraries are separated by semicolons - <b>;</b>
+	* library=n - use the <b>WINDOWS</b> (third-party) library
+	* library=b - use <b>WINE</b> (built-in) library
+	* library=n,b - use <b>WINDOWS</b> library and then <b>WINE</b>
+	* library=b,n - use <b>WINE</b> library and then <b>WINDOWS</b>
+	* library= - disable the use of this library") :CBE" "${WINEDLLOVERRIDES}!libglesv2=!d3dx9_36,d3dx9_42=n,b;mfc120=b,n" \
     --field=":LBL" "" \
     --field="$(eval_gettext "ADD ARGUMENTS FOR .EXE FILE")!$(eval_gettext "Adding an argument after the <b>.exe</b> file, just like you would add an argument in a shortcut on a <b>WINDOWS </b> system") :CBE" "\\${LAUNCH_PARAMETERS[@]}!-dx11 -skipintro 1" \
     --field=":LBL" "" \
@@ -2975,7 +2987,7 @@ gui_vkBasalt () {
     local PW_ChromaticAberration_INFO=$(eval_gettext 'Adds chromatic aberration to an image')
     local PW_Clarity_INFO=$(eval_gettext 'Sharpening textures with slight modifications of image contrast (similar in effect to CAS)')
     local PW_ColorMatrix_INFO=$(eval_gettext 'Adding cool colors')
-    local PW_Colourfulness_INFO=$(eval_gettext 'Increasing color saturation. Increasing color saturation')
+    local PW_Colourfulness_INFO=$(eval_gettext 'Increasing color saturation')
     local PW_FakeHDR_INFO=$(eval_gettext 'Add fake HDR')
     local PW_FilmGrain2_INFO=$(eval_gettext 'Adding the film grain effect')
     local PW_Curves_INFO=$(eval_gettext 'Increases the contrast of the image without affecting the bright and dark areas, so that the detail in shadows and sky is not lost')
@@ -3721,7 +3733,7 @@ EOF
         mv -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack"
         yad_info "$(eval_gettext "Backup has been successfully created for prefix:") $PW_PREFIX_NAME"
         if [[ ! -f "${PORT_WINE_TMP_PATH}/pfx_backup_info" ]] ; then
-            yad_info "$(eval_gettext "Attention! Do not pass the resev copy to third parties, there is a risk of losing accounts")"
+            yad_info "$(eval_gettext "Attention! Do not pass the resev copy to third parties, there is a risk of losing accounts!")"
             echo "1" > "${PORT_WINE_TMP_PATH}/pfx_backup_info"
         fi
     else

data_from_portwine/scripts/portwine_db/Anno4

@@ -5,11 +5,13 @@
 #####################examples###########################
 if [[ "$LANGUAGE" == "ru" ]] ; then
     export PW_COMMENT_DB="Если после первого запуска вы увидите черный экран, просто перезапустите игру."
-fi
+else
-if [ "${update_loc}" = "ENG" ] ; then
     export PW_COMMENT_DB="If after the first launch you see a black screen,\njust restart the game."
 fi
+
 export PW_VULKAN_USE=1
+
+add_in_start_portwine () {
     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

data_from_portwine/scripts/portwine_db/HogwartsLegacy

@@ -8,8 +8,7 @@ if [[ "$LANGUAGE" == "ru" ]] ; then
 clearcpuid=514 в раздел GRUB_CMDLINE_LINUX_DEFAULT
 в файле /etc/default/grub. Для упрощения можно использовать
 утилиту Grub Customizer"
-fi
+else
-if [ "${update_loc}" = "ENG" ] ; then
     export PW_COMMENT_DB="If your game does not start, you need to add
 clearcpuid=514 to the GRUB_CMDLINE_LINUX_DEFAULT section
 in the /etc/default/grub file. To simplify things, you can use

data_from_portwine/scripts/portwine_db/IGClient

@@ -6,7 +6,7 @@
 if [[ "$LANGUAGE" == "ru" ]] ; then
     export PW_COMMENT_DB="После первого подтверждения логина в вашем браузере, необходимо перезапустить игру."
 fi
-if [ "${update_loc}" = "ENG" ] ; then
+if [[ "$LANGUAGE" == "ru" ]] ; then
     export PW_COMMENT_DB="After the first login confirmation in your browser, you need to restart the game."
 fi
 

data_from_portwine/scripts/portwine_db/MWO

@@ -4,11 +4,9 @@
 #MWO.exe
 #Rating=1-5
 #####################examples###########################
-
 if [[ "$LANGUAGE" == "ru" ]] ; then
      export PW_COMMENT_DB="На данный момент игра работает, но долго запускаеться из Лаунчера.\nПосле установки игры, при повторном запуске, игра будет запускаться быстро."
-fi
+else
-if [ "${update_loc}" = "ENG" ] ; then
      export PW_COMMENT_DB="At the moment the game works, but it takes a long time to start from the Launcher.\nAfter installing the game, when restarting, the game will start quickly."
 fi
 

data_from_portwine/scripts/portwine_db/default

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-#Author: linux-gaming.ru
-#name_exe_file.exe
-#Rating=1-5
-#####################examples###########################
-# # if [[ "$LANGUAGE" == "ru" ]] ; then
-# #     export PW_COMMENT_DB="blalala rus"
-# # fi
-# # if [ "${update_loc}" = "ENG" ] ; then
-# #     export PW_COMMENT_DB="blaala eng"
-# # fi
-
-##export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
-##export PW_DLL_INSTALL="vcrun2017"               # Install DLL in port prefix (used winetricks)
-##export WINEDLLOVERRIDES="blabla=n,b"
-##export LAUNCH_PARAMETERS="+com_skipIntroVideo 1 +com_skipSignInManager 1"               # Additional launch options
-
-##export PW_VULKAN_USE=1                          # 1 ,dxvk or 0 for OpenGL
-##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
-##export PW_OLD_GL_STRING=1
-##export PW_HIDE_NVIDIA_GPU=1
-##export PW_FORCE_USE_VSYNC=0                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
-##export PW_VIRTUAL_DESKTOP=1
-##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue
-
-##export ENABLE_VKBASALT=1
-##export PW_VKBASALT_EFFECTS="FakeHDR:cas"        # Use Reshade in others games (dx9-12 to vulkan only)
-##export PW_VKBASALT_FFX_CAS="0.75"               # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1)
-
-##export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
-##export PW_NO_ESYNC=0                            # Do not use eventfd-based in-process synchronization primitives
-##export PW_USE_GSTREAMER=1                       # 0 - disabled use winegstreamer 
-##export PW_REDUCE_PULSE_LATENCY=1                    # Fix crackling audio in games
-
-##export PW_NO_WRITE_WATCH=1                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
-##export PW_HEAP_DELAY_FREE=1
-
-##export WINEARCH=win32                           # defaut = win64
-##export WINEPREFIX=
-
-##export PW_USE_TERMINAL=1                        # Force run in terminal
-##export PW_GUI_DISABLED_CS=1                     # 1 = disabled GUI
-
-##export PATH_TO_GAME=
-
-##add_in_start_portwine () { commands ; }

data_from_portwine/scripts/pw_autoinstall/PW_LOL

@@ -20,11 +20,10 @@ if try_download "https://lol.secure.dyn.riotcdn.net/channels/public/x/installer/
 then
     pw_start_progress_bar_block "Installing League of Legends."
     if [[ "$LANGUAGE" == "ru" ]] ; then
-       yad_info "Вы должны нажать кнопку установки, не изменяя настроек!"
+        yad_info "Вы должны нажать кнопку установки, не изменяя настроек!"
-   fi
+    else
-   if [ "${update_loc}" = "ENG" ] ; then
+        yad_info "You must click the install button without changing the settings!"
-       yad_info "You must click the install button without changing the settings!"
+    fi
-  fi
     pw_kill_autostart RiotClientServices.exe &
     pw_run "${PW_AUTOINSTALL_EXE}" 
     portwine_exe="$WINEPREFIX/drive_c/Riot Games/Riot Client/RiotClientServices.exe"

data_from_portwine/scripts/start.sh

@@ -280,22 +280,26 @@ use: [--reinstall] [--autoinstall]
         export PW_YAD_SET="$2"
         pw_autoinstall_from_db
         exit 0 ;;
+
+    '--generate-pot' )
+        generate_pot
+        exit 0 ;;
 esac
 
 ### GUI ###
 
-export PW_PREFIX_NAME="$(echo "${PW_PREFIX_NAME}" | sed -e s/[[:blank:]]/_/g)"
+PW_PREFIX_NAME="$(echo "${PW_PREFIX_NAME}" | sed -e s/[[:blank:]]/_/g)"
-export PW_ALL_PREFIXES=$(ls "${PORT_WINE_PATH}/data/prefixes/" | sed -e s/"${PW_PREFIX_NAME}$"//g)
+PW_ALL_PREFIXES=$(ls "${PORT_WINE_PATH}/data/prefixes/" | sed -e s/"${PW_PREFIX_NAME}$"//g)
 
 unset PW_ADD_PREFIXES_TO_GUI
 IFS_OLD=$IFS
 IFS=$'\n'
 for PAIG in ${PW_ALL_PREFIXES[*]} ; do
     [[ "${PAIG}" != $(echo "${PORTWINE_DB^^}" | sed -e s/[[:blank:]]/_/g) ]] && \
-    export PW_ADD_PREFIXES_TO_GUI="${PW_ADD_PREFIXES_TO_GUI}!${PAIG}"
+    PW_ADD_PREFIXES_TO_GUI="${PW_ADD_PREFIXES_TO_GUI}!${PAIG}"
 done
 IFS=$IFS_OLD
-export PW_ADD_PREFIXES_TO_GUI="${PW_PREFIX_NAME^^}${PW_ADD_PREFIXES_TO_GUI}"
+PW_ADD_PREFIXES_TO_GUI="${PW_PREFIX_NAME^^}${PW_ADD_PREFIXES_TO_GUI}"
 
 PW_ALL_DIST=$(ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"${PW_WINE_LG_VER}$//g" | sed -e s/"${PW_PROTON_LG_VER}$//g")
 if command -v wine &>/dev/null
@@ -304,47 +308,52 @@ else unset DIST_ADD_TO_GUI
 fi
 for DAIG in ${PW_ALL_DIST}
 do
-    export DIST_ADD_TO_GUI="${DIST_ADD_TO_GUI}!${DAIG}"
+    DIST_ADD_TO_GUI="${DIST_ADD_TO_GUI}!${DAIG}"
 done
 
 check_nvidia_rtx && check_variables PW_VULKAN_USE "2"
 
+SORT_OPENGL="$(eval_gettext "OPENGL (For video cards without VULKAN)")"
+SORT_STABLE="$(eval_gettext "Stable") DXVK ${DXVK_STABLE_VER}, VKD3D ${VKD3D_STABLE_VER}"
+SORT_NEWEST="$(eval_gettext "Newest") DXVK ${DXVK_GIT_VER}, VKD3D ${VKD3D_GIT_VER}"
+SORT_GALLIUM="$(eval_gettext "GALLIUM_NINE (DX9 for MESA)")"
+
 case "${PW_VULKAN_USE}" in
-    0) export PW_DEFAULT_VULKAN_USE="$(eval_gettext "OPENGL (For video cards without VULKAN)")!$(eval_gettext "Stable DXVK ${DXVK_STABLE_VER}, VKD3D ${VKD3D_STABLE_VER}")!$(eval_gettext "Newest DXVK ${DXVK_GIT_VER}, VKD3D ${VKD3D_GIT_VER}")!$(eval_gettext "GALLIUM_NINE (DX9 for MESA)")" ;;
+    0) PW_DEFAULT_VULKAN_USE="$SORT_OPENGL!$SORT_STABLE!$SORT_NEWEST!$SORT_GALLIUM" ;;
-    1) export PW_DEFAULT_VULKAN_USE="$(eval_gettext "Stable DXVK ${DXVK_STABLE_VER}, VKD3D ${VKD3D_STABLE_VER}")!$(eval_gettext "Newest DXVK ${DXVK_GIT_VER}, VKD3D ${VKD3D_GIT_VER}")!$(eval_gettext "OPENGL (For video cards without VULKAN)")!$(eval_gettext "GALLIUM_NINE (DX9 for MESA)")" ;;
+    1) PW_DEFAULT_VULKAN_USE="$SORT_STABLE!$SORT_NEWEST!$SORT_OPENGL!$SORT_GALLIUM" ;;
-    3) export PW_DEFAULT_VULKAN_USE="$(eval_gettext "GALLIUM_NINE (DX9 for MESA)")!$(eval_gettext "Stable DXVK ${DXVK_STABLE_VER}, VKD3D ${VKD3D_STABLE_VER}")!$(eval_gettext "Newest DXVK ${DXVK_GIT_VER}, VKD3D ${VKD3D_GIT_VER}")!$(eval_gettext "OPENGL (For video cards without VULKAN)")" ;;
+    3) PW_DEFAULT_VULKAN_USE="$SORT_GALLIUM!$SORT_STABLE!$SORT_NEWEST!$SORT_OPENGL" ;;
-    *) export PW_DEFAULT_VULKAN_USE="$(eval_gettext "Newest DXVK ${DXVK_GIT_VER}, VKD3D ${VKD3D_GIT_VER}")!$(eval_gettext "Stable DXVK ${DXVK_STABLE_VER}, VKD3D ${VKD3D_STABLE_VER}")!$(eval_gettext "OPENGL (For video cards without VULKAN)")!$(eval_gettext "GALLIUM_NINE (DX9 for MESA)")" ;;
+    *) PW_DEFAULT_VULKAN_USE="$SORT_NEWEST!$SORT_STABLE!$SORT_OPENGL!$SORT_GALLIUM" ;;
 esac
 
 if [[ ! -z "${PORTWINE_DB_FILE}" ]] ; then
     [[ -z "${PW_COMMENT_DB}" ]] && PW_COMMENT_DB="$(eval_gettext "PortProton database file was found for") <b>${PORTWINE_DB}</b>."
     if [[ ! -z $(echo "${PW_WINE_USE}" | grep "^PROTON_LG$") ]] ; then
-        export PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+        PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
     elif [[ ! -z $(echo "${PW_WINE_USE}" | grep "^PROTON_GE$") ]] ; then
-        export PW_DEFAULT_WINE_USE="${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+        PW_DEFAULT_WINE_USE="${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
     else
         if [[ "${PW_WINE_USE}" == "${PW_PROTON_LG_VER}" ]] ; then
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+            PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
         elif [[ "${PW_WINE_USE}" == "${PW_WINE_LG_VER}" ]] ; then
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+            PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
         else
-            export DIST_ADD_TO_GUI=$(echo "${DIST_ADD_TO_GUI}" | sed -e s/"\!${PW_WINE_USE}$//g")
+            DIST_ADD_TO_GUI=$(echo "${DIST_ADD_TO_GUI}" | sed -e s/"\!${PW_WINE_USE}$//g")
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+            PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
         fi
     fi
 else
     if [[ $PW_WINE_USE == PROTON_LG ]] ; then
-        export PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+        PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
     elif [[ $PW_WINE_USE == WINE_*_LG ]] ; then
-        export PW_DEFAULT_WINE_USE="${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+        PW_DEFAULT_WINE_USE="${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
     else
         if [[ "${PW_WINE_USE}" == "${PW_PROTON_LG_VER}" ]] ; then
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+            PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
         elif [[ "${PW_WINE_USE}" == "${PW_WINE_LG_VER}" ]] ; then
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+            PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
         else
-            export DIST_ADD_TO_GUI=$(echo "${DIST_ADD_TO_GUI}" | sed -e s/"\!${PW_WINE_USE}$//g")
+            DIST_ADD_TO_GUI=$(echo "${DIST_ADD_TO_GUI}" | sed -e s/"\!${PW_WINE_USE}$//g")
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
+            PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_WINE_LG_VER}!${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
         fi
     fi
     unset PW_GUI_DISABLED_CS
@@ -398,7 +407,10 @@ else
     for PW_DESKTOP_FILES in ${PW_ALL_DF} ; do
         PW_NAME_D_ICON="$(cat "${PORT_WINE_PATH}/${PW_DESKTOP_FILES}" | grep Icon | awk -F= '{print $2}')"
         PW_NAME_D_ICON_48="${PW_NAME_D_ICON//".png"/"_48.png"}"
-        if [[ ! -f "${PW_NAME_D_ICON_48}" ]]  && [[ -f "${PW_NAME_D_ICON}" ]] && [[ -x "`command -v "convert" 2>/dev/null`" ]] ; then
+        if [[ ! -f "${PW_NAME_D_ICON_48}" ]]  \
+        && [[ -f "${PW_NAME_D_ICON}" ]] \
+        && command -v "convert" 2>/dev/null
+        then
             convert "${PW_NAME_D_ICON}" -resize 48x48 "${PW_NAME_D_ICON_48}"
         fi
         PW_GENERATE_BUTTONS+="--field=   ${PW_DESKTOP_FILES//".desktop"/""}!${PW_NAME_D_ICON_48}!:FBTN%@bash -c \"run_desktop_b_click "${PW_DESKTOP_FILES//" "/¬}"\"%"
@@ -411,29 +423,29 @@ else
     IFS="$orig_IFS"
 
     "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --separator=";" \
-    --field="   $(eval_gettext "REINSTALL PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \
+    --field="   $(eval_gettext "Reinstall PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \
-    --field="   $(eval_gettext "REMOVE PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
+    --field="   $(eval_gettext "Remove PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
-    --field="   $(eval_gettext "UPDATE PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
+    --field="   $(eval_gettext "Update PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
-    --field="   $(eval_gettext "CHANGELOG")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click open_changelog"' \
+    --field="   $(eval_gettext "Changelog")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click open_changelog"' \
-    --field="   $(eval_gettext "CHANGE LANGUAGE")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_loc"' \
+    --field="   $(eval_gettext "Change language")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_loc"' \
-    --field="   $(eval_gettext "EDIT USER.CONF")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \
+    --field="   $(eval_gettext "Edit user.conf")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \
-    --field="   $(eval_gettext "SCRIPTS FROM BACKUP")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \
+    --field="   $(eval_gettext "Scripts from backup")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click 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="   $(eval_gettext "CREDITS")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_credits"'  2>/dev/null &
+    --field="   $(eval_gettext "Credits")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_credits"'  2>/dev/null &
 
     "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --separator=";" \
     --field="  3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
     --field="  PREFIX  : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \
     --field="  WINE    : :CB" "${PW_DEFAULT_WINE_USE}" \
     --field="              $(eval_gettext "Create prefix backup")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' \
-    --field="   WINETRICKS"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_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"!"$(eval_gettext "Run winetricks to install additional libraries to the selected prefix")":"FBTN" '@bash -c "button_click WINETRICKS"' \
     --field="   $(eval_gettext "Clear prefix")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Clear the prefix to fix problems")":"FBTN" '@bash -c "button_click gui_clear_pfx"' \
     --field="   $(eval_gettext "Get other Wine")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Open the menu to download other versions of WINE or PROTON")":"FBTN" '@bash -c "button_click gui_proton_downloader"' \
     --field="   $(eval_gettext "Uninstaller")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run the program uninstaller built into wine")":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \
     --field="   $(eval_gettext "Prefix Manager")     "!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run winecfg to edit the settings of the selected prefix")":"FBTN" '@bash -c "button_click WINECFG"' \
     --field="   $(eval_gettext "File Manager")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine file manager")":"FBTN" '@bash -c "button_click WINEFILE"' \
-    --field="   $(eval_gettext "CMD")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine cmd")":"FBTN" '@bash -c "button_click WINECMD"' \
+    --field="   $(eval_gettext "Command line")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine cmd")":"FBTN" '@bash -c "button_click WINECMD"' \
-    --field="   $(eval_gettext "REGEDIT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine regedit")":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" &
+    --field="   $(eval_gettext "Regedit")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine regedit")":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" &
 
     "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll \
     --field="   Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"$(eval_gettext "Emulator for Nintendo game consoles with high compatibility")":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \
@@ -499,11 +511,11 @@ else
         --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
         --title "PortProton-${install_ver} (${scripts_install_ver})" \
         --tab-pos=bottom \
-        --tab="$(eval_gettext "Autoinstalls")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+        --tab="$(eval_gettext "AUTOINSTALLS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
-        --tab="$(eval_gettext "Emulators")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+        --tab="$(eval_gettext "EMULATORS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
-        --tab="$(eval_gettext "Wine Settings")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+        --tab="$(eval_gettext "WINE SETTINGS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
-        --tab="$(eval_gettext "PortProton Settings")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+        --tab="$(eval_gettext "PORTPROTON SETTINGS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
-        --tab="$(eval_gettext "Installed")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null
+        --tab="$(eval_gettext "INSTALLED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null
         YAD_STATUS="$?"
     else
         "${pw_yad_v13_0}" --key=$KEY --notebook --expand \
@@ -511,11 +523,11 @@ else
         --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
         --title "PortProton-${install_ver} (${scripts_install_ver})" \
         --tab-pos=bottom \
-        --tab="$(eval_gettext "Installed")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+        --tab="$(eval_gettext "INSTALLED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
-        --tab="$(eval_gettext "Autoinstalls")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+        --tab="$(eval_gettext "AUTOINSTALLS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
-        --tab="$(eval_gettext "Emulators")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+        --tab="$(eval_gettext "EMULATORS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
-        --tab="$(eval_gettext "Wine Settings")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
+        --tab="$(eval_gettext "WINE SETTINGS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
-        --tab="$(eval_gettext "PortProton Settings")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null
+        --tab="$(eval_gettext "PORTPROTON SETTINGS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null
         YAD_STATUS="$?"
     fi
 
@@ -539,10 +551,10 @@ else
 fi
 
 case "${VULKAN_MOD}" in
-    "$(eval_gettext "OPENGL (For video cards without VULKAN)")" )                       export PW_VULKAN_USE="0" ;;
+    "$SORT_OPENGL" )     export PW_VULKAN_USE="0" ;;
-    "$(eval_gettext "Stable DXVK ${DXVK_STABLE_VER} и VKD3D ${VKD3D_STABLE_VER}")" )    export PW_VULKAN_USE="1" ;;
+    "$SORT_STABLE" )     export PW_VULKAN_USE="1" ;;
-    "$(eval_gettext "Newest DXVK ${DXVK_GIT_VER} и VKD3D ${VKD3D_GIT_VER}")" )          export PW_VULKAN_USE="2" ;;
+    "$SORT_NEWEST" )     export PW_VULKAN_USE="2" ;;
-    "$(eval_gettext "GALLIUM_NINE (DX9 for MESA)")" )                                   export PW_VULKAN_USE="3" ;;
+    "$SORT_GALLIUM" )    export PW_VULKAN_USE="3" ;;
 esac
 
 init_wine_ver

data_from_portwine/scripts/var

@@ -2,6 +2,7 @@
 #Author: Castro-Fidel (linux-gaming.ru)
 #SCRIPTS_NEXT_VERSION=2282
 ########################################################################
+export LANGUAGES_LIST="ru"
 export PW_MANGOHUD="0"
 export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"
 export PW_VKBASALT_EFFECTS="Curves:cas"