github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-20 06:08:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.0.x' into 0.6.x

Browse Source 
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
This commit is contained in:
Luke Dashjr
2012-10-15 18:23:33 +00:00
parent a9f8791388 747b688b54
commit 37be168579
33 changed files with 150 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qt/bitcoinstrings.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"If the file does not exist, create it with owner-readable-only file "
"permissions.\n"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error"),
QT_TRANSLATE_NOOP("bitcoin-core", "An error occurred while setting up the RPC port %i for listening: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "An error occurred while setting up the RPC port %u for listening: %s"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"You must set rpcpassword=<password> in the configuration file:\n"
"%s\n"