Commit f70fd02e authored by Vladislav's avatar Vladislav

changes...

parent d44835c5
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "Project-Id-Version: PACKAGE VERSION\n" msgstr "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-19 21:02+0500\n" "POT-Creation-Date: 2024-09-20 17:00+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -1245,11 +1245,10 @@ msgstr "" ...@@ -1245,11 +1245,10 @@ msgstr ""
msgid "Change settings gamescope for" msgid "Change settings gamescope for"
msgstr "" msgstr ""
#, sh-format
msgid "<b>Gamescope is not detected on the system, to install it, run the " msgid "<b>Gamescope is not detected on the system, to install it, run the "
"command in the terminal:\\nflatpak install -y runtime/org." "command in the terminal:\\nflatpak install -y runtime/org."
"freedesktop.Platform.VulkanLayer.gamescope/x86_64/" "freedesktop.Platform.VulkanLayer.gamescope/x86_64/$"
"${GAMESCOPE_VERSION}\\n(Can be selected and copied)</b>" "%{GAMESCOPE_VERSION}%\\n(Can be selected and copied)</b>"
msgstr "" msgstr ""
msgid "<b>Gamescope is not detected on the system, please contact the " msgid "<b>Gamescope is not detected on the system, please contact the "
...@@ -1548,11 +1547,12 @@ msgstr "" ...@@ -1548,11 +1547,12 @@ msgstr ""
msgid "SAVE" msgid "SAVE"
msgstr "" msgstr ""
msgid "scripts" #, sh-format
msgid "PortProton v. ${install_ver}\n"
"scripts v. ${scripts_install_ver}"
msgstr "" msgstr ""
#, sh-format msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
msgid "Copyright © ${DATE} Castro-Fidel (linux-gaming.ru)"
msgstr "" msgstr ""
msgid "This program comes with absolutely no warranty.\n" msgid "This program comes with absolutely no warranty.\n"
...@@ -1564,10 +1564,9 @@ msgid "Author: Casro-Fidel (Mikhail Tergoev)\n" ...@@ -1564,10 +1564,9 @@ msgid "Author: Casro-Fidel (Mikhail Tergoev)\n"
"Developer assistants and testers:" "Developer assistants and testers:"
msgstr "" msgstr ""
#, sh-format
msgid "MIT License\n" msgid "MIT License\n"
"\n" "\n"
"Copyright © ${DATE} Castro-Fidel (linux-gaming.ru)\n" "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
"\n" "\n"
"Permission is hereby granted, free of charge, to any person " "Permission is hereby granted, free of charge, to any person "
"obtaining a copy\n" "obtaining a copy\n"
......
...@@ -8,8 +8,8 @@ msgid "" ...@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-19 20:52+0500\n" "POT-Creation-Date: 2024-09-19 23:26+0500\n"
"PO-Revision-Date: 2024-09-15 15:29+0500\n" "PO-Revision-Date: 2024-09-19 23:35+0500\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: es_ES\n" "Language: es_ES\n"
...@@ -1627,16 +1627,15 @@ msgstr "" ...@@ -1627,16 +1627,15 @@ msgstr ""
msgid "Change settings gamescope for" msgid "Change settings gamescope for"
msgstr "Cambiar ajustes gamescope para" msgstr "Cambiar ajustes gamescope para"
#, fuzzy, sh-format
msgid "" msgid ""
"<b>Gamescope is not detected on the system, to install it, run the command " "<b>Gamescope is not detected on the system, to install it, run the command "
"in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform." "in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform."
"VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n(Can be selected and " "VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be selected and "
"copied)</b>" "copied)</b>"
msgstr "" msgstr ""
" <b>Gamescope no se detecta en el sistema, para instalarlo, ejecute el " " <b>Gamescope no se detecta en el sistema, para instalarlo, ejecute el "
"comando en el terminal:\\n flatpak install -y runtime/org.freedesktop." "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>." "seleccionar y copiar)</b>."
#, fuzzy #, fuzzy
...@@ -2006,12 +2005,13 @@ msgstr "ATRÁS" ...@@ -2006,12 +2005,13 @@ msgstr "ATRÁS"
msgid "SAVE" msgid "SAVE"
msgstr "AHORRAR" msgstr "AHORRAR"
#, fuzzy
msgid "scripts"
msgstr "Actualizar scripts:"
#, sh-format #, sh-format
msgid "Copyright © ${DATE} Castro-Fidel (linux-gaming.ru)" msgid ""
"PortProton v. ${install_ver}\n"
"scripts v. ${scripts_install_ver}"
msgstr ""
msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
msgstr "" msgstr ""
msgid "" msgid ""
...@@ -2025,11 +2025,10 @@ msgid "" ...@@ -2025,11 +2025,10 @@ msgid ""
"Developer assistants and testers:" "Developer assistants and testers:"
msgstr "" msgstr ""
#, sh-format
msgid "" msgid ""
"MIT License\n" "MIT License\n"
"\n" "\n"
"Copyright © ${DATE} Castro-Fidel (linux-gaming.ru)\n" "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
"\n" "\n"
"Permission is hereby granted, free of charge, to any person obtaining a " "Permission is hereby granted, free of charge, to any person obtaining a "
"copy\n" "copy\n"
...@@ -2098,9 +2097,8 @@ msgstr "" ...@@ -2098,9 +2097,8 @@ msgstr ""
msgid "ABOUT PORTPROTON" msgid "ABOUT PORTPROTON"
msgstr "" msgstr ""
#, fuzzy
msgid "AUTORS" msgid "AUTORS"
msgstr "EMULADORES" msgstr ""
msgid "LICENSE" msgid "LICENSE"
msgstr "" msgstr ""
...@@ -2114,6 +2112,10 @@ msgstr "" ...@@ -2114,6 +2112,10 @@ msgstr ""
msgid "THIRD PARTY LIBRARIES" msgid "THIRD PARTY LIBRARIES"
msgstr "" msgstr ""
#, fuzzy
#~ msgid "scripts"
#~ msgstr "Actualizar scripts:"
#~ msgid "" #~ msgid ""
#~ "Fixes artifacts on AMD and Intel video cards. (Use only when necessary)." #~ "Fixes artifacts on AMD and Intel video cards. (Use only when necessary)."
#~ msgstr "" #~ msgstr ""
......
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-19 20:52+0500\n" "POT-Creation-Date: 2024-09-19 23:26+0500\n"
"PO-Revision-Date: 2024-09-19 21:03+0500\n" "PO-Revision-Date: 2024-09-19 23:32+0500\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: ru_RU\n" "Language: ru_RU\n"
...@@ -1596,16 +1596,15 @@ msgstr "" ...@@ -1596,16 +1596,15 @@ msgstr ""
msgid "Change settings gamescope for" msgid "Change settings gamescope for"
msgstr "Изменить настройки Gamescope для" msgstr "Изменить настройки Gamescope для"
#, sh-format
msgid "" msgid ""
"<b>Gamescope is not detected on the system, to install it, run the command " "<b>Gamescope is not detected on the system, to install it, run the command "
"in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform." "in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform."
"VulkanLayer.gamescope/x86_64/${GAMESCOPE_VERSION}\\n(Can be selected and " "VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be selected and "
"copied)</b>" "copied)</b>"
msgstr "" msgstr ""
"<b>Gamescope не найден в системе, для его установки выполните команду в " "<b>Gamescope не найден в системе, для его установки выполните команду в "
"терминале:\\nflatpak install -y runtime/org.freedesktop.Platform.VulkanLayer." "терминале:\\nflatpak install -y runtime/org.freedesktop.Platform.VulkanLayer."
"gamescope/x86_64/${GAMESCOPE_VERSION}\\n(Данный текст можно выделить и " "gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Данный текст можно выделить и "
"скопировать)</b>" "скопировать)</b>"
msgid "" msgid ""
...@@ -1973,12 +1972,16 @@ msgstr "НАЗАД" ...@@ -1973,12 +1972,16 @@ msgstr "НАЗАД"
msgid "SAVE" msgid "SAVE"
msgstr "СОХРАНИТЬ" msgstr "СОХРАНИТЬ"
msgid "scripts"
msgstr "версия"
#, sh-format #, sh-format
msgid "Copyright © ${DATE} Castro-Fidel (linux-gaming.ru)" msgid ""
msgstr "Авторские права © ${DATE} Castro-Fidel (linux-gaming.ru)" "PortProton v. ${install_ver}\n"
"scripts v. ${scripts_install_ver}"
msgstr ""
"PortProton v. ${install_ver}\n"
"версия v. ${scripts_install_ver}"
msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
msgstr "Авторские права © $%DATE% Castro-Fidel (linux-gaming.ru)"
msgid "" msgid ""
"This program comes with absolutely no warranty.\n" "This program comes with absolutely no warranty.\n"
...@@ -1996,11 +1999,10 @@ msgstr "" ...@@ -1996,11 +1999,10 @@ msgstr ""
"\n" "\n"
"Помощники разработчика и тестировщики:" "Помощники разработчика и тестировщики:"
#, sh-format
msgid "" msgid ""
"MIT License\n" "MIT License\n"
"\n" "\n"
"Copyright © ${DATE} Castro-Fidel (linux-gaming.ru)\n" "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
"\n" "\n"
"Permission is hereby granted, free of charge, to any person obtaining a " "Permission is hereby granted, free of charge, to any person obtaining a "
"copy\n" "copy\n"
...@@ -2028,7 +2030,7 @@ msgid "" ...@@ -2028,7 +2030,7 @@ msgid ""
msgstr "" msgstr ""
"Лицензия Массачусетского технологического института (MIT License)\n" "Лицензия Массачусетского технологического института (MIT License)\n"
"\n" "\n"
"Авторские права © ${DATE} Castro-Fidel (linux-gaming.ru)\n" "Авторские права © $%DATE% Castro-Fidel (linux-gaming.ru)\n"
"\n" "\n"
"Настоящим предоставляется бесплатное разрешение любому лицу, получившему " "Настоящим предоставляется бесплатное разрешение любому лицу, получившему "
"копию данного\n" "копию данного\n"
...@@ -2137,6 +2139,9 @@ msgstr "ПРИСОЕДЕНИТЬСЯ" ...@@ -2137,6 +2139,9 @@ msgstr "ПРИСОЕДЕНИТЬСЯ"
msgid "THIRD PARTY LIBRARIES" msgid "THIRD PARTY LIBRARIES"
msgstr "БИБЛИОТЕКИ" msgstr "БИБЛИОТЕКИ"
#~ msgid "scripts"
#~ msgstr "версия"
#~ msgid "MIT License" #~ msgid "MIT License"
#~ msgstr "Лицензия Массачусетского технологического института (MIT License)" #~ msgstr "Лицензия Массачусетского технологического института (MIT License)"
...@@ -2146,14 +2151,6 @@ msgstr "БИБЛИОТЕКИ" ...@@ -2146,14 +2151,6 @@ msgstr "БИБЛИОТЕКИ"
#~ msgid "Copyright" #~ msgid "Copyright"
#~ msgstr "Авторские права" #~ msgstr "Авторские права"
#, sh-format
#~ msgid ""
#~ "PortProton v. ${install_ver}\n"
#~ "scripts v. ${scripts_install_ver}"
#~ msgstr ""
#~ "PortProton v. ${install_ver}\n"
#~ "версия v. ${scripts_install_ver}"
#~ msgid "Open game folder" #~ msgid "Open game folder"
#~ msgstr "Открыть папку с игрой" #~ msgstr "Открыть папку с игрой"
......
...@@ -143,11 +143,11 @@ export -f generate_pot ...@@ -143,11 +143,11 @@ export -f generate_pot
eval_translations () { eval_translations () {
# Для того чтобы раскрывать переменную уже после создания массива # Для того чтобы раскрывать переменную уже после создания массива
# Вместо {translations[\$TEST text]} нужно (eval_translations "\${TEST} text" "TEST=test") в переводе переменная должна быть в {} # Вместо {translations[\$TEST text]} нужно (eval_translations "\$%TEST% text" "TEST=test"), перевод должен быть с %% тоже
# В остальных случаях можно использовать {translations[\$TEST text]} ,но переменную нужно обьявлять до создания массива # В остальных случаях можно использовать {translations[\$TEST text]} ,но переменную нужно обьявлять до создания массива
# до source "${PORT_SCRIPTS_PATH}/translations/$LANGUAGE" или можно использовать команды {translations[\$(cat file.txt) text]} # до source "${PORT_SCRIPTS_PATH}/translations/$LANGUAGE" или можно использовать команды {translations[\$(cat file.txt) text]}
# но тогда выполнение команды будет происходить во время создания массива всегда, а не там где это требуется # но тогда выполнение команды будет происходить во время создания массива всегда, а не там где это требуется
echo "${translations[$1]//\$*"}"/${2//*=/}}" echo "${translations[$1]//\$*"%"/${2//*=/}}"
} }
create_translations () { create_translations () {
...@@ -213,7 +213,7 @@ EOF ...@@ -213,7 +213,7 @@ EOF
fi fi
if [[ $msgid =~ "\$" ]] ; then if [[ $msgid =~ "\$" ]] ; then
msgid=${msgid//"\$"/\\$} msgid=${msgid//"\$"/\\$}
if [[ $msgstr =~ "\${" ]] ; then if [[ $msgstr =~ "\$%" ]] ; then
msgstr=${msgstr//"\$"/\\$} msgstr=${msgstr//"\$"/\\$}
fi fi
fi fi
...@@ -4716,7 +4716,7 @@ gui_gamescope () { ...@@ -4716,7 +4716,7 @@ gui_gamescope () {
else else
if check_flatpak ; then if check_flatpak ; then
GAMESCOPE_VERSION="$(grep 'VERSION_ID=' /etc/os-release)" GAMESCOPE_VERSION="$(grep 'VERSION_ID=' /etc/os-release)"
GAMESCOPE_NEED_INSTALL=$(eval_translations "<b>Gamescope is not detected on the system, to install it, run the command in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/\${GAMESCOPE_VERSION}\\n(Can be selected and copied)</b>" "GAMESCOPE_VERSION=${GAMESCOPE_VERSION//VERSION_ID=/}") GAMESCOPE_NEED_INSTALL=$(eval_translations "<b>Gamescope is not detected on the system, to install it, run the command in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/\$%{GAMESCOPE_VERSION}%\\n(Can be selected and copied)</b>" "GAMESCOPE_VERSION=${GAMESCOPE_VERSION//VERSION_ID=/}")
YAD_TEXT_SELECTION="--selectable-labels" YAD_TEXT_SELECTION="--selectable-labels"
else else
GAMESCOPE_NEED_INSTALL="${translations[<b>Gamescope is not detected on the system, please contact the manufacturer of your distribution\\nor search the Internet for information on how to install gamescope on your system.</b>]}" GAMESCOPE_NEED_INSTALL="${translations[<b>Gamescope is not detected on the system, please contact the manufacturer of your distribution\\nor search the Internet for information on how to install gamescope on your system.</b>]}"
...@@ -5857,10 +5857,10 @@ gui_credits () { ...@@ -5857,10 +5857,10 @@ gui_credits () {
source "${PORT_WINE_PATH}/data/scripts/thanks" source "${PORT_WINE_PATH}/data/scripts/thanks"
"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri --scroll \ "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri --scroll \
--text-align=center --text="PortProton v. ${install_ver} --text-align=center --text="${translations[PortProton v. \${install_ver}
${translations[scripts]} v. ${scripts_install_ver}" --text-info <<< "https://linux-gaming.ru scripts v. \${scripts_install_ver}]}" --text-info <<< "https://linux-gaming.ru
$(eval_translations "Copyright © \${DATE} Castro-Fidel (linux-gaming.ru)" "DATE=$(date +%Y)") $(eval_translations "Copyright © \$%DATE% Castro-Fidel (linux-gaming.ru)" "DATE=$(date +%Y)")
${translations[This program comes with absolutely no warranty. ${translations[This program comes with absolutely no warranty.
See the License for details.]}" 2>/dev/null & See the License for details.]}" 2>/dev/null &
...@@ -5873,7 +5873,7 @@ $(credits_devel)" 2>/dev/null & ...@@ -5873,7 +5873,7 @@ $(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=3 --text-info --scroll <<< "$(eval_translations "MIT License
Copyright © \${DATE} Castro-Fidel (linux-gaming.ru) Copyright © \$%DATE% Castro-Fidel (linux-gaming.ru)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the \"Software\"), to deal of this software and associated documentation files (the \"Software\"), to deal
......
...@@ -161,30 +161,14 @@ export pw_yad="${PW_GUI_THEMES_PATH}/gui/yad_gui_pp" ...@@ -161,30 +161,14 @@ export pw_yad="${PW_GUI_THEMES_PATH}/gui/yad_gui_pp"
change_locale change_locale
scripts_install_ver=$(<"${PORT_WINE_TMP_PATH}/scripts_ver")
export scripts_install_ver
if [[ ! -f "${PORT_SCRIPTS_PATH}/translations/$LANGUAGE" ]] ; then
create_translations
fi
unset translations
# shellcheck source=/dev/null
source "${PORT_SCRIPTS_PATH}/translations/$LANGUAGE"
if [[ $TRANSLATIONS_VER != "$scripts_install_ver" ]] ; then
try_remove_dir "${PORT_SCRIPTS_PATH}/translations"
create_translations
# shellcheck source=/dev/null
source "${PORT_SCRIPTS_PATH}/translations/$LANGUAGE"
fi
export urlg="https://linux-gaming.ru/portproton/" export urlg="https://linux-gaming.ru/portproton/"
export url_cloud="https://cloud.linux-gaming.ru/portproton" export url_cloud="https://cloud.linux-gaming.ru/portproton"
export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
try_remove_dir "${PW_WINELIB}/var" try_remove_dir "${PW_WINELIB}/var"
install_ver="$(<"${PORT_WINE_TMP_PATH}/PortProton_ver")" install_ver="$(<"${PORT_WINE_TMP_PATH}/PortProton_ver")"
export install_ver export install_ver
scripts_install_ver=$(<"${PORT_WINE_TMP_PATH}/scripts_ver")
export scripts_install_ver
export WINETRICKS_DOWNLOADER="curl" export WINETRICKS_DOWNLOADER="curl"
export USER_CONF="${PORT_WINE_PATH}/data/user.conf" export USER_CONF="${PORT_WINE_PATH}/data/user.conf"
check_user_conf check_user_conf
...@@ -370,6 +354,21 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then ...@@ -370,6 +354,21 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
export PW_FILESYSTEM export PW_FILESYSTEM
fi fi
if [[ ! -f "${PORT_SCRIPTS_PATH}/translations/$LANGUAGE" ]] ; then
create_translations
fi
unset translations
# shellcheck source=/dev/null
source "${PORT_SCRIPTS_PATH}/translations/$LANGUAGE"
if [[ $TRANSLATIONS_VER != "$scripts_install_ver" ]] ; then
try_remove_dir "${PORT_SCRIPTS_PATH}/translations"
create_translations
# shellcheck source=/dev/null
source "${PORT_SCRIPTS_PATH}/translations/$LANGUAGE"
fi
# create lock file # create lock file
if ! check_flatpak ; then if ! check_flatpak ; then
if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment