From e95c43408ae201636ab7a059cbaffd10482948a0 Mon Sep 17 00:00:00 2001
From: huhamhire <me@huhamhire.com>
Date: Mon, 2 Dec 2013 14:39:53 +0800
Subject: [PATCH] Fix zh_CN translation problems

Signed-off-by: huhamhire <me@huhamhire.com>
---
 lang/de_DE.ts |   3 +--
 lang/zh_CN.qm | Bin 6917 -> 6924 bytes
 lang/zh_CN.ts |  60 +++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/lang/de_DE.ts b/lang/de_DE.ts
index be2d277..8114403 100644
--- a/lang/de_DE.ts
+++ b/lang/de_DE.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de_DE" sourcelanguage="en_US">
+<!DOCTYPE TS><TS version="2.0" language="de_DE" sourcelanguage="en_US">
 <context>
     <name>HostsUtlMain</name>
     <message>
diff --git a/lang/zh_CN.qm b/lang/zh_CN.qm
index 175d07e33a044902ccd082b211418327382a37c4..d842be42b82b23a989ca1117ac43d9c131352165 100644
GIT binary patch
delta 754
zcmWMkT}TvR6uq<i&Hl{J&giCTq1%|K+rvsC83-9cWRZ%M2r4LPo355??b<`28;RnY
zShSXvmT6_6rlCFP3O;C78~$J>L_hWeu~Z_8mDq!J9_Bk7xcA(1?w#7C#-wWz?gvE2
z5{QhQ#AX<gaG5mBNVLUAX}1fB^v~$b2u~EAMXsyS;5NG0Q$-XuKpl%qL_E(OjFO1d
z3EWg;9}!DZX`Zj3ey6G^`3F((HdSW?`h*_!>$gor+Er#M&4A7VOAJT7+my?y+D{S5
zxvVQ~4Fd03x8F--_{>HH2?J7DU;;v0i&<cH7&y#Few!vzz2Ggq4`JNNXZPO#PV#MS
zV;I=QcV8I?&S|VB3ou`kYC!<@L}PF95K*h<=PM`rYqWW>mE<N}tG09z1H;_f*5+2C
z&~$BY)&>gy>9X@ukgQ%eHZ%c)Bl>*L9I!!O`#YQ{BvF6YGY|et|8)O782zsI^Y2i<
zqTgHr53&k!@j8)sSg^{w!EXukg&53VFvLaHK)=9{X>zzx5NtS}TnhsR!x!HGaMAGh
z021luMS6@?2}`0-)`SEV;*NkF&XdJU@n>-&k2uj*4j~f#_a!9V5T~kvVzW5oI02nQ
zMr(Z^R^DkWdwGsXnl^ee!-!1r64!3VhHX-m&W)9X&Pq{1Ilww8YP%jQj*wC;_!nfe
ztj&3YK>_(rEE<e!@}rMMNHQZ26-?uXA+qn&BsMWF`xbEHkZO6fvL8A+*?-fDz8v|3
z7!N~Ja2?*DhEsFiIw@2_4swzUpEB5@D(1Kz@1{DIQ@k<kDBcPd%_)Ok7N_CTy(7XN
zkY%BRfn1kCyvsto_mBM5yf?$)vKQHsl^DBH;&8g0imlvr-fnX$B`2NA;A+qj#?^WE
Mh3<mD>CkrmKL^6bdjJ3c

delta 718
zcmWksZ%9*d6g_YIy|=x$xA$Aq<tR0mpbOe4LIXc2kra`InMfjJYG7(AHKho2k_{S3
zNi!wXW>Fa$DvrP`{Gf?0{DXxUWnqFyCXykQeX-kz$Kmk1_uO;teGSRJ<i==kJ8)`0
zU~UJSW`I%)iJ5_j5Hju;0&*WNz7hfZ2~^#QCtiSS-8Dc|Hy*C80isSwcW8j#Elf7_
z0PKKHdb3XTJ9R}V-+*lqx<}E}r*!HEzPbTxHnWzVB%P0}CU_q3@@)1r<2N<Vv953c
zFnwY}3JHqoY<ZLfwx46mGcO7I#hAq@KsO>fpFbwU6=F{BJ;E`ut!<bFb%<TJMhGV*
zm(@vlMmp*w<E%?6Y4HPSmF5-dSHsfExQBG=r0;2Ncwzo&$V;dOj4g)JRWcBD)zI41
z3fPVqbMjItna?;pFbeP&@>&0T!W*)0!wy95mD~NZ#Fym0v<GB(Q4WhAsD4e}S|@Hv
zRCw_w4NO;Dd>`?<%4{JG7ColKn0hjlZ_2b*da1x{%1ZIkU}jnv>?d3@{W?U+j58`a
zX;sRKs+8TPB<1R^<q~p!P_1*9(}}LDO>^{a_@R!rRgfTM>(D6qA9b>pP;FGFD^HVN
zn!53y<FDCuvxn+~=CZL%fHrRSXL_UPCQeNV#?tBwG>4H^WqYeREV+bU&9OtK)!VdG
zC;c1T&JDTmXz&7mGG9cA!h9fqif(D)gP$j8Bd_`37rJ%i6+TqmOZ@^5H@m1li(K35
z^<*J7ZxeC2fJ%5!MPFQ~MOQ2c&jMTegg^p29=OcnL(MEv5;6iqN>X5gyF<H89!9j8
eCxs?B7lh=%yd^rcX*tFOU*NE9PpI4$6#oIF*}9kj

diff --git a/lang/zh_CN.ts b/lang/zh_CN.ts
index 731dce0..12407aa 100644
--- a/lang/zh_CN.ts
+++ b/lang/zh_CN.ts
@@ -173,7 +173,7 @@
         <location filename="hostsutl.py" line="965"/>
         <source>Notice: %i hosts entries has
   been applied in %ssecs.</source>
-        <translation>注意：共有 %i 条 hosts 条目在
+        <translation type="obsolete">注意：共有 %i 条 hosts 条目在
   %s秒内被插入到 hosts 文件中。</translation>
     </message>
     <message>
@@ -191,7 +191,7 @@
         <source>Incorrect Data file!
 Please use the &quot;Download&quot; key to
 fetch a new data file.</source>
-        <translation>数据文件错误！
+        <translation type="obsolete">数据文件错误！
 请点击“下载”按钮来获取
 新的数据文件。</translation>
     </message>
@@ -211,7 +211,7 @@ fetch a new data file.</source>
 hosts file.
 Please run this program as Administrator/root
 so it can modify your hosts file.</source>
-        <translation>您未获取修改系统 hosts 文件的
+        <translation type="obsolete">您未获取修改系统 hosts 文件的
 相关权限。
 请以管理员方式或者根用户运行本
 工具。</translation>
@@ -228,7 +228,7 @@ Please try another server.</source>
         <source>Data file not found!
 Please use the &quot;Download&quot; key to
 fetch a new data file.</source>
-        <translation>未找到数据文件！
+        <translation type="obsolete">未找到数据文件！
 请点击“下载”按钮来获取
 新的数据文件。</translation>
     </message>
@@ -245,7 +245,7 @@ to the hosts file on your system?
 This operation could not be reverted if
 you have not made a backup of your
 current hosts file.</source>
-        <translation>您确认继续执行当前操作以修改系统 hosts
+        <translation type="obsolete">您确认继续执行当前操作以修改系统 hosts
 文件吗？
 
 若先前未对 hosts 文件进行备份，该操作将
@@ -416,5 +416,55 @@ current hosts file.</source>
         <source>Powered by PyQT</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="hostsutl.py" line="965"/>
+        <source>Notice: %i hosts entries has 
+  been applied in %ssecs.</source>
+        <translation>注意：共有 %i 条 hosts 条目在
+  %s秒内被插入到 hosts 文件中。</translation>
+    </message>
+    <message>
+        <location filename="hostsutl.py" line="1098"/>
+        <source>Incorrect Data file!
+Please use the &quot;Download&quot; key to 
+fetch a new data file.</source>
+        <translation>数据文件错误！
+请点击“下载”按钮来获取
+新的数据文件。</translation>
+    </message>
+    <message>
+        <location filename="hostsutl.py" line="1072"/>
+        <source>You do not have permissions to change the 
+hosts file.
+Please run this program as Administrator/root
+so it can modify your hosts file.</source>
+        <translation>您未获取修改系统 hosts 文件的
+相关权限。
+请以管理员方式或者根用户运行本
+工具。</translation>
+    </message>
+    <message>
+        <location filename="hostsutl.py" line="1113"/>
+        <source>Data file not found!
+Please use the &quot;Download&quot; key to 
+fetch a new data file.</source>
+        <translation>未找到数据文件！
+请点击“下载”按钮来获取
+新的数据文件。</translation>
+    </message>
+    <message>
+        <location filename="hostsutl.py" line="1132"/>
+        <source>Are you sure you want to apply changes 
+to the hosts file on your system?
+
+This operation could not be reverted if 
+you have not made a backup of your 
+current hosts file.</source>
+        <translation>您确认继续执行当前操作以修改系统 hosts
+文件吗？
+
+若先前未对 hosts 文件进行备份，该操作将
+不可逆转。</translation>
+    </message>
 </context>
 </TS>