diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot index f8a58fe..c2273ec 100644 --- 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-11 19:56+0500\n" + "POT-Creation-Date: 2024-09-11 22:46+0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1488,6 +1488,9 @@ msgstr "" msgid "Mirror changed to:" msgstr "" +msgid "Do you actually want to change the scripts version to:" +msgstr "" + msgid "Branch changed to:" msgstr "" diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.mo b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.mo index 3f2e081..610c1b8 100644 Binary files a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.mo and b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.mo differ diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po index 68d67cd..0b976bc 100644 --- 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-11 19:39+0500\n" -"PO-Revision-Date: 2024-09-11 19:56+0500\n" +"POT-Creation-Date: 2024-09-11 22:45+0500\n" +"PO-Revision-Date: 2024-09-11 22:46+0500\n" "Last-Translator: \n" "Language-Team: \n" "Language: es_ES\n" @@ -1927,6 +1927,9 @@ 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:" diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo index 295dda4..31bf4dc 100644 Binary files a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo and b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo differ diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po index e332f2d..a17108a 100644 --- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-11 19:39+0500\n" -"PO-Revision-Date: 2024-09-11 19:41+0500\n" +"POT-Creation-Date: 2024-09-11 22:45+0500\n" +"PO-Revision-Date: 2024-09-11 22:45+0500\n" "Last-Translator: \n" "Language-Team: \n" "Language: ru_RU\n" @@ -1900,6 +1900,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 "Версия изменена на:" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 348494d..382ecca 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -4696,7 +4696,7 @@ gui_userconf () { KEY_USERCONF_GUI=$RANDOM - "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="1" --form --columns=2 --separator=" " --text-align=center --align-buttons --separator=";" --homogeneous-column \ + "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="1" --form --columns=2 --separator=" " --text-align=center --align-buttons --homogeneous-column \ --gui-type-text="${PANED_GUI_TYPE_TEXT_UP}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_UP}" \ --field=" $(gettext "Change mirror to") $NEW_MIRROR"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --userconf change_mirror"' \ --field=" $(gettext "Change branch to") $NEW_BRANCH"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --userconf change_branch"' \ @@ -4761,7 +4761,6 @@ gui_userconf () { change_mirror ;; change_branch) - unset SKIP_CHECK_UPDATES change_branch ;; change_gui_start) @@ -5546,14 +5545,22 @@ export -f change_mirror change_branch () { if [[ "$BRANCH" == "master" ]] ; then - sed -i 's/="master"/="devel"/g' "$USER_CONF" - export MIRROR="GITHUB" - yad_info "$(gettext "Branch changed to:") DEVEL" + if yad_question "$(gettext "Do you actually want to change the scripts version to:") DEVEL?" ; then + sed -i 's/="master"/="devel"/g' "$USER_CONF" + export MIRROR="GITHUB" + pw_notify_send -i info \ + "$(gettext "Branch changed to:")" "DEVEL" + unset SKIP_CHECK_UPDATES + fi else - sed -i 's/="devel"/="master"/g' "$USER_CONF" - echo "2024" > "${PORT_WINE_TMP_PATH}/scripts_ver" - export PW_CHANGE_BRANCH="1" - yad_info "$(gettext "Branch changed to:") STABLE" + if yad_question "$(gettext "Do you actually want to change the scripts version to:") STABLE?" ; then + sed -i 's/="devel"/="master"/g' "$USER_CONF" + echo "2024" > "${PORT_WINE_TMP_PATH}/scripts_ver" + export PW_CHANGE_BRANCH="1" + pw_notify_send -i info \ + "$(gettext "Branch changed to:")" "STABLE" + unset SKIP_CHECK_UPDATES + fi fi print_info "Restarting PP for change branch..." /usr/bin/env bash -c "${pw_full_command_line[0]} --gui_userconf" &