translation update pre-rc2

src/qt/locale/bitcoin_zh_CN.ts

@@ -1,4 +1,4 @@
-<TS language="zh_CN" version="2.1">
+<TS language="zh_CN" version="2.0">
 <context>
     <name>AddressBookPage</name>
     <message>
@@ -2101,6 +2101,10 @@
         <source>Remove this entry</source>
         <translation>移除此项</translation>
     </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>交易费将从发送总额中扣除。接收人将收到比您在金额框中输入的更少的比特币。如果选中了多个收件人，交易费平分。</translation>
+    </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
         <translation>从金额中减去交易费(&amp;U)</translation>
@@ -2155,6 +2159,10 @@
         <source>&amp;Sign Message</source>
         <translation>签名消息(&amp;S)</translation>
     </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>您可以用你的地址对消息/协议进行签名，以证明您可以接收发送到该地址的比特币。注意不要对任何模棱两可或者随机的消息进行签名，以免遭受钓鱼式攻击。请确保消息内容准确的表达了您的真实意愿。</translation>
+    </message>
     <message>
         <source>The Bitcoin address to sign the message with</source>
         <translation>用来对消息签名的地址 </translation>
@@ -2814,10 +2822,6 @@
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>绑定指定的IP地址开始监听。IPv6地址请使用[host]:port 格式</translation>
     </message>
-    <message>
-        <source>Continuously rate-limit free transactions to &lt;n&gt;*1000 bytes per minute (default: %u)</source>
-        <translation>自由交易不断的速率限制为&lt;n&gt;*1000 字节每分钟(默认值: %u)</translation>
-    </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
         <translation>删除钱包的所有交易记录，且只有用 -rescan参数启动客户端才能重新取回交易记录 </translation>
@@ -2826,18 +2830,10 @@
         <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
         <translation>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
     </message>
-    <message>
-        <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
-        <translation>进入回归测试模式，它采用一种特殊的可立即解决的区块链模拟情况。</translation>
-    </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
         <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation>
     </message>
-    <message>
-        <source>In this mode -genproclimit controls how many blocks are generated immediately.</source>
-        <translation>在-genproclimit这种模式下控制产出多少区块</translation>
-    </message>
     <message>
         <source>Maximum total fees to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
         <translation>单次交易最多使用交易费；设置太低可能导致大宗交易中止 (默认: %s)</translation>
@@ -2858,6 +2854,14 @@
         <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
         <translation>无法 %s的绑定到电脑上，比特币核心钱包可能已经在运行。</translation>
     </message>
+    <message>
+        <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>警告：数据块生成数量异常，最近 %d 小时收到了 %d 个数据块（预期为 %d 个）</translation>
+    </message>
+    <message>
+        <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+        <translation>警告：请检查您的网络连接，最近 %d 小时收到了 %d 个数据块（预期为 %d 个）</translation>
+    </message>
     <message>
         <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
         <translation>警告：-paytxfee 交易费设置得太高了！每笔交易都将支付交易费。</translation>
@@ -2994,10 +2998,6 @@
         <source>Specify wallet file (within data directory)</source>
         <translation>指定钱包文件（数据目录内）</translation>
     </message>
-    <message>
-        <source>This is intended for regression testing tools and app development.</source>
-        <translation>这是用于回归测试和应用开发目的。</translation>
-    </message>
     <message>
         <source>Use UPnP to map the listening port (default: %u)</source>
         <translation>使用UPnp映射监听端口 (默认: %u) </translation>
@@ -3074,10 +3074,6 @@
         <source>Fees (in BTC/Kb) smaller than this are considered zero fee for relaying (default: %s)</source>
         <translation>交易费(BTC/kb)比这更小的交易在转发时将被视为零费交易 (默认: %s) </translation>
     </message>
-    <message>
-        <source>Fees (in BTC/Kb) smaller than this are considered zero fee for transaction creation (default: %s)</source>
-        <translation>交易费(BTC/kb)比这更小的交易在生成交易时将被视为零费交易 (默认: %s) </translation>
-    </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
         <translation>如果未设置交易费用，自动添加足够的交易费以确保交易在平均n个数据块内被确认 (默认: %u) </translation>
@@ -3102,10 +3098,6 @@
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
         <translation>为每个代理连接随机化凭据。这将启用 Tor 流隔离 (默认: %u)</translation>
     </message>
-    <message>
-        <source>Require high priority for relaying free or low-fee transactions (default: %u)</source>
-        <translation>免费中继和低费率交易需要高优先级 (默认: %u)</translation>
-    </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
         <translation>设置 高优先级/低交易费 交易的最大字节  (缺省: %d)</translation>
@@ -3174,10 +3166,6 @@ rpcpassword=%s
         <source>Activating best chain...</source>
         <translation>正在激活最佳数据链...</translation>
     </message>
-    <message>
-        <source>Allow self signed root certificates (default: 0)</source>
-        <translation>允许自签名根证书 (默认: 0)</translation>
-    </message>
     <message>
         <source>Can't run with a wallet in prune mode.</source>
         <translation>不能在修剪模式下运行一个钱包。</translation>
@@ -3266,14 +3254,6 @@ rpcpassword=%s
         <source>RPC support for HTTP persistent connections (default: %d)</source>
         <translation>RPC 支持 HTTP 持久连接 (默认: %d)</translation>
     </message>
-    <message>
-        <source>Randomly drop 1 of every &lt;n&gt; network messages</source>
-        <translation>随机每1个丢失测试&lt;n&gt;网络信息</translation>
-    </message>
-    <message>
-        <source>Randomly fuzz 1 of every &lt;n&gt; network messages</source>
-        <translation>随机每1个模拟测试&lt;n&gt;网络信息</translation>
-    </message>
     <message>
         <source>Rebuild block chain index from current blk000??.dat files on startup</source>
         <translation>启动时重新为当前的 blk000??.dat 文件建立索引</translation>
@@ -3425,18 +3405,10 @@ rpcpassword=%s
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = 保留 tx meta data , 如 account owner 和 payment request information, 2 = 不保留 tx meta data) </translation>
     </message>
-    <message>
-        <source>Flush database activity from memory pool to disk log every &lt;n&gt; megabytes (default: %u)</source>
-        <translation>Flush database activity from memory pool to disk log every &lt;n&gt; megabytes (default: %u)</translation>
-    </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
         <translation>数据块验证 严密级别  -checkblocks (0-4, 默认: %u) </translation>
     </message>
-    <message>
-        <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source>
-        <translation>挖矿时，记录交易优先级 和 每kb交易费 (默认: %u) </translation>
-    </message>
     <message>
         <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
         <translation>维护一份完整的交易索引, 用于 getrawtransaction RPC调用 (默认: %u)</translation>
@@ -3461,18 +3433,10 @@ rpcpassword=%s
         <source>Acceptable ciphers (default: %s)</source>
         <translation>可接受的密码算法 (默认: %s) </translation>
     </message>
-    <message>
-        <source>Disable safemode, override a real safe mode event (default: %u)</source>
-        <translation>禁止使用安全模式，重新写入一个真正的安全模式日志(默认: %u)</translation>
-    </message>
     <message>
         <source>Error loading wallet.dat</source>
         <translation>wallet.dat 钱包文件加载出错</translation>
     </message>
-    <message>
-        <source>Force safe mode (default: %u)</source>
-        <translation>强制安全模式 (默认: %u)</translation>
-    </message>
     <message>
         <source>Generate coins (default: %u)</source>
         <translation>生成比特币 (默认: %u)</translation>
@@ -3489,10 +3453,6 @@ rpcpassword=%s
         <source>Invalid -proxy address: '%s'</source>
         <translation>无效的代理地址：%s</translation>
     </message>
-    <message>
-        <source>Limit size of signature cache to &lt;n&gt; entries (default: %u)</source>
-        <translation>签名缓冲区大小限制最多 &lt;n&gt; 条 (默认: %u) </translation>
-    </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
         <translation>使用 &lt;port&gt;端口监听 JSON-RPC 连接 (默认: %u ; testnet: %u) </translation>
@@ -3517,10 +3477,6 @@ rpcpassword=%s
         <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
         <translation>每个连接的最大发送缓存，&lt;n&gt;*1000 字节 (默认: %u)</translation>
     </message>
-    <message>
-        <source>Only accept block chain matching built-in checkpoints (default: %u)</source>
-        <translation>仅接受符合客户端检查点设置 的数据块链 (默认: %u) </translation>
-    </message>
     <message>
         <source>Prepend debug output with timestamp (default: %u)</source>
         <translation>输出调试信息时，前面加上时间戳 (默认: %u)</translation>
@@ -3533,10 +3489,6 @@ rpcpassword=%s
         <source>Relay non-P2SH multisig (default: %u)</source>
         <translation>是否转发 非P2SH格式的多签名交易 (默认: %u) </translation>
     </message>
-    <message>
-        <source>Run a thread to flush wallet periodically (default: %u)</source>
-        <translation>运行一个线程，定时清理钱包 (默认: %u)</translation>
-    </message>
     <message>
         <source>Server certificate file (default: %s)</source>
         <translation>服务器证书文件 (默认: %s) </translation>
@@ -3557,10 +3509,6 @@ rpcpassword=%s
         <source>Set the number of threads to service RPC calls (default: %d)</source>
         <translation>设置RPC服务线程数 (默认: %d) </translation>
     </message>
-    <message>
-        <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source>
-        <translation>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</translation>
-    </message>
     <message>
         <source>Specify configuration file (default: %s)</source>
         <translation>指定配置文件 (默认: %s) </translation>
@@ -3577,10 +3525,6 @@ rpcpassword=%s
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
         <translation>付款时允许使用未确认的零钱 (默认: %u) </translation>
     </message>
-    <message>
-        <source>Stop running after importing blocks from disk (default: %u)</source>
-        <translation>从磁盘导入数据块后退出 (默认: %u) </translation>
-    </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>断开 非礼节点的阀值 (默认: %u) </translation>