diff --git a/debian/changelog b/debian/changelog index f901f2e..3f422e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spark-store (4.3.1) UNRELEASED; urgency=medium + + * 修复自提权更新问题 + * 提升aptss稳定性 + + -- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800 + spark-store (4.3.0-fix5) stable; urgency=medium * 支持GXDE,重启空链接清理 diff --git a/debian/spark-store.postinst b/debian/spark-store.postinst index 9298834..879a976 100755 --- a/debian/spark-store.postinst +++ b/debian/spark-store.postinst @@ -42,8 +42,7 @@ case "$1" in ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss - # Create symbol links for SSINSTALL - ln -s -f /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy + # Install key mkdir -p /tmp/spark-store-install/ diff --git a/debian/spark-store.prerm b/debian/spark-store.prerm index f266bb6..1adb1a5 100755 --- a/debian/spark-store.prerm +++ b/debian/spark-store.prerm @@ -47,8 +47,7 @@ for username in `ls /home` # Stop update detect service systemctl disable spark-update-notifier - # Clean the auto install polkit file if exist - rm -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy + # Remove gpg key file rm -f /etc/apt/trusted.gpg.d/spark-store.gpg diff --git a/pkg/lib/systemd/system/spark-update-notifier.timer b/pkg/lib/systemd/system/spark-update-notifier.timer new file mode 100644 index 0000000..b8a4818 --- /dev/null +++ b/pkg/lib/systemd/system/spark-update-notifier.timer @@ -0,0 +1,11 @@ +[Unit] +Description=Timer for Spark Update Notifier + +[Timer] +# 开机后第一次执行 +OnBootSec=1min +# 每天执行一次 +OnUnitActiveSec=1d + +[Install] +WantedBy=timers.target \ No newline at end of file diff --git a/pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy b/pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy similarity index 70% rename from pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy rename to pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy index 49c5000..d82d670 100644 --- a/pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy +++ b/pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy @@ -4,15 +4,15 @@ <policyconfig> <vendor>Spark Store</vendor> <icon_name>x-package-repository</icon_name> - <action id="store.spark-app.ss-do-upgrade-worker"> - <description>运行ss-do-upgrade-worker需要权限</description> - <message>要使用ss-do-upgrade-worker需要权限</message> + <action id="store.spark-app.ss-do-upgrade"> + <description>运行ss-do-upgrade需要权限</description> + <message>要使用ss-do-upgrade需要权限</message> <defaults> <allow_any>yes</allow_any> <allow_inactive>yes</allow_inactive> <allow_active>yes</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> </action> </policyconfig> diff --git a/tool/auto-install-policy/store.spark-app.ssinstall.policy b/pkg/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy similarity index 100% rename from tool/auto-install-policy/store.spark-app.ssinstall.policy rename to pkg/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy diff --git a/spark-store-project.pro b/spark-store-project.pro index c1fac77..c1b13c3 100644 --- a/spark-store-project.pro +++ b/spark-store-project.pro @@ -46,7 +46,7 @@ desktop.path = /usr/share/applications service.files += pkg/usr/lib/systemd/system/spark-update-notifier.service service.path = /usr/lib/systemd/system/ -polkit-1.files += pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy +polkit-1.files += pkg/usr/share/polkit-1/actions/* polkit-1.path = /usr/share/polkit-1/actions/ icon.files += pkg/usr/share/icons/hicolor/scalable/apps/*.svg diff --git a/tool/apt-fast/ss-apt-fast b/tool/apt-fast/ss-apt-fast index 827ea8e..c051823 100755 --- a/tool/apt-fast/ss-apt-fast +++ b/tool/apt-fast/ss-apt-fast @@ -600,9 +600,18 @@ if [ "$option" == "install" ]; then eval "${_DOWNLOADER}" # execute downloadhelper command if [ "$(find "$DLDIR" -printf . | wc -c)" -gt 1 ]; then + + # Delete incomplete/corrupted downloaded files, if any: Not recursive, as we don't expect any dirs to exist within $DLDIR. + + # When Aria2c downloads a file and detects it is corrupted, its filename won't be renamed back to its actual name, + # preserving .aria2 file extension, which also indicates when a file hasn't been completely downloaded. + for x in *.aria2; do + rm -f "$x" "${x%.aria2}" + done + # Move all packages to the apt install directory by force to ensure # already existing debs which may be incomplete are replaced - find . -type f -name "*.deb" -execdir mv -ft "$APTCACHE" {} \+ + find . -type f \( -name '*.deb' -o -name '*.ddeb' \) -execdir mv -ft "$APTCACHE" {} \+ fi cd - &>/dev/null || msg "Failed to change back directory" "warning" fi diff --git a/tool/aptss b/tool/aptss index de4f4a6..aec8e86 100755 --- a/tool/aptss +++ b/tool/aptss @@ -78,7 +78,7 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || ###执行 - ${SS_APT_FAST} "$@" --allow-downgrades -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf +${SS_APT_FAST} "$@" --allow-downgrades -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf ret="$?" if [ "$ret" -ne 0 ];then echo -e "\e[1;33m$TRANSHELL_CONTENT_PLEASE_USE_APTSS_INSTEAD_OF_APT\e[0m" @@ -86,19 +86,7 @@ exit $ret fi -elif [ "$1" = "download" ];then -###执行 - - ${SS_APT_FAST} "$@" --allow-downgrades -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf - - -elif [ "$1" = "policy" ] || [ "$1" = "search" ];then - - - -###执行 - /usr/bin/apt "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf elif [ "$1" = "ssupdate" ];then @@ -116,6 +104,7 @@ curl --silent -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/spar #只更新星火源 elif [ "$1" = "update" ];then + echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m" echo curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list" @@ -123,8 +112,10 @@ mkdir -p /tmp/aptss-conf/ curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf" chmod -R 755 /tmp/aptss-conf ### 额外一份拿来给aptss自动补全用 - /usr/bin/apt "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf + + ${SS_APT_FAST} "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf else - /usr/bin/apt "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf + ${SS_APT_FAST} "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf fi + diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh index 3d5291c..4e3cf6e 100755 --- a/tool/update-upgrade/ss-do-upgrade-worker.sh +++ b/tool/update-upgrade/ss-do-upgrade-worker.sh @@ -1,5 +1,5 @@ #!/bin/bash - +export LANGUAGE=en_US case $1 in ssupdate) diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index 2f3c99b..2b72ba4 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -1,4 +1,8 @@ #!/bin/bash +if [ "$(id -u)" != "0" ] ; then + pkexec "$0" "$@" + exit +fi trap "rm -f /tmp/spark-store/upgradeStatus.txt" EXIT source /opt/durapps/spark-store/bin/bashimport/transhell.amber load_transhell_debug diff --git a/tool/update-upgrade/ss-update-notifier.sh b/tool/update-upgrade/ss-update-notifier.sh index 5770a5c..0d203b0 100755 --- a/tool/update-upgrade/ss-update-notifier.sh +++ b/tool/update-upgrade/ss-update-notifier.sh @@ -1,5 +1,5 @@ #!/bin/bash -export LANGUAGE=en_US + source /opt/durapps/spark-store/bin/bashimport/transhell.amber load_transhell_debug @@ -55,26 +55,23 @@ fi aptss update -updatetext=`aptss ssupdate 2>&1` +updatetext=`LANGUAGE=en_US aptss ssupdate 2>&1` until [ "`echo $updatetext | grep E: `" = "" ];do echo "${TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC}" sleep 15 -updatetext=`aptss ssupdate 2>&1` +updatetext=`LANGUAGE=en_US aptss ssupdate 2>&1` done -isupdate=`echo ${updatetext: -5}` -if [ "$isupdate" = "date." ] ; then +update_app_number=$(env LANGUAGE=en_US /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" 2>/dev/null | grep -c upgradable) + +if [ "$update_app_number" -le 0 ] ; then exit 0 fi -## 从这里开始,只有检测到了更新才会进行 -update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串` -update_app_number=`echo ${update_app_number##*information...}` - # 获取用户选择的要更新的应用 PKG_LIST="$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)" # 指定分隔符为 \n diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 5338a92..baea222 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -129,7 +129,7 @@ <location filename="../src/pages/appintopage.cpp" line="198"/> <location filename="../src/pages/appintopage.cpp" line="336"/> <location filename="../src/pages/appintopage.cpp" line="370"/> - <location filename="../src/pages/appintopage.cpp" line="530"/> + <location filename="../src/pages/appintopage.cpp" line="533"/> <source>Download and Install</source> <translation type="unfinished"></translation> </message> @@ -188,7 +188,7 @@ <message> <location filename="../src/pages/appintopage.cpp" line="183"/> <location filename="../src/pages/appintopage.cpp" line="363"/> - <location filename="../src/pages/appintopage.cpp" line="502"/> + <location filename="../src/pages/appintopage.cpp" line="505"/> <source>Reinstall</source> <translation type="unfinished"></translation> </message> @@ -199,7 +199,7 @@ </message> <message> <location filename="../src/pages/appintopage.cpp" line="341"/> - <location filename="../src/pages/appintopage.cpp" line="478"/> + <location filename="../src/pages/appintopage.cpp" line="481"/> <source>Install</source> <translation type="unfinished"></translation> </message> @@ -209,46 +209,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> - <location filename="../src/pages/appintopage.cpp" line="461"/> - <location filename="../src/pages/appintopage.cpp" line="465"/> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> <source>The current application does not support or tested on deepin, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="461"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> <source>The current application does not support or tested on UOS, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="465"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> <source>The current application does not support or tested on Ubuntu, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>The current application does not support or tested on current platform, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> <source>Uninstall succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>The URL has been copied to the clipboard</source> <translation type="unfinished"></translation> </message> diff --git a/translations/spark-store_es.ts b/translations/spark-store_es.ts index c996941..98d4b03 100644 --- a/translations/spark-store_es.ts +++ b/translations/spark-store_es.ts @@ -129,7 +129,7 @@ <location filename="../src/pages/appintopage.cpp" line="198"/> <location filename="../src/pages/appintopage.cpp" line="336"/> <location filename="../src/pages/appintopage.cpp" line="370"/> - <location filename="../src/pages/appintopage.cpp" line="530"/> + <location filename="../src/pages/appintopage.cpp" line="533"/> <source>Download and Install</source> <translation>Descargar e instalar</translation> </message> @@ -188,7 +188,7 @@ <message> <location filename="../src/pages/appintopage.cpp" line="183"/> <location filename="../src/pages/appintopage.cpp" line="363"/> - <location filename="../src/pages/appintopage.cpp" line="502"/> + <location filename="../src/pages/appintopage.cpp" line="505"/> <source>Reinstall</source> <translation>Reinstalación</translation> </message> @@ -199,7 +199,7 @@ </message> <message> <location filename="../src/pages/appintopage.cpp" line="341"/> - <location filename="../src/pages/appintopage.cpp" line="478"/> + <location filename="../src/pages/appintopage.cpp" line="481"/> <source>Install</source> <translation>Instalación</translation> </message> @@ -209,46 +209,46 @@ <translation>Se está instalando</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> - <location filename="../src/pages/appintopage.cpp" line="461"/> - <location filename="../src/pages/appintopage.cpp" line="465"/> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> <source>The current application does not support or tested on deepin, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="461"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> <source>The current application does not support or tested on UOS, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="465"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> <source>The current application does not support or tested on Ubuntu, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>The current application does not support or tested on current platform, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>Spark Store</source> <translation>SPARK Store</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> <source>Uninstall succeeded</source> <translation>Desinstalación exitosa</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>The URL has been copied to the clipboard</source> <translation>La URL ha sido copiada al portapapeles</translation> </message> diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 5abc49f..d2e2a3e 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -129,7 +129,7 @@ <location filename="../src/pages/appintopage.cpp" line="198"/> <location filename="../src/pages/appintopage.cpp" line="336"/> <location filename="../src/pages/appintopage.cpp" line="370"/> - <location filename="../src/pages/appintopage.cpp" line="530"/> + <location filename="../src/pages/appintopage.cpp" line="533"/> <source>Download and Install</source> <translation>Télécharger et installer</translation> </message> @@ -188,7 +188,7 @@ <message> <location filename="../src/pages/appintopage.cpp" line="183"/> <location filename="../src/pages/appintopage.cpp" line="363"/> - <location filename="../src/pages/appintopage.cpp" line="502"/> + <location filename="../src/pages/appintopage.cpp" line="505"/> <source>Reinstall</source> <translation>Réinstaller</translation> </message> @@ -199,7 +199,7 @@ </message> <message> <location filename="../src/pages/appintopage.cpp" line="341"/> - <location filename="../src/pages/appintopage.cpp" line="478"/> + <location filename="../src/pages/appintopage.cpp" line="481"/> <source>Install</source> <translation>Installation</translation> </message> @@ -209,46 +209,46 @@ <translation>Installation en cours</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> - <location filename="../src/pages/appintopage.cpp" line="461"/> - <location filename="../src/pages/appintopage.cpp" line="465"/> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> <source>The current application does not support or tested on deepin, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="461"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> <source>The current application does not support or tested on UOS, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="465"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> <source>The current application does not support or tested on Ubuntu, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>The current application does not support or tested on current platform, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>Spark Store</source> <translation>Le Spark store</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> <source>Uninstall succeeded</source> <translation>Désinstallation réussie</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>The URL has been copied to the clipboard</source> <translation>L'URL a été copiée dans le presse - papiers</translation> </message> diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 61a819a..e041cff 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -124,7 +124,7 @@ <location filename="../src/pages/appintopage.cpp" line="198"/> <location filename="../src/pages/appintopage.cpp" line="336"/> <location filename="../src/pages/appintopage.cpp" line="370"/> - <location filename="../src/pages/appintopage.cpp" line="530"/> + <location filename="../src/pages/appintopage.cpp" line="533"/> <source>Download and Install</source> <translation>下载并安装</translation> </message> @@ -188,7 +188,7 @@ <message> <location filename="../src/pages/appintopage.cpp" line="183"/> <location filename="../src/pages/appintopage.cpp" line="363"/> - <location filename="../src/pages/appintopage.cpp" line="502"/> + <location filename="../src/pages/appintopage.cpp" line="505"/> <source>Reinstall</source> <translation>重新安装</translation> </message> @@ -199,7 +199,7 @@ </message> <message> <location filename="../src/pages/appintopage.cpp" line="341"/> - <location filename="../src/pages/appintopage.cpp" line="478"/> + <location filename="../src/pages/appintopage.cpp" line="481"/> <source>Install</source> <translation>安装</translation> </message> @@ -209,46 +209,46 @@ <translation>正在安装</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> - <location filename="../src/pages/appintopage.cpp" line="461"/> - <location filename="../src/pages/appintopage.cpp" line="465"/> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> <source>The current application does not support or tested on deepin, there may be problems</source> <translation>当前应用不支持或未在deepin上测试过,安装后可能会出现问题</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="461"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> <source>The current application does not support or tested on UOS, there may be problems</source> <translation>当前应用不支持或未在UOS上测试过,安装后可能会出现问题</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="465"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> <source>The current application does not support or tested on Ubuntu, there may be problems</source> <translation>当前应用不支持或未在Ubuntu上测试过,安装后可能会出现问题</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>The current application does not support or tested on current platform, there may be problems</source> <translation>当前应用不支持或未在您的平台上测试过,安装后可能会出现问题</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> <source>Uninstall succeeded</source> <translation>卸载成功</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>The URL has been copied to the clipboard</source> <translation>链接已复制到剪贴板</translation> </message> diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index 7871c13..442d45b 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -124,7 +124,7 @@ <location filename="../src/pages/appintopage.cpp" line="198"/> <location filename="../src/pages/appintopage.cpp" line="336"/> <location filename="../src/pages/appintopage.cpp" line="370"/> - <location filename="../src/pages/appintopage.cpp" line="530"/> + <location filename="../src/pages/appintopage.cpp" line="533"/> <source>Download and Install</source> <translation>下載並安裝</translation> </message> @@ -188,7 +188,7 @@ <message> <location filename="../src/pages/appintopage.cpp" line="183"/> <location filename="../src/pages/appintopage.cpp" line="363"/> - <location filename="../src/pages/appintopage.cpp" line="502"/> + <location filename="../src/pages/appintopage.cpp" line="505"/> <source>Reinstall</source> <translation>重新安裝</translation> </message> @@ -199,7 +199,7 @@ </message> <message> <location filename="../src/pages/appintopage.cpp" line="341"/> - <location filename="../src/pages/appintopage.cpp" line="478"/> + <location filename="../src/pages/appintopage.cpp" line="481"/> <source>Install</source> <translation>安装</translation> </message> @@ -209,46 +209,46 @@ <translation>正在安装</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> - <location filename="../src/pages/appintopage.cpp" line="461"/> - <location filename="../src/pages/appintopage.cpp" line="465"/> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>Warning</source> <translation></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="457"/> + <location filename="../src/pages/appintopage.cpp" line="460"/> <source>The current application does not support or tested on deepin, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="461"/> + <location filename="../src/pages/appintopage.cpp" line="464"/> <source>The current application does not support or tested on UOS, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="465"/> + <location filename="../src/pages/appintopage.cpp" line="468"/> <source>The current application does not support or tested on Ubuntu, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="469"/> + <location filename="../src/pages/appintopage.cpp" line="472"/> <source>The current application does not support or tested on current platform, there may be problems</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="533"/> + <location filename="../src/pages/appintopage.cpp" line="536"/> <source>Uninstall succeeded</source> <translation>卸载成功</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="548"/> + <location filename="../src/pages/appintopage.cpp" line="551"/> <source>The URL has been copied to the clipboard</source> <translation>链接已复制到剪贴板</translation> </message>