From 1156278dbf5558e7356f877de7883d5ee4a1226c Mon Sep 17 00:00:00 2001
From: Merrick <anphorea@gmail.com>
Date: Sun, 26 Jun 2016 17:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A0=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CnBeta/assets/about.qml             |  7 ++++++
 CnBeta/assets/main.qml              |  8 +++---
 CnBeta/bar-descriptor.xml           |  2 +-
 CnBeta/translations/CnBeta.ts       | 32 +++++++++++++++++++++++-
 CnBeta/translations/CnBeta_zh_CN.ts | 38 +++++++++++++++++++++++++++--
 5 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/CnBeta/assets/about.qml b/CnBeta/assets/about.qml
index 182a2e1..100c45e 100644
--- a/CnBeta/assets/about.qml
+++ b/CnBeta/assets/about.qml
@@ -48,6 +48,13 @@ Page {
                 text: qsTr("2.   Raw text process may produces bad paragraphs.")
                 textStyle.fontWeight: FontWeight.W100
             }
+            Label {
+                multiline: true
+                horizontalAlignment: HorizontalAlignment.Left
+                textStyle.fontSize: FontSize.Small
+                text: qsTr("3.   No HTML Link.")
+                textStyle.fontWeight: FontWeight.W100
+            }
             Label {
                 multiline: true
                 text: qsTr("ALL CONTENT RIGHTS RESERVED BY CNBETA.COM")
diff --git a/CnBeta/assets/main.qml b/CnBeta/assets/main.qml
index a504796..1920c5f 100644
--- a/CnBeta/assets/main.qml
+++ b/CnBeta/assets/main.qml
@@ -76,11 +76,11 @@ NavigationPane {
                 id: ssd
                 property string err
                 title: qsTr("ERROR")
-                body: qsTr("Error fetching data, Server response is [%1]").arg(err)
+                body: qsTr("Error fetching data, Server response is [%1], please check your internet connection.").arg(err)
                 includeRememberMe: false
-                confirmButton.label: "Reload"
-                cancelButton.label: "Cancel"
-                customButton.label: "Exit App"
+                confirmButton.label: qsTr("Reload")
+                cancelButton.label: qsTr("Cancel")
+                customButton.label: qsTr("Exit App")
                 customButton.enabled: true
                 confirmButton.enabled: true
                 cancelButton.enabled: true
diff --git a/CnBeta/bar-descriptor.xml b/CnBeta/bar-descriptor.xml
index fc9096e..873f867 100644
--- a/CnBeta/bar-descriptor.xml
+++ b/CnBeta/bar-descriptor.xml
@@ -59,7 +59,7 @@
 
     <!-- Fourth digit segment of the package version. First three segments are taken from the
          <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
-    <buildId>1</buildId>
+    <buildId>2</buildId>
     <packageLocale>zh-CN</packageLocale>
 
     <!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
diff --git a/CnBeta/translations/CnBeta.ts b/CnBeta/translations/CnBeta.ts
index 44afc26..63db3f0 100644
--- a/CnBeta/translations/CnBeta.ts
+++ b/CnBeta/translations/CnBeta.ts
@@ -44,7 +44,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/about.qml" line="53"/>
+        <location filename="../assets/about.qml" line="55"/>
+        <source>3.   No HTML Link.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../assets/about.qml" line="60"/>
         <source>ALL CONTENT RIGHTS RESERVED BY CNBETA.COM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -56,6 +61,31 @@
         <source>CnBeta for BlackBerry 10</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../assets/main.qml" line="78"/>
+        <source>ERROR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="79"/>
+        <source>Error fetching data, Server response is [%1], please check your internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="81"/>
+        <source>Reload</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="82"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="83"/>
+        <source>Exit App</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>settings</name>
diff --git a/CnBeta/translations/CnBeta_zh_CN.ts b/CnBeta/translations/CnBeta_zh_CN.ts
index d263ec5..bd10d50 100644
--- a/CnBeta/translations/CnBeta_zh_CN.ts
+++ b/CnBeta/translations/CnBeta_zh_CN.ts
@@ -26,7 +26,7 @@
     <message>
         <location filename="../assets/about.qml" line="29"/>
         <source>Merrick Zhang ( anphorea@gmail.com )</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../assets/about.qml" line="35"/>
@@ -44,7 +44,12 @@
         <translation>2.  页面内容是自动分析取得，可能会出错。</translation>
     </message>
     <message>
-        <location filename="../assets/about.qml" line="53"/>
+        <location filename="../assets/about.qml" line="55"/>
+        <source>3.   No HTML Link.</source>
+        <translation>3.  内容中不包括超链接。</translation>
+    </message>
+    <message>
+        <location filename="../assets/about.qml" line="60"/>
         <source>ALL CONTENT RIGHTS RESERVED BY CNBETA.COM</source>
         <translation>文章内容版权由cnbeta.com所有</translation>
     </message>
@@ -56,6 +61,35 @@
         <source>CnBeta for BlackBerry 10</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="../assets/main.qml" line="78"/>
+        <source>ERROR</source>
+        <translation>网络发生错误</translation>
+    </message>
+    <message>
+        <source>Error fetching data, Server response is [%1]</source>
+        <translation type="obsolete">获取数据失败，服务器返回了 [%1]，请检查网络连接</translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="79"/>
+        <source>Error fetching data, Server response is [%1], please check your internet connection.</source>
+        <translation>获取数据失败，服务器返回了 [%1]，请检查网络连接。</translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="81"/>
+        <source>Reload</source>
+        <translation>重试</translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="82"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="83"/>
+        <source>Exit App</source>
+        <translation>退出</translation>
+    </message>
 </context>
 <context>
     <name>settings</name>