update locales

data_from_portwine/scripts/credits

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Author: chal55rus, Castro-Fidel (linux-gaming.ru)
 ########################################################################
-if [ "${update_loc}" = "RUS" ]
+if [[ "$LANGUAGE" == "ru" ]]
 then
     KEY_CREDITS=$RANDOM
 

data_from_portwine/scripts/functions_helper

@@ -41,11 +41,19 @@ change_locale () {
         LANGUAGE=$(cat "${PORT_WINE_TMP_PATH}/PortProton_loc")
     fi
 
+    if [[ "$LANGUAGE" == "RUS" ]] ; then
+        LANGUAGE=ru
+        echo "ru" > "${PORT_WINE_TMP_PATH}/PortProton_loc"
+    elif [[ "$LANGUAGE" == "ENG" ]] ; then
+        LANGUAGE=en
+        echo "en" > "${PORT_WINE_TMP_PATH}/PortProton_loc"
+    fi
+
     if [[ -z "${LANG}" ]] ; then
         export LANG=C
         LANGUAGE="en"
     else
-        if [[ "${LANGUAGE}" == "ru" || "${LANGUAGE}" == "en" ]] \
+        if [[ ! -z "${LANGUAGE}" ]] \
         && [[ -f "${PORT_WINE_TMP_PATH}/PortProton_loc" ]] ; then
             echo ""
         else
@@ -61,11 +69,31 @@ change_locale () {
             fi
         fi
     fi
-    export $LANGUAGE
+    export LANGUAGE
 }
-
 export -f change_locale
 
+generate_pot () {
+    LANGUAGES_LIST=(ru)
+    for lang in "${LANGUAGES_LIST[@]}"
+    do
+    echo "${lang}"
+    mkdir -p "${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/"
+    LANG_PO="${PORT_WINE_PATH}/data/locales/"${lang}"/LC_MESSAGES/PortProton.po"
+    LANG_MO="${PORT_WINE_PATH}/data/locales/"${lang}"/LC_MESSAGES/PortProton.mo"
+    TEMPLATE_POT="${PORT_WINE_PATH}/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
+    if [ -f "$LANG_PO" ]; then
+        echo "update $LANG_PO file"
+        msgmerge --update $LANG_PO $TEMPLATE_POT
+    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
 
 check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}
 
@@ -180,7 +208,7 @@ try_download () {
         curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
         -H 'Pragma: no-cache' -L "$url" -o "$dest" 2>&1 | \
         tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \
-        "$pw_yad_v13_0" --progress --percentage=0 --text="${loc_downloading} $filename" --auto-close --no-escape \
+        "$pw_yad_v13_0" --progress --percentage=0 --text="$(eval_gettext "Downloading") $filename" --auto-close --no-escape \
         --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \
         --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15
     fi
@@ -192,7 +220,7 @@ try_download () {
             curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
             -H 'Pragma: no-cache' -L "$url" -o "$dest" 2>&1 | \
             tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \
-            "$pw_yad_v13_0" --progress --percentage=0 --text="${loc_downloading} $filename" --auto-close --no-escape \
+            "$pw_yad_v13_0" --progress --percentage=0 --text="$(eval_gettext "Downloading") $filename" --auto-close --no-escape \
             --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \
             --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15
         fi
@@ -400,29 +428,6 @@ pw_reinstall_pp () {
     exit 0
 }
 
-generate_pot () {
-    LANGUAGES_LIST=(ru)
-    for lang in "${LANGUAGES_LIST[@]}"
-    do
-    echo "${lang}"
-    mkdir -p "${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/"
-    LANG_PO="${PORT_WINE_PATH}/data/locales/"${lang}"/LC_MESSAGES/PortProton.po"
-    LANG_MO="${PORT_WINE_PATH}/data/locales/"${lang}"/LC_MESSAGES/PortProton.mo"
-    TEMPLATE_POT="${PORT_WINE_PATH}/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
-    if [ -f "$LANG_PO" ]; then
-        echo "update $LANG_PO file"
-        msgmerge --update $LANG_PO $TEMPLATE_POT
-    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
-
 check_user_conf () {
     if [ ! -f "${USER_CONF}" ]; then
         echo "#!/usr/bin/env bash" > "${USER_CONF}"
@@ -1430,7 +1435,7 @@ pw_find_exe () {
     PW_EXCLUDE_EXE_FIND='(windows|explorer|anticheat|programdata|redist|setup|.ppdb|unin|error|crash|handler|install|/jre/|steam|uploader|eac|netframe)'
     PW_PATH_FOR_FIND="${PORT_WINE_PATH}/data/prefixes/"
 
-    pw_start_progress_bar_block "Searching for .exe files... Please wait."
+    pw_start_progress_bar_block "$(eval_gettext "Searching for .exe files... Please wait.")"
     find -P "${PW_PATH_FOR_FIND}" -type f -name "*.exe" ${PW_FIND_TIME} | grep -viE ${PW_EXCLUDE_EXE_FIND} | \
     awk -F"/prefixes/" '{print $2}' > "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe"
     pw_stop_progress_bar
@@ -1571,7 +1576,7 @@ start_portwine () {
         && [[ "${DISABLE_CP_DEFPFX}" == 1 ]] ; then
             pw_update_pfx_cover_gui
             pw_wineboot -i
-        elif yad_question "$loc_gui_dll_new_pfx ${PW_PREFIX_NAME}" ; then
+        elif yad_question "$(eval_gettext "Do you want to installing recommended libraries in the new prefix:") ${PW_PREFIX_NAME}" ; then
             pw_update_pfx_cover_gui
             unpack_tar_xz "${PW_PLUGINS_PATH}/default_pfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" silent
             pw_wineboot -r
@@ -2459,6 +2464,19 @@ pw_start_progress_bar_block () {
     fi
 }
 
+pw_start_progress_bar_install_game () {
+    if ! check_start_from_steam ; then
+        "${pw_yad}" --progress --progress-text="$(eval_gettext "Please wait. Installing the") $@
+        " --pulsate --borders="$PROGRESS_BAR_BORDERS_SIZE" \
+        --no-buttons --undecorated --center --skip-taskbar \
+        --width="$PROGRESS_BAR_WIDTH_SIZE" \
+        --wrap-width="$PROGRESS_BAR_WIDTH_SIZE" \
+        --window-icon="$PW_GUI_ICON_PATH/portproton.svg" &>/dev/null &
+        export PW_YAD_PID_PROGRESS_BAR_BLOCK="$!"
+        return 0
+    fi
+}
+
 pw_stop_progress_bar () {
     for PW_KILL_YAD_PID in "$PW_YAD_PID_PROGRESS_BAR_BLOCK" "$PW_YAD_PID_PROGRESS_BAR_CS" \
                            "$PW_YAD_PID_PFX_COVER_UI" "$PW_YAD_PID_PROGRESS_BAR_COVER"
@@ -3346,7 +3364,7 @@ portwine_create_shortcut () {
             done
             if [[ "${PW_SKIP_RESTART_STEAM}" != 1 ]] && pgrep -i steam &>/dev/null ; then
                 if yad_question "$(eval_gettext "For adding shortcut to STEAM, needed restart.\n\nRestart STEAM now?")" ; then
-                    pw_start_progress_bar_block "Restarting STEAM... Please wait."
+                    pw_start_progress_bar_block "$(eval_gettext "Restarting STEAM... Please wait.")"
                     kill -s SIGTERM $(pgrep -a steam) &>/dev/null
                     while pgrep -i steam &>/dev/null ; do
                         sleep 0.5
@@ -3701,13 +3719,13 @@ EOF
     try_remove_file "${PORT_WINE_TMP_PATH}"/pp_pfx_backup.sh
     if [[ -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" ]] ; then
         mv -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack"
-        yad_info "$PW_PFX_BACKUP_SUCCESS $PW_PREFIX_NAME"
+        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 "$PW_PFX_BACKUP_INFO"
+            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
-        yad_error "$PW_PFX_BACKUP_ERROR $PW_PREFIX_NAME"
+        yad_error "$(eval_gettext "An error occurred while backing up the prefix:") $PW_PREFIX_NAME"
     fi
     return 0
 }

data_from_portwine/scripts/portwine_db/Anno4

@@ -3,7 +3,7 @@
 #Anno4.exe
 #Rating=1-5
 #####################examples###########################
-if [ "${update_loc}" = "RUS" ] ; then
+if [[ "$LANGUAGE" == "ru" ]] ; then
     export PW_COMMENT_DB="Если после первого запуска вы увидите черный экран, просто перезапустите игру."
 fi
 if [ "${update_loc}" = "ENG" ] ; then

data_from_portwine/scripts/portwine_db/HogwartsLegacy

@@ -3,7 +3,7 @@
 #HogwartsLegacy.exe
 #Rating=1-5
 #####################examples###########################
-if [ "${update_loc}" = "RUS" ] ; then
+if [[ "$LANGUAGE" == "ru" ]] ; then
     export PW_COMMENT_DB="Если у вас игра не запускается, то необходимо добавить
 clearcpuid=514 в раздел GRUB_CMDLINE_LINUX_DEFAULT
 в файле /etc/default/grub. Для упрощения можно использовать

data_from_portwine/scripts/portwine_db/IGClient

@@ -3,7 +3,7 @@
 #IGClient.exe
 #Rating=1-5
 #####################examples###########################
-if [ "${update_loc}" = "RUS" ] ; then
+if [[ "$LANGUAGE" == "ru" ]] ; then
     export PW_COMMENT_DB="После первого подтверждения логина в вашем браузере, необходимо перезапустить игру."
 fi
 if [ "${update_loc}" = "ENG" ] ; then

data_from_portwine/scripts/portwine_db/MWO

@@ -5,7 +5,7 @@
 #Rating=1-5
 #####################examples###########################
 
-if [ "${update_loc}" = "RUS" ] ; then
+if [[ "$LANGUAGE" == "ru" ]] ; then
      export PW_COMMENT_DB="На данный момент игра работает, но долго запускаеться из Лаунчера.\nПосле установки игры, при повторном запуске, игра будет запускаться быстро."
 fi
 if [ "${update_loc}" = "ENG" ] ; then

data_from_portwine/scripts/portwine_db/Origin

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#Author: PortWINE
-#Origin.exe 
-#Rating=?
-#####################examples###########################
-export PW_DLL_INSTALL="vcrun2012 vcrun2019"               # Install DDL in port prefix (used winetricks) 
-export PW_VULKAN_USE=1                       # dxvk, vkd3d or 0 for OpenGL
-export PW_USE_TERMINAL="1"
-
-###WINE_KRON4EK###
-# export PW_WINE_USE="WINE-7.13-STAGING-AMD64"
-# check_download_wine_ver_for_origin () {
-#     if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then
-#         if try_download "https://github.com/Kron4ek/Wine-Builds/releases/download/7.13/wine-7.13-staging-amd64.tar.xz" \
-#         "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then
-#             if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then
-#                 try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz"
-#                 UNPACK_STATUS=0
-#             else
-#                 try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz"
-#                 try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}"
-#             fi
-#         fi
-#         [[ "${UNPACK_STATUS}" != 0 ]] && exit 1
-#     fi
-# }
-# check_download_wine_ver_for_origin

data_from_portwine/scripts/portwine_db/default

@@ -3,7 +3,7 @@
 #name_exe_file.exe
 #Rating=1-5
 #####################examples###########################
-# # if [ "${update_loc}" = "RUS" ] ; then
+# # if [[ "$LANGUAGE" == "ru" ]] ; then
 # #     export PW_COMMENT_DB="blalala rus"
 # # fi
 # # if [ "${update_loc}" = "ENG" ] ; then

data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Ankama-Setup.exe"
 start_portwine
 if try_download "https://download.ankama.com/launcher/full/win/" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Ankama Launcher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Ankama Launcher."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Programs/Ankama Launcher/Ankama Launcher.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
 ########################################################################
-[ "${update_loc}" = "RUS" ] && export BN_LOC=ruRU || export BN_LOC=enUS
+[[ "$LANGUAGE" == "ru" ]] && export BN_LOC=ruRU || export BN_LOC=enUS
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe"
 export PW_WINE_USE="WINE_LG"
 
@@ -11,8 +11,8 @@ then
     try_remove_dir "$WINEPREFIX/drive_c/ProgramData/Battle.net"
     pw_kill_autostart Battle.net.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
-    pw_start_progress_bar_block "${loc_gui_installing_the} Battle Net. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Battle Net."
-    portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "Battle.net.exe" | grep "Battle.net/Battle.net.exe"`
+    portwine_exe="$(find "$WINEPREFIX/drive_c/" -type f -name "Battle.net.exe" | grep "Battle.net/Battle.net.exe")"
     pw_stop_progress_bar
     portwine_create_shortcut
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_BDO

@@ -16,7 +16,7 @@ wait_wineserver
 
 if try_download "https://nez-o-dn.playblackdesert.com/UploadData/installer/BlackDesert_Installer_RU.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Black Desert Online. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Black Desert Online."
     pw_run "${PW_AUTOINSTALL_EXE}" 
     portwine_exe="$WINEPREFIX/drive_c/Pearlabyss/BlackDesert/BlackDesertLauncher.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/BethesdaNetLauncher_Setup.exe"
 start_portwine
 if try_download"https://download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} BethesdaNetLauncher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "BethesdaNetLauncher."
     pw_kill_autostart BethesdaNetLauncher.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Bethesda.net Launcher/BethesdaNetLauncher.exe"

data_from_portwine/scripts/pw_autoinstall/PW_BSR

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/bsr_setup.exe"
 start_portwine
 if try_download "https://battleofspaceraiders.com/install/bsr_setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Battle Of Space Raiders. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Battle Of Space Raiders."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Battle Of Space Raiders/aops.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_CALIBER

@@ -13,7 +13,7 @@ gui_proton_downloader silent "${PW_WINE_USE}"
 start_portwine
 if try_download "https://caliber-files.gcdn.co/caliber-s3/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} CALIBER. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "CALIBER."
     pw_kill_autostart VC_redist.x64.exe 3 &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/1C Game Studios/Caliber/Launcher.exe"

data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER

@@ -10,7 +10,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="CatsLauncher"
 start_portwine
 if try_download "https://catswhoplay.com/downloads/CatsLauncher_0.1.10.msi" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} CatsLauncher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "CatsLauncher."
     pw_run msiexec /i "${PW_AUTOINSTALL_EXE}"
     portwine_exe="${WINEPREFIX}/drive_c/Program Files/CatsWhoPlay/Cats Launcher/CatsLauncher.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_CEMU

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/`echo ${PW_URL_CEMU} | awk -F/ '{prin
 start_portwine
 if try_download "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Cemu. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Cemu."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/`echo ${PW_URL_CEMU} | awk -F/ '{print $5}' | sed 's/.zip//'`/Cemu.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_CITRA

@@ -9,7 +9,7 @@ start_portwine
 
 if try_download "github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Citra. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Citra."
     pw_run "${PW_AUTOINSTALL_EXE}"
     if [[ -f "$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Citra/nightly/citra-qt.exe" ]] ; then
         export portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Citra/nightly/citra-qt.exe"

data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT

@@ -9,7 +9,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Crossout"
 start_portwine
 if try_download "https://yupmaster.gaijinent.com/launcher/current.php?id=CrossoutLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Crossout. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Crossout."
     pw_kill_autostart launcher.exe 3 &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Crossout/launcher.exe"

data_from_portwine/scripts/pw_autoinstall/PW_CWC

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CWClient_Install.exe"
 start_portwine
 if try_download "https://cdn-01.contractwarsgame.com/standalone/CWClient_Install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} CONTRACT WARS Client. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "CONTRACT WARS Client."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Games/CWClient/CWClientLauncher.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_DEMUL

@@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/demul07_280418.7z"
 start_portwine
 if try_download "http://demul.emulation64.com/files/demul07_280418.7z" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Demul. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Demul."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Demul"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Demul/demul.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/dolphin-x64-5.0.exe"
 start_portwine
 if try_download "https://dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Dolphin 5.0. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Dolphin 5.0."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files/Dolphin/Dolphin.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_EAAPP

@@ -12,7 +12,7 @@ export PW_USE_EAC_AND_BE="1"
 start_portwine
 if try_download "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "EA Launcher."
     pw_kill_autostart EABackgroundSer 5 please &
     mkdir -p "$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop"
     pw_run "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_EPIC

@@ -11,7 +11,7 @@ try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
 start_portwine
 if try_download "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Epic Games Launcher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Epic Games Launcher."
     # try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Epic Games/Epic Online Services/"
     # try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Epic Games/Launcher/"
     # try_remove_dir "${WINEPREFIX}/drive_c/ProgramData/Epic"

data_from_portwine/scripts/pw_autoinstall/PW_EPSXE

@@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/ePSXe205.zip"
 start_portwine
 if try_download "https://www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" no_mirror 
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} VBA-M. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "VBA-M."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/EPSXe"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/EPSXe/ePSXe.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_EVE

@@ -21,7 +21,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher"
 start_portwine
 if try_download "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} EVE Online Launcher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "EVE Online Launcher."
     EVE_LAUNCHER_DIR="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/eve-online"
 
     $pw_7z x "${PW_USER_TEMP}/eve-online-latest+Setup.exe" -o"${EVE_LAUNCHER_DIR}" -y

data_from_portwine/scripts/pw_autoinstall/PW_FCEUX

@@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/fceux-2.6.5-win64.zip"
 start_portwine
 if try_download "https://github.com/TASEmulators/fceux/releases/download/v2.6.6/fceux-2.6.6-win64.zip" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} FCEUX. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "FCEUX."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/FCEUX"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/FCEUX/fceux64.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE

@@ -24,7 +24,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GameforgeInstaller.exe"
 start_portwine
 if try_download "https://raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}"
 then
-    pw_start_progress_bar_block "Gameforge-Client. ${loc_gui_please_wait} "
+    pw_start_progress_bar_block "Gameforge-Client."
     pw_shutdown_please SparkWebHelper.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GameforgeClient/gfclient.exe"

data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT

@@ -10,7 +10,7 @@ start_portwine
 
 if try_download "https://ys-api-os.mihoyo.com/event/download_porter/link/ys_global/genshinimpactpc/default" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Installing Genshin Impact Launcher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_block "Installing Genshin Impact Launcher."
     pw_kill_autostart launcher.exe &
     export PATH_TO_GAME="${PW_USER_TEMP}"
     pw_run "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_GLYPH

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GlyphInstall.exe"
 start_portwine
 if try_download "https://glyph.dyn.triongames.com/glyph/live/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} GlyphClient. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "GlyphClient."
     pw_kill_autostart GlyphClient.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Glyph/GlyphClient.exe"

data_from_portwine/scripts/pw_autoinstall/PW_GOG

@@ -15,7 +15,7 @@ start_portwine
 
 if try_download "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} GOG Galaxy. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "GOG Galaxy."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GOG Galaxy/GalaxyClient.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2

@@ -12,7 +12,7 @@ export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2S
 
 if try_download "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Guild Wars 2. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Guild Wars 2."
     pw_kill_autostart Gw2.exe 3 &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2.exe"

data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT

@@ -8,7 +8,7 @@ export PW_DLL_INSTALL="vcrun2019"
 start_portwine
 if try_download "https://content.indiegalacdn.com/common/IGClientSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Indiegala Client. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Indiegala Client."
     pw_kill_autostart IGClient.exe 3 &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="${WINEPREFIX}/drive_c/Program Files/IGClient/IGClient.exe"

data_from_portwine/scripts/pw_autoinstall/PW_ITCH

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/itch-setup.exe"
 start_portwine
 if try_download "https://itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} ITCH.IO. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "ITCH.IO."
     pw_kill_autostart itch.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe=`find "$WINEPREFIX/drive_c/users" -type f -name "itch.exe"`

data_from_portwine/scripts/pw_autoinstall/PW_LOL

@@ -18,8 +18,8 @@ start_portwine
 wait_wineserver
 if try_download "https://lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Installing League of Legends. ${loc_gui_please_wait} "
+    pw_start_progress_bar_block "Installing League of Legends."
-    if [ "${update_loc}" = "RUS" ] ; then
+    if [[ "$LANGUAGE" == "ru" ]] ; then
        yad_info "Вы должны нажать кнопку установки, не изменяя настроек!"
    fi
    if [ "${update_loc}" = "ENG" ] ; then

data_from_portwine/scripts/pw_autoinstall/PW_MAME

@@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/mame0259b_64bit.exe"
 start_portwine
 if try_download "https://github.com/mamedev/mame/releases/download/mame0259/mame0259b_64bit.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} MAME. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "MAME."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Mame"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Mame/mame.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_MW

@@ -10,7 +10,7 @@ start_portwine
 
 if try_download "https://gdn.gaijin.net/launcher/current.php?id=ModernWarshipsLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Modern Warships. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Modern Warships."
     pw_kill_autostart launcher.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/users/$USER/AppData/Local/ModernWarships/launcher.exe"

data_from_portwine/scripts/pw_autoinstall/PW_MWO

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/MWO_Launcher_Setup.exe"
 start_portwine
 if try_download "http://mwogame.com/download.php" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Metal War Online. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Metal War Online."
     pw_run "${PW_AUTOINSTALL_EXE}"
     if [[ -d "$WINEPREFIX/drive_c/games/" ]] ; then
         portwine_exe="$WINEPREFIX/drive_c/games/MetalWarOnline/MWOLauncher.exe"

data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Author: Castro-Fidel (linux-gaming.ru)
-########################################################################
-export LAUNCH_PARAMETERS=("/silent" "/NoLaunch" )
-export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/OriginSetup.exe"
-start_portwine
-if try_download "https://origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
-then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Origin. ${loc_gui_please_wait}"
-    # pw_kill_autostart Origin.exe &
-    pw_run "${PW_AUTOINSTALL_EXE}"
-    portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Origin/Origin.exe"
-    pw_stop_progress_bar
-    try_remove_file "${PW_AUTOINSTALL_EXE}"
-    try_remove_file "${portwine_exe}.ppdb"
-    kill_portwine
-    portwine_create_shortcut
-fi
-stop_portwine

data_from_portwine/scripts/pw_autoinstall/PW_OSU

@@ -11,7 +11,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_block "${loc_gui_installing_the} OSU!. ${loc_gui_please_wait} "
+    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
         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

data_from_portwine/scripts/pw_autoinstall/PW_PANZAR

@@ -10,7 +10,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Panzar"
 start_portwine
 if try_download "https://www.panzar.ru/ru/download/installer/" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Panzar. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Panzar."
     pw_kill_autostart start.exe 3 &
     pw_run "${PW_AUTOINSTALL_EXE}"
     export portwine_exe="${WINEPREFIX}/drive_c/Games/Panzar/start.exe"

data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY

@@ -11,7 +11,7 @@ export PW_PREFIX_NAME="DOTNET"
 start_portwine
 if try_download "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Plarium Play. ${loc_gui_please_wait}"
+    pw_start_progress_bar_install_game "Plarium Play."
     pw_kill_autostart PlariumPlay.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/PlariumPlay/PlariumPlay.exe"

data_from_portwine/scripts/pw_autoinstall/PW_POE

@@ -7,7 +7,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PathOfExileInstaller.exe"
 start_portwine
 if try_download "https://web.poecdn.com/protected/downloads/PathOfExileInstaller.exe?key=lpKVe-ZJOqVrur8612s8gg" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Path of Exile. ${loc_gui_please_wait}"
+    pw_start_progress_bar_install_game "Path of Exile."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Grinding Gear Games/Path of Exile/PathOfExile.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PPSSPPSetup.exe"
 start_portwine
 if try_download "https://ppsspp.org/files/1_16_5/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} PPSSPPS. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "PPSSPPS."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files/PPSSPP/PPSSPPWindows64.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64

@@ -16,7 +16,7 @@ then
     GET_URL_POSTFIX="$(cat "${PW_AUTOINSTALL_EXE}" | grep "Did your download not start?" | awk -F"$PR64_VER" '{print $2}' | awk -F'/' '{print $1}')"
     try_remove_file "${PW_AUTOINSTALL_EXE}"
     try_download "https://www.pj64-emu.com/file/setup-project64${PR64_VER}${GET_URL_POSTFIX}/" "${PW_AUTOINSTALL_EXE}" no_mirror
-    pw_start_progress_bar_block "${loc_gui_installing_the} Project64. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Project64."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Project64 3.0/Project64.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH

@@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/RetroArch.7z"
 start_portwine
 if try_download "https://buildbot.libretro.com/stable/1.16.0/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} RetroArch. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "RetroArch."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/RetroArch-Win64/retroarch.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR

@@ -8,11 +8,11 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Rockstar"
 start_portwine
 if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Rockstar-Games-Launcher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Rockstar Games Launcher."
     try_remove_dir "$WINEPREFIX/drive_c/Program Files/Rockstar Games/Launcher"
     pw_kill_autostart RockstarService.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
-    portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "Launcher.exe" | grep "Rockstar Games/Launcher/Launcher.exe"`
+    portwine_exe="$(find "$WINEPREFIX/drive_c/" -type f -name "Launcher.exe" | grep "Rockstar Games/Launcher/Launcher.exe")"
     pw_create_unique_exe "rockstar_launcher_pp"
     try_remove_file "${PW_AUTOINSTALL_EXE}"
     try_remove_file "${portwine_exe}.ppdb"

data_from_portwine/scripts/pw_autoinstall/PW_SO

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SO_installer.exe"
 start_portwine
 if try_download "https://update-nl-release.stalker.so/launcher/SO_installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Stalker Online. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Stalker Online."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Game/StalkerOnline/StalkerOnline Launcher.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT

@@ -9,7 +9,7 @@ export PW_PREFIX_NAME=DOTNET
 start_portwine
 if try_download "https://exbo2.b-cdn.net/EXBO_Setup_ru.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Installing STALCRAFT Launcher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "STALCRAFT Launcher."
     pw_kill_autostart ExboLauncher &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Roaming/EXBO/java/bin/ExboLauncher.exe"

data_from_portwine/scripts/pw_autoinstall/PW_STAR_RAIL

@@ -9,7 +9,7 @@ start_portwine
 
 if try_download "https://sg-public-api.hoyoverse.com/event/download_porter/link/hkrpg_global/oswebpc/default" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Installing Honkai Star Rail Launcher. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Honkai Star Rail Launcher."
     pw_kill_autostart launcher.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files/Star Rail/launcher.exe"

data_from_portwine/scripts/pw_autoinstall/PW_STEAM

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SteamSetup.exe"
 start_portwine
 if try_download "https://cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_cs "${loc_gui_installing_the} Steam. ${loc_gui_please_wait} "
+    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" ]

data_from_portwine/scripts/pw_autoinstall/PW_SWL

@@ -8,7 +8,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SecretWorldLegendsMin.exe"
 start_portwine
 if try_download "https://web-cdn.funcom.com/downloads/swl/SecretWorldLegendsMin.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Secret World Legends. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Secret World Legends."
     pw_kill_autostart ClientPatcher.exe &
 #    pw_kill_autostart PatcherSetup.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_UBC

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe"
 start_portwine
 if try_download "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_cs "${loc_gui_installing_the} Ubisoft Connect. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Ubisoft Connect."
     pw_kill_autostart UbisoftConnect.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Ubisoft Game Launcher/UbisoftConnect.exe"

data_from_portwine/scripts/pw_autoinstall/PW_VBA-M

@@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-x86_64.zip"
 start_portwine
 if try_download "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/latest/download/visualboyadvance-m-Win-x86_64.zip" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} VBA-M. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "VBA-M."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Visualboyadvance-m"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Visualboyadvance-m/visualboyadvance-m.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME

@@ -8,7 +8,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Warframe"
 start_portwine
 if try_download "http://content.warframe.com/dl/Warframe.msi" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Warframe. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Warframe."
     pw_kill_autostart Launcher.exe 3 &
     pw_run msiexec /i "${PW_AUTOINSTALL_EXE}"
     export portwine_exe="${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Warframe/Downloaded/Public/Tools/Launcher.exe"

data_from_portwine/scripts/pw_autoinstall/PW_WGC

@@ -2,7 +2,7 @@
 # Author: cefeiko
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
-[ "${update_loc}" = "RUS" ] && export WGC_LOC=RU || export WGC_LOC=EU
+[[ "$LANGUAGE" == "ru" ]] && export WGC_LOC=RU || export WGC_LOC=EU
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe"
 export PW_PREFIX_NAME="WGC"
 

data_from_portwine/scripts/pw_autoinstall/PW_WOSB

@@ -13,7 +13,7 @@ WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseaba
 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
 then
-    pw_start_progress_bar_block "Installing World of Sea Battle. ${loc_gui_please_wait} "
+    pw_start_progress_bar_block "Installing World of Sea Battle."
     pw_run "${PW_AUTOINSTALL_EXE}" 
     try_remove_file "${PW_AUTOINSTALL_EXE}"
     pw_stop_progress_bar

data_from_portwine/scripts/pw_autoinstall/PW_XEMU

@@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/xemu-win-release.zip"
 start_portwine
 if try_download "https://github.com/xemu-project/xemu/releases/latest/download/xemu-win-release.zip" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} xemu. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "xemu."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/xemu"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/xemu/xemu.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_XENIA

@@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/xenia_master.zip"
 start_portwine
 if try_download "https://github.com/xenia-project/release-builds-windows/releases/latest/download/xenia_master.zip" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Xenia. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Xenia."
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/xenia"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/xenia/xenia.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/yabause-0.9.15-win64.exe"
 start_portwine
 if try_download "https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "${loc_gui_installing_the} Yabause. ${loc_gui_please_wait} "
+    pw_start_progress_bar_install_game "Yabause."
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files/yabause 0.9.15/yabause.exe"
     try_remove_file "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/setup.sh

@@ -47,7 +47,7 @@ if check_flatpak \
 	if [[ -d "$PORT_WINE_OLD_PATH" ]] \
 	&& yad_question "$(eval_gettext "PortProton installed by script has been detected. Do you want to transfer all the data from it to the new flatpak version of PortProton?")"
 	then
-		pw_start_progress_bar_block "$loc_gui_settings"
+		pw_start_progress_bar_block "$(eval_gettext "Please wait...")"
 
 		try_remove_file "${HOME}/.local/share/applications/PortProton.desktop"
 		try_remove_file "${PORT_WINE_OLD_PATH}"/PortProton.desktop