cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-01 17:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.x' into 0.7.x

Browse Source 
Conflicts:
	src/bitcoinrpc.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
This commit is contained in:
Luke Dashjr 2012-10-20 23:28:14 +00:00
commit f9459ef914
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitcoinrpc.cpp
View File

@ -796,7 +796,7 @@ void ThreadRPCServer2(void* parg)
}
catch(boost::system::system_error &e)
{
strerr = strprintf(_("An error occurred while setting up the RPC port %i for listening on IPv6, falling back to IPv4: %s"), endpoint.port(), e.what());
strerr = strprintf(_("An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s"), endpoint.port(), e.what());
}
try {

2
src/qt/bitcoinstrings.cpp
View File

@ -19,7 +19,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:"
"@STRENGTH)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"An error occurred while setting up the RPC port %i for listening on IPv6, "
"An error occurred while setting up the RPC port %u for listening on IPv6, "
"falling back to IPv4: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"An error occurred while setting up the RPC port %u for listening on IPv4: %s"),