diff --git a/README.md b/README.md index 4fb8576..4021d78 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,10 @@ All packages will be shared in our repository for users to get freely. Distrobution supported：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(May stop support in the future） ; UniontechOS Home 21 +You can track our Issue resoving progress here https://gitee.com/deepin-community-store/spark-store/board -I hope people who see here can also join our team，development help or submit applications are welcomed + +We hope people who see here can also join our team，development help or submit applications are welcomed If you want to submit an APP to share with others，Please [Click here](https://upload.deepinos.org/index) diff --git a/README.zh.md b/README.zh.md index 66f300c..6efbb91 100644 --- a/README.zh.md +++ b/README.zh.md @@ -10,6 +10,8 @@ 希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态 +在这里追踪我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board + 如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index) diff --git a/debian/changelog b/debian/changelog index 7381de5..2004cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +spark-store (3.2.4~test3) stable; urgency=medium + + * 发版，合入到master + * 翻译完毕 + * 合入先前的各项改动，为：客户端集成投稿器入口和支持，修复：安装依赖时间较长时错误地返回“安装完毕”结果，现在客户端版本更新时不关闭免密码登录，UOS安装进程合并正常aptss中 + + + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + +spark-store (3.2.4~test2) stable; urgency=medium + + * 客户端集成投稿器入口和支持 + * 修复：安装依赖时间较长时错误地返回“安装完毕”结果 + + + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + +spark-store (3.2.4~test1) stable; urgency=medium + + * 客户端更新时不关闭免密码登录 + * UOS合并正常aptss中 + + +-- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.3) stable; urgency=medium * 客户端异常退出时仍然占用资源问题修复 diff --git a/debian/spark-store.prerm b/debian/spark-store.prerm index 6c0d052..8c44924 100755 --- a/debian/spark-store.prerm +++ b/debian/spark-store.prerm @@ -1,5 +1,6 @@ #!/bin/sh +if [ "$1" = "remove" ] || [ "$1" = "purge" ];then # Remove residual symbol links rm /usr/local/bin/spark-store rm /usr/local/bin/ssinstall @@ -39,3 +40,8 @@ fi apt-key del '9D9A A859 F750 24B1 A1EC E16E 0E41 D354 A29A 440C' +else + +echo "非卸载操作，不进行配置清理" + +fi diff --git a/src/downloadlist.cpp b/src/downloadlist.cpp index 799a9ce..8e6c7dc 100644 --- a/src/downloadlist.cpp +++ b/src/downloadlist.cpp @@ -151,7 +151,7 @@ void downloadlist::install(int t) bool haveError = false; bool notRoot = false; - installer.waitForFinished(); + installer.waitForFinished(-1); // 不设置超时 out = installer.readAllStandardOutput(); QStringList everyOut = out.split("\n"); @@ -169,7 +169,7 @@ void downloadlist::install(int t) QProcess isInstall; isInstall.start("dpkg -s " + pkgName); - isInstall.waitForFinished(); + isInstall.waitForFinished(180); // 默认超时 3 分钟 int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length(); if(error == 0) { diff --git a/src/downloadworker.cpp b/src/downloadworker.cpp index a2069aa..95c9ef6 100644 --- a/src/downloadworker.cpp +++ b/src/downloadworker.cpp @@ -116,7 +116,7 @@ void DownloadController::startDownload(const QString &url) else{ for (int i = 0; i < domains.size(); i++) { - command.append(replaceDomain(url, domains.at(i)).toUtf8()); + command.append(replaceDomain(url, domains.at(i)).replace("+","%2B").toUtf8()); //对+进行转译，避免oss出错 } } diff --git a/src/main.cpp b/src/main.cpp index bb74f29..29ed8f9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,7 +15,7 @@ int main(int argc, char *argv[]) // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题 // 浏览器开启 GPU 支持 - qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blacklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode"); + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode"); QVector fakeArgs(argc + 2); fakeArgs[0] = argv[0]; @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) DAboutDialog dialog; a.setAboutDialog(&dialog); dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion("Version 3.2.3")); + dialog.setVersion(DApplication::buildVersion("Version 3.2.4~test3")); dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo dialog.setProductName(QLabel::tr("Spark Store")); dialog.setDescription( @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("spark-union"); a.setOrganizationDomain("https://www.deepinos.org/"); a.setApplicationName("Spark Store"); //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文 - a.setApplicationVersion(DApplication::buildVersion("3.2.3")); + a.setApplicationVersion(DApplication::buildVersion("3.2.4~test3")); a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store"); a.setApplicationDescription( QObject::tr( diff --git a/src/widget.cpp b/src/widget.cpp index 8e7d2eb..0faf40b 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -193,6 +193,7 @@ void Widget::initUI() // 添加菜单项 QAction *actionSubmission = new QAction(tr("Submit App"), this); + QAction *actionSubmissionWithClient = new QAction(tr("Submit App with client(Recommanded)"), this); QAction *setting = new QAction(tr("Settings")); QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings")); @@ -200,6 +201,7 @@ void Widget::initUI() menu->addAction(setting); menu->addAction(upgrade); menu->addAction(actionSubmission); + menu->addAction(actionSubmissionWithClient); titlebar->setMenu(menu); @@ -207,6 +209,23 @@ void Widget::initUI() connect(setting, &QAction::triggered, this, &Widget::opensetting); connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("x-terminal-emulator -e /opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");}); + // 投稿器 + connect(actionSubmissionWithClient, &QAction::triggered, this, [=] + { + QString submitterSpk = "spk://store/tools/spark-store-submitter"; + QFile actionSubmissionClientStatus("/opt/spark-store-submitter/bin/spark-store-submitter"); + if (actionSubmissionClientStatus.exists()) + { + qDebug() << "投稿器存在"; + QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter"); + } + else{ + qDebug() << "投稿器不存在，跳转页面"; + openUrl(submitterSpk); + } + + }); + // 载入自定义字体 int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf"); QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID); @@ -1109,11 +1128,11 @@ void Widget::on_pushButton_uninstall_clicked() QProcess uninstall; uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << pkgName.toLower()); - uninstall.waitForFinished(); + uninstall.waitForFinished(-1); // 默认无限时长 QProcess check; check.start("dpkg", QStringList() << "-s" << pkgName.toLower()); - check.waitForFinished(); + check.waitForFinished(180); // 默认超时 3 分钟 if (check.readAllStandardOutput().isEmpty()) { @@ -1284,6 +1303,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1) ui->stackedWidget->setCurrentIndex(2); qDebug() << "程序跳转链接地址：" << arg1; + QString url = arg1.toString(); /* load.cancel(); // 打开并发加载线程前关闭正在执行的线程 @@ -1294,7 +1314,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1) */ appinfoLoadThread.requestInterruption(); appinfoLoadThread.wait(100); - appinfoLoadThread.setUrl(arg1); + appinfoLoadThread.setUrl(url.replace("+","%2B")); //对+进行转译，避免oss出错 appinfoLoadThread.start(); } } diff --git a/src/workerthreads.cpp b/src/workerthreads.cpp index 86ac7cb..99d40c7 100644 --- a/src/workerthreads.cpp +++ b/src/workerthreads.cpp @@ -92,7 +92,7 @@ void SpkAppInfoLoaderThread::run() QProcess isInstall; packagename = json["Pkgname"].toString(); isInstall.start("dpkg -s " + json["Pkgname"].toString()); - isInstall.waitForFinished(); + isInstall.waitForFinished(180); // 默认超时 3 分钟 int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length(); if(error == 0) { @@ -100,12 +100,12 @@ void SpkAppInfoLoaderThread::run() QProcess isUpdate; isUpdate.start("dpkg-query --showformat='${Version}' --show " + json["Pkgname"].toString()); - isUpdate.waitForFinished(); + isUpdate.waitForFinished(180); // 默认超时 3 分钟 QString localVersion = isUpdate.readAllStandardOutput(); localVersion.replace("'", ""); isUpdate.start("dpkg --compare-versions " + localVersion + " ge " + json["Version"].toString()); - isUpdate.waitForFinished(); + isUpdate.waitForFinished(180); // 默认超时 3 分钟 if(!isUpdate.exitCode()) { isUpdated = true; diff --git a/tool/apt-fast-conf/apt-fast.conf b/tool/apt-fast-conf/apt-fast.conf index 0139d67..eb93e80 100644 --- a/tool/apt-fast-conf/apt-fast.conf +++ b/tool/apt-fast-conf/apt-fast.conf @@ -14,6 +14,17 @@ _APTMGR=apt +#### +# +# UOS sources auth config +# +# +if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then +AUTH_UOS_USER="uos-https://license.chinauos.com-apt" +AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf | grep home-packages.chinauos.com`" +AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }` + +fi # Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download # packages directly. # @@ -54,7 +65,7 @@ DOWNLOADBEFORE=true # # Default: disabled # -MIRRORS=( 'https://d.store.deepinos.org.cn/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d3.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/,http://cdn.dl.uniartisan.com:9000/deepinos/' ) +MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' ) # Maximum number of connections @@ -68,14 +79,10 @@ _MAXNUM=5 # Maximum number of connections per server # Default: 10 # -_MAXCONPERSRV=10 +_MAXCONPERSRV=1 + -# Download file using given number of connections -# If more than N URIs are given, first N URIs are used and remaining URIs are used for backup. -# If less than N URIs are given, those URIs are used more than once so that N connections total are made simultaneously. -# -_SPLITCON=8 # Split size i.e. size of each piece @@ -93,6 +100,7 @@ _MINSPLITSZ=1M _PIECEALGO=default + # Downloadmanager listfile # You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST} # @@ -118,7 +126,7 @@ DLLIST='/tmp/apt-fast.list' # # Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' # -_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' +_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}' # Download temp folder for Downloadmanager diff --git a/tool/ssinstall b/tool/ssinstall index 749d336..d361c71 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -40,8 +40,6 @@ fi ##################apt-fast/metalink测试 DEPEND="这里一定会安装所以放弃处理" -isuos=`cat /etc/os-release | grep UnionTech` - ##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码 if [ "$(id -u)" != "0" ];then @@ -54,15 +52,8 @@ echo "$upass" | sudo -S aptss ssupdate && echo "$upass" | sudo -S bwrap --dev-bi fi -if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then -echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast" -echo ---------------------------------------------------------------------------------- -echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf - -fi - -if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then +if [ "$DEPEND" != "" ]; then echo "检测到apt-fast，使用aptss进行多线程下载加速" echo ---------------------------------------------------------------------------------- echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf @@ -81,13 +72,8 @@ echo "未安装依赖：apt-fast 开始安装" aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y fi -if [ "$DEPEND" != "" ] && [ "$isuos" != "" ]; then -echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast" -echo ---------------------------------------------------------------------------------- -dpkg -i $1 || aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf -fi -if [ "$DEPEND" != "" ] && [ "$isuos" = "" ]; then +if [ "$DEPEND" != "" ]; then echo "检测到apt-fast，使用aptss进行多线程下载加速" echo ---------------------------------------------------------------------------------- dpkg -i $1 || aptss install -yf diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index be5a580..990a0c8 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -8,33 +8,6 @@ echo "获取更新列表..." PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)" -isuos=`cat /etc/os-release | grep UnionTech` -if [ "$isuos" != "" ]; then ###这是确定是否为UOS 如果是 -echo "UOS中系统依赖无法使用第三方下载工具，使用apt-fast下载本体" - - cd /var/cache/apt/archives - for PKG_NAME in $PKG_LIST; - do - echo "$PKG_NAME 正在下载..." - sudo aptss download "$PKG_NAME" -y >/dev/null 2>&1; - done - - echo "----开始安装" - for PKG_NAME in $PKG_LIST; - do - echo "$PKG_NAME 正在更新..." - if sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install "$PKG_NAME" -y >/dev/null 2>&1; - then - echo "$PKG_NAME 已更新" - else - echo "WARNING: $PKG_NAME 无法更新" - fi - done - - - -else ###这是确定是否为UOS,如果不是 - for PKG_NAME in $PKG_LIST; do echo "$PKG_NAME 正在更新..." @@ -47,6 +20,5 @@ else ###这是确定是否为UOS,如果不是 done -fi ###这是确定是否为UOS fi ###这是确定是否同意 \ No newline at end of file diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 823177f..9794e45 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -12,9 +12,9 @@ QLabel - - - + + + Spark Store @@ -22,22 +22,22 @@ QObject - + We publish this program under GPL V3 - + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - + The Spark Project - + <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>Spark developers</span><br/><br/>Published under GPL V3 @@ -149,8 +149,8 @@ - - + + Install @@ -368,32 +368,37 @@ - + Clean - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. - + Size: - + Location：/tmp/spark-store - - About us + + 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 &lt;jifengshenmo@outlook.com&gt; 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>QQ group:872690351<br/></p></body></html> @@ -428,92 +433,97 @@ - + 0B 0B - + Spark Store - + Search or enter spk:// - + Submit App - + + Submit App with client(Recommanded) + + + + Settings - + APP Upgrade and Install Settings - + Not Exist - - - - + + + + Spark\ Store - - + + Reinstall - + Failed to get the name to the file to be downloaded. - + Upgrade - + Updating, please wait... - + Uninstall succeeded - + Relative apps Not Found! - + Request Error: %1 - + Temporary cache was cleaned - + The URL has been copied to the clipboard diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 2529c5f..6070d1a 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -23,9 +23,9 @@ Spark Store est publié sous licence GPL V3 Nous sommes nés pour le changement. - - - + + + Spark Store @@ -33,22 +33,22 @@ Nous sommes nés pour le changement. QObject - + We publish this program under GPL V3 - + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - + The Spark Project - + <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>Spark developers</span><br/><br/>Published under GPL V3 @@ -210,8 +210,8 @@ Nous sommes nés pour le changement. - - + + Install @@ -394,32 +394,37 @@ Nous sommes nés pour le changement. - + Clean - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. - + Size: - + Location：/tmp/spark-store - - About us + + 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 &lt;jifengshenmo@outlook.com&gt; 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>QQ group:872690351<br/></p></body></html> @@ -589,7 +594,7 @@ Nous sommes nés pour le changement. Taille: - + 0B 0B @@ -606,87 +611,92 @@ Nous sommes nés pour le changement. <html><head/><body><p>Nous ne sommes pas l'équipe officielle, tout comme vous, nous ne sommes qu'un des nombreux passionnés et utilisateurs de systèmes Linux / deepin, nous développons et gérons le "Spark Store"! ", est de rassembler la communauté pour partager des logiciels utiles, ou pour participer au développement ensemble, afin que nous utilisions tous les derniers et meilleurs logiciels. </p><p> Nous n'en tirons aucun profit, tous les développeurs et mainteneurs ne sont pas payés, et nous comptons sur les dons de la communauté pour la plupart de nos dépenses, dont nous sommes reconnaissants et qui nous permettent de ne pas dépenser trop d'énergie se soucier du financement. </p><p>Notre service et nos logiciels sont gratuits pour tout le monde à utiliser, à communiquer et à apprendre, mais vous devez vous conformer aux lois et réglementations locales dans le processus de votre utilisation, sinon tout problème n'a rien à voir avec nous. </p><p>Si une partie du magasin enfreint vos droits, veuillez nous en informer &lt;jifengshenmo@outlook.com&gt; nous retirerons le contenu en infraction dès que possible. </p><p>Si vous souhaitez également vous impliquer avec nous, que vous soyez impliqué dans le développement, la conception, le pitching ou la soumission de travaux, nous vous invitons à nous rejoindre. </p><p>QQ group:872690351<br/></p></body></html> - - - - + + + + Spark\ Store - + Spark Store - + Search or enter spk:// - + Submit App - + + Submit App with client(Recommanded) + + + + Settings - + APP Upgrade and Install Settings - + Not Exist - - + + Reinstall - + Failed to get the name to the file to be downloaded. - + Relative apps Not Found! - + Request Error: %1 - + Upgrade - + Updating, please wait... - + Uninstall succeeded - + Temporary cache was cleaned - + The URL has been copied to the clipboard diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 5545f8c..3117674 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -12,9 +12,9 @@ QLabel - - - + + + Spark Store Spark 应用商店 @@ -22,12 +22,12 @@ QObject - + We publish this program under GPL V3 本程序按GPL V3开源 - + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> <span style=' font-size:10pt;font-weight:60;'>一款社区维护的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span> @@ -40,7 +40,7 @@ <span style=' font-size:10pt;font-weight:60;'>deepin 社区驱动的一款第三方应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - + The Spark Project 星火计划 The Spark Project @@ -49,7 +49,7 @@ <span style=' font-size:10pt;font-weight:60;'>一款由 深度社区 出品的应用商店</span><br/>""<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>""<span style=' font-size:12pt;'>星火开发者联盟</span><br/>本程序遵循 GPL V3 协议发布 - + <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>Spark developers</span><br/><br/>Published under GPL V3 <span style='font-size:10pt;font-weight:60;'>由 Deepin 社区出品的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>星火商店开发组</span><br/><br/>遵循 GPL V3 协议发布 @@ -204,8 +204,8 @@ - - + + Install 安装 @@ -403,32 +403,37 @@ 缓存目录 - + Clean 清空 - + Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. 因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。 - + Size: 目录大小： - + Location：/tmp/spark-store 目录位置：/tmp/spark-store - + + 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 &lt;jifengshenmo@outlook.com&gt; 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>QQ group:872690351<br/></p></body></html> <html><head/><body><p>我们并<span style=" font-weight:600;">不是</span>官方团队，和你一样，我们也只是众多Linux/deepin系统爱好者和用户之中的一员，我们开发并且运营这个“Spark应用商店”，是为了让社区的朋友们一起分享好用的软件，或者一起参与开发，让大家都用到最新的，最优秀的软件。</p><p>我们并没有因此盈利，所有开发和维护人员都不会获得报酬，我们的主要支出大部分依赖于社区对我们的捐助，很感谢大家，这部分捐助让我们并不需要耗费太多精力去担心资金问题。</p><p>我们的服务和开发的软件都是免费供给大家使用，交流，学习的，但是在您的使用过程中一定要遵守当地的法律法规，否则出现任何问题和我们无关。</p><p>如果商店中任何一部分有侵犯您权益的行为，请告知我们 &lt;jifengshenmo@outlook.com&gt;，我们会第一时间删除侵权内容。</p><p>如果你也想参与我们，不管是参与开发，设计，投递还是投稿作品，我们都欢迎你的加入。</p><p>QQ 群：872690351<br/></p></body></html> @@ -488,37 +493,42 @@ 检查星火应用商店更新 - + 0B - + Spark Store Spark 应用商店 - + Search or enter spk:// 搜索或打开链接 - + Submit App 投递应用 - + + Submit App with client(Recommanded) + 使用本地投稿器投递应用（推荐） + + + Settings 设置 - + APP Upgrade and Install Settings 应用更新和安装设置 - + Not Exist 不存在 @@ -527,11 +537,11 @@ 更新完毕 - - - - + + + + Spark\ Store 星火应用商店 @@ -568,8 +578,8 @@ 大小： - - + + Reinstall 重新安装 @@ -578,17 +588,17 @@ 加载应用程序图标失败。 - + Failed to get the name to the file to be downloaded. 获取安装包文件名失败。 - + Relative apps Not Found! 相关应用未找到！ - + Request Error: %1 请求错误：%1 @@ -597,12 +607,12 @@ 目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！ - + Upgrade 升级 - + Updating, please wait... 正在更新，请稍候…… @@ -662,17 +672,17 @@ Click yes to continue. 服务器未知错误 - + Uninstall succeeded 卸载成功 - + Temporary cache was cleaned 缓存目录已清空 - + The URL has been copied to the clipboard 链接已复制到剪贴板