Merge branch 'akai2211-master'

data_from_portwine/scripts/lang

@@ -331,6 +331,24 @@ if [[ "${update_loc}" == "RUS" ]] ; then
 	export loc_gui_installing_the="Устанавливаем"
 	export loc_gui_please_wait="Пожалуйста подождите..."
 
+	export loc_dolphin="Эмулятор для игровых консолей Nintendo с высокой совместимостью"
+	export loc_mame="Мультиаркадный эмулятор, позволяющий играть в старые аркадные игры"
+	export loc_scummvm="Эмулятор для классических квестовых игр от LucasArts и других студий"
+	export loc_retroarch="Многоплатформенный фронтенд для эмуляторов с обширными настройками"
+	export loc_ppsspp_windows="Windows - Эмулятор для игровой консоли PlayStation Portable (PSP)"
+	export loc_citra="Эмулятор для игровой консоли Nintendo 3DS"
+	export loc_cemu="Эмулятор для игровой консоли Wii U"
+	export loc_duckstation="Эмулятор для игровой консоли PlayStation 1"
+	export loc_epsxe="Эмулятор для игровой консоли PlayStation 1 с высокой совместимостью"
+	export loc_project64="Эмулятор для игровой консоли Nintendo 64"
+	export loc_vba_m="Эмулятор для игровой консоли Game Boy Advance"
+	export loc_yabause="Эмулятор для игровой консоли Sega Saturn"
+	export loc_xenia="Эмулятор для игровой консоли Xbox 360"
+	export loc_fceux=" Эмулятор для игровой консоли Nintendo Entertainment System (NES или Dendy)"
+	export loc_xemu="Эмулятор для игровой консоли Xbox"
+	export loc_demul="Эмулятор для игровой консоли Sega Dreamcast"
+	export loc_rpcs3="Эмулятор для игровой консоли PlayStation 3"
+
 elif [[ "${update_loc}" == "ENG" ]] ; then
 
 	export loc_gui_pw_reinstall_pp="REINSTALL ${portname}"
@@ -642,4 +660,23 @@ A brief instruction:
 
 	export loc_gui_installing_the="Installing the"
 	export loc_gui_please_wait="Please wait..."
+
+	export loc_dolphin="Emulator for Nintendo game consoles with high compatibility"
+	export loc_mame="Multi-arcade emulator that allows you to play old arcade games"
+	export loc_scummvm="Emulator for classic adventure games from LucasArts and other studios"
+	export loc_retroarch="Multi-platform frontend for emulators with extensive settings"
+	export loc_ppsspp_windows="Windows - Emulator for the PlayStation Portable (PSP) game console"
+	export loc_citra="Emulator for the Nintendo 3DS game console"
+	export loc_cemu="Emulator for the Wii U game console"
+	export loc_duckstation="Emulator for the PlayStation 1 game console"
+	export loc_epsxe="Emulator for the PlayStation 1 game console with high compatibility"
+	export loc_project64="Emulator for the Nintendo 64 game console"
+	export loc_vba_m="Emulator for the Game Boy Advance game console"
+	export loc_yabause="Emulator for the Sega Saturn game console"
+	export loc_xenia="Emulator for the Xbox 360 game console"
+	export loc_fceux="Emulator for the Nintendo Entertainment System (NES or Dendy) game console"
+	export loc_xemu="Emulator for the Xbox game console"
+	export loc_demul="Emulator for the Sega Dreamcast game console"
+	export loc_rpcs3="Emulator for the PlayStation 3 game console"
+
 fi

data_from_portwine/scripts/start.sh

@@ -772,23 +772,23 @@ else
     --field="   $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" &
 
     "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --keep-icon-size --scroll  \
-    --field="   Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \
-    --field="   MAME"!"$PW_GUI_ICON_PATH/mame.png"!"":"FBTN" '@bash -c "button_click PW_MAME"' \
-    --field="   ScummVM"!"$PW_GUI_ICON_PATH/scummvm.png"!"":"FBTN" '@bash -c "button_click PW_SCUMMVM"' \
-    --field="   RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"":"FBTN" '@bash -c "button_click PW_RETROARCH"' \
-    --field="   PPSSPP Windows"!"$PW_GUI_ICON_PATH/ppsspp.png"!"":"FBTN" '@bash -c "button_click PW_PPSSPP"' \
-    --field="   Citra"!"$PW_GUI_ICON_PATH/citra.png"!"":"FBTN" '@bash -c "button_click PW_CITRA"' \
-    --field="   Cemu"!"$PW_GUI_ICON_PATH/cemu.png"!"":"FBTN" '@bash -c "button_click PW_CEMU"' \
-    --field="   DuckStation"!"$PW_GUI_ICON_PATH/duckstation.png"!"":"FBTN" '@bash -c "button_click PW_DUCKSTATION"' \
-    --field="   ePSXe"!"$PW_GUI_ICON_PATH/epsxe.png"!"":"FBTN" '@bash -c "button_click PW_EPSXE"' \
-    --field="   Project64"!"$PW_GUI_ICON_PATH/project64.png"!"":"FBTN" '@bash -c "button_click PW_PROJECT64"' \
-    --field="   VBA-M"!"$PW_GUI_ICON_PATH/vba-m.png"!"":"FBTN" '@bash -c "button_click PW_VBA-M"' \
-    --field="   Yabause"!"$PW_GUI_ICON_PATH/yabause.png"!"":"FBTN" '@bash -c "button_click PW_YABAUSE"' \
-    --field="   Xenia"!"$PW_GUI_ICON_PATH/xenia.png"!"":"FBTN" '@bash -c "button_click PW_XENIA"' \
-    --field="   FCEUX"!"$PW_GUI_ICON_PATH/fceux.png"!"":"FBTN" '@bash -c "button_click PW_FCEUX"' \
-    --field="   xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"":"FBTN" '@bash -c "button_click PW_XEMU"' \
-    --field="   Demul"!"$PW_GUI_ICON_PATH/demul.png"!"":"FBTN" '@bash -c "button_click PW_DEMUL"' \
-    --field="   Rpcs3"!"$PW_GUI_ICON_PATH/rpcs3.png"!"":"FBTN" '@bash -c "button_click PW_RPCS3"' 2>/dev/null &
+    --field="   Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"${loc_dolphin}":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \
+    --field="   MAME"!"$PW_GUI_ICON_PATH/mame.png"!"${loc_mame}":"FBTN" '@bash -c "button_click PW_MAME"' \
+    --field="   ScummVM"!"$PW_GUI_ICON_PATH/scummvm.png"!"${loc_scummvm}":"FBTN" '@bash -c "button_click PW_SCUMMVM"' \
+    --field="   RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"${loc_retroarch}":"FBTN" '@bash -c "button_click PW_RETROARCH"' \
+    --field="   PPSSPP Windows"!"$PW_GUI_ICON_PATH/ppsspp.png"!"${loc_ppsspp_windows}":"FBTN" '@bash -c "button_click PW_PPSSPP"' \
+    --field="   Citra"!"$PW_GUI_ICON_PATH/citra.png"!"${loc_citra}":"FBTN" '@bash -c "button_click PW_CITRA"' \
+    --field="   Cemu"!"$PW_GUI_ICON_PATH/cemu.png"!"${loc_cemu}":"FBTN" '@bash -c "button_click PW_CEMU"' \
+    --field="   DuckStation"!"$PW_GUI_ICON_PATH/duckstation.png"!"${loc_duckstation}":"FBTN" '@bash -c "button_click PW_DUCKSTATION"' \
+    --field="   ePSXe"!"$PW_GUI_ICON_PATH/epsxe.png"!"${loc_epsxe}":"FBTN" '@bash -c "button_click PW_EPSXE"' \
+    --field="   Project64"!"$PW_GUI_ICON_PATH/project64.png"!"${loc_project64}":"FBTN" '@bash -c "button_click PW_PROJECT64"' \
+    --field="   VBA-M"!"$PW_GUI_ICON_PATH/vba-m.png"!"${loc_vba_m}":"FBTN" '@bash -c "button_click PW_VBA-M"' \
+    --field="   Yabause"!"$PW_GUI_ICON_PATH/yabause.png"!"${loc_yabause}":"FBTN" '@bash -c "button_click PW_YABAUSE"' \
+    --field="   Xenia"!"$PW_GUI_ICON_PATH/xenia.png"!"${loc_xenia}":"FBTN" '@bash -c "button_click PW_XENIA"' \
+    --field="   FCEUX"!"$PW_GUI_ICON_PATH/fceux.png"!"${loc_fceux}":"FBTN" '@bash -c "button_click PW_FCEUX"' \
+    --field="   xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"${loc_xemu}":"FBTN" '@bash -c "button_click PW_XEMU"' \
+    --field="   Demul"!"$PW_GUI_ICON_PATH/demul.png"!"${loc_demul}":"FBTN" '@bash -c "button_click PW_DEMUL"' \
+    --field="   Rpcs3"!"$PW_GUI_ICON_PATH/rpcs3.png"!"${loc_rpcs3}":"FBTN" '@bash -c "button_click PW_RPCS3"' 2>/dev/null &
 
     "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --keep-icon-size --scroll \
     --field="   Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \