diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-15 18:23:33 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-15 18:23:33 +0000 |
| commit | 37be168579a9ad1b94d73bc383ba003fe4dbca2d (patch) | |
| tree | 2b9b1135d0e656f174df8eb4310cf4567b6c7f50 /src/qt/locale/bitcoin_zh_CN.ts | |
| parent | a9f8791388ffad16f208bd8ea64d55808e0362a7 (diff) | |
| parent | 747b688b54076c3b35cb37cae7c529f11a18a588 (diff) | |
| download | bitcoin-37be168579a9ad1b94d73bc383ba003fe4dbca2d.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/qt/locale/bitcoin_cs.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_zh_CN.ts
Diffstat (limited to 'src/qt/locale/bitcoin_zh_CN.ts')
| -rw-r--r-- | src/qt/locale/bitcoin_zh_CN.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index bdcd581b06..4a72ecb003 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -261,7 +261,7 @@ Are you sure you wish to encrypt your wallet?</source> <message> <location filename="../askpassphrasedialog.cpp" line="117"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation type="unfinished"></translation> + <translation>重要提示：您以前备份的钱包文件应该替换成最新生成的加密钱包文件（重新备份）。从安全性上考虑，您以前备份的未加密的钱包文件，在您使用新的加密钱包后将无效，请重新备份。</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="126"/> @@ -1761,11 +1761,6 @@ Address: %4 <translation>警告：磁盘空间不足</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>An error occurred while setting up the RPC port %i for listening: %s</source> - <translation>设置RPC监听端口%i时发生错误: %s</translation> - </message> - <message> <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>生成货币 @@ -2095,6 +2090,11 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Maximum per-connection send buffer, <n>*1000 bytes (缺省: 10000)</translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>设置RPC监听端口%u时发生错误: %s</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">使用UPnp映射监听端口(缺省: 1)</translation> |