diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 01:33:05 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 01:35:36 +0000 |
| commit | 6047902934c452ae318697af688b8fb0e09a58ff (patch) | |
| tree | 679c57f31a3e4bdb652b7e294b0716dba0d015b3 /src/qt/locale/bitcoin_zh_CN.ts | |
| parent | 894ce6d88d9ce13ce4be5e473b818311775da0b6 (diff) | |
| parent | be2e2845ec0844d42008287842bb053aabe58b0b (diff) | |
| download | bitcoin-6047902934c452ae318697af688b8fb0e09a58ff.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/qt/locale/bitcoin_ca_ES.ts
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fr_CA.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_uk.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index b18a636c22..7872158dc1 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -626,7 +626,7 @@ Address: %4 <message> <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"></translation> + <translation>发生严重错误。</translation> </message> </context> <context> @@ -1758,7 +1758,7 @@ Address: %4 <message> <location filename="../bitcoinstrings.cpp" line="32"/> <source>An error occurred while setting up the RPC port %i for listening: %s</source> - <translation type="unfinished"></translation> + <translation>设置RPC监听端口%i时发生错误: %s</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="49"/> @@ -1785,7 +1785,7 @@ Address: %4 <message> <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> - <translation type="unfinished"></translation> + <translation>通过DNS查找节点(缺省：1)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="85"/> |