diff --git a/debian/changelog b/debian/changelog index 7a3f2fe..e98c87f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,69 +1,92 @@ +spark-store (4.2.7) stable; urgency=medium + + * 修复：更新星火商店后禁止更新提醒的配置失效 + * 新增：支持在设置中关闭平台不兼容提示 + * 调整：更改了下载量统计的方式，减少漏数 + + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + + spark-store (4.2.6.6) stable; urgency=medium + * 调整：文案修改：安装失败后引导查看详情而不是重新安装 * 修复：dpkg阻塞出现漏掉的安装失败，现在在安装后检测是否安装 * 修复：UOS专业版上安装成功仍然显示失败的问题：方式：忽略E:等消息，仅检查脚本报错 * 调整：卸载应用时采用autopurge以一并卸载依赖 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + spark-store (4.2.6.5) stable; urgency=medium + * 调整：ssaudit安装结束时会提示安装结束 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + spark-store (4.2.6.4) stable; urgency=medium + * 修复：关于页面的入口过时 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.6.3) stable; urgency=medium + * 修复：部分下载统计线路失效 - -- shenmo - + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.6.2) stable; urgency=medium + * 新增：支持arm架构搜索 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.6.1) stable; urgency=medium + * 修复：mint下更新检测不正常 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.6) stable; urgency=medium + * 修复：截图加载失败时点击闪退 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.5.1) stable; urgency=medium + * 调整：重写了spark-dstore-patch，速度提升，尤其对机械硬盘下 * 调整：优化了aptss源文件同步策略 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.5) stable; urgency=medium + * 修复：ssinstall在文件不存在时仍然报安装成功 * 修复：删除不再需要的依赖：libc6-dev * 在aarch64架构安装时也启用32位支持 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + spark-store (4.2.4) stable; urgency=medium + * 修复：ssinstall校验失败的时候仍然提示安装成功 * 新增：ssinstall可以自动刷新ssupdate以防止仓库更新中导致的安装校验失败 * 修复：在不受支持的平台安装应用时弹出提示不正确 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + spark-store (4.2.3.3) stable; urgency=medium + * aptss 不再使用bwrap，去除依赖，支持容器中启动 * aptss 支持非root模式启动 * aptss 添加transhell支持 @@ -74,27 +97,30 @@ spark-store (4.2.3.3) stable; urgency=medium * 4.3 roadmap 实现，在浏览不支持的应用时会出现提示 * 4.3 roadmap 实现，在下载文件夹没有读写权限时会出现提示 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.3.2~Reason10) stable; urgency=medium + * 完成除web外大部分功能适配 * 修复依赖不完整的问题 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.3.2~Reason9) stable; urgency=medium + * sender-d.sh * ssinstall和ssaudit的安装测试转到upgrade-worker - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.3.2~Reason8) stable; urgency=medium + * sender-d改用cpp重写，在aarch64上稳定运行 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.3.2~Reason7) stable; urgency=medium @@ -103,36 +129,44 @@ spark-store (4.2.3.2~Reason7) stable; urgency=medium * ssinstall在发现无法安装后尝试先进行下aptss update * 修复：安装商店后首次启动无法安装任何软件 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 spark-store (4.2.3.2~Reason5) stable; urgency=medium + * aptss 不再使用bwrap，去除依赖，支持容器中启动 * aptss 支持非root模式启动 * aptss 添加transhell支持 * 关于界面自动获取分支名称 * 现在安装成功则自动删除安装包 - -- shenmo + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + + spark-store (4.2.3.2~Reason3) stable; urgency=medium + * 现在可在x86上编译，使用同一套代码 * 暂时在aarch64上使用旧web----等待柚子 * 空间，疾疫，现在是静谧 -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + spark-store (4.2.3.2~only-for-test1) stable; urgency=medium + * 注意！！！！！！ 此版本仅为启动测试，还需要进一步完善——hardcode需要改善——关于web界面的调用方式需要在柚子做好之后修改成新的 * fix: hardcode * fix: sender-d -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.2.3.1) stable; urgency=medium * 修复: ssinstall验证签名出错 -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.2.3) stable; urgency=medium * 修复: 编译依赖不全 * 修复： prerm导致的dpkg崩溃 @@ -142,12 +176,14 @@ spark-store (4.2.3) stable; urgency=medium -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.2.3~test4) stable; urgency=medium * 修复: aptss 无法安装 -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.2.3~test3) stable; urgency=medium * 调整：打包时从 debian/changelog 自动获取构建版本号并写入关于窗口保证与deb一致 @@ -159,6 +195,7 @@ spark-store (4.2.3~test3) stable; urgency=medium -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.2.3~test2) stable; urgency=medium * 调整：开启安装包加固 diff --git a/debian/spark-store.postinst b/debian/spark-store.postinst index ad43268..e681b13 100755 --- a/debian/spark-store.postinst +++ b/debian/spark-store.postinst @@ -4,23 +4,23 @@ case "$1" in configure) case `arch` in - x86_64) - echo "Enabling i386 arch..." - dpkg --add-architecture i386 - ;; - aarch64) - echo "Enabling armhf arch..." - dpkg --add-architecture armhf - ;; - *) - echo "Unknown architecture, skip enable 32-bit arch" - ;; + x86_64) + echo "Enabling i386 arch..." + dpkg --add-architecture i386 + ;; + + aarch64) + echo "Enabling armhf arch..." + dpkg --add-architecture armhf + ;; + + *) + echo "Unknown architecture, skip enable 32-bit arch" + ;; esac - mkdir -p /var/lib/aptss/lists - # Remove the sources.list file rm -f /etc/apt/sources.list.d/sparkstore.list @@ -39,22 +39,20 @@ case "$1" in # 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/ cp -f /opt/durapps/spark-store/bin/spark-store.asc /tmp/spark-store-install/spark-store.asc gpg --dearmor /tmp/spark-store-install/spark-store.asc cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg - # Run apt update to avoid users being fucked up by the non-exist dependency problem - # Now abandoned as aptss now run ssupdate everytime - #aptss ssupdate + # Start upgrade detect service + systemctl daemon-reload systemctl enable spark-update-notifier systemctl start spark-update-notifier + # Update certain caches update-icon-caches /usr/share/icons/hicolor || true update-desktop-database /usr/share/applications || true diff --git a/debian/spark-store.prerm b/debian/spark-store.prerm index e6c39ca..c9aa676 100755 --- a/debian/spark-store.prerm +++ b/debian/spark-store.prerm @@ -1,16 +1,20 @@ #!/bin/bash + function notify-send() { - #Detect the user using such display + # Detect the user using such display local user=$(who | awk '{print $1}' | head -n 1) - #Detect the id of the user + # Detect the id of the user local uid=$(id -u $user) - sudo -u $user DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@" + sudo -u $user DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@" } -if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then +if [ "$1" = "remove" -o "$1" = "purge" ] ; then + echo "$1" + echo "卸载操作，进行配置清理" + # Remove residual symbol links rm -f /usr/local/bin/spark-store rm -f /usr/local/bin/ssinstall @@ -22,10 +26,18 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then rm -rf /etc/aptss/ rm -rf /var/lib/aptss/ - - # Remove residual symbol links to stop upgrade detect rm -f /etc/xdg/autostart/spark-update-notifier.desktop + # Remove config files +for username in `ls /home` + do + echo /home/$username + if [ -d /home/$username/.config/spark-union/spark-store ] + then + rm -rf /home/$username/.config/spark-union/spark-store + fi + done + # Shutdown services systemctl stop spark-update-notifier @@ -39,13 +51,12 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ] ; then rm -f /etc/apt/trusted.gpg.d/spark-store.gpg apt-key del '9D9A A859 F750 24B1 A1EC E16E 0E41 D354 A29A 440C' else - echo "非卸载操作，不进行配置清理" - if [ ! -z "`pidof spark-store`" ];then - echo "关闭已有 spark-store.." - notify-send "正在升级星火商店" "请在升级结束后重启星火商店" -i spark-store - killall spark-store - else - echo "继续安装 spark-store.." + if [ ! -z "`pidof spark-store`" ] ; then + echo "关闭已有 spark-store.." + notify-send "正在升级星火商店" "请在升级结束后重启星火商店" -i spark-store + killall spark-store fi fi + + diff --git a/src/application.cpp b/src/application.cpp index ef453cb..cede3ef 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -137,9 +137,9 @@ void Application::initAboutDialog() dialog->setProductName(productName()); dialog->setProductIcon(productIcon()); dialog->setVersion(translate("DAboutDialog", "Version: %1").arg(applicationVersion())); -#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0)) - dialog->setVersion(applicationVersion()); -#endif + if (runtimeDtkVersion() >= DTK_VERSION_CHECK(5, 6, 4, 0)) { + dialog->setVersion(applicationVersion()); + } // 根据 shenmo 要求，不显示组织 Logo // dialog->setCompanyLogo(QPixmap(":/icon/Logo-Spark.png")); dialog->setCompanyLogo(QPixmap()); diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index f2e24bd..15e6252 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -6,6 +6,7 @@ #include "backend/image_show.h" #include "application.h" #include "utils/utils.h" +#include "pages/settingspage.h" #include #include @@ -380,6 +381,10 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList) void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport) { + if (!SettingsPage::needUncompatibleNotification) { + return; + } + bool isDeepin = Dtk::Core::DSysInfo::productType() == Dtk::Core::DSysInfo::Deepin; bool isUOS = Dtk::Core::DSysInfo::productType() == Dtk::Core::DSysInfo::Uos; bool checkdeepin = (isDeepin && !deepinSupport); diff --git a/src/pages/settingspage.cpp b/src/pages/settingspage.cpp index a0bf537..87e90c6 100644 --- a/src/pages/settingspage.cpp +++ b/src/pages/settingspage.cpp @@ -11,6 +11,7 @@ #define DEFAULT_SERVER_URL "https://cdn.d.store.deepinos.org.cn/" #define DEFAULT_CHECK_DOMAIN "deepinos" +bool SettingsPage::needUncompatibleNotification = true; bool SettingsPage::isdownload = false; SettingsPage::SettingsPage(QWidget *parent) @@ -99,6 +100,9 @@ void SettingsPage::initConfig() SparkAPI::setServerUrl(config.value("server/choose").toString()); } configCanSave = true; // 　防止触发保存配置信号 + + needUncompatibleNotification = config.value("other/uncompatibleNotification", needUncompatibleNotification).toBool(); + ui->checkBox->setChecked(needUncompatibleNotification); } SettingsPage::~SettingsPage() @@ -252,3 +256,11 @@ void SettingsPage::on_pushButton_clearWebCache_clicked() cacheDir.removeRecursively(); }); } + +void SettingsPage::on_checkBox_clicked(bool checked) +{ + needUncompatibleNotification = checked; + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + config.setValue("other/uncompatibleNotification", needUncompatibleNotification); + config.sync(); +} diff --git a/src/pages/settingspage.h b/src/pages/settingspage.h index f65347f..d1e9267 100644 --- a/src/pages/settingspage.h +++ b/src/pages/settingspage.h @@ -30,6 +30,11 @@ private slots: void on_pushButton_clearWebCache_clicked(); + void on_checkBox_clicked(bool checked); + +public: + static bool needUncompatibleNotification; + private: static bool isdownload; bool configCanSave; diff --git a/src/pages/settingspage.ui b/src/pages/settingspage.ui index 5792ca4..3e9fbe8 100644 --- a/src/pages/settingspage.ui +++ b/src/pages/settingspage.ui @@ -54,7 +54,7 @@ 0 - + @@ -67,21 +67,21 @@ true - + 0 0 743 - 839 + 950 - + - + 18 @@ -93,10 +93,10 @@ - + - + 100 @@ -132,7 +132,7 @@ - + 160 @@ -145,7 +145,7 @@ - + Qt::Horizontal @@ -161,10 +161,10 @@ - + - + Qt::Horizontal @@ -177,7 +177,7 @@ - + color:#808080 @@ -190,7 +190,7 @@ - + Spark Store Update @@ -217,10 +217,44 @@ - + + + + + + + 18 + + + + Other Settings + + + + + + + + + + Enable notification for apps not compatible with current system + + + true + + + + + + + + + + + - + 18 @@ -232,10 +266,10 @@ - + - + color:#808080 @@ -252,14 +286,14 @@ - + Location：/tmp/spark-store - + Qt::Horizontal @@ -279,7 +313,7 @@ - + 80 @@ -305,10 +339,10 @@ - + - + 18 @@ -320,7 +354,7 @@ - + <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p> <p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> @@ -337,7 +371,7 @@ - + Qt::Vertical diff --git a/tool/ss-feedback/sender-d b/tool/ss-feedback/sender-d index d013ed1..bb51bdc 100755 --- a/tool/ss-feedback/sender-d +++ b/tool/ss-feedback/sender-d @@ -17,8 +17,6 @@ echo "Segment fault" exit -1 fi -mkdir -p /tmp/spark-store/mail-send-content -cd /tmp/spark-store/mail-send-content APP_LOCATION=${1#*/$STORE_URL/} APP_LOCATION=${APP_LOCATION%/*} @@ -41,42 +39,11 @@ fi -MAIL_INFO_0=sparkstorefeedback@163.com:YWYGLQNOPLWNNJJY -MAIL_INFO_1=ss_feedback@163.com:CCPFYUYHTLBVFTSM -MAIL_INFO_2=spark_store_good@163.com:FIGNKXCLBGCYUDUF -MAIL_INFO_3=wudibaolongzsoy@163.com:IOGHUIEDXXMGWJTI -MAIL_INFO_4=suasnjaksf@163.com:KWUBIOYTGYIPVALZ -# -MAIL_INFO_5=asdasdasdasd0827@163.com:TSSLXXCEAAATCZJJ -MAIL_INFO_6=hjkhuiasndkj@163.com:XJZDDLHZYACGJVWM -MAIL_INFO_7=xncniasudhqi@163.com:OZPUJHBMGLDWEGEI -MAIL_INFO_8=ajhdiahiudqahwui@163.com:HFAJCJOCWIDZHGIG -MAIL_INFO_9=xcvuyefbewr@163.com:LVXGTJVORDEDYWQI - -MAIL_INFO_RANDOM=MAIL_INFO_$(($RANDOM % 10)) - -MAIL_INFO_RANDOM=`echo ${!MAIL_INFO_RANDOM}` -# 把对应变量赋值过来 - -MAIL_ADDRESS_FROM_INFO_RANDOM=`echo $MAIL_INFO_RANDOM | sed "{s/:.*//}" ` +echo $STORE_URL/$APP_LOCATION +curl -X POST -H "Content-Type: application/json" -d '{"path": "'"${STORE_URL}/${APP_LOCATION}"'"}' http://zunyun01.store.deepinos.org.cn:38324/handle_post -cat << EOF > ./data.txt ------------------------------------- -From:$MAIL_ADDRESS_FROM_INFO_RANDOM -To:$MAIL_ADDRESS_FROM_INFO_RANDOM -Subject: Download count command -check=i love amber forever -command:download_count -APP_LOCATION=$STORE_URL/$APP_LOCATION ------------------------------------- - -EOF - -curl -s --url "smtp://smtp.163.com" --mail-from "$MAIL_ADDRESS_FROM_INFO_RANDOM" --mail-rcpt "$MAIL_ADDRESS_FROM_INFO_RANDOM" --upload-file ./data.txt --user "$MAIL_INFO_RANDOM" - -rm /tmp/spark-store/mail-send-content/data.txt echo "Finished" diff --git a/tool/update-upgrade/ss-update-controler.sh b/tool/update-upgrade/ss-update-controler.sh index 7546b37..f75f73d 100755 --- a/tool/update-upgrade/ss-update-controler.sh +++ b/tool/update-upgrade/ss-update-controler.sh @@ -8,7 +8,7 @@ endloop=0 #####################检测是否启动过了更新检测工具 while [ $endloop -eq 0 ] ;do -if [ -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then +if [ ! -e $HOME/.config/spark-union/spark-store/ssshell-config-do-not-show-upgrade-notify ];then text_update_open="${TRANSHELL_CONTENT_CLOSE}" #已经开启了就显示关闭 else @@ -21,14 +21,12 @@ option=`zenity --list --text="${TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN} case $option in 0) - if [ -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then - zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK}" --timeout=2 - pkexec systemctl disable spark-update-notifier + if [ ! -e $HOME/.config/spark-union/spark-store/ssshell-config-do-not-show-upgrade-notify ];then + mkdir -p $HOME/.config/spark-union/spark-store/ + touch $HOME/.config/spark-union/spark-store/ssshell-config-do-not-show-upgrade-notify zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_CLOSED}" --timeout=2 else - zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK}" --timeout=2 - pkexec systemctl enable spark-update-notifier - pkexec service spark-update-notifier start + rm -f $HOME/.config/spark-union/spark-store/ssshell-config-do-not-show-upgrade-notify zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_OPENED}" --timeout=2 fi ;; diff --git a/tool/update-upgrade/ss-update-notifier.sh b/tool/update-upgrade/ss-update-notifier.sh index 5f3a8d0..e555ed9 100755 --- a/tool/update-upgrade/ss-update-notifier.sh +++ b/tool/update-upgrade/ss-update-notifier.sh @@ -20,6 +20,8 @@ function notify-send() { sudo -u $user DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus notify-send "$@" } + + # 检测网络链接畅通 function network-check() { @@ -106,4 +108,16 @@ fi update_transhell ## 如果都是hold或者版本一致的那就直接退出，否则把剩余的给提醒了 + +##TODO:除了apt-mark hold之外额外有一个禁止检查列表 + +## 如果不想提示就不提示 + +user=$(who | awk '{print $1}' | head -n 1) +if [ -e "/home/$user/.config/spark-union/spark-store/ssshell-config-do-not-show-upgrade-notify" ];then +echo "他不想站在世界之巅，好吧" +echo "Okay he don't want to be at the top of the world, okay" +exit +else notify-send -a spark-store "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY}" "${TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE}" +fi diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 6cceda9..e13a3b6 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -10,9 +10,9 @@ - - - + + + Download @@ -175,79 +175,79 @@ - + Click Open - + Developer Mode Disabled - - - + + + Reinstall - + Upgrade - - + + Install - + Installing - - - - + + + + Warning - + The current application does not support deepin, there may be problems - + The current application does not support UOS, there may be problems - + The current application does not support Ubuntu, there may be problems - + The current application does not support current platform, there may be problems - - + + Spark Store - + Uninstall succeeded - + The URL has been copied to the clipboard @@ -577,62 +577,72 @@ + Other Settings + + + + + Enable notification for apps not compatible with current system + + + + Temp - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. - + 0B 0B - + Location：/tmp/spark-store - + Clean - + Size: - + Clear Web Cache - + About us - + <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p> <p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + Updating, please wait... - + Spark Store - + Temporary cache was cleaned diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 7794988..7404e92 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -10,9 +10,9 @@ - - - + + + Download @@ -175,79 +175,79 @@ - + Click Open - + Developer Mode Disabled - - - + + + Reinstall - + Upgrade - - + + Install - + Installing - - - - + + + + Warning - + The current application does not support deepin, there may be problems - + The current application does not support UOS, there may be problems - + The current application does not support Ubuntu, there may be problems - + The current application does not support current platform, there may be problems - - + + Spark Store - + Uninstall succeeded - + The URL has been copied to the clipboard @@ -577,62 +577,72 @@ + Other Settings + + + + + Enable notification for apps not compatible with current system + + + + Temp - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. - + 0B 0B - + Location：/tmp/spark-store - + Clean - + Size: - + Clear Web Cache - + About us - + <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p> <p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + Updating, please wait... - + Spark Store - + Temporary cache was cleaned diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 8e7de18..48c412f 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -10,9 +10,9 @@ - - - + + + Download 下载 @@ -175,79 +175,79 @@ 软件官网 - + Click Open 点击跳转 - + Developer Mode Disabled 开发者模式未开启 - - - + + + Reinstall 重新安装 - + Upgrade 升级 - - + + Install 安装 - + Installing 正在安装 - - - - + + + + Warning 警告 - + The current application does not support deepin, there may be problems 当前应用不支持deepin，安装后可能会出现问题 - + The current application does not support UOS, there may be problems 当前应用不支持UOS，安装后可能会出现问题 - + The current application does not support Ubuntu, there may be problems 当前应用不支持Ubuntu，安装后可能会出现问题 - + The current application does not support current platform, there may be problems 当前应用不支持平台，安装后可能会出现问题 - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板 @@ -369,22 +369,6 @@ dpkg progress had been aborted，please check the install info or try to reinstall. dpkg出现错误，请检查安装详情或尝试重新安装 - - Error happened in dpkg progress , you can try it again. - 安装被中止，可重新安装。 - - - Error happened in dpkg progress , you can try it again - dpkg出现错误，可重新安装 - - - dpkg progress had been aborted，you can retry installation. - dpkg进程被中断，您可重试安装。 - - - dpkg progress had been aborted，you can retry installation - 安装被中止，可重新安装 - @@ -593,62 +577,72 @@ + Other Settings + 其他设置 + + + + Enable notification for apps not compatible with current system + 开启应用不兼容当前系统提示 + + + Temp 缓存目录 - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. 因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。 - + 0B - + Location：/tmp/spark-store 目录位置：/tmp/spark-store - + Clean 清空 - + Size: 目录大小： - + Clear Web Cache 清理网页缓存 - + About us 关于我们 - + <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p> <p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> <html><head/><body><p>我们并<span style=" font-weight:600;">不是</span>官方团队，和你一样，我们也只是众多Linux/deepin系统爱好者和用户之中的一员，我们开发并且运营这个“Spark应用商店”，是为了让社区的朋友们一起分享好用的软件，或者一起参与开发，让大家都用到最新的，最优秀的软件。</p><p>我们并没有因此盈利，所有开发和维护人员都不会获得报酬，我们的主要支出大部分依赖于社区对我们的捐助，很感谢大家，这部分捐助让我们并不需要耗费太多精力去担心资金问题。</p><p>我们的服务和开发的软件都是免费供给大家使用，交流，学习的，但是在您的使用过程中一定要遵守当地的法律法规，否则出现任何问题和我们无关。</p><p>如果商店中任何一部分有侵犯您权益的行为，请告知我们 <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> ，我们会第一时间删除侵权内容。</p><p>如果你也想参与我们，不管是参与开发，设计，投递还是投稿作品，我们都欢迎你的加入。<p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>请点击<a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">这里</span></a>来联系我们，加群</p></body></html> - + Updating, please wait... 正在更新，请稍候…… - + Spark Store 星火应用商店 - + Temporary cache was cleaned 缓存目录已清空 diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index 8fc5d6e..417b8e8 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -10,9 +10,9 @@ - - - + + + Download 下载 @@ -175,79 +175,79 @@ 软件官网 - + Click Open 点击跳转 - + Developer Mode Disabled 开发者模式未开启 - - - + + + Reinstall 重新安裝 - + Upgrade 升级 - - + + Install 安装 - + Installing 正在安装 - - - - + + + + Warning - + The current application does not support deepin, there may be problems - + The current application does not support UOS, there may be problems - + The current application does not support Ubuntu, there may be problems - + The current application does not support current platform, there may be problems - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板 @@ -360,30 +360,14 @@ Error happened in dpkg progress , please check the install info or try to reinstall. - + 安裝被中止，請檢查安裝詳情或嘗試重新安裝 dpkg progress had been aborted，please check the install info or try to reinstall. - - - - Error happened in dpkg progress , you can try it again. - 安装被中止，可重新安装。 - - - Error happened in dpkg progress , you can try it again - dpkg出现错误，可重新安装 - - - dpkg progress had been aborted，you can retry installation. - dpkg进程被中断，您可重试安装。 - - - dpkg progress had been aborted，you can retry installation - 安装被中止，可重新安装 + dpkg出現錯誤，請檢查安裝詳情或嘗試重新安裝 @@ -593,62 +577,72 @@ + Other Settings + 其他設定 + + + + Enable notification for apps not compatible with current system + 開啟應用不相容當前系統提示 + + + Temp 缓存目录 - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. 因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。 - + 0B - + Location：/tmp/spark-store 目录位置：/tmp/spark-store - + Clean 清空 - + Size: 目录大小： - + Clear Web Cache 清理网页缓存 - + About us 关于我们 - + <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p> <p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + <html><head/><body><p>我們並<span style=" font-weight:600;">不是</span>官方團隊，和你一樣，我們也只是眾多Linux/deepin系統愛好者和使用者之中的一員，我們開發並且運營這個“Spark應用商店”，是為了讓社羣的朋友們一起分享好用的軟體，或者一起參與開發，讓大家都用到最新的，最優秀的軟體。</p><p>我們並沒有因此盈利，所有開發和維護人員都不會獲得報酬，我們的主要支出大部分依賴於社羣對我們的捐助，很感謝大家，這部分捐助讓我們並不需要耗費太多精力去擔心資金問題。</p><p>我們的服務和開發的軟體都是免費供給大家使用，交流，學習的，但是在您的使用過程中一定要遵守當地的法律法規，否則出現任何問題和我們無關。</p><p>如果商店中任何一部分有侵犯您權益的行為，請告知我們 <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> ，我們會第一時間刪除侵權內容。</p><p>如果你也想參與我們，不管是參與開發，設計，投遞還是投稿作品，我們都歡迎你的加入。<p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>請點選<a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">這裡</span></a>來聯絡我們，加群</p></body></html> - + Updating, please wait... 正在更新，请稍候…… - + Spark Store 星火应用商店 - + Temporary cache was cleaned 缓存目录已清空