From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 8 Feb 2012 03:49:03 +0000 (-0500)
Subject: Merge branch '0.5.0.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~24
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=a21e4da9012f87d2cb8b2c38517efda1999fab05

Merge branch '0.5.0.x' into 0.5.x

Conflicts:
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_zh_TW.ts
---

a21e4da9012f87d2cb8b2c38517efda1999fab05
diff --cc doc/README
index 6c6c70a,6af11c3..1323814
--- a/doc/README
+++ b/doc/README
@@@ -1,6 -1,6 +1,6 @@@
 -Bitcoin 0.5.0.4 BETA
 +Bitcoin 0.5.3 BETA
  
- Copyright (c) 2009-2011 Bitcoin Developers
+ Copyright (c) 2009-2012 Bitcoin Developers
  Distributed under the MIT/X11 software license, see the accompanying
  file license.txt or http://www.opensource.org/licenses/mit-license.php.
  This product includes software developed by the OpenSSL Project for use in
diff --cc doc/README_windows.txt
index 4fdf4a5,25cb069..f52c1d1
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@@ -1,6 -1,6 +1,6 @@@
 -Bitcoin 0.5.0.4 BETA
 +Bitcoin 0.5.3 BETA
  
- Copyright (c) 2009-2011 Bitcoin Developers
+ Copyright (c) 2009-2012 Bitcoin Developers
  Distributed under the MIT/X11 software license, see the accompanying
  file license.txt or http://www.opensource.org/licenses/mit-license.php.
  This product includes software developed by the OpenSSL Project for use in
diff --cc src/bitcoinrpc.cpp
index 729c590,b1d8514..d44e4a6
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@@ -2158,9 -2159,10 +2158,11 @@@ void ThreadRPCServer2(void* parg
  {
      printf("ThreadRPCServer started\n");
  
 -    if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
 +    strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
 +    if (strRPCUserColonPass == ":")
      {
+         unsigned char rand_pwd[32];
+         RAND_bytes(rand_pwd, 32);
          string strWhatAmI = "To use bitcoind";
          if (mapArgs.count("-server"))
              strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
diff --cc src/qt/locale/bitcoin_ru.ts
index 9f78220,648caab..a87ec11
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@@ -674,8 -669,8 +674,8 @@@ Address: %
      </message>
      <message>
          <location filename="../optionsdialog.cpp" line="217"/>
-         <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly.  Most transactions are 1KB.  Fee 0.01 recommended.</source>
-         <translation>Опциональная комиссия за кадый KB транзакции, которое позволяет быть уверенным, что Ваша транзакция будет обработана быстро.  Большинство транзакций занимают 1 KB.  Рекомендованная комиссия: 0.01 BTC.</translation>
+         <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly.  Most transactions are 1kB.  Fee 0.01 recommended.</source>
 -        <translation>Опциональная комиссия за кадый kB транзакции, которое позволяет быть уверенным, что Ваша транзакция будет обработана быстро.  Большинство транщакций занимают 1 kB.  Рекомендованная комиссия: 0.01 BTC.</translation>
++        <translation>Опциональная комиссия за кадый kB транзакции, которое позволяет быть уверенным, что Ваша транзакция будет обработана быстро.  Большинство транзакций занимают 1 kB.  Рекомендованная комиссия: 0.01 BTC.</translation>
      </message>
      <message>
          <location filename="../optionsdialog.cpp" line="223"/>
diff --cc src/qt/locale/bitcoin_zh_TW.ts
index 56dd548,562ddb3..fb5e533
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@@ -673,8 -673,8 +673,8 @@@ Address: %
      </message>
      <message>
          <location filename="../optionsdialog.cpp" line="217"/>
-         <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly.  Most transactions are 1KB.  Fee 0.01 recommended.</source>
-         <translation>非必要的交易手續費, 有助於縮短你的交易處理時間. 以 KB 為計費單位, 而大部份交易的大小是 1KB. 建議設定為 0.01 元.</translation>
+         <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly.  Most transactions are 1kB.  Fee 0.01 recommended.</source>
 -        <translation>非必要的交易手續費, 有助於縮短你的交易處理時間. 以 kB 為計費單位, 而大部份交易的大小是 1kB. 建議設定為 0.01 位元幣.</translation>
++        <translation>非必要的交易手續費, 有助於縮短你的交易處理時間. 以 kB 為計費單位, 而大部份交易的大小是 1kB. 建議設定為 0.01 元.</translation>
      </message>
      <message>
          <location filename="../optionsdialog.cpp" line="223"/>
@@@ -683,8 -683,8 +683,8 @@@
      </message>
      <message>
          <location filename="../optionsdialog.cpp" line="226"/>
-         <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source>
-         <translation>非必要的交易手續費, 有助於縮短你的交易處理時間. 以 KB 為計費單位, 而大部份交易的大小是 1KB. 建議設定為 0.01 元.</translation>
+         <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1kB. Fee 0.01 recommended.</source>
 -        <translation>非必要的交易手續費, 有助於縮短你的交易處理時間. 以 kB 為計費單位, 而大部份交易的大小是 1kB. 建議設定為 0.01 位元幣.</translation>
++        <translation>非必要的交易手續費, 有助於縮短你的交易處理時間. 以 kB 為計費單位, 而大部份交易的大小是 1kB. 建議設定為 0.01 元.</translation>
      </message>
  </context>
  <context>