diff --git a/src/widgets/common/downloaditem.cpp b/src/widgets/common/downloaditem.cpp index c68797c..081cf3c 100644 --- a/src/widgets/common/downloaditem.cpp +++ b/src/widgets/common/downloaditem.cpp @@ -194,13 +194,15 @@ void DownloadItem::slotAsyncInstall(int t) out = installer.readAllStandardOutput(); QStringList everyOut = out.split("\n"); + QString tempOutput; for (int i = 0; i < everyOut.size(); i++) { - if(everyOut[i].left(2) == "E:") + tempOutput = everyOut[i]; + if (everyOut[i].left(2) == "E:" || tempOutput.contains("错误") || tempOutput.contains("exit code") || tempOutput.contains("OMG-IT-GOES-WRONG")) { haveError = true; } - if(everyOut[i].right(14) == "Not authorized") + if (tempOutput.contains("Not authorized")) { notRoot = true; } @@ -208,12 +210,12 @@ void DownloadItem::slotAsyncInstall(int t) QProcess isInstall; isInstall.start("dpkg", QStringList() << "-s" << pkgName); - isInstall.waitForFinished(180*1000); // 默认超时 3 分钟 + isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟 int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length(); if (error == 0 && !haveError) { ui->pushButton_install->hide(); - Utils::sendNotification("spark-store",tr("Spark Store"),ui->label->text() + " " + tr("Installation complete.")); + Utils::sendNotification("spark-store", tr("Spark Store"), ui->label->text() + " " + tr("Installation complete.")); ui->label_2->setText(tr("Finish")); ui->label_2->setToolTip(tr("Finish")); download = 3; @@ -224,7 +226,7 @@ void DownloadItem::slotAsyncInstall(int t) ui->pushButton_install->show(); ui->pushButton_install->setText(tr("Retry")); download = 1; - Utils::sendNotification("spark-store",tr("Spark Store"),tr("Error happened in dpkg progress , you can try it again.")); + Utils::sendNotification("spark-store", tr("Spark Store"), tr("Error happened in dpkg progress , you can try it again.")); ui->label_2->setText(tr("Error happened in dpkg progress , you can try it again")); ui->label_2->setToolTip(tr("Error happened in dpkg progress , you can try it again")); ui->pushButton_3->show(); @@ -232,7 +234,7 @@ void DownloadItem::slotAsyncInstall(int t) if (notRoot) { - Utils::sendNotification("spark-store",tr("Spark Store"),tr("dpkg progress had been aborted,you can retry installation.")); + Utils::sendNotification("spark-store", tr("Spark Store"), tr("dpkg progress had been aborted,you can retry installation.")); ui->label_2->setText(tr("dpkg progress had been aborted,you can retry installation")); ui->label_2->setToolTip(tr("dpkg progress had been aborted,you can retry installation")); ui->pushButton_install->show(); @@ -241,5 +243,9 @@ void DownloadItem::slotAsyncInstall(int t) ui->widget_spinner->hide(); DownloadItem::isInstall = false; + + installer.deleteLater(); + isInstall.deleteLater(); + emit finished(error == 0 && !haveError && !notRoot); } diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index d70c3b5..9b5f537 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -10,9 +10,9 @@ </message> <message> <location filename="../src/pages/appintopage.ui" line="244"/> - <location filename="../src/pages/appintopage.cpp" line="173"/> - <location filename="../src/pages/appintopage.cpp" line="315"/> - <location filename="../src/pages/appintopage.cpp" line="430"/> + <location filename="../src/pages/appintopage.cpp" line="176"/> + <location filename="../src/pages/appintopage.cpp" line="318"/> + <location filename="../src/pages/appintopage.cpp" line="482"/> <source>Download</source> <translation type="unfinished"></translation> </message> @@ -175,51 +175,79 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="47"/> + <location filename="../src/pages/appintopage.cpp" line="50"/> <source>Click Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="112"/> + <location filename="../src/pages/appintopage.cpp" line="115"/> <source>Developer Mode Disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="158"/> - <location filename="../src/pages/appintopage.cpp" line="331"/> - <location filename="../src/pages/appintopage.cpp" line="403"/> + <location filename="../src/pages/appintopage.cpp" line="161"/> + <location filename="../src/pages/appintopage.cpp" line="334"/> + <location filename="../src/pages/appintopage.cpp" line="455"/> <source>Reinstall</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="165"/> + <location filename="../src/pages/appintopage.cpp" line="168"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="320"/> - <location filename="../src/pages/appintopage.cpp" line="379"/> + <location filename="../src/pages/appintopage.cpp" line="323"/> + <location filename="../src/pages/appintopage.cpp" line="431"/> <source>Install</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="325"/> + <location filename="../src/pages/appintopage.cpp" line="328"/> <source>Installing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="434"/> - <location filename="../src/pages/appintopage.cpp" line="447"/> + <location filename="../src/pages/appintopage.cpp" line="410"/> + <location filename="../src/pages/appintopage.cpp" line="414"/> + <location filename="../src/pages/appintopage.cpp" line="418"/> + <location filename="../src/pages/appintopage.cpp" line="422"/> + <source>Warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="410"/> + <source>The current application does not support deepin, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="414"/> + <source>The current application does not support UOS, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="418"/> + <source>The current application does not support Ubuntu, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="422"/> + <source>The current application does not support current platform, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="486"/> + <location filename="../src/pages/appintopage.cpp" line="499"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="434"/> + <location filename="../src/pages/appintopage.cpp" line="486"/> <source>Uninstall succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="447"/> + <location filename="../src/pages/appintopage.cpp" line="499"/> <source>The URL has been copied to the clipboard</source> <translation type="unfinished"></translation> </message> @@ -299,9 +327,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="213"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="224"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="232"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="218"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="229"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="237"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> @@ -312,40 +340,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="213"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="218"/> <source>Installation complete.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="214"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="215"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="219"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="220"/> <source>Finish</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="222"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="227"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="224"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="229"/> <source>Error happened in dpkg progress , you can try it again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="225"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="226"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="230"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="231"/> <source>Error happened in dpkg progress , you can try it again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="232"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="237"/> <source>dpkg progress had been aborted,you can retry installation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="233"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="234"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="238"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="239"/> <source>dpkg progress had been aborted,you can retry installation</source> <translation type="unfinished"></translation> </message> @@ -452,33 +480,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="186"/> + <location filename="../src/mainwindow-dtk.cpp" line="187"/> <source>Submit App</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="187"/> + <location filename="../src/mainwindow-dtk.cpp" line="188"/> <source>Submit App with client(Recommanded)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="188"/> + <location filename="../src/mainwindow-dtk.cpp" line="189"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="189"/> + <location filename="../src/mainwindow-dtk.cpp" line="190"/> <source>APP Upgrade and Install Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="145"/> - <location filename="../src/mainwindow-dtk.cpp" line="240"/> + <location filename="../src/mainwindow-dtk.cpp" line="146"/> + <location filename="../src/mainwindow-dtk.cpp" line="241"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="150"/> + <location filename="../src/mainwindow-dtk.cpp" line="151"/> <source>Search or enter spk://</source> <translation type="unfinished"></translation> </message> @@ -488,7 +516,7 @@ <message> <location filename="../src/application.cpp" line="33"/> <location filename="../src/application.cpp" line="34"/> - <location filename="../src/mainwindow-dtk.cpp" line="125"/> + <location filename="../src/mainwindow-dtk.cpp" line="126"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> @@ -508,7 +536,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="243"/> + <location filename="../src/mainwindow-dtk.cpp" line="244"/> <source>Show MainWindow</source> <translation type="unfinished"></translation> </message> @@ -619,12 +647,12 @@ <context> <name>TitleBarMenu</name> <message> - <location filename="../src/mainwindow-dtk.cpp" line="244"/> + <location filename="../src/mainwindow-dtk.cpp" line="245"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="245"/> + <location filename="../src/mainwindow-dtk.cpp" line="246"/> <source>Exit</source> <translation type="unfinished"></translation> </message> diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 356294c..c5cf857 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -10,9 +10,9 @@ </message> <message> <location filename="../src/pages/appintopage.ui" line="244"/> - <location filename="../src/pages/appintopage.cpp" line="173"/> - <location filename="../src/pages/appintopage.cpp" line="315"/> - <location filename="../src/pages/appintopage.cpp" line="430"/> + <location filename="../src/pages/appintopage.cpp" line="176"/> + <location filename="../src/pages/appintopage.cpp" line="318"/> + <location filename="../src/pages/appintopage.cpp" line="482"/> <source>Download</source> <translation type="unfinished"></translation> </message> @@ -175,51 +175,79 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="47"/> + <location filename="../src/pages/appintopage.cpp" line="50"/> <source>Click Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="112"/> + <location filename="../src/pages/appintopage.cpp" line="115"/> <source>Developer Mode Disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="158"/> - <location filename="../src/pages/appintopage.cpp" line="331"/> - <location filename="../src/pages/appintopage.cpp" line="403"/> + <location filename="../src/pages/appintopage.cpp" line="161"/> + <location filename="../src/pages/appintopage.cpp" line="334"/> + <location filename="../src/pages/appintopage.cpp" line="455"/> <source>Reinstall</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="165"/> + <location filename="../src/pages/appintopage.cpp" line="168"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="320"/> - <location filename="../src/pages/appintopage.cpp" line="379"/> + <location filename="../src/pages/appintopage.cpp" line="323"/> + <location filename="../src/pages/appintopage.cpp" line="431"/> <source>Install</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="325"/> + <location filename="../src/pages/appintopage.cpp" line="328"/> <source>Installing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="434"/> - <location filename="../src/pages/appintopage.cpp" line="447"/> + <location filename="../src/pages/appintopage.cpp" line="410"/> + <location filename="../src/pages/appintopage.cpp" line="414"/> + <location filename="../src/pages/appintopage.cpp" line="418"/> + <location filename="../src/pages/appintopage.cpp" line="422"/> + <source>Warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="410"/> + <source>The current application does not support deepin, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="414"/> + <source>The current application does not support UOS, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="418"/> + <source>The current application does not support Ubuntu, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="422"/> + <source>The current application does not support current platform, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="486"/> + <location filename="../src/pages/appintopage.cpp" line="499"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="434"/> + <location filename="../src/pages/appintopage.cpp" line="486"/> <source>Uninstall succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="447"/> + <location filename="../src/pages/appintopage.cpp" line="499"/> <source>The URL has been copied to the clipboard</source> <translation type="unfinished"></translation> </message> @@ -299,9 +327,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="213"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="224"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="232"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="218"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="229"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="237"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> @@ -312,40 +340,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="213"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="218"/> <source>Installation complete.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="214"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="215"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="219"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="220"/> <source>Finish</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="222"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="227"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="224"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="229"/> <source>Error happened in dpkg progress , you can try it again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="225"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="226"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="230"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="231"/> <source>Error happened in dpkg progress , you can try it again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="232"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="237"/> <source>dpkg progress had been aborted,you can retry installation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="233"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="234"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="238"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="239"/> <source>dpkg progress had been aborted,you can retry installation</source> <translation type="unfinished"></translation> </message> @@ -452,33 +480,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="186"/> + <location filename="../src/mainwindow-dtk.cpp" line="187"/> <source>Submit App</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="187"/> + <location filename="../src/mainwindow-dtk.cpp" line="188"/> <source>Submit App with client(Recommanded)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="188"/> + <location filename="../src/mainwindow-dtk.cpp" line="189"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="189"/> + <location filename="../src/mainwindow-dtk.cpp" line="190"/> <source>APP Upgrade and Install Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="145"/> - <location filename="../src/mainwindow-dtk.cpp" line="240"/> + <location filename="../src/mainwindow-dtk.cpp" line="146"/> + <location filename="../src/mainwindow-dtk.cpp" line="241"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="150"/> + <location filename="../src/mainwindow-dtk.cpp" line="151"/> <source>Search or enter spk://</source> <translation type="unfinished"></translation> </message> @@ -488,7 +516,7 @@ <message> <location filename="../src/application.cpp" line="33"/> <location filename="../src/application.cpp" line="34"/> - <location filename="../src/mainwindow-dtk.cpp" line="125"/> + <location filename="../src/mainwindow-dtk.cpp" line="126"/> <source>Spark Store</source> <translation type="unfinished"></translation> </message> @@ -508,7 +536,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="243"/> + <location filename="../src/mainwindow-dtk.cpp" line="244"/> <source>Show MainWindow</source> <translation type="unfinished"></translation> </message> @@ -619,12 +647,12 @@ <context> <name>TitleBarMenu</name> <message> - <location filename="../src/mainwindow-dtk.cpp" line="244"/> + <location filename="../src/mainwindow-dtk.cpp" line="245"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="245"/> + <location filename="../src/mainwindow-dtk.cpp" line="246"/> <source>Exit</source> <translation type="unfinished"></translation> </message> diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 491792c..b2db24d 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -10,9 +10,9 @@ </message> <message> <location filename="../src/pages/appintopage.ui" line="244"/> - <location filename="../src/pages/appintopage.cpp" line="173"/> - <location filename="../src/pages/appintopage.cpp" line="315"/> - <location filename="../src/pages/appintopage.cpp" line="430"/> + <location filename="../src/pages/appintopage.cpp" line="176"/> + <location filename="../src/pages/appintopage.cpp" line="318"/> + <location filename="../src/pages/appintopage.cpp" line="482"/> <source>Download</source> <translation>下载</translation> </message> @@ -175,51 +175,79 @@ <translation>软件官网</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="47"/> + <location filename="../src/pages/appintopage.cpp" line="50"/> <source>Click Open</source> <translation>点击跳转</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="112"/> + <location filename="../src/pages/appintopage.cpp" line="115"/> <source>Developer Mode Disabled</source> <translation>开发者模式未开启</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="158"/> - <location filename="../src/pages/appintopage.cpp" line="331"/> - <location filename="../src/pages/appintopage.cpp" line="403"/> + <location filename="../src/pages/appintopage.cpp" line="161"/> + <location filename="../src/pages/appintopage.cpp" line="334"/> + <location filename="../src/pages/appintopage.cpp" line="455"/> <source>Reinstall</source> <translation>重新安装</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="165"/> + <location filename="../src/pages/appintopage.cpp" line="168"/> <source>Upgrade</source> <translation>升级</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="320"/> - <location filename="../src/pages/appintopage.cpp" line="379"/> + <location filename="../src/pages/appintopage.cpp" line="323"/> + <location filename="../src/pages/appintopage.cpp" line="431"/> <source>Install</source> <translation>安装</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="325"/> + <location filename="../src/pages/appintopage.cpp" line="328"/> <source>Installing</source> <translation>正在安装</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="434"/> - <location filename="../src/pages/appintopage.cpp" line="447"/> + <location filename="../src/pages/appintopage.cpp" line="410"/> + <location filename="../src/pages/appintopage.cpp" line="414"/> + <location filename="../src/pages/appintopage.cpp" line="418"/> + <location filename="../src/pages/appintopage.cpp" line="422"/> + <source>Warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="410"/> + <source>The current application does not support deepin, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="414"/> + <source>The current application does not support UOS, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="418"/> + <source>The current application does not support Ubuntu, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="422"/> + <source>The current application does not support current platform, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="486"/> + <location filename="../src/pages/appintopage.cpp" line="499"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="434"/> + <location filename="../src/pages/appintopage.cpp" line="486"/> <source>Uninstall succeeded</source> <translation>卸载成功</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="447"/> + <location filename="../src/pages/appintopage.cpp" line="499"/> <source>The URL has been copied to the clipboard</source> <translation>链接已复制到剪贴板</translation> </message> @@ -299,9 +327,9 @@ <translation>下载完成.</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="213"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="224"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="232"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="218"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="229"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="237"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> @@ -312,40 +340,40 @@ <translation>正在安装</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="213"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="218"/> <source>Installation complete.</source> <translation>安装完成.</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="214"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="215"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="219"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="220"/> <source>Finish</source> <translation>完成</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="222"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="227"/> <source>Retry</source> <translation>重试</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="224"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="229"/> <source>Error happened in dpkg progress , you can try it again.</source> <translation>安装被中止,可重新安装。</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="225"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="226"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="230"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="231"/> <source>Error happened in dpkg progress , you can try it again</source> <translation>dpkg出现错误,可重新安装</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="232"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="237"/> <source>dpkg progress had been aborted,you can retry installation.</source> <translation>dpkg进程被中断,您可重试安装。</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="233"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="234"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="238"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="239"/> <source>dpkg progress had been aborted,you can retry installation</source> <translation>安装被中止,可重新安装</translation> </message> @@ -452,33 +480,33 @@ <translation>更新</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="186"/> + <location filename="../src/mainwindow-dtk.cpp" line="187"/> <source>Submit App</source> <translation>投递应用</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="187"/> + <location filename="../src/mainwindow-dtk.cpp" line="188"/> <source>Submit App with client(Recommanded)</source> <translation>使用本地投稿器投递应用(推荐)</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="188"/> + <location filename="../src/mainwindow-dtk.cpp" line="189"/> <source>Settings</source> <translation>设置</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="189"/> + <location filename="../src/mainwindow-dtk.cpp" line="190"/> <source>APP Upgrade and Install Settings</source> <translation>应用更新和安装设置</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="145"/> - <location filename="../src/mainwindow-dtk.cpp" line="240"/> + <location filename="../src/mainwindow-dtk.cpp" line="146"/> + <location filename="../src/mainwindow-dtk.cpp" line="241"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="150"/> + <location filename="../src/mainwindow-dtk.cpp" line="151"/> <source>Search or enter spk://</source> <translation>搜索或打开链接</translation> </message> @@ -488,7 +516,7 @@ <message> <location filename="../src/application.cpp" line="33"/> <location filename="../src/application.cpp" line="34"/> - <location filename="../src/mainwindow-dtk.cpp" line="125"/> + <location filename="../src/mainwindow-dtk.cpp" line="126"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> @@ -508,7 +536,7 @@ <translation>下载列表</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="243"/> + <location filename="../src/mainwindow-dtk.cpp" line="244"/> <source>Show MainWindow</source> <translation>显示主窗口</translation> </message> @@ -619,12 +647,12 @@ <context> <name>TitleBarMenu</name> <message> - <location filename="../src/mainwindow-dtk.cpp" line="244"/> + <location filename="../src/mainwindow-dtk.cpp" line="245"/> <source>About</source> <translation>关于</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="245"/> + <location filename="../src/mainwindow-dtk.cpp" line="246"/> <source>Exit</source> <translation>退出</translation> </message> diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index 64bc98e..7369c14 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -10,9 +10,9 @@ </message> <message> <location filename="../src/pages/appintopage.ui" line="244"/> - <location filename="../src/pages/appintopage.cpp" line="173"/> - <location filename="../src/pages/appintopage.cpp" line="315"/> - <location filename="../src/pages/appintopage.cpp" line="430"/> + <location filename="../src/pages/appintopage.cpp" line="176"/> + <location filename="../src/pages/appintopage.cpp" line="318"/> + <location filename="../src/pages/appintopage.cpp" line="482"/> <source>Download</source> <translation>下载</translation> </message> @@ -175,51 +175,79 @@ <translation>软件官网</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="47"/> + <location filename="../src/pages/appintopage.cpp" line="50"/> <source>Click Open</source> <translation>点击跳转</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="112"/> + <location filename="../src/pages/appintopage.cpp" line="115"/> <source>Developer Mode Disabled</source> <translation>开发者模式未开启</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="158"/> - <location filename="../src/pages/appintopage.cpp" line="331"/> - <location filename="../src/pages/appintopage.cpp" line="403"/> + <location filename="../src/pages/appintopage.cpp" line="161"/> + <location filename="../src/pages/appintopage.cpp" line="334"/> + <location filename="../src/pages/appintopage.cpp" line="455"/> <source>Reinstall</source> <translation>重新安裝</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="165"/> + <location filename="../src/pages/appintopage.cpp" line="168"/> <source>Upgrade</source> <translation>升级</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="320"/> - <location filename="../src/pages/appintopage.cpp" line="379"/> + <location filename="../src/pages/appintopage.cpp" line="323"/> + <location filename="../src/pages/appintopage.cpp" line="431"/> <source>Install</source> <translation>安装</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="325"/> + <location filename="../src/pages/appintopage.cpp" line="328"/> <source>Installing</source> <translation>正在安装</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="434"/> - <location filename="../src/pages/appintopage.cpp" line="447"/> + <location filename="../src/pages/appintopage.cpp" line="410"/> + <location filename="../src/pages/appintopage.cpp" line="414"/> + <location filename="../src/pages/appintopage.cpp" line="418"/> + <location filename="../src/pages/appintopage.cpp" line="422"/> + <source>Warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="410"/> + <source>The current application does not support deepin, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="414"/> + <source>The current application does not support UOS, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="418"/> + <source>The current application does not support Ubuntu, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="422"/> + <source>The current application does not support current platform, there may be problems</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pages/appintopage.cpp" line="486"/> + <location filename="../src/pages/appintopage.cpp" line="499"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="434"/> + <location filename="../src/pages/appintopage.cpp" line="486"/> <source>Uninstall succeeded</source> <translation>卸载成功</translation> </message> <message> - <location filename="../src/pages/appintopage.cpp" line="447"/> + <location filename="../src/pages/appintopage.cpp" line="499"/> <source>The URL has been copied to the clipboard</source> <translation>链接已复制到剪贴板</translation> </message> @@ -299,9 +327,9 @@ <translation>下載完成.</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="213"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="224"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="232"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="218"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="229"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="237"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> @@ -312,40 +340,40 @@ <translation>正在安裝</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="213"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="218"/> <source>Installation complete.</source> <translation>安裝完成.</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="214"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="215"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="219"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="220"/> <source>Finish</source> <translation>完成</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="222"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="227"/> <source>Retry</source> <translation>重试</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="224"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="229"/> <source>Error happened in dpkg progress , you can try it again.</source> <translation>安装被中止,可重新安装。</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="225"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="226"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="230"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="231"/> <source>Error happened in dpkg progress , you can try it again</source> <translation>dpkg出现错误,可重新安装</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="232"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="237"/> <source>dpkg progress had been aborted,you can retry installation.</source> <translation>dpkg进程被中断,您可重试安装。</translation> </message> <message> - <location filename="../src/widgets/common/downloaditem.cpp" line="233"/> - <location filename="../src/widgets/common/downloaditem.cpp" line="234"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="238"/> + <location filename="../src/widgets/common/downloaditem.cpp" line="239"/> <source>dpkg progress had been aborted,you can retry installation</source> <translation>安装被中止,可重新安装</translation> </message> @@ -452,33 +480,33 @@ <translation>軟體更新</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="186"/> + <location filename="../src/mainwindow-dtk.cpp" line="187"/> <source>Submit App</source> <translation>上傳軟體</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="187"/> + <location filename="../src/mainwindow-dtk.cpp" line="188"/> <source>Submit App with client(Recommanded)</source> <translation>從客戶端上傳軟體(推薦的)</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="188"/> + <location filename="../src/mainwindow-dtk.cpp" line="189"/> <source>Settings</source> <translation>設定</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="189"/> + <location filename="../src/mainwindow-dtk.cpp" line="190"/> <source>APP Upgrade and Install Settings</source> <translation>軟體升級 和 安裝設定</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="145"/> - <location filename="../src/mainwindow-dtk.cpp" line="240"/> + <location filename="../src/mainwindow-dtk.cpp" line="146"/> + <location filename="../src/mainwindow-dtk.cpp" line="241"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="150"/> + <location filename="../src/mainwindow-dtk.cpp" line="151"/> <source>Search or enter spk://</source> <translation>搜索或打开链接</translation> </message> @@ -488,7 +516,7 @@ <message> <location filename="../src/application.cpp" line="33"/> <location filename="../src/application.cpp" line="34"/> - <location filename="../src/mainwindow-dtk.cpp" line="125"/> + <location filename="../src/mainwindow-dtk.cpp" line="126"/> <source>Spark Store</source> <translation>星火应用商店</translation> </message> @@ -508,7 +536,7 @@ <translation>下载列表</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="243"/> + <location filename="../src/mainwindow-dtk.cpp" line="244"/> <source>Show MainWindow</source> <translation>显示主窗口</translation> </message> @@ -619,12 +647,12 @@ <context> <name>TitleBarMenu</name> <message> - <location filename="../src/mainwindow-dtk.cpp" line="244"/> + <location filename="../src/mainwindow-dtk.cpp" line="245"/> <source>About</source> <translation>关于</translation> </message> <message> - <location filename="../src/mainwindow-dtk.cpp" line="245"/> + <location filename="../src/mainwindow-dtk.cpp" line="246"/> <source>Exit</source> <translation>退出</translation> </message>