diff --git a/src/application.cpp b/src/application.cpp
index b3e5965..9aeea14 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -93,7 +93,7 @@ void Application::setBuildDateTime(const QString &buildDateTime)
qDebug() << "Spark Store has been updated!";
config.setValue("build/version", QString(APP_VERSION));
- config.setValue("build/branch",QString(APP_BRANCH));
+ config.setValue("build/branch", QString(APP_BRANCH));
config.setValue("build/time", buildDateTime);
config.sync();
}
@@ -158,6 +158,17 @@ void Application::initAboutDialog()
dialog->hide();
}
+void Application::loadTranslator()
+{
+ DApplication::loadTranslator();
+
+ if (QLocale::system().language() == QLocale::Chinese) {
+ QTranslator *webengineTranslator = new QTranslator(this);
+ webengineTranslator->load(QLocale(QLocale::Chinese), "qtwebengine", "_", ":/translations");
+ installTranslator(webengineTranslator);
+ }
+}
+
#if (DTK_VERSION >= DTK_VERSION_CHECK(5, 6, 4, 0))
/**
* @brief Application::initFeatureDisplayDialog 初始化版本特性对话框
diff --git a/src/application.h b/src/application.h
index de66a7e..22f6b14 100644
--- a/src/application.h
+++ b/src/application.h
@@ -30,6 +30,8 @@ private:
void initFeatureDisplayDialog();
#endif
+ void loadTranslator();
+
private:
QJsonObject m_featuresJsonObj;
diff --git a/src/assets/assets.qrc b/src/assets/assets.qrc
index ed35fdf..c0548c9 100644
--- a/src/assets/assets.qrc
+++ b/src/assets/assets.qrc
@@ -62,5 +62,6 @@
<file>tags/uos-authorize.svg</file>
<file>tags/uos-small.png</file>
<file>tags/uos.svg</file>
+ <file>translations/qtwebengine_zh.qm</file>
</qresource>
</RCC>
diff --git a/src/assets/translations/qtwebengine_zh.qm b/src/assets/translations/qtwebengine_zh.qm
new file mode 100644
index 0000000..d3c927b
Binary files /dev/null and b/src/assets/translations/qtwebengine_zh.qm differ
diff --git a/src/assets/translations/qtwebengine_zh.ts b/src/assets/translations/qtwebengine_zh.ts
new file mode 100644
index 0000000..c1167fb
--- /dev/null
+++ b/src/assets/translations/qtwebengine_zh.ts
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN" sourcelanguage="es">
+<context>
+ <name>QWebEnginePage</name>
+ <message>
+ <source>Cut</source>
+ <translation>剪切</translation>
+ </message>
+ <message>
+ <source>Back</source>
+ <translation>后退</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation>复制</translation>
+ </message>
+ <message>
+ <source>Redo</source>
+ <translation>恢复</translation>
+ </message>
+ <message>
+ <source>Stop</source>
+ <translation>停止</translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation>撤销</translation>
+ </message>
+ <message>
+ <source>&Back</source>
+ <translation>&后退</translation>
+ </message>
+ <message>
+ <source>Paste</source>
+ <translation>粘贴</translation>
+ </message>
+ <message>
+ <source>Copy Image URL</source>
+ <translation>复制图片地址</translation>
+ </message>
+ <message>
+ <source>Open Link in This Window</source>
+ <translation>在当前窗口中打开链接</translation>
+ </message>
+ <message>
+ <source>Toggle Mute</source>
+ <translation>切换静音</translation>
+ </message>
+ <message>
+ <source>Inspect Element</source>
+ <translation>检查元素</translation>
+ </message>
+ <message>
+ <source>Toggle Media Controls</source>
+ <translation>切换媒体控制</translation>
+ </message>
+ <message>
+ <source>Reload</source>
+ <translation>重新加载</translation>
+ </message>
+ <message>
+ <source>Copy Link URL</source>
+ <translation>复制链接地址</translation>
+ </message>
+ <message>
+ <source>Exit Full Screen Mode</source>
+ <translation>退出全屏模式</translation>
+ </message>
+ <message>
+ <source>Paste and Match Style</source>
+ <translation>Pegar y coincidir estilo</translation>
+ </message>
+ <message>
+ <source>Follow Link</source>
+ <translation>Seguir vínculo</translation>
+ </message>
+ <message>
+ <source>Open Link in New Tab</source>
+ <translation>在新标签页中打开链接</translation>
+ </message>
+ <message>
+ <source>Reload and Bypass Cache</source>
+ <translation>重新加载且绕过缓存</translation>
+ </message>
+ <message>
+ <source>Select folder to upload</source>
+ <translation>Seleccionar una carpeta para subir</translation>
+ </message>
+ <message>
+ <source>Save Image</source>
+ <translation>保存图片</translation>
+ </message>
+ <message>
+ <source>Save Media</source>
+ <translation>保存媒体</translation>
+ </message>
+ <message>
+ <source>Toggle Looping</source>
+ <translation>切换循环播放</translation>
+ </message>
+ <message>
+ <source>Close Page</source>
+ <translation>关闭页面</translation>
+ </message>
+ <message>
+ <source>Toggle Play/Pause</source>
+ <translation>切换播放/暂停</translation>
+ </message>
+ <message>
+ <source>Copy Image</source>
+ <translation>复制图片</translation>
+ </message>
+ <message>
+ <source>&Reload</source>
+ <translation>&重新加载</translation>
+ </message>
+ <message>
+ <source>Select All</source>
+ <translation>全选</translation>
+ </message>
+ <message>
+ <source>Save Link</source>
+ <translation>Guardar enlace</translation>
+ </message>
+ <message>
+ <source>Copy Media URL</source>
+ <translation>复制媒体地址</translation>
+ </message>
+ <message>
+ <source>Forward</source>
+ <translation>前进</translation>
+ </message>
+ <message>
+ <source>&Forward</source>
+ <translation>&前进</translation>
+ </message>
+ <message>
+ <source>Open Link in New Window</source>
+ <translation>在新窗口中打开链接</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to leave this page?</source>
+ <translation>您确定要离开当前页面吗？</translation>
+ </message>
+</context>
+<context>
+ <name>QQuickWebEngineView</name>
+ <message>
+ <source>Back</source>
+ <translation>后退</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation>复制</translation>
+ </message>
+ <message>
+ <source>Copy Image URL</source>
+ <translation>复制图片地址</translation>
+ </message>
+ <message>
+ <source>Toggle Mute</source>
+ <translation>切换静音</translation>
+ </message>
+ <message>
+ <source>Inspect Element</source>
+ <translation>检查元素</translation>
+ </message>
+ <message>
+ <source>Toggle Media Controls</source>
+ <translation>切换媒体控制</translation>
+ </message>
+ <message>
+ <source>Reload</source>
+ <translation>重新加载</translation>
+ </message>
+ <message>
+ <source>Copy Link URL</source>
+ <translation>复制链接地址</translation>
+ </message>
+ <message>
+ <source>Exit Full Screen Mode</source>
+ <translation>退出全屏模式</translation>
+ </message>
+ <message>
+ <source>Follow Link</source>
+ <translation>跳转链接</translation>
+ </message>
+ <message>
+ <source>Save Image</source>
+ <translation>保存图片</translation>
+ </message>
+ <message>
+ <source>Save Media</source>
+ <translation>保存媒体</translation>
+ </message>
+ <message>
+ <source>Toggle Looping</source>
+ <translation>切换循环播放</translation>
+ </message>
+ <message>
+ <source>Toggle Play/Pause</source>
+ <translation>切换播放/暂停</translation>
+ </message>
+ <message>
+ <source>Copy Image</source>
+ <translation>复制图片</translation>
+ </message>
+ <message>
+ <source>Save Link</source>
+ <translation>保存链接</translation>
+ </message>
+ <message>
+ <source>Copy Media URL</source>
+ <translation>复制媒体地址</translation>
+ </message>
+ <message>
+ <source>Forward</source>
+ <translation>前进</translation>
+ </message>
+</context>
+<context>
+ <name>QtWebEngineCore</name>
+ <message>
+ <source>Javascript Alert - %1</source>
+ <translation>Javascript 警告 - %1</translation>
+ </message>
+ <message>
+ <source>Javascript Confirm - %1</source>
+ <translation>Javascript 确认 - %1</translation>
+ </message>
+ <message>
+ <source>Javascript Prompt - %1</source>
+ <translation>Javascript 提示 - %1</translation>
+ </message>
+ <message>
+ <source>Are you sure you want to leave this page?</source>
+ <translation>您确定要离开当前页面吗？</translation>
+ </message>
+</context>
+<context>
+ <name>QtWebEnginePlugin</name>
+ <message>
+ <source>Cannot create a separate instance of WebEngineDownloadItem</source>
+ <translation>无法创建一个 WebEngineDownloadItem 的独立实例</translation>
+ </message>
+ <message>
+ <source>Cannot create separate instance of WebEngineLoadRequest</source>
+ <translation>无法创建一个 WebEngineLoadRequest 的独立实例</translation>
+ </message>
+ <message>
+ <source>Cannot create a separate instance of WebEngineSettings</source>
+ <translation>无法创建一个 WebEngineSettings 的独立实例</translation>
+ </message>
+ <message>
+ <source>Cannot create separate instance of WebEngineNavigationRequest</source>
+ <translation>无法创建一个 WebEngineNavigationRequest 的独立实例</translation>
+ </message>
+ <message>
+ <source>Cannot create separate instance of WebEngineNewViewRequest</source>
+ <translation>无法创建一个 WebEngineNewViewRequest 的独立实例</translation>
+ </message>
+ <message>
+ <source>Cannot create separate instance of WebEngineCertificateError</source>
+ <translation>无法创建一个 WebEngineCertificateError 的独立实例</translation>
+ </message>
+ <message>
+ <source>Cannot create a separate instance of FullScreenRequest</source>
+ <translation>无法创建一个 FullScreenRequest 的独立实例</translation>
+ </message>
+ <message>
+ <source>Cannot create a separate instance of NavigationHistory</source>
+ <translation>无法创建一个 NavigationHistory 的独立实例</translation>
+ </message>
+</context>
+<context>
+ <name>QtWebEngineExperimentalPlugin</name>
+ <message>
+ <source>Cannot create a separate instance of WebEngineViewExperimental</source>
+ <translation>无法创建一个 WebEngineViewExperimental 的独立实例</translation>
+ </message>
+ <message>
+ <source>Cannot create a separate instance of WebEngineViewport</source>
+ <translation>无法创建一个 WebEngineViewport 的独立实例</translation>
+ </message>
+</context>
+<context>
+ <name>UIDelegatesManager</name>
+ <message>
+ <source>Enter username and password for "%1" at %2://%3</source>
+ <translation>为在 %2://%3 的“%1”输入用户名和密码</translation>
+ </message>
+ <message>
+ <source>Connect to proxy "%1" using:</source>
+ <translation>使用“%1”连接代理：</translation>
+ </message>
+</context>
+<context>
+ <name>QtWebEngineTestSupportPlugin</name>
+ <message>
+ <source>Cannot create a separate instance of WebEngineErrorPage</source>
+ <translation>无法创建一个 WebEngineErrorPage 的独立实例</translation>
+ </message>
+</context>
+</TS>
diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp
index 15e6252..73d8315 100644
--- a/src/pages/appintopage.cpp
+++ b/src/pages/appintopage.cpp
@@ -172,7 +172,7 @@ void AppIntoPage::openUrl(const QUrl &url)
}
else
{
- ui->downloadButton->setText(tr("Download"));
+ ui->downloadButton->setText(tr("Download and Install"));
ui->downloadButton->setEnabled(true);
ui->downloadButton->show();
}
@@ -310,7 +310,7 @@ void AppIntoPage::isDownloading(const QUrl &url)
if (item->download == 2)
{
ui->downloadButton->setEnabled(true);
- ui->downloadButton->setText(tr("Download"));
+ ui->downloadButton->setText(tr("Download and Install"));
}
if (item->download == 1)
{
@@ -480,7 +480,7 @@ void AppIntoPage::on_pushButton_3_clicked()
if (check.readAllStandardOutput().isEmpty())
{
- ui->downloadButton->setText(tr("Download"));
+ ui->downloadButton->setText(tr("Download and Install"));
ui->pushButton_3->hide();
updatesEnabled();
diff --git a/src/pages/appintopage.ui b/src/pages/appintopage.ui
index c3c8024..bb82364 100644
--- a/src/pages/appintopage.ui
+++ b/src/pages/appintopage.ui
@@ -241,7 +241,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Download</string>
+ <string>Download and Install</string>
</property>
</widget>
</item>
diff --git a/src/spark-store.pro b/src/spark-store.pro
index 33a7429..724cb81 100644
--- a/src/spark-store.pro
+++ b/src/spark-store.pro
@@ -93,6 +93,7 @@ RESOURCES += \
TRANSLATIONS += \
../translations/spark-store_en.ts \
+ ../translations/spark-store_es.ts \
../translations/spark-store_fr.ts \
../translations/spark-store_zh_CN.ts \
../translations/spark-store_zh_TW.ts
diff --git a/src/widgets/common/downloaditem.cpp b/src/widgets/common/downloaditem.cpp
index 045647d..f20ecca 100644
--- a/src/widgets/common/downloaditem.cpp
+++ b/src/widgets/common/downloaditem.cpp
@@ -234,9 +234,9 @@ void DownloadItem::slotAsyncInstall(int t)
if (notRoot)
{
- Utils::sendNotification("spark-store", tr("Spark Store"), tr("dpkg progress had been aborted，please check the install info or try to reinstall."));
- ui->label_2->setText(tr("dpkg progress had been aborted，please check the install info or try to reinstall."));
- ui->label_2->setToolTip(tr("dpkg progress had been aborted，please check the install info or try to reinstall."));
+ Utils::sendNotification("spark-store", tr("Spark Store"), tr("dpkg progress had been aborted, please check the install info or try to reinstall."));
+ ui->label_2->setText(tr("dpkg progress had been aborted, please check the install info or try to reinstall."));
+ ui->label_2->setToolTip(tr("dpkg progress had been aborted, please check the install info or try to reinstall."));
ui->pushButton_install->show();
ui->pushButton_3->hide();
}
diff --git a/src/widgets/common/webenginepage.cpp b/src/widgets/common/webenginepage.cpp
index f52b336..767caae 100644
--- a/src/widgets/common/webenginepage.cpp
+++ b/src/widgets/common/webenginepage.cpp
@@ -7,20 +7,7 @@
WebEnginePage::WebEnginePage(QObject *parent)
: QWebEnginePage(parent)
{
- QLocale ql;
- switch (ql.language())
- {
- case QLocale::Chinese:
- {
- // 系统语言是中文，获取网页为中文 @momen @uniartisan
- QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
- qDebug() << profile->httpAcceptLanguage();
- profile->setHttpAcceptLanguage("zh-CN,zh;q=0.8,en;q=0.6");
- }
- break;
- default:
- break;
- }
+ initHttpAcceptLanguage();
}
WebEnginePage::~WebEnginePage()
@@ -47,6 +34,18 @@ QWebEnginePage *WebEnginePage::createWindow(QWebEnginePage::WebWindowType type)
return page;
}
+void WebEnginePage::initHttpAcceptLanguage()
+{
+ switch (QLocale::system().language()) {
+ case QLocale::Chinese: {
+ // 系统语言是中文，获取网页为中文 @momen @uniartisan
+ profile()->setHttpAcceptLanguage("zh-CN,zh;q=0.8,en;q=0.6");
+ } break;
+ default:
+ break;
+ }
+}
+
void WebEnginePage::slotUrlChanged(const QUrl &url)
{
if (m_currentUrl == url)
diff --git a/src/widgets/common/webenginepage.h b/src/widgets/common/webenginepage.h
index 6ebfb19..15f0cf3 100644
--- a/src/widgets/common/webenginepage.h
+++ b/src/widgets/common/webenginepage.h
@@ -16,6 +16,9 @@ public:
protected:
QWebEnginePage *createWindow(WebWindowType type) override;
+private:
+ void initHttpAcceptLanguage();
+
private slots:
void slotUrlChanged(const QUrl &url);
diff --git a/src/widgets/common/webengineview.cpp b/src/widgets/common/webengineview.cpp
index 21eb678..afd500b 100644
--- a/src/widgets/common/webengineview.cpp
+++ b/src/widgets/common/webengineview.cpp
@@ -1,8 +1,6 @@
#include "webengineview.h"
#include "webenginepage.h"
-#include <QDesktopServices>
-
WebEngineView::WebEngineView(QWidget *parent)
: QWebEngineView(parent)
{
diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts
index d031691..1579777 100644
--- a/translations/spark-store_en.ts
+++ b/translations/spark-store_en.ts
@@ -8,14 +8,6 @@
<source>Form</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/pages/appintopage.ui" line="244"/>
- <location filename="../src/pages/appintopage.cpp" line="175"/>
- <location filename="../src/pages/appintopage.cpp" line="313"/>
- <location filename="../src/pages/appintopage.cpp" line="483"/>
- <source>Download</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/pages/appintopage.ui" line="290"/>
<source>Uninstall</source>
@@ -132,6 +124,14 @@
<source>Screen capture</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/pages/appintopage.ui" line="244"/>
+ <location filename="../src/pages/appintopage.cpp" line="175"/>
+ <location filename="../src/pages/appintopage.cpp" line="313"/>
+ <location filename="../src/pages/appintopage.cpp" line="483"/>
+ <source>Download and Install</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/pages/appintopage.ui" line="429"/>
<location filename="../src/pages/appintopage.ui" line="432"/>
@@ -374,7 +374,7 @@
<location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
- <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
+ <source>dpkg progress had been aborted, please check the install info or try to reinstall.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/translations/spark-store_es.ts b/translations/spark-store_es.ts
index c4fe5c3..bb740a2 100644
--- a/translations/spark-store_es.ts
+++ b/translations/spark-store_es.ts
@@ -8,14 +8,6 @@
<source>Form</source>
<translation>Tipo</translation>
</message>
- <message>
- <location filename="../src/pages/appintopage.ui" line="244"/>
- <location filename="../src/pages/appintopage.cpp" line="175"/>
- <location filename="../src/pages/appintopage.cpp" line="313"/>
- <location filename="../src/pages/appintopage.cpp" line="483"/>
- <source>Download</source>
- <translation>Descargar</translation>
- </message>
<message>
<location filename="../src/pages/appintopage.ui" line="290"/>
<source>Uninstall</source>
@@ -132,6 +124,14 @@
<source>Screen capture</source>
<translation>Captura de pantalla</translation>
</message>
+ <message>
+ <location filename="../src/pages/appintopage.ui" line="244"/>
+ <location filename="../src/pages/appintopage.cpp" line="175"/>
+ <location filename="../src/pages/appintopage.cpp" line="313"/>
+ <location filename="../src/pages/appintopage.cpp" line="483"/>
+ <source>Download and Install</source>
+ <translation>Descargar e instalar</translation>
+ </message>
<message>
<location filename="../src/pages/appintopage.ui" line="429"/>
<location filename="../src/pages/appintopage.ui" line="432"/>
@@ -268,16 +268,24 @@
<context>
<name>DAboutDialog</name>
<message>
- <location filename="../src/application.cpp" line="139"/>
+ <location filename="../src/application.cpp" line="141"/>
<source>Version: %1</source>
<translation>Versión %1</translation>
</message>
<message>
- <location filename="../src/application.cpp" line="149"/>
+ <location filename="../src/application.cpp" line="151"/>
<source>%1 is released under %2</source>
<translation>%1 publicado bajo %2</translation>
</message>
</context>
+<context>
+ <name>DownloadController</name>
+ <message>
+ <location filename="../src/backend/downloadworker.cpp" line="176"/>
+ <source>Download Failed, please retry :(</source>
+ <translation>Descarga fall, por favor vuelva a intentarlo</translation>
+ </message>
+</context>
<context>
<name>DownloadItem</name>
<message>
@@ -366,8 +374,8 @@
<location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
- <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
- <translation>El proceso dpkg ha sido abortado, verifique la información de instalación o intente reinstalarlo.</translation>
+ <source>dpkg progress had been aborted, please check the install info or try to reinstall.</source>
+ <translation>El proceso de DPKG ha sido interrumpido, compruebe la información de instalación o intente reinstalar.</translation>
</message>
<message>
<location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
@@ -506,19 +514,19 @@
<context>
<name>QObject</name>
<message>
- <location filename="../src/application.cpp" line="33"/>
- <location filename="../src/application.cpp" line="34"/>
+ <location filename="../src/application.cpp" line="35"/>
+ <location filename="../src/application.cpp" line="36"/>
<location filename="../src/mainwindow-dtk.cpp" line="126"/>
<source>Spark Store</source>
<translation>SPARK Store</translation>
</message>
<message>
- <location filename="../src/application.cpp" line="38"/>
+ <location filename="../src/application.cpp" line="40"/>
<source><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></source>
<translation><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></translation>
</message>
<message>
- <location filename="../src/application.cpp" line="146"/>
+ <location filename="../src/application.cpp" line="148"/>
<source>Spark Project</source>
<translation>Proyecto spark</translation>
</message>
diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts
index 5e574ff..abde11d 100644
--- a/translations/spark-store_fr.ts
+++ b/translations/spark-store_fr.ts
@@ -8,14 +8,6 @@
<source>Form</source>
<translation>Type</translation>
</message>
- <message>
- <location filename="../src/pages/appintopage.ui" line="244"/>
- <location filename="../src/pages/appintopage.cpp" line="175"/>
- <location filename="../src/pages/appintopage.cpp" line="313"/>
- <location filename="../src/pages/appintopage.cpp" line="483"/>
- <source>Download</source>
- <translation>Télécharger</translation>
- </message>
<message>
<location filename="../src/pages/appintopage.ui" line="290"/>
<source>Uninstall</source>
@@ -132,6 +124,14 @@
<source>Screen capture</source>
<translation>Captures d'écran</translation>
</message>
+ <message>
+ <location filename="../src/pages/appintopage.ui" line="244"/>
+ <location filename="../src/pages/appintopage.cpp" line="175"/>
+ <location filename="../src/pages/appintopage.cpp" line="313"/>
+ <location filename="../src/pages/appintopage.cpp" line="483"/>
+ <source>Download and Install</source>
+ <translation>Télécharger et installer</translation>
+ </message>
<message>
<location filename="../src/pages/appintopage.ui" line="429"/>
<location filename="../src/pages/appintopage.ui" line="432"/>
@@ -283,7 +283,7 @@
<message>
<location filename="../src/backend/downloadworker.cpp" line="176"/>
<source>Download Failed, please retry :(</source>
- <translation type="unfinished"></translation>
+ <translation>Le téléchargement a échoué, veuillez réessayer</translation>
</message>
</context>
<context>
@@ -374,8 +374,8 @@
<location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
- <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
- <translation>Le processus dpkg a été abandonné, vérifiez les informations d'installation ou essayez de le réinstaller.</translation>
+ <source>dpkg progress had been aborted, please check the install info or try to reinstall.</source>
+ <translation>La progression de DPKG a été interrompue, veuillez vérifier les informations d’installation ou essayer de réinstaller.</translation>
</message>
<message>
<location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts
index 78c024e..7cb6ae0 100644
--- a/translations/spark-store_zh_CN.ts
+++ b/translations/spark-store_zh_CN.ts
@@ -8,14 +8,6 @@
<source>Form</source>
<translation></translation>
</message>
- <message>
- <location filename="../src/pages/appintopage.ui" line="244"/>
- <location filename="../src/pages/appintopage.cpp" line="175"/>
- <location filename="../src/pages/appintopage.cpp" line="313"/>
- <location filename="../src/pages/appintopage.cpp" line="483"/>
- <source>Download</source>
- <translation>下载</translation>
- </message>
<message>
<location filename="../src/pages/appintopage.ui" line="290"/>
<source>Uninstall</source>
@@ -127,6 +119,14 @@
<source>Screen capture</source>
<translation>屏幕截图</translation>
</message>
+ <message>
+ <location filename="../src/pages/appintopage.ui" line="244"/>
+ <location filename="../src/pages/appintopage.cpp" line="175"/>
+ <location filename="../src/pages/appintopage.cpp" line="313"/>
+ <location filename="../src/pages/appintopage.cpp" line="483"/>
+ <source>Download and Install</source>
+ <translation>下载并安装</translation>
+ </message>
<message>
<location filename="../src/pages/appintopage.ui" line="429"/>
<location filename="../src/pages/appintopage.ui" line="432"/>
@@ -283,7 +283,7 @@
<message>
<location filename="../src/backend/downloadworker.cpp" line="176"/>
<source>Download Failed, please retry :(</source>
- <translation type="unfinished"></translation>
+ <translation>下载失败，请重试</translation>
</message>
</context>
<context>
@@ -368,14 +368,14 @@
<location filename="../src/widgets/common/downloaditem.cpp" line="230"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="231"/>
<source>Error happened in dpkg progress , please check the install info or try to reinstall.</source>
- <translation>安装被中止，请检查安装详情或尝试重新安装</translation>
+ <translation>安装出现错误，请检查安装详情或尝试重新安装。</translation>
</message>
<message>
<location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
- <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
- <translation>dpkg出现错误，请检查安装详情或尝试重新安装</translation>
+ <source>dpkg progress had been aborted, please check the install info or try to reinstall.</source>
+ <translation>安装被中止，请检查安装详情或尝试重新安装。</translation>
</message>
<message>
<location filename="../src/widgets/common/downloaditem.cpp" line="144"/>
diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts
index d4f2af1..4aa4b63 100644
--- a/translations/spark-store_zh_TW.ts
+++ b/translations/spark-store_zh_TW.ts
@@ -8,14 +8,6 @@
<source>Form</source>
<translation></translation>
</message>
- <message>
- <location filename="../src/pages/appintopage.ui" line="244"/>
- <location filename="../src/pages/appintopage.cpp" line="175"/>
- <location filename="../src/pages/appintopage.cpp" line="313"/>
- <location filename="../src/pages/appintopage.cpp" line="483"/>
- <source>Download</source>
- <translation>下载</translation>
- </message>
<message>
<location filename="../src/pages/appintopage.ui" line="290"/>
<source>Uninstall</source>
@@ -127,6 +119,14 @@
<source>Screen capture</source>
<translation>軟體演示</translation>
</message>
+ <message>
+ <location filename="../src/pages/appintopage.ui" line="244"/>
+ <location filename="../src/pages/appintopage.cpp" line="175"/>
+ <location filename="../src/pages/appintopage.cpp" line="313"/>
+ <location filename="../src/pages/appintopage.cpp" line="483"/>
+ <source>Download and Install</source>
+ <translation>下載並安裝</translation>
+ </message>
<message>
<location filename="../src/pages/appintopage.ui" line="429"/>
<location filename="../src/pages/appintopage.ui" line="432"/>
@@ -283,7 +283,7 @@
<message>
<location filename="../src/backend/downloadworker.cpp" line="176"/>
<source>Download Failed, please retry :(</source>
- <translation type="unfinished"></translation>
+ <translation>下載失敗，請重試</translation>
</message>
</context>
<context>
@@ -368,14 +368,14 @@
<location filename="../src/widgets/common/downloaditem.cpp" line="230"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="231"/>
<source>Error happened in dpkg progress , please check the install info or try to reinstall.</source>
- <translation>安裝被中止，請檢查安裝詳情或嘗試重新安裝</translation>
+ <translation>安裝出現錯誤，請檢查安裝詳情或嘗試重新安裝。</translation>
</message>
<message>
<location filename="../src/widgets/common/downloaditem.cpp" line="237"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="238"/>
<location filename="../src/widgets/common/downloaditem.cpp" line="239"/>
- <source>dpkg progress had been aborted，please check the install info or try to reinstall.</source>
- <translation>dpkg出現錯誤，請檢查安裝詳情或嘗試重新安裝</translation>
+ <source>dpkg progress had been aborted, please check the install info or try to reinstall.</source>
+ <translation>安裝被中止，請檢查安裝詳情或嘗試重新安裝。</translation>
</message>
<message>
<location filename="../src/widgets/common/downloaditem.cpp" line="144"/>