fixed license

2025-03-20 16:35:33 +03:00
parent 9b1134b251
commit ddf4c8b298
3 changed files with 31 additions and 38 deletions
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,6 +2,8 @@
 -----------------------------------------
 История изменений:

+* исправлено отображение лицензии
+
 ###Scripts version 2403### / stable / Дата: 18.03.2025 / Размер скачиваемого обновления: 200 мегабайт
 * кумулятивное обновление стабильной версии скриптов PortProton

--- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
+++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-07 17:14+0500\n"
-"PO-Revision-Date: 2025-03-07 17:18+0500\n"
+"POT-Creation-Date: 2025-03-20 16:24+0300\n"
+"PO-Revision-Date: 2025-03-20 16:12+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
-"X-Generator: Poedit 3.4.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"X-Generator: Poedit 3.5\n"

 msgid ""
 "A running PortProton session was detected.\\nDo you want to end the previous "
@@ -1658,7 +1658,6 @@ msgstr ""
 "запуском), работает вместе с SDL BACKEND (используется по умолчанию в "
 "Wayland сессии)"

-#, fuzzy
 msgid ""
 "if specified, sets a base output height to linearly scale the cursor against."
 msgstr ""
@@ -2045,13 +2044,6 @@ msgstr "НАЗАД"
 msgid "SAVE"
 msgstr "СОХРАНИТЬ"

-msgid ""
-"This program comes with absolutely no warranty.\n"
-"See the License for details."
-msgstr ""
-"Эта программа поставляется без каких-либо гарантий.\n"
-"Подробнее см. в Лицензия."
-
 msgid ""
 "Author:   Casro-Fidel (Mikhail Tergoev)\n"
 "\n"
@@ -2076,7 +2068,7 @@ msgstr "Хотите присоединится и помочь в развит

 msgid ""
 "Website:  http://linux-gaming.ru\n"
-"Discord:  http://discord.gg/yJSEFjF\n"
+"TG:       https://t.me/linux_gaming_ru\n"
 "VK:       https://vk.com/linuxgamingru\n"
 "-------------------------------------------\n"
 "Become a paid subscriber:\n"
@@ -2085,7 +2077,7 @@ msgid ""
 "-------------------------------------------"
 msgstr ""
 "Website:  https://linux-gaming.ru/\n"
-"Discord:  http://discord.gg/yJSEFjF\n"
+"TG:       https://t.me/linux_gaming_ru\n"
 "VK:       https://vk.com/linuxgamingru\n"
 "-------------------------------------------\n"
 "Стать платным подписчиком:\n"
@@ -2120,9 +2112,6 @@ msgstr ""
 msgid "ABOUT US"
 msgstr "О НАС"

-msgid "ABOUT PORTPROTON"
-msgstr "О PORTPROTON"
-
 msgid "AUTORS"
 msgstr "АВТОРЫ"

@@ -2138,6 +2127,16 @@ msgstr "ПРИСОЕДЕНИТЬСЯ"
 msgid "THIRD PARTY LIBRARIES"
 msgstr "БИБЛИОТЕКИ"

+#~ msgid ""
+#~ "This program comes with absolutely no warranty.\n"
+#~ "See the License for details."
+#~ msgstr ""
+#~ "Эта программа поставляется без каких-либо гарантий.\n"
+#~ "Подробнее см. в Лицензия."
+
+#~ msgid "ABOUT PORTPROTON"
+#~ msgstr "О PORTPROTON"
+
 #~ msgid "Mirror changed to:"
 #~ msgstr "Зеркало для скачивания изменено на:"

--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -7056,24 +7056,15 @@ gui_credits () {
    # shellcheck source=/dev/null
    source "${PORT_WINE_PATH}/data/scripts/thanks"

-    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri --scroll \
-    --text-align=center --text="${translations[PortProton v. \${install_ver}
-scripts v. \${scripts_install_ver}]}" --text-info <<< "https://linux-gaming.ru
-
-$(eval_translations "Copyright © \$%DATE% Castro-Fidel (linux-gaming.ru)" "DATE=$(date +%Y)")
-
-${translations[This program comes with absolutely no warranty.
-See the License for details.]}" 2>/dev/null &
-
-    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=2 --scroll \
+    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --scroll \
    --text-info <<< "${translations[Author:   Casro-Fidel (Mikhail Tergoev)

 Developer assistants and testers:]}
 $(credits_devel)" 2>/dev/null &

-    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll < <(eval_translations "MIT License
+    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=2 --text-info --scroll <<< "MIT License

-Copyright © \$%DATE% Castro-Fidel (linux-gaming.ru)
+Copyright © $(date +%Y) Castro-Fidel (linux-gaming.ru)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the \"Software\"), to deal
@@ -7091,9 +7082,9 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE." "DATE=$(date +%Y)") 2>/dev/null &
+SOFTWARE." "DATE=$(date +%Y)" 2>/dev/null &

-    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=4 \
+    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=3 \
    --text-info --show-uri --scroll \
    <<< "${translations[The project was supported:
 https://boosty.to/portwine-linux.ru]}
@@ -7101,11 +7092,11 @@ $(credits_boosty)

 ${translations[The list will be updated...]}" 2>/dev/null &

-    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=5 \
+    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=4 \
    --text="${translations[Do you want to join and help in the development of the project:]}" \
    --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \
    --uri-color=red --show-uri --text-info --scroll <<< "${translations[Website:  http://linux-gaming.ru
-Discord:  http://discord.gg/yJSEFjF
+TG:       https://t.me/linux_gaming_ru
 VK:       https://vk.com/linuxgamingru
 -------------------------------------------
 Become a paid subscriber:
@@ -7113,7 +7104,7 @@ boosty:  https://boosty.to/portwine-linux.ru
 Yandex wallet:   410012267513818
 -------------------------------------------]}" 2>/dev/null &

-    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
+    "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=5 --show-uri --title="THIRD PARTY LIBRARIES" \
    --text-info <<< "${translations[                               Third-party libraries that are used in PortProton

            PortProton is built on the basis of the following free software libraries:
@@ -7125,9 +7116,10 @@ YAD: https://github.com/v1cont/yad
 DGVOODOO2: https://dege.fw.hu/]}" 2>/dev/null &

    "${pw_yad}" --title "${translations[ABOUT US]}" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
-    --notebook --no-buttons  --tab-pos=bottom --expand --width=750 --height=400 \
-    --tab="${translations[ABOUT PORTPROTON]}" --tab="${translations[AUTORS]}" --tab="${translations[LICENSE]}" \
-    --tab="${translations[SPONSORS]}" --tab="${translations[JOIN]}" --tab="${translations[THIRD PARTY LIBRARIES]}"
+    --notebook --no-buttons  --tab-pos=bottom --expand --width=950 --height=500 \
+    --tab="${translations[AUTORS]}" --tab="${translations[LICENSE]}" \
+    --tab="${translations[SPONSORS]}" --tab="${translations[JOIN]}" \
+    --tab="${translations[THIRD PARTY LIBRARIES]}"

    restart_pp
 }