From 1204442fcd255394961b1c202cac0fd7a557a200 Mon Sep 17 00:00:00 2001
From: IZARTeam <izar.magic@gmail.com>
Date: Thu, 6 Feb 2014 03:31:51 +0800
Subject: [PATCH] Add zh_cn translations in class_singleWorker.py

And fix some mistakes in Chinese translation
---
 src/translations/bitmessage_zh_cn.qm | Bin 39733 -> 42405 bytes
 src/translations/bitmessage_zh_cn.ts |  93 ++++++++++++++++++++++++++-
 2 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/translations/bitmessage_zh_cn.qm b/src/translations/bitmessage_zh_cn.qm
index dce6934795e909e521b6c72629bbcbaa515432aa..3f894afd7087d156a33a57fbe1448e33852bd982 100644
GIT binary patch
delta 4535
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
TFQFm(c!yc$D{T%7eVp+x31M#l

delta 2567
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
WKd8ddHN>TSWpId8erVkDIsXU8CDvyE

diff --git a/src/translations/bitmessage_zh_cn.ts b/src/translations/bitmessage_zh_cn.ts
index 1812e4bf..adc055e5 100644
--- a/src/translations/bitmessage_zh_cn.ts
+++ b/src/translations/bitmessage_zh_cn.ts
@@ -862,7 +862,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2750"/>
         <source>Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.</source>
-        <translation>已经移动项目到回收站。没有图形化的界面可以查看您的回收站，不过如果您还想找回的化它还在您的硬盘上。</translation>
+        <translation>已经移动项目到回收站。没有图形化的界面可以查看您的回收站，不过如果您还想找回的话它还在您的硬盘上。</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="2730"/>
@@ -882,7 +882,7 @@ It is important that you back up this file. Would you like to open the file now?
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3063"/>
         <source>Do you really want to remove this avatar?</source>
-        <translation>您真的想一处这个头像么？</translation>
+        <translation>您真的想移除这个头像么？</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="3071"/>
@@ -984,6 +984,95 @@ It is important that you back up this file. Would you like to open the file now?
         <source>Message sent. Waiting for acknowledgement. Sent at %1</source>
         <translation>消息已经发送. 正在等待回执. 发送于 %1</translation>
     </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="361"/>
+        <source>Error! Could not find sender address (your address) in the keys.dat file.</source>
+        <translation>错误! 无法在文件 keys.dat 中找到发送者地址(你的地址)</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="426"/>
+        <source>Doing work necessary to send broadcast...</source>
+        <translation>正在做一些必须的工作来发送广播.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="443"/>
+        <source>Broadcast sent on %1</source>
+        <translation>广播发送于 %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="485"/>
+        <source>Encryption key was requested earlier.</source>
+        <translation>已在更早的时候得到加密密钥.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="523"/>
+        <source>Sending a request for the recipient&apos;s encryption key.</source>
+        <translation>正在请求收件人的加密密钥.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="564"/>
+        <source>Looking up the receiver&apos;s public key</source>
+        <translation>正在查找收件人的公钥.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="619"/>
+        <source>Problem: Destination is a mobile device who requests that the destination be included in the message but this is disallowed in your settings.  %1</source>
+        <translation>错误: 目标是一个移动设备, 要求不加密目标地址, 但是你的设置中不允许这么做. %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="636"/>
+        <source>Doing work necessary to send message.
+There is no required difficulty for version 2 addresses like this.</source>
+        <translation>正在做一些必要的工作来发送消息.
+这里要求的难度不像第2版的地址那样.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="648"/>
+        <source>Doing work necessary to send message.
+Receiver&apos;s required difficulty: %1 and %2</source>
+        <translation>正在做一些必要的工作来发送消息.
+接收者要求的难度为: %1 和 %2</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="657"/>
+        <source>Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do.</source>
+        <translation>错误: 收件人要求的做工量(%1 和 %2)大于我们的最大接受做工量. </translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="669"/>
+        <source>Problem: You are trying to send a message to yourself or a chan but your encryption key could not be found in the keys.dat file. Could not encrypt message. %1</source>
+        <translation>错误: 你正在尝试发送消息到你自身或者一个频道, 但是你的加密密钥无法在文件keys.dat中找到. 无法加密消息. %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="681"/>
+        <source>Doing work necessary to send message.</source>
+        <translation>正在做一些必要的工作来发送消息.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="831"/>
+        <source>Message sent. Sent on %1</source>
+        <translation>消息已经发送. 发送于 %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="835"/>
+        <source>Message sent. Waiting for acknowledgement. Sent on %1</source>
+        <translation>消息已经发送. 正在等待回执. 发送于 %1</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="904"/>
+        <source>Doing work necessary to request encryption key.</source>
+        <translation>正在做一些必要的工作来请求加密密钥.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="928"/>
+        <source>Broacasting the public key request. This program will auto-retry if they are offline.</source>
+        <translation>正在广播公钥请求. 如果他们不在线, 这一过程将自动重试.</translation>
+    </message>
+    <message>
+        <location filename="../class_singleWorker.py" line="929"/>
+        <source>Sending public key request. Waiting for reply. Requested at %1</source>
+        <translation>正在发送公钥请求. 等待回应中. 请求于 %1</translation>
+    </message>
 </context>
 <context>
     <name>NewAddressDialog</name>
-- 
2.45.1