From 37bd19acf44206e65b3afd203d3555ac619dbb21 Mon Sep 17 00:00:00 2001
From: Barry <870709864@qq.com>
Date: Sat, 26 Jan 2019 23:47:08 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                   |   1 +
 QtScrcpy/i18n/QtScrcpy_en.qm | Bin 1578 -> 2027 bytes
 QtScrcpy/i18n/QtScrcpy_en.ts |  25 ++++++++++++++++++++++++-
 QtScrcpy/i18n/QtScrcpy_zh.qm | Bin 1295 -> 1600 bytes
 QtScrcpy/i18n/QtScrcpy_zh.ts |  25 ++++++++++++++++++++++++-
 all.pro                      |   4 ++--
 6 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e9f5d46..e8d49bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,4 @@
 /output/win/debug/QtScrcpy.ilk
 /output/win/debug/QtScrcpy.pdb
 /output/win/debug/QtScrcpy.exe
+/output/win/release/QtScrcpy.exe
diff --git a/QtScrcpy/i18n/QtScrcpy_en.qm b/QtScrcpy/i18n/QtScrcpy_en.qm
index ed7808850d274d10e1ca5697eb66bf7575e5a60b..e20e8b1ff5ca6104011c47ac418c3b4388dd4736 100644
GIT binary patch
delta 517
zcmZ3*^O}Ex2;+^3q8*_e#;;fz7}!`j6ECnZFfb}}9dn(^z`%H&n^kBH0|VPs?vw0#
z3=AwjJQIq_7#LW@d43p$GBB`u^GRE_FfcGJ;9GrJgn@zO3*XM*B@7I#t1}rG*gkE%
z^n;~djUkO8lOcy8l|g|ag(06Im7$nHfgz6}pP__7fgzQlf+3Tkn4yG&fq{X6je&td
zI4v_LRUsumwOAo9zeFLmBD1)Joq>UYGb}SDHQz12D3_6$fq_8>$=DKxB8EhUJceS1
zG=@}$A_fJ9WQKf(T!sRM9ESQ-h7yKUxaneG(@TmH^NQ0_ixiUca|?1(OH#2|pn=zd
zG=@Z|uTtP<i=djFmYA87no^I&Xdi}huy#-YBr}vU6fqPrq%!1z0|XIRn7%4u$Vc%T
js@K%Y6EjN`l1qz<Qu9g_U~Z9yc(f!Ri(e-nWX%Ksg&=q*

delta 73
zcmaFOzlvvq2;+{4q8+B3i5FNH7#Nkgj=4@{U|_t?%__8pfq~@<_epj=1_l-%o(V-|
e3=AydeA1RJ3=B*QG8q_H12=y9!7{m<JplmJkrRFZ

diff --git a/QtScrcpy/i18n/QtScrcpy_en.ts b/QtScrcpy/i18n/QtScrcpy_en.ts
index df70b71..bc9824e 100644
--- a/QtScrcpy/i18n/QtScrcpy_en.ts
+++ b/QtScrcpy/i18n/QtScrcpy_en.ts
@@ -117,10 +117,33 @@
         <translation>return</translation>
     </message>
 </context>
+<context>
+    <name>VideoForm</name>
+    <message>
+        <location filename="../videoform.cpp" line="90"/>
+        <source>wait current file transfer to complete</source>
+        <translation>wait current file transfer to complete</translation>
+    </message>
+    <message>
+        <location filename="../videoform.cpp" line="93"/>
+        <source>file transfer complete</source>
+        <translation>file transfer complete</translation>
+    </message>
+    <message>
+        <location filename="../videoform.cpp" line="96"/>
+        <source>file transfer failed</source>
+        <translation>file transfer failed</translation>
+    </message>
+    <message>
+        <location filename="../videoform.cpp" line="418"/>
+        <source>file does not exist</source>
+        <translation>file does not exist</translation>
+    </message>
+</context>
 <context>
     <name>videoForm</name>
     <message>
-        <location filename="../videoform.ui" line="75"/>
+        <location filename="../videoform.ui" line="78"/>
         <source>qrc:/qml/pinwheel.qml</source>
         <translation>qrc:/qml/pinwheel.qml</translation>
     </message>
diff --git a/QtScrcpy/i18n/QtScrcpy_zh.qm b/QtScrcpy/i18n/QtScrcpy_zh.qm
index 61d13bf60f55960cad2044a60d369401521123b6..b6617d24a73bbc7078858911f37d04efa89c33da 100644
GIT binary patch
delta 372
zcmeC@I>0kQgz?5i(T-3K<5#Q<3@kG_6ECnZFfcslI_5f+fq}7<n^kBH0|U!P?vw0#
z3=GV1JQIq_7#NsMd43p$GBB`6^GRE_FfcIj@U6Zq!oa}%fNy8;5(WmA=u8F%R=<sx
zo-o&QrMCNh^W%+<2-o0XU|?WiV_;wqPRq<mRY=KCEmp|OFHuOX$Sf{lXJBC949iSO
z&3DT$%4K9`U|`?@Y4um=pB&wjBmmbe2G(3sl$ckXmRh8coS$2elUkCBLx24@kO7f~
zy{d2nL{JS#OU%qkO~ImFq}nsSH9k1V7ppVW$`dn76p~Aeic<4R6i|&U$%i|O3t{l&
HwJb>hl*eWh

delta 73
zcmX@W)6X?QgmK42(GFA2#0xA83=Ge?j=4@{U|=leW))h)z`*=~`y{&_0|Rp$&xE2f
e1_owRK55Gq1_macOa=xP+l`-|Fi(EY8VLZ<0~103

diff --git a/QtScrcpy/i18n/QtScrcpy_zh.ts b/QtScrcpy/i18n/QtScrcpy_zh.ts
index 702e84b..801b707 100644
--- a/QtScrcpy/i18n/QtScrcpy_zh.ts
+++ b/QtScrcpy/i18n/QtScrcpy_zh.ts
@@ -117,10 +117,33 @@
         <translation>返回</translation>
     </message>
 </context>
+<context>
+    <name>VideoForm</name>
+    <message>
+        <location filename="../videoform.cpp" line="90"/>
+        <source>wait current file transfer to complete</source>
+        <translation>等待当前文件传输完成</translation>
+    </message>
+    <message>
+        <location filename="../videoform.cpp" line="93"/>
+        <source>file transfer complete</source>
+        <translation>文件传输完成</translation>
+    </message>
+    <message>
+        <location filename="../videoform.cpp" line="96"/>
+        <source>file transfer failed</source>
+        <translation>文件传输失败</translation>
+    </message>
+    <message>
+        <location filename="../videoform.cpp" line="418"/>
+        <source>file does not exist</source>
+        <translation>文件不存在</translation>
+    </message>
+</context>
 <context>
     <name>videoForm</name>
     <message>
-        <location filename="../videoform.ui" line="75"/>
+        <location filename="../videoform.ui" line="78"/>
         <source>qrc:/qml/pinwheel.qml</source>
         <translation>qrc:/qml/pinwheel.qml</translation>
     </message>
diff --git a/all.pro b/all.pro
index aa4e301..8e07ee8 100644
--- a/all.pro
+++ b/all.pro
@@ -3,5 +3,5 @@ SUBDIRS = QtScrcpy
 
 # 多语言翻译文件
 TRANSLATIONS = \
-    $$PWD/QtScrcpy/res/i18n/QtScrcpy_zh.ts \
-    $$PWD/QtScrcpy/res/i18n/QtScrcpy_en.ts
+    $$PWD/QtScrcpy/i18n/QtScrcpy_zh.ts \
+    $$PWD/QtScrcpy/i18n/QtScrcpy_en.ts