Merge branch 'Htylol-added-tray-name' into devel

data_from_portwine/scripts/functions_helper

@@ -3586,10 +3586,8 @@ pw_run () {
             ${PW_DISPLAY} \
             "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
         else
-            if [[ "$PW_USE_TERMINAL" == 1 ]] \
+            if [[ "$PW_USE_TERMINAL" == 1 ]] ; then
-            && [[ "$PW_USE_RUNTIME" == 1 ]]
+                PW_ADD_TO_ARGS_IN_RUNTIME="--xterm"
-            then
-                export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm"
                 pw_init_runtime
             fi
             echo ""
@@ -3727,10 +3725,14 @@ pw_winefile () {
 }
 
 pw_winecmd () {
-    export PW_USE_TERMINAL=1
     start_portwine
     cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" || fatal
+    if check_flatpak ; then
+        $PW_TERM "pw_run cmd"
+    else
+        export PW_USE_TERMINAL=1
         pw_run cmd
+    fi
     stop_portwine --restart
 }
 

data_from_portwine/scripts/start.sh

@@ -257,8 +257,8 @@ esac
 
 if check_flatpak ; then
     if check_gamescope_session
-    then PW_TERM="xterm -fullscreen -bg black -fg white -e"
+    then PW_TERM="env LANG=C xterm -fullscreen -bg black -fg white -e"
-    else PW_TERM="xterm -bg black -fg white -e"
+    else PW_TERM="env LANG=C xterm -bg black -fg white -e"
     fi
 fi