From 5b3d1aea39d9587909f37c9dbf8f2405121d6fe2 Mon Sep 17 00:00:00 2001
From: zty199 <1282441920@qq.com>
Date: Thu, 19 Nov 2020 13:59:25 +0800
Subject: [PATCH] Fix Bugs

Fix a bug that the dirname in ~/.local/share/ is translated into
Chinese;
Update part of translation.
---
 spark-webapp-runtime/main.cpp                 |   4 +--
 .../spark-webapp-runtime_zh_CN.qm             | Bin 1663 -> 1664 bytes
 .../spark-webapp-runtime_zh_CN.ts             |  26 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/spark-webapp-runtime/main.cpp b/spark-webapp-runtime/main.cpp
index 5812176..2ee56a1 100644
--- a/spark-webapp-runtime/main.cpp
+++ b/spark-webapp-runtime/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
     DAboutDialog dialog;
     a.loadTranslator();
     a.setAttribute(Qt::AA_UseHighDpiPixmaps);
-    a.setApplicationName(DEFAULT_TITLE);
+    a.setApplicationName("SparkWebAppRuntime"); // 这里不要翻译,否则 ~/.local/share 中文件夹名也会被翻译
     a.setProductName(DEFAULT_TITLE);
     a.setAboutDialog(&dialog);
 
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
     parser.addOption(optWidth);
 
     QCommandLineOption optHeight(QStringList() << "H" << "height",
-                                 QObject::tr("The Height of Application. Default is %1").arg(DEFAULT_HEIGHT),
+                                 QObject::tr("The Height of Application. Default is %1.").arg(DEFAULT_HEIGHT),
                                  "height",
                                  QString::number(DEFAULT_HEIGHT));
     parser.addOption(optHeight);
diff --git a/spark-webapp-runtime/translations/spark-webapp-runtime_zh_CN.qm b/spark-webapp-runtime/translations/spark-webapp-runtime_zh_CN.qm
index c348be34654673b83d5534ba4365022671825c3f..eddef58a8dcf83cf1e72461529a01ecbe49ebb43 100644
GIT binary patch
delta 582
zcmey*)4)4HrhYkN-eNrl2Bw9KTNkA=Ffj77Fz)`xz`*=~#YHBMfq}u4<?w0{pPhB*
zA%7r$0qd^5dq8!8tRL^ZV_;yp!oi&Ml!1YDI|oPqL!dkZ&&dURK>h?iId`DBjNkYc
zZ(j#AKbG&p$8$jSzI-3W-T}?a<qzmjW?&FvHO&O7zQ+vI$(4M*|HFT&iR<-LRYLSj
zHG&VN7IZ#NpOCsUp5K6J-i_`hGpgeH5h9aW7{7~(bnmOri<?raQPwiiw>~em-S3+L
z(_|4QHvxzs$V~r-3Hd<5EGBymh+x(9;K#FW#4UrEnx@a7z@W-tXu!k)@&FqUYfiq%
zq%m25MMzKpVSd=Z40fO~^32A{N+8iH?zsN4mi`MJJ{jyYW}urjxt!S<q7Gqa^j=Im
zC*Nmw*3|)-7uZ^#2Xsj|Ln=cOLokpmVkiTX3S}*27ejQa-UmMp{tk43H;bF51|c08
zmc8%eTY##!vAEdU5K;}aHy8+g7!-p2yVs%Fr_UNAtiTY;5X9gE^JP^P(Byfn4*@C%
BzPJDY

delta 594
zcmZqR{m(N&rhYwR-eNrl2BtNPTNkA=Ffa-;K73LLr2nxn?*7NX!2FuUMJA7dfx(>R
z@M;iWgmvd3e;|Je>#n|gKy{(4AMd<lU|_k-!JPDzfq``!2S@)ypgaT5$pw5sem~#h
z?dyQ%r|@0)cn+v8gzuvmP(5=Ee?WgS1A_>wNhVO$U1pGu<n#R>7_1l+Ca%>}R}0ZE
z)d)V6TG078eM0Kaczy;w28DSyx|htTit9&+O=A2mDbc;JKCg;9uD}06hfi6{MBn<n
z)ONpb40@A!nA`+F5@jtQqx~Ny<O2nhnCvwWs%PDZTLv>aO`k!5L6yOf1LS@-Al8_C
zl1W329mrx2^iRr4O)g;sIaCDI!mxiC>_Brxn2l9cU@~PbAjf2|&zOO3I8bF4vok^^
z#L>}vF`WTad4btkQv+mXU~7FILpVb!LlQ$UkSt;-1CeDdWfwzqs@?}b4*m{Q?ZDy&
zF&CHW49nj4@hw1=>see(P4Jluv?Z9qC)mGx9hw~mtTDo&3_%P&2!B;o0Zp9G`VatQ
C$i!j*

diff --git a/spark-webapp-runtime/translations/spark-webapp-runtime_zh_CN.ts b/spark-webapp-runtime/translations/spark-webapp-runtime_zh_CN.ts
index 2425566..d59a898 100644
--- a/spark-webapp-runtime/translations/spark-webapp-runtime_zh_CN.ts
+++ b/spark-webapp-runtime/translations/spark-webapp-runtime_zh_CN.ts
@@ -21,62 +21,62 @@
     <message>
         <location filename="../main.cpp" line="61"/>
         <source>Description: %1</source>
-        <translation>描述: %1</translation>
+        <translation>描述:%1</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="66"/>
         <source>Enable CommandLineParser. Default is false.</source>
-        <translation>启用参数解析方式. 默认顺序解析方式.</translation>
+        <translation>启用参数解析方式。默认顺序解析方式。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="70"/>
         <source>The Title of Application. Default is %1.</source>
-        <translation>设置程序的运行标题. 默认是 %1.</translation>
+        <translation>设置程序的运行标题。默认是 %1。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="76"/>
         <source>The target URL. Default is Blank.</source>
-        <translation>设置要打开的目标URL. 默认是空.</translation>
+        <translation>设置要打开的目标 URL。默认是空。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="82"/>
         <source>The Width of Application. Default is %1.</source>
-        <translation>设置程序运行的宽度. 默认是 %1.</translation>
+        <translation>设置应用的窗口宽度。默认是 %1。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="88"/>
-        <source>The Height of Application. Default is %1</source>
-        <translation>设置程序运行的高度. 默认是 %1</translation>
+        <source>The Height of Application. Default is %1.</source>
+        <translation>设置应用的窗口高度。默认是 %1。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="94"/>
         <source>The ICON of Application.</source>
-        <translation>设置程序运行的图标.</translation>
+        <translation>设置应用的图标。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="100"/>
         <source>The Description of Application.</source>
-        <translation>设置程序的描述信息.</translation>
+        <translation>设置应用的描述信息。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="106"/>
         <source>The Configuration file of Application.</source>
-        <translation>设置程序运行的配置文件.</translation>
+        <translation>设置应用的配置文件。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="112"/>
         <source>The root path of the program web service.</source>
-        <translation>设置内置WebServer的根路径.</translation>
+        <translation>设置内置 WebServer 的根路径。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="119"/>
         <source>The port number of the program web service.</source>
-        <translation>设置内置WebServer的监听端口号.</translation>
+        <translation>设置内置 WebServer 的监听端口号。</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="126"/>
         <source>The ssl port number of the program web service.</source>
-        <translation>设置内置WebServer的SSL协议的监听端口号.</translation>
+        <translation>设置内置 WebServer 的 SSL 协议的监听端口号。</translation>
     </message>
     <message>
         <location filename="../globaldefine.h" line="7"/>