Merge branch 'Htylol-assoc-mass' into devel

9df95680 · Mikhail Tergoev · 055d1dd8 · bd721645 · 9df95680 · 055d1dd8
Commit 9df95680 authored Sep 24, 2024 by Mikhail Tergoev
8 changed files
--- 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-15 15:29+0500\n"
+        "POT-Creation-Date: 2024-09-20 17:00+0500\n"
        "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
        "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
        "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -291,6 +291,9 @@ msgstr  ""
 msgid   "REMIND ME LATER"
 msgstr  ""

+msgid   "EXIT"
+msgstr  ""
+
 msgid   "Searching for .exe files... Please wait."
 msgstr  ""

@@ -317,9 +320,6 @@ msgid   "d3dadapter9.so.1.0.0 - Not found in the system.\\nInstall the "
        "missing package: <b>d3dadapter9</b>"
 msgstr  ""

-msgid   "EXIT"
-msgstr  ""
-
 msgid   "You will need to check internet connection,and\\npress Repeat for "
        "repeat download"
 msgstr  ""
@@ -958,10 +958,9 @@ msgstr  ""
 msgid   "Show temperature in Fahrenheit"
 msgstr  ""

-msgid   "Show if GPU is throttling based on Power, current, temp or "
-        "\"other\" (Only shows if throttling is currently happening). "
-        "Currently disabled by default for Nvidia as it causes lag on 3000 "
-        "series"
+msgid   "Show if GPU is throttling based on Power, current, temp or other "
+        "(Only shows if throttling is currently happening). Currently "
+        "disabled by default for Nvidia as it causes lag on 3000 series"
 msgstr  ""

 msgid   "Same as throttling_status but displays throttling in the frametime "
@@ -1246,15 +1245,14 @@ msgstr  ""
 msgid   "Change settings gamescope for"
 msgstr  ""

-#, sh-format
 msgid   "<b>Gamescope is not detected on the system, to install it, run the "
-        "command in the terminal:\\n flatpak install -y runtime/org."
-        "freedesktop.Platform.VulkanLayer.gamescope/x86_64/"
-        "${GAMESCOPE_VERSION}\\n (Can be selected and copied)</b>"
+        "command in the terminal:\\nflatpak install -y runtime/org."
+        "freedesktop.Platform.VulkanLayer.gamescope/x86_64/$"
+        "%{GAMESCOPE_VERSION}%\\n(Can be selected and copied)</b>"
 msgstr  ""

 msgid   "<b>Gamescope is not detected on the system, please contact the "
-        "manufacturer of your distribution\\n or search the Internet for "
+        "manufacturer of your distribution\\nor search the Internet for "
        "information on how to install gamescope on your system.</b>"
 msgstr  ""

@@ -1551,16 +1549,14 @@ msgstr  ""

 #, sh-format
 msgid   "PortProton v. ${install_ver}\n"
-        "    scripts v. ${scripts_install_ver}"
+        "scripts v. ${scripts_install_ver}"
 msgstr  ""

-#, sh-format
-msgid   "https://linux-gaming.ru\n"
-        "\n"
-        "Copyright © $DATE Castro-Fidel (linux-gaming.ru)\n"
-        "\n"
-        "This program comes with absolutely no warranty.\n"
-        "See the License for details.\n"
+msgid   "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
+msgstr  ""
+
+msgid   "This program comes with absolutely no warranty.\n"
+        "See the License for details."
 msgstr  ""

 msgid   "Author:   Casro-Fidel (Mikhail Tergoev)\n"
@@ -1568,10 +1564,9 @@ msgid   "Author:   Casro-Fidel (Mikhail Tergoev)\n"
        "Developer assistants and testers:"
 msgstr  ""

-#, sh-format
 msgid   "MIT License\n"
        "\n"
-        "Copyright © $DATE Castro-Fidel (linux-gaming.ru)\n"
+        "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
        "\n"
        "Permission is hereby granted, free of charge, to any person "
        "obtaining a copy\n"
@@ -1601,14 +1596,14 @@ msgid   "MIT License\n"
        "ARISING FROM,\n"
        "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER "
        "DEALINGS IN THE\n"
-        "SOFTWARE.\n"
+        "SOFTWARE."
 msgstr  ""

 msgid   "The project was supported:\n"
        "https://boosty.to/portwine-linux.ru"
 msgstr  ""

-msgid   "The list will be updated...\n"
+msgid   "The list will be updated..."
 msgstr  ""

 msgid   "Do you want to join and help in the development of the project:"

--- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.mo
+++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.mo
--- 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-15 15:28+0500\n"
-"PO-Revision-Date: 2024-09-15 15:29+0500\n"
+"POT-Creation-Date: 2024-09-19 23:26+0500\n"
+"PO-Revision-Date: 2024-09-19 23:35+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -259,6 +259,7 @@ msgstr "Un emulador para la consola de juegos Sega Dreamcast"
 msgid "AUTOINSTALLS"
 msgstr "INSTALACIONES AUTOMÁTICAS"

+#, fuzzy
 msgid "EMULATORS"
 msgstr "EMULADORES"

@@ -323,6 +324,9 @@ msgstr "NO SOCIO"
 msgid "REMIND ME LATER"
 msgstr "VUELVA MÁS TARDE"

+msgid "EXIT"
+msgstr "SALIR"
+
 msgid "Searching for .exe files... Please wait."
 msgstr "Buscando archivos .exe... Por favor, espera."

@@ -354,9 +358,6 @@ msgstr ""
 "d3dadapter9.so.1.0.0 - No encontrado en el sistema.\n"
 "Instala el paquete faltante:<b>d3dadapter9</b>"

-msgid "EXIT"
-msgstr "SALIR"
-
 msgid ""
 "You will need to check internet connection,and\\npress Repeat for repeat "
 "download"
@@ -1165,10 +1166,11 @@ msgstr ""
 msgid "Show temperature in Fahrenheit"
 msgstr "Mostrar temperatura en Fahrenheit"

+#, fuzzy
 msgid ""
-"Show if GPU is throttling based on Power, current, temp or \"other\" (Only "
-"shows if throttling is currently happening). Currently disabled by default "
-"for Nvidia as it causes lag on 3000 series"
+"Show if GPU is throttling based on Power, current, temp or other (Only shows "
+"if throttling is currently happening). Currently disabled by default for "
+"Nvidia as it causes lag on 3000 series"
 msgstr ""
 "Mostrar si la GPU está limitando basado en Potencia, corriente, temperatura "
 "u \"otro\" (Solo se muestra si actualmente está ocurriendo limitación). "
@@ -1389,6 +1391,7 @@ msgstr ""
 "cuando pierden el enfoque, por lo que esto puede usarse para permitir que la "
 "aplicación se ejecute en segundo plano. (Configuraciones de Glide)"

+#, fuzzy
 msgid ""
 "dgVoodoo2 settings\\n<b>NOTE:</b> To display help for each item, simply "
 "hover over the text"
@@ -1624,21 +1627,21 @@ msgstr ""
 msgid "Change settings gamescope for"
 msgstr "Cambiar ajustes gamescope para"

-#, sh-format
 msgid ""
 "<b>Gamescope is not detected on the system, to install it, run the command "
-"in the terminal:\\n flatpak install -y runtime/org.freedesktop.Platform."
-"VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n (Can be selected and "
+"in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform."
+"VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be selected and "
 "copied)</b>"
 msgstr ""
 " <b>Gamescope no se detecta en el sistema, para instalarlo, ejecute el "
 "comando en el terminal:\\n flatpak install -y runtime/org.freedesktop."
-"Platform.VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n (Se puede "
+"Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n (Se puede "
 "seleccionar y copiar)</b>."

+#, fuzzy
 msgid ""
 "<b>Gamescope is not detected on the system, please contact the manufacturer "
-"of your distribution\\n or search the Internet for information on how to "
+"of your distribution\\nor search the Internet for information on how to "
 "install gamescope on your system.</b>"
 msgstr ""
 "<b>Gamescope no se detecta en el sistema, póngase en contacto con el "
@@ -1673,6 +1676,7 @@ msgstr ""
 msgid "Mesa vulkan WSI"
 msgstr "WSI mesa volcánica"

+#, fuzzy
 msgid ""
 "Overrides the WSI present mode:\n"
 "fifo - First in, first out. Limits the frame rate + no tearing. (VSync)\n"
@@ -2004,17 +2008,15 @@ msgstr "AHORRAR"
 #, sh-format
 msgid ""
 "PortProton v. ${install_ver}\n"
-"    scripts v. ${scripts_install_ver}"
+"scripts v. ${scripts_install_ver}"
+msgstr ""
+
+msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
 msgstr ""

-#, sh-format
 msgid ""
-"https://linux-gaming.ru\n"
-"\n"
-"Copyright © $DATE Castro-Fidel (linux-gaming.ru)\n"
-"\n"
 "This program comes with absolutely no warranty.\n"
-"See the License for details.\n"
+"See the License for details."
 msgstr ""

 msgid ""
@@ -2023,11 +2025,10 @@ msgid ""
 "Developer assistants and testers:"
 msgstr ""

-#, sh-format
 msgid ""
 "MIT License\n"
 "\n"
-"Copyright © $DATE Castro-Fidel (linux-gaming.ru)\n"
+"Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
 "\n"
 "Permission is hereby granted, free of charge, to any person obtaining a "
 "copy\n"
@@ -2051,7 +2052,7 @@ msgid ""
 "FROM,\n"
 "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN "
 "THE\n"
-"SOFTWARE.\n"
+"SOFTWARE."
 msgstr ""

 msgid ""
@@ -2059,7 +2060,7 @@ msgid ""
 "https://boosty.to/portwine-linux.ru"
 msgstr ""

-msgid "The list will be updated...\n"
+msgid "The list will be updated..."
 msgstr ""

 msgid "Do you want to join and help in the development of the project:"
@@ -2111,6 +2112,10 @@ msgstr ""
 msgid "THIRD PARTY LIBRARIES"
 msgstr ""

+#, fuzzy
+#~ msgid "scripts"
+#~ msgstr "Actualizar scripts:"
+
 #~ msgid ""
 #~ "Fixes artifacts on AMD and Intel video cards. (Use only when necessary)."
 #~ msgstr ""

--- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo
+++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.mo
--- 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-15 15:28+0500\n"
-"PO-Revision-Date: 2024-09-15 15:28+0500\n"
+"POT-Creation-Date: 2024-09-19 23:26+0500\n"
+"PO-Revision-Date: 2024-09-19 23:32+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ru_RU\n"
@@ -320,6 +320,9 @@ msgstr "НЕ НАПОМИНАТЬ"
 msgid "REMIND ME LATER"
 msgstr "НАПОМНИТЬ ПОЗЖЕ"

+msgid "EXIT"
+msgstr "ВЫХОД"
+
 msgid "Searching for .exe files... Please wait."
 msgstr "Поиск .exe файлов... Пожалуйста, подождите."

@@ -350,9 +353,6 @@ msgstr ""
 "d3dadapter9.so.1.0.0 - Не найден в системе.\\nУстановите недостающий пакет: "
 "<b>d3dadapter9</b>"

-msgid "EXIT"
-msgstr "ВЫХОД"
-
 msgid ""
 "You will need to check internet connection,and\\npress Repeat for repeat "
 "download"
@@ -639,7 +639,7 @@ msgstr ""
 "<b>Super + O:</b>  Уменьшение резкости FSR на 1\n"
 "<b>Super + S:</b>  Снимок экрана (находится в /tmp/gamescope_DATE.png)\n"
 "<b>Super + G:</b>  Переключение захвата клавиатуры\n"
-"<b>Super + C:</b>  Обновление буфера обмена\""
+"<b>Super + C:</b>  Обновление буфера обмена"

 msgid "Change the version of <b>WINDOWS</b> emulation"
 msgstr "Изменить версию эмуляции <b>WINDOWS</b>"
@@ -1177,9 +1177,9 @@ msgid "Show temperature in Fahrenheit"
 msgstr "Показывать температуру в градусах Фаренгейта"

 msgid ""
-"Show if GPU is throttling based on Power, current, temp or \"other\" (Only "
-"shows if throttling is currently happening). Currently disabled by default "
-"for Nvidia as it causes lag on 3000 series"
+"Show if GPU is throttling based on Power, current, temp or other (Only shows "
+"if throttling is currently happening). Currently disabled by default for "
+"Nvidia as it causes lag on 3000 series"
 msgstr ""
 "Показать, регулируется ли графический процессор в зависимости от мощности, "
 "тока, температуры или «другого» (показывает только то, происходит ли "
@@ -1596,25 +1596,24 @@ msgstr ""
 msgid "Change settings gamescope for"
 msgstr "Изменить настройки Gamescope для"

-#, sh-format
 msgid ""
 "<b>Gamescope is not detected on the system, to install it, run the command "
-"in the terminal:\\n flatpak install -y runtime/org.freedesktop.Platform."
-"VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n (Can be selected and "
+"in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform."
+"VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be selected and "
 "copied)</b>"
 msgstr ""
 "<b>Gamescope не найден в системе, для его установки выполните команду в "
-"терминале:\\n flatpak install -y runtime/org.freedesktop.Platform."
-"VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n (можно выделить и "
+"терминале:\\nflatpak install -y runtime/org.freedesktop.Platform.VulkanLayer."
+"gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Данный текст можно выделить и "
 "скопировать)</b>"

 msgid ""
 "<b>Gamescope is not detected on the system, please contact the manufacturer "
-"of your distribution\\n or search the Internet for information on how to "
+"of your distribution\\nor search the Internet for information on how to "
 "install gamescope on your system.</b>"
 msgstr ""
 "<b>Gamescope не найден в системе, обратитесь к производителю вашего "
-"дистрибутива\\n или поищите в Интернете информацию о том, как установить "
+"дистрибутива\\nили поищите в Интернете информацию о том, как установить "
 "gamescope в вашей системе</b>"

 msgid "Show resolution"
@@ -1976,26 +1975,20 @@ msgstr "СОХРАНИТЬ"
 #, sh-format
 msgid ""
 "PortProton v. ${install_ver}\n"
-"    scripts v. ${scripts_install_ver}"
+"scripts v. ${scripts_install_ver}"
 msgstr ""
 "PortProton v. ${install_ver}\n"
-"    версия v. ${scripts_install_ver}"
+"версия v. ${scripts_install_ver}"
+
+msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
+msgstr "Авторские права © $%DATE% Castro-Fidel (linux-gaming.ru)"

-#, sh-format
 msgid ""
-"https://linux-gaming.ru\n"
-"\n"
-"Copyright © $DATE Castro-Fidel (linux-gaming.ru)\n"
-"\n"
 "This program comes with absolutely no warranty.\n"
-"See the License for details.\n"
+"See the License for details."
 msgstr ""
-"https://linux-gaming.ru\n"
-"\n"
-"Авторские права © $DATE Castro-Fidel (linux-gaming.ru)\n"
-"\n"
 "Эта программа поставляется без каких-либо гарантий.\n"
-"Подробнее см. в Лицензия.\n"
+"Подробнее см. в Лицензия."

 msgid ""
 "Author:   Casro-Fidel (Mikhail Tergoev)\n"
@@ -2006,11 +1999,10 @@ msgstr ""
 "\n"
 "Помощники разработчика и тестировщики:"

-#, sh-format
 msgid ""
 "MIT License\n"
 "\n"
-"Copyright © $DATE Castro-Fidel (linux-gaming.ru)\n"
+"Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
 "\n"
 "Permission is hereby granted, free of charge, to any person obtaining a "
 "copy\n"
@@ -2034,11 +2026,11 @@ msgid ""
 "FROM,\n"
 "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN "
 "THE\n"
-"SOFTWARE.\n"
+"SOFTWARE."
 msgstr ""
 "Лицензия Массачусетского технологического института (MIT License)\n"
 "\n"
-"Авторские права © $DATE Castro-Fidel (linux-gaming.ru)\n"
+"Авторские права © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
 "\n"
 "Настоящим предоставляется бесплатное разрешение любому лицу, получившему "
 "копию данного\n"
@@ -2068,7 +2060,7 @@ msgstr ""
 "ВОЗНИКАЮЩАЯ ИЗ\n"
 "ВНЕ ИЛИ В СВЯЗИ С ПРОГРАММНЫМ ОБЕСПЕЧЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ ИЛИ ДРУГИМИ "
 "СДЕЛКАМИ В\n"
-"ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ.\n"
+"ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ."

 msgid ""
 "The project was supported:\n"
@@ -2077,8 +2069,8 @@ msgstr ""
 "Проект поддержали:\n"
 "https://boosty.to/portwine-linux.ru"

-msgid "The list will be updated...\n"
-msgstr "Список будет дополняться...\n"
+msgid "The list will be updated..."
+msgstr "Список будет дополняться..."

 msgid "Do you want to join and help in the development of the project:"
 msgstr "Хотите присоединится и помочь в развитии проекта:"
@@ -2147,6 +2139,18 @@ msgstr "ПРИСОЕДЕНИТЬСЯ"
 msgid "THIRD PARTY LIBRARIES"
 msgstr "БИБЛИОТЕКИ"

+#~ msgid "scripts"
+#~ msgstr "версия"
+
+#~ msgid "MIT License"
+#~ msgstr "Лицензия Массачусетского технологического института (MIT License)"
+
+#~ msgid "(Can be selected and copied)"
+#~ msgstr "(можно выделить и скопировать)"
+
+#~ msgid "Copyright"
+#~ msgstr "Авторские права"
+
 #~ msgid "Open game folder"
 #~ msgstr "Открыть папку с игрой"


--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
--- a/data_from_portwine/scripts/setup.sh
+++ b/data_from_portwine/scripts/setup.sh
@@ -53,9 +53,9 @@ if check_flatpak \
 && [[ -f "${HOME}/.local/share/applications/PortProton.desktop" ]] ; then
 	PORT_WINE_OLD_PATH="$(grep "Exec=" "${HOME}/.local/share/applications/PortProton.desktop" | awk -F'env ' '{print $2}' | awk -F'/data/scripts/' '{print $1}')"
 	if [[ -d "$PORT_WINE_OLD_PATH" ]] \
-	&& yad_question "$(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?")"
+	&& yad_question "${translations[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 "$(gettext "Please wait...")"
+		pw_start_progress_bar_block "${translations[Please wait...]}"

 		try_remove_file "${HOME}/.local/share/applications/PortProton.desktop"
 		try_remove_file "${PORT_WINE_OLD_PATH}"/PortProton.desktop
@@ -100,7 +100,7 @@ if check_flatpak \
 			done
 		fi
 		pw_stop_progress_bar
-		yad_info "$(gettext "PortProton has been moved to flatpak. You can now remove the old directory:") ${PORT_WINE_OLD_PATH}"
+		yad_info "${translations[PortProton has been moved to flatpak. You can now remove the old directory:]} ${PORT_WINE_OLD_PATH}"
 	fi
 fi


--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh