use seed nodes as fallback if IRC fails or with TOR

-- version 0.2.12

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@85 1a98c847-1fd6-4fd8-948a-caf3550aa51b

db.cpp

@@ -511,9 +511,9 @@ bool LoadAddresses()
 // CWalletDB
 //
 
-bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
+bool CWalletDB::LoadWallet()
 {
-    vchDefaultKeyRet.clear();
+    vchDefaultKey.clear();
     int nFileVersion = 0;
 
     // Modify defaults
@@ -587,7 +587,7 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
             }
             else if (strType == "defaultkey")
             {
-                ssValue >> vchDefaultKeyRet;
+                ssValue >> vchDefaultKey;
             }
             else if (strType == "version")
             {
@@ -650,8 +650,7 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
 bool LoadWallet(bool& fFirstRunRet)
 {
     fFirstRunRet = false;
-    vector<unsigned char> vchDefaultKey;
-    if (!CWalletDB("cr+").LoadWallet(vchDefaultKey))
+    if (!CWalletDB("cr+").LoadWallet())
         return false;
     fFirstRunRet = vchDefaultKey.empty();
 

db.h

@@ -14,9 +14,11 @@ class CWalletTx;
 
 extern map<string, string> mapAddressBook;
 extern CCriticalSection cs_mapAddressBook;
+extern vector<unsigned char> vchDefaultKey;
 extern bool fClient;
 
 
+
 extern unsigned int nWalletDBUpdated;
 extern DbEnv dbenv;
 
@@ -373,6 +375,7 @@ public:
 
     bool WriteDefaultKey(const vector<unsigned char>& vchPubKey)
     {
+        vchDefaultKey = vchPubKey;
         nWalletDBUpdated++;
         return Write(string("defaultkey"), vchPubKey);
     }
@@ -390,7 +393,7 @@ public:
         return Write(make_pair(string("setting"), strKey), value);
     }
 
-    bool LoadWallet(vector<unsigned char>& vchDefaultKeyRet);
+    bool LoadWallet();
 };
 
 bool LoadWallet(bool& fFirstRunRet);

init.cpp

@@ -339,22 +339,27 @@ bool CMyApp::OnInit2()
     if (mapArgs.count("-?") || mapArgs.count("--help"))
     {
         wxString strUsage = string() +
-            _("Usage: bitcoin [options]") + "\t\t\t\t\t\t\n" +
-            _("Options:\n") +
-            "  -gen            \t\t  " + _("Generate coins\n") +
-            "  -gen=0          \t\t  " + _("Don't generate coins\n") +
-            "  -min            \t\t  " + _("Start minimized\n") +
-            "  -datadir=<dir>  \t  "   + _("Specify data directory\n") +
-            "  -proxy=<ip:port>\t  "   + _("Connect through socks4 proxy\n") +
-            "  -addnode=<ip>   \t  "   + _("Add a node to connect to\n") +
-            "  -connect=<ip>   \t  "   + _("Connect only to the specified node\n") +
-            "  -?              \t\t  " + _("This help message\n");
+          _("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
+            "  bitcoin [options]       \t" + "\n" +
+            "  bitcoin [command]       \t" + _("Send command to bitcoin running with -server or -daemon\n") +
+            "  bitcoin [command] -?    \t" + _("Get help for a command\n") +
+            "  bitcoin help            \t" + _("List commands\n") +
+          _("Options:\n") +
+            "  -gen            \t  " + _("Generate coins\n") +
+            "  -gen=0          \t  " + _("Don't generate coins\n") +
+            "  -min            \t  " + _("Start minimized\n") +
+            "  -datadir=<dir>  \t  " + _("Specify data directory\n") +
+            "  -proxy=<ip:port>\t  " + _("Connect through socks4 proxy\n") +
+            "  -addnode=<ip>   \t  " + _("Add a node to connect to\n") +
+            "  -connect=<ip>   \t  " + _("Connect only to the specified node\n") +
+            "  -server         \t  " + _("Accept command line and JSON-RPC commands\n") +
+            "  -daemon         \t  " + _("Run in the background as a daemon and accept commands\n") +
+            "  -?              \t  " + _("This help message\n");
+
 
         if (fWindows && fGUI)
         {
-            // Remove spaces, the tabs make the columns line up in the message box
-            for (int i = 0; i < 50; i++)
-                strUsage.Replace(" \t", "\t");
+            // Tabs make the columns line up in the message box
             wxMessageBox(strUsage, "Bitcoin", wxOK);
         }
         else

irc.cpp

@@ -159,7 +159,6 @@ bool Wait(int nSeconds)
 void ThreadIRCSeed(void* parg)
 {
     printf("ThreadIRCSeed started\n");
-    SetThreadPriority(THREAD_PRIORITY_NORMAL);
     int nErrorWait = 10;
     int nRetryWait = 10;
     bool fNameInUse = false;

locale/de/LC_MESSAGES/bitcoin.po

@@ -0,0 +1,810 @@
+# DataWraith <DataWraith@web.de>, 2010.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2010-05-26 22:02-0000\n"
+"PO-Revision-Date: 2010-06-03 13:11+0200\n"
+"Last-Translator: DataWraith\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ../../..\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: ../../../init.cpp:342
+msgid "Usage: bitcoin [options]"
+msgstr "Verwendung: bitcoin [optionen]"
+
+#: ../../../init.cpp:343
+msgid "Options:\n"
+msgstr "Optionen:\n"
+
+#: ../../../init.cpp:344
+msgid "Generate coins\n"
+msgstr "Münzen erzeugen\n"
+
+#: ../../../init.cpp:345
+msgid "Don't generate coins\n"
+msgstr "Keine Münzen erzeugen\n"
+
+#: ../../../init.cpp:346
+msgid "Start minimized\n"
+msgstr "Minimiert starten\n"
+
+#: ../../../init.cpp:347
+msgid "Specify data directory\n"
+msgstr "Datenverzeichnis festlegen\n"
+
+#: ../../../init.cpp:348
+msgid "Connect through socks4 proxy\n"
+msgstr "Socks4 Proxy verwenden\n"
+
+#: ../../../init.cpp:349
+msgid "Add a node to connect to\n"
+msgstr "Einen Teilnehmer hinzufügen, zu dem verbunden werden soll\n"
+
+#: ../../../init.cpp:350
+msgid "Connect only to the specified node\n"
+msgstr "Nur zu dem angegebenen Teilnehmer verbinden\n"
+
+#: ../../../init.cpp:351
+msgid "This help message\n"
+msgstr "Diese Anleitung\n"
+
+#: ../../../init.cpp:455
+msgid "Error loading addr.dat      \n"
+msgstr "Fehler beim Laden von addr.dat      \n"
+
+#: ../../../init.cpp:461
+msgid "Error loading blkindex.dat      \n"
+msgstr "Fehler beim Laden von blkindex.dat      \n"
+
+#: ../../../init.cpp:468
+msgid "Error loading wallet.dat      \n"
+msgstr "Fehler beim Laden von wallet.dat      \n"
+
+#: ../../../init.cpp:536
+msgid "Invalid -proxy address"
+msgstr "Ungültige -Proxy Adresse"
+
+#: ../../../init.cpp:629
+msgid "Program has crashed and will terminate.  "
+msgstr "Das Programm ist abgestürzt und wird beendet.  "
+
+#: ../../../main.cpp:1465
+msgid "Warning: Disk space is low  "
+msgstr "Warnung: Festplatte fast voll  "
+
+#: ../../../main.cpp:2994
+#, c-format
+msgid "Error: This is an oversized transaction that requires a transaction fee of %s  "
+msgstr "Fehler: Die Überweisung ist sehr groß. Es wird eine Gebühr von %s erhoben.  "
+
+#: ../../../main.cpp:2996
+msgid "Error: Transaction creation failed  "
+msgstr "Fehler: Überweisung konnte nicht erzeugt werden.  "
+
+#: ../../../main.cpp:3001
+#: ../../../ui.cpp:1761
+#: ../../../ui.cpp:1763
+#: ../../../ui.cpp:1904
+#: ../../../ui.cpp:2053
+msgid "Sending..."
+msgstr "Überweise..."
+
+#: ../../../main.cpp:3005
+msgid "Error: The transaction was rejected.  This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."
+msgstr "Fehler: Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden."
+
+#: ../../../main.cpp:3017
+msgid "Invalid amount"
+msgstr "Ungültiger Betrag"
+
+#: ../../../main.cpp:3019
+#: ../../../ui.cpp:1971
+#: ../../../ui.cpp:2038
+msgid "Insufficient funds"
+msgstr "Unzureichende Geldmittel"
+
+#: ../../../main.cpp:3024
+msgid "Invalid bitcoin address"
+msgstr "Ungültige Bitcoin-Adresse"
+
+#: ../../../ui.cpp:189
+#, c-format
+msgid "This transaction is over the size limit.  You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network.  Do you want to pay the fee?"
+msgstr "Diese Überweisung übersteigt das Betragslimit. Sie können sie trotzdem tätigen, aber es wird eine Gebühr von %s erhoben, die an den Teilnehmer ausgeschüttet wird, der Ihre Überweisung bearbeitet und dadurch hilft das Netzwerk am laufen zu halten. Möchten Sie die Gebühr entrichten?"
+
+#: ../../../ui.cpp:285
+msgid "Status"
+msgstr "Status"
+
+#: ../../../ui.cpp:286
+msgid "Date"
+msgstr "Datum"
+
+#: ../../../ui.cpp:287
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../../../ui.cpp:288
+msgid "Debit"
+msgstr "Belastungen"
+
+#: ../../../ui.cpp:289
+msgid "Credit"
+msgstr "Gutschriften"
+
+#: ../../../ui.cpp:489
+#, c-format
+msgid "Open for %d blocks"
+msgstr "Offen für %d Blöcke"
+
+#: ../../../ui.cpp:491
+#, c-format
+msgid "Open until %s"
+msgstr "Offen bis %s"
+
+#: ../../../ui.cpp:497
+#, c-format
+msgid "%d/offline?"
+msgstr "%d/Offline?"
+
+#: ../../../ui.cpp:499
+#, c-format
+msgid "%d/unconfirmed"
+msgstr "%d/nicht bestätigt"
+
+#: ../../../ui.cpp:501
+#, c-format
+msgid "%d confirmations"
+msgstr "%d Bestätigungen"
+
+#: ../../../ui.cpp:584
+msgid "Generated"
+msgstr "Erzeugt"
+
+#: ../../../ui.cpp:592
+#, c-format
+msgid "Generated (%s matures in %d more blocks)"
+msgstr "Erzeugt (%s reifen nach %d weiteren Blöcken)"
+
+#: ../../../ui.cpp:596
+msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
+msgstr "Erzeugt - Warnung: Dieser Block wurde von keinem anderen Teilnehmer empfangen und wird wahrscheinlich nicht akzeptiert werden!"
+
+#: ../../../ui.cpp:600
+msgid "Generated (not accepted)"
+msgstr "Erzeugt (nicht akzeptiert)"
+
+#: ../../../ui.cpp:610
+msgid "From: "
+msgstr "Von: "
+
+#: ../../../ui.cpp:634
+msgid "From: unknown, Received with: "
+msgstr "Von: Unbekannt, Empfangen durch: "
+
+#: ../../../ui.cpp:676
+msgid "Payment to yourself"
+msgstr "Überweisung an Sie selbst"
+
+#: ../../../ui.cpp:713
+msgid "To: "
+msgstr "An: "
+
+#: ../../../ui.cpp:1009
+msgid "    Generating"
+msgstr "    Erzeugen"
+
+#: ../../../ui.cpp:1011
+msgid "(not connected)"
+msgstr "(nicht verbunden)"
+
+#: ../../../ui.cpp:1014
+#, c-format
+msgid "     %d connections     %d blocks     %d transactions"
+msgstr "     %d Verbindungen     %d Blöcke     %d Überweisungen"
+
+#: ../../../ui.cpp:1123
+#: ../../../ui.cpp:2351
+msgid "New Receiving Address"
+msgstr "&Neue Empfangs-Adresse"
+
+#: ../../../ui.cpp:1124
+#: ../../../ui.cpp:2352
+msgid ""
+"It's good policy to use a new address for each payment you receive.\n"
+"\n"
+"Label"
+msgstr ""
+"Am besten verwenden Sie für jede Zahlung die Sie erhalten eine neue Adresse.\n"
+"\n"
+"Beschreibung"
+
+#: ../../../ui.cpp:1193
+msgid "<b>Status:</b> "
+msgstr "<b>Status:</b> "
+
+#: ../../../ui.cpp:1198
+msgid ", has not been successfully broadcast yet"
+msgstr ", wurde noch nicht erfolgreich übertragen"
+
+#: ../../../ui.cpp:1200
+#, c-format
+msgid ", broadcast through %d node"
+msgstr ", durch %d Teilnehmer übertragen"
+
+#: ../../../ui.cpp:1202
+#, c-format
+msgid ", broadcast through %d nodes"
+msgstr ", durch %d Teilnehmer übertragen"
+
+#: ../../../ui.cpp:1206
+msgid "<b>Date:</b> "
+msgstr "<b>Datum</b> "
+
+#: ../../../ui.cpp:1214
+msgid "<b>Source:</b> Generated<br>"
+msgstr "<b>Quelle:</b>Erzeugt<br>"
+
+#: ../../../ui.cpp:1220
+#: ../../../ui.cpp:1238
+msgid "<b>From:</b> "
+msgstr "<b>Von:</b> "
+
+#: ../../../ui.cpp:1238
+msgid "unknown"
+msgstr "Unbekannt"
+
+#: ../../../ui.cpp:1239
+#: ../../../ui.cpp:1263
+#: ../../../ui.cpp:1322
+msgid "<b>To:</b> "
+msgstr "<b>An:</b> "
+
+#: ../../../ui.cpp:1242
+msgid " (yours, label: "
+msgstr " (Eigene, Beschreibung: "
+
+#: ../../../ui.cpp:1244
+msgid " (yours)"
+msgstr " (Eigene)"
+
+#: ../../../ui.cpp:1281
+#: ../../../ui.cpp:1293
+#: ../../../ui.cpp:1356
+msgid "<b>Credit:</b> "
+msgstr "<b>Gutschrift:</b> "
+
+#: ../../../ui.cpp:1283
+#, c-format
+msgid "(%s matures in %d more blocks)"
+msgstr "(%s reifen nach %d weiteren Blöcken)"
+
+#: ../../../ui.cpp:1285
+msgid "(not accepted)"
+msgstr "(nicht akzeptiert)"
+
+#: ../../../ui.cpp:1330
+#: ../../../ui.cpp:1353
+msgid "<b>Debit:</b> "
+msgstr "<b>Belastung:</b> "
+
+#: ../../../ui.cpp:1344
+msgid "<b>Transaction fee:</b> "
+msgstr "<b>Überweisungsgebühr:</b> "
+
+#: ../../../ui.cpp:1360
+msgid "<b>Net amount:</b> "
+msgstr "<b>Nettobetrag:</b> "
+
+#: ../../../ui.cpp:1367
+msgid "Message:"
+msgstr "Nachricht:"
+
+#: ../../../ui.cpp:1370
+msgid "Generated coins must wait 120 blocks before they can be spent.  When you generated this block, it was broadcast to the network to be added to the block chain.  If it fails to get into the chain, it will change to \"not accepted\" and not be spendable.  This may occasionally happen if another node generates a block within a few seconds of yours."
+msgstr ""
+"Erzeugte Münzen müssen 120 Blöcke lang reifen. Als Sie diesen Block erzeugt haben, wurde er an alle Teilnehmer übertragen, damit er zur Block-Kette hinzugefügt werden kann. Falls der Block es nicht in die Block-Kette schafft, wird die Beschreibung zu \"nicht akzeptiert\" geändert, und Sie können die Münzen nicht ausgeben. Dies kann manchmal "
+"passieren, wenn Sie und ein anderer Teilnehmer annähernd zeitgleich einen Block erzeugen."
+
+#: ../../../ui.cpp:1437
+msgid "Main"
+msgstr "Haupt"
+
+#: ../../../ui.cpp:1442
+msgid "&Minimize on close"
+msgstr "Beim schließen &Minimieren"
+
+#: ../../../ui.cpp:1595
+#, c-format
+msgid "version 0.%d.%d beta"
+msgstr "Version 0.%d.%d Beta"
+
+#: ../../../ui.cpp:1681
+msgid "Will appear as \"From: Unknown\""
+msgstr "Wird als \"Von: Unbekannt\" erscheinen"
+
+#: ../../../ui.cpp:1682
+msgid "Can't include a message when sending to a Bitcoin address"
+msgstr "Beim überweisen an eine Bitcoin-Adresse kann keine Nachricht angegeben werden."
+
+#: ../../../ui.cpp:1735
+msgid "Error in amount  "
+msgstr "Fehler in Betrag  "
+
+#: ../../../ui.cpp:1735
+#: ../../../ui.cpp:1740
+#: ../../../ui.cpp:1745
+#: ../../../ui.cpp:1771
+#: ../../../uibase.cpp:61
+msgid "Send Coins"
+msgstr "Überweisen"
+
+#: ../../../ui.cpp:1740
+msgid "Amount exceeds your balance  "
+msgstr "Der Betrag übersteigt Ihr Guthaben  "
+
+#: ../../../ui.cpp:1745
+msgid "Total exceeds your balance when the "
+msgstr "Der Betrag übersteigt Ihr Guthaben, wenn man die Überweisungsgebühr von "
+
+#: ../../../ui.cpp:1745
+msgid " transaction fee is included  "
+msgstr " berücksichtigt  "
+
+#: ../../../ui.cpp:1761
+msgid "Payment sent  "
+msgstr "Zahlung überwiesen  "
+
+#: ../../../ui.cpp:1771
+msgid "Invalid address  "
+msgstr "Ungültige Adresse  "
+
+#: ../../../ui.cpp:1825
+#, c-format
+msgid "Sending %s to %s"
+msgstr "Überweise %s an %s"
+
+#: ../../../ui.cpp:1898
+#: ../../../ui.cpp:1931
+msgid "CANCELLED"
+msgstr "ANNULLIERT"
+
+#: ../../../ui.cpp:1902
+msgid "Cancelled"
+msgstr "Annulliert"
+
+#: ../../../ui.cpp:1904
+msgid "Transfer cancelled  "
+msgstr "Überweisung annulliert  "
+
+#: ../../../ui.cpp:1957
+msgid "Error: "
+msgstr "Fehler: "
+
+#: ../../../ui.cpp:1976
+msgid "Connecting..."
+msgstr "Verbinde..."
+
+#: ../../../ui.cpp:1981
+msgid "Unable to connect"
+msgstr "Kann nicht verbinden"
+
+#: ../../../ui.cpp:1986
+msgid "Requesting public key..."
+msgstr "Fordere öffentlichen Schlüssel an..."
+
+#: ../../../ui.cpp:1998
+msgid "Received public key..."
+msgstr "Öffentlichen Schlüssel empfangen..."
+
+#: ../../../ui.cpp:2010
+msgid "Transfer was not accepted"
+msgstr "Überweisung wurde nicht akzeptiert"
+
+#: ../../../ui.cpp:2019
+msgid "Invalid response received"
+msgstr "Ungültige Antwort erhalten"
+
+#: ../../../ui.cpp:2034
+msgid "Creating transaction..."
+msgstr "Erstelle Überweisung..."
+
+#: ../../../ui.cpp:2046
+#, c-format
+msgid "This is an oversized transaction that requires a transaction fee of %s"
+msgstr "Die Überweisung ist sehr groß. Es wird eine Gebühr von %s erhoben."
+
+#: ../../../ui.cpp:2048
+msgid "Transaction creation failed"
+msgstr "Überweisung konnte nicht erzeugt werden."
+
+#: ../../../ui.cpp:2055
+msgid "Transaction aborted"
+msgstr "Überweisung abgebrochen"
+
+#: ../../../ui.cpp:2063
+msgid "Lost connection, transaction cancelled"
+msgstr "Verbindung verloren, Überweisungsvorgang abgebrochen"
+
+#: ../../../ui.cpp:2079
+msgid "Sending payment..."
+msgstr "Überweise Zahlung..."
+
+#: ../../../ui.cpp:2085
+msgid "The transaction was rejected.  This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."
+msgstr "Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden."
+
+#: ../../../ui.cpp:2092
+msgid "Waiting for confirmation..."
+msgstr "Warte auf Bestätigung..."
+
+#: ../../../ui.cpp:2110
+msgid ""
+"The payment was sent, but the recipient was unable to verify it.\n"
+"The transaction is recorded and will credit to the recipient,\n"
+"but the comment information will be blank."
+msgstr ""
+"Die Zahlung wurde überwiesen, aber der Empfänger konnte sie nicht bestätigen.\n"
+"Die Überweisung wurde gespeichert und wird dem Empfänger gutgeschrieben,\n"
+"aber die begleitende Nachricht wird nicht ankommen."
+
+#: ../../../ui.cpp:2119
+msgid "Payment was sent, but an invalid response was received"
+msgstr "Die Zahlung wurde überwiesen, aber die Antwort war fehlerhaft"
+
+#: ../../../ui.cpp:2125
+msgid "Payment completed"
+msgstr "Zahlung ausgeführt"
+
+#: ../../../ui.cpp:2156
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2339
+msgid "Name"
+msgstr "Name"
+
+#: ../../../ui.cpp:2157
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2339
+msgid "Address"
+msgstr "Adresse"
+
+#: ../../../ui.cpp:2159
+#: ../../../ui.cpp:2314
+msgid "Label"
+msgstr "Beschreibung"
+
+#: ../../../ui.cpp:2160
+#: ../../../uibase.cpp:908
+msgid "Bitcoin Address"
+msgstr "Bitcoin-Adresse"
+
+#: ../../../ui.cpp:2284
+msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book.  "
+msgstr "Dies ist eine Ihrer eigenen Adressen für den Zahlungseingang und kann deshalb nicht in das Adressbuch übernommen werden.  "
+
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2308
+msgid "Edit Address"
+msgstr "Adresse bearbeiten"
+
+#: ../../../ui.cpp:2314
+msgid "Edit Address Label"
+msgstr "Beschreibung der Adresse bearbeiten"
+
+#: ../../../ui.cpp:2339
+#: ../../../ui.cpp:2345
+msgid "Add Address"
+msgstr "Adresse hinzufügen"
+
+#: ../../../ui.cpp:2421
+msgid "Bitcoin"
+msgstr "Bitcoin"
+
+#: ../../../ui.cpp:2423
+msgid "Bitcoin - Generating"
+msgstr "Bitcoin - Erzeuge"
+
+#: ../../../ui.cpp:2425
+msgid "Bitcoin - (not connected)"
+msgstr "Bitcoin - (nicht verbunden)"
+
+#: ../../../ui.cpp:2500
+msgid "&Open Bitcoin"
+msgstr "Bitcoin Ö&ffnen"
+
+#: ../../../ui.cpp:2501
+msgid "O&ptions..."
+msgstr "O&ptionen..."
+
+#: ../../../ui.cpp:2502
+#: ../../../uibase.cpp:34
+msgid "&Generate Coins"
+msgstr "Münzen Er&zeugen"
+
+#: ../../../ui.cpp:2505
+#: ../../../uibase.cpp:27
+msgid "E&xit"
+msgstr "B&eenden"
+
+#: ../../../uibase.cpp:30
+msgid "&File"
+msgstr "&Datei"
+
+#: ../../../uibase.cpp:38
+msgid "&Your Receiving Addresses..."
+msgstr "&Ihre Empfangs-Adressen..."
+
+#: ../../../uibase.cpp:42
+msgid "&Options..."
+msgstr "&Optionen..."
+
+#: ../../../uibase.cpp:45
+msgid "&Settings"
+msgstr "&Einstellungen"
+
+#: ../../../uibase.cpp:49
+msgid "&About..."
+msgstr "Ü&ber..."
+
+#: ../../../uibase.cpp:52
+msgid "&Help"
+msgstr "&Hilfe"
+
+#: ../../../uibase.cpp:62
+msgid "Address Book"
+msgstr "Adressbuch"
+
+#: ../../../uibase.cpp:77
+msgid "Your Bitcoin Address:"
+msgstr "Ihre Bitcoin-Adresse:"
+
+#: ../../../uibase.cpp:84
+msgid " &New... "
+msgstr " &Neu... "
+
+#: ../../../uibase.cpp:87
+#: ../../../uibase.cpp:851
+#: ../../../uibase.cpp:954
+msgid " &Copy to Clipboard "
+msgstr " In die Zwischenablage &kopieren "
+
+#: ../../../uibase.cpp:102
+msgid "Balance:"
+msgstr "Kontostand:"
+
+#: ../../../uibase.cpp:121
+msgid " All"
+msgstr " Alle"
+
+#: ../../../uibase.cpp:121
+msgid " Sent"
+msgstr " Überwiesen"
+
+#: ../../../uibase.cpp:121
+msgid " Received"
+msgstr " Erhalten"
+
+#: ../../../uibase.cpp:121
+msgid " In Progress"
+msgstr " In Bearbeitung"
+
+#: ../../../uibase.cpp:142
+msgid "All Transactions"
+msgstr "Alle Überweisungen"
+
+#: ../../../uibase.cpp:153
+msgid "Sent/Received"
+msgstr "Überwiesen/Erhalten"
+
+#: ../../../uibase.cpp:164
+msgid "Sent"
+msgstr "Überwiesen"
+
+#: ../../../uibase.cpp:175
+msgid "Received"
+msgstr "Erhalten"
+
+#: ../../../uibase.cpp:318
+#: ../../../uibase.cpp:479
+#: ../../../uibase.cpp:580
+#: ../../../uibase.cpp:793
+#: ../../../uibase.cpp:854
+#: ../../../uibase.cpp:963
+#: ../../../uibase.cpp:1052
+msgid "OK"
+msgstr "OK"
+
+#: ../../../uibase.cpp:361
+msgid "Optional transaction fee you give to the nodes that process your transactions."
+msgstr "Optionale Überweisungsgebühr, die Sie an den Teilnehmer entrichten, der Ihre Überweisungen bearbeitet."
+
+#: ../../../uibase.cpp:370
+msgid "Transaction fee:"
+msgstr "Überweisungsgebühr:"
+
+#: ../../../uibase.cpp:386
+msgid "&Limit coin generation to"
+msgstr "Erzeugung von Münzen auf"
+
+#: ../../../uibase.cpp:393
+msgid "processors"
+msgstr "Prozessoren &beschränken"
+
+#: ../../../uibase.cpp:399
+msgid "&Start Bitcoin on system startup"
+msgstr "Bitcoin beim &Systemstart ausführen"
+
+#: ../../../uibase.cpp:403
+msgid "&Minimize to the tray instead of the taskbar"
+msgstr "In den Infobereich statt in die Taskleiste &minimieren"
+
+#: ../../../uibase.cpp:407
+msgid "M&inimize to the tray on close"
+msgstr "Beim schließen in den Infobereich m&inimieren"
+
+#: ../../../uibase.cpp:414
+msgid "&Connect through socks4 proxy: "
+msgstr "&Verbinden per Socks4-Proxy: "
+
+#: ../../../uibase.cpp:426
+msgid "Proxy &IP:"
+msgstr "Proxy &IP:"
+
+#: ../../../uibase.cpp:434
+msgid " &Port:"
+msgstr " &Port:"
+
+#: ../../../uibase.cpp:456
+msgid "// [don't translate] Test panel 2 for future expansion"
+msgstr ""
+
+#: ../../../uibase.cpp:460
+msgid "// [don't translate] Let's not start multiple pages until the first page is filled up"
+msgstr ""
+
+#: ../../../uibase.cpp:482
+#: ../../../uibase.cpp:735
+#: ../../../uibase.cpp:798
+#: ../../../uibase.cpp:857
+#: ../../../uibase.cpp:966
+#: ../../../uibase.cpp:1055
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../../../uibase.cpp:485
+msgid "&Apply"
+msgstr "&Anwenden"
+
+#: ../../../uibase.cpp:546
+msgid "Bitcoin "
+msgstr "Bitcoin "
+
+#: ../../../uibase.cpp:552
+msgid "version"
+msgstr "Version"
+
+#: ../../../uibase.cpp:563
+msgid ""
+"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
+"\n"
+"This is experimental software.  Do not rely on it for actual financial transactions.\n"
+"\n"
+"Distributed under the MIT/X11 software license, see the accompanying file \n"
+"license.txt or http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"This product includes software developed by the OpenSSL Project for use in the \n"
+"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
+"Eric Young (eay@cryptsoft.com)."
+msgstr ""
+"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
+"\n"
+"Dies ist experimentelle Software.  Verlassen Sie sich für tatsächliche\n"
+"finanzielle Transaktionen nicht auf sie.\n"
+"\n"
+"Lizensiert unter der MIT/X11 Software-Lizenz. Beachten Sie die beiliegende\n"
+"Datei license.txt oder http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Nutzung im\n"
+"OpenSSL Toolkit (http://www.openssl.org/) geschrieben wurde sowie\n"
+"kryptographische Software von Eric Young (eay@cryptsoft.com)."
+
+#: ../../../uibase.cpp:619
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"
+msgstr "Geben Sie eine Bitcoin-Adresse (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) oder IP-Adresse (z.B. 123.45.6.7) ein"
+
+#: ../../../uibase.cpp:633
+msgid "Pay &To:"
+msgstr "Überweisen &An:"
+
+#: ../../../uibase.cpp:648
+msgid "&Paste"
+msgstr "&Einfügen"
+
+#: ../../../uibase.cpp:651
+msgid " Address &Book..."
+msgstr " Address&buch..."
+
+#: ../../../uibase.cpp:658
+msgid "&Amount:"
+msgstr "&Betrag:"
+
+#: ../../../uibase.cpp:668
+msgid "T&ransfer:"
+msgstr "Ü&berweisung:"
+
+#: ../../../uibase.cpp:674
+msgid " Standard"
+msgstr " Standard"
+
+#: ../../../uibase.cpp:696
+msgid "&From:"
+msgstr "&Von:"
+
+#: ../../../uibase.cpp:713
+msgid "&Message:"
+msgstr "&Nachricht:"
+
+#: ../../../uibase.cpp:730
+msgid "&Send"
+msgstr "Ü&berweisen"
+
+#: ../../../uibase.cpp:782
+msgid ""
+"\n"
+"\n"
+"Connecting..."
+msgstr ""
+"\n"
+"\n"
+"Verbinde..."
+
+#: ../../../uibase.cpp:832
+msgid "These are your Bitcoin addresses for receiving payments.  You may want to give a different one to each sender so you can keep track of who is paying you.  The highlighted address is displayed in the main window."
+msgstr "Dies sind Ihre Bitcoin-Adressen zum Empfang von Zahlungen. Sie sollten vielleicht jedem Überweisenden eine andere Adresse geben um nachvollziehen zu können von wem eine Zahlung stammt. Die markierte Adresse wird im Hauptfenster angezeigt."
+
+#: ../../../uibase.cpp:845
+#: ../../../uibase.cpp:957
+msgid "&Edit..."
+msgstr "&Bearbeiten..."
+
+#: ../../../uibase.cpp:848
+#: ../../../uibase.cpp:960
+msgid " &New Address... "
+msgstr " &Neue Adresse... "
+
+#: ../../../uibase.cpp:920
+msgid "Sending"
+msgstr "Überweise"
+
+#: ../../../uibase.cpp:928
+msgid "These are your Bitcoin addresses for receiving payments.  You can give a different one to each sender to keep track of who is paying you.  The highlighted address will be displayed in the main window."
+msgstr "Dies sind Ihre Bitcoin-Adressen zum Empfang von Zahlungen. Sie können jedem Überweisenden eine andere Adresse geben um nachvollziehen zu können von wem eine Zahlung stammt. Die markierte Adresse wird im Hauptfenster angezeigt."
+
+#: ../../../uibase.cpp:941
+msgid "Receiving"
+msgstr "Empfange"
+
+#: ../../../uibase.cpp:951
+msgid "&Delete"
+msgstr "&Löschen"
+
+#: ../../../uibase.h:150
+msgid "Transaction Details"
+msgstr "Überweisungsdetails"
+
+#: ../../../uibase.h:203
+msgid "Options"
+msgstr "Optionen"
+
+#: ../../../uibase.h:231
+msgid "About Bitcoin"
+msgstr "Über Bitcoin"
+
+#: ../../../uibase.h:341
+msgid "Your Bitcoin Addresses"
+msgstr "Ihre Bitcoin-Adressen"

locale/it/LC_MESSAGES/bitcoin.po

@@ -0,0 +1,806 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-26 22:02-0000\n"
+"PO-Revision-Date: 2010-05-27 13:01+0100\n"
+"Last-Translator: Franco Cimatti <hostfat@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ../../..\n"
+
+#: ../../../init.cpp:342
+msgid "Usage: bitcoin [options]"
+msgstr "Uso: bitcoin [options]"
+
+#: ../../../init.cpp:343
+msgid "Options:\n"
+msgstr "Opzioni:\n"
+
+#: ../../../init.cpp:344
+msgid "Generate coins\n"
+msgstr "Genera monete\n"
+
+#: ../../../init.cpp:345
+msgid "Don't generate coins\n"
+msgstr "Non generare monete\n"
+
+#: ../../../init.cpp:346
+msgid "Start minimized\n"
+msgstr "Avvia minimizzato\n"
+
+#: ../../../init.cpp:347
+msgid "Specify data directory\n"
+msgstr "Indica la cartella per i dati\n"
+
+#: ../../../init.cpp:348
+msgid "Connect through socks4 proxy\n"
+msgstr "Connetti attraverso proxy socks4\n"
+
+#: ../../../init.cpp:349
+msgid "Add a node to connect to\n"
+msgstr "Aggiungi un nodo a cui connetterti\n"
+
+#: ../../../init.cpp:350
+msgid "Connect only to the specified node\n"
+msgstr "Impossibile connettersi al nodo specificato\n"
+
+#: ../../../init.cpp:351
+msgid "This help message\n"
+msgstr "Questo messaggio di aiuto\n"
+
+#: ../../../init.cpp:455
+msgid "Error loading addr.dat      \n"
+msgstr "Errore nel caricare addr.dat      \n"
+
+#: ../../../init.cpp:461
+msgid "Error loading blkindex.dat      \n"
+msgstr "Errore nel caricare blkindex.dat      \n"
+
+#: ../../../init.cpp:468
+msgid "Error loading wallet.dat      \n"
+msgstr "Errore nel caricare wallet.dat      \n"
+
+#: ../../../init.cpp:536
+msgid "Invalid -proxy address"
+msgstr "Indirizzo proxy non valido"
+
+#: ../../../init.cpp:629
+msgid "Program has crashed and will terminate.  "
+msgstr "Il programma è crashato e sarà terminato.  "
+
+#: ../../../main.cpp:1465
+msgid "Warning: Disk space is low  "
+msgstr "Attenzione: c'è poco spazio sul disco  "
+
+#: ../../../main.cpp:2994
+#, c-format
+msgid "Error: This is an oversized transaction that requires a transaction fee of %s  "
+msgstr "Errore: Questa è un operazione fuoriscala che richiede un sovrapprezzo di %s  "
+
+#: ../../../main.cpp:2996
+msgid "Error: Transaction creation failed  "
+msgstr "Errore: La creazione del trasferimento è fallito  "
+
+#: ../../../main.cpp:3001
+#: ../../../ui.cpp:1761
+#: ../../../ui.cpp:1763
+#: ../../../ui.cpp:1904
+#: ../../../ui.cpp:2053
+msgid "Sending..."
+msgstr "Inviando..."
+
+#: ../../../main.cpp:3005
+msgid "Error: The transaction was rejected.  This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."
+msgstr "Errore: Il trasferimento è stato respinto. Questo può accadere se alcune delle monete nel tuo portafoglio erano già state spese, o anche se hai usato una copia di wallet.dat e le monete erano già state spese nella copia originale ma non segnate in quest'ultima."
+
+#: ../../../main.cpp:3017
+msgid "Invalid amount"
+msgstr "Quantità non valida"
+
+#: ../../../main.cpp:3019
+#: ../../../ui.cpp:1971
+#: ../../../ui.cpp:2038
+msgid "Insufficient funds"
+msgstr "Fondi insufficenti"
+
+#: ../../../main.cpp:3024
+msgid "Invalid bitcoin address"
+msgstr "Indirizzo bitcoin non valido"
+
+#: ../../../ui.cpp:189
+#, c-format
+msgid "This transaction is over the size limit.  You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network.  Do you want to pay the fee?"
+msgstr "Questo trasferimento è oltre le dimensioni massime. Puoi comunque inviarlo per un costo aggiuntivo di %s, che andrà ai nodi che effettueranno il processo della tua operazione e che supportano il network. Vuoi pagare il costo aggiuntivo?"
+
+#: ../../../ui.cpp:285
+msgid "Status"
+msgstr "Stato"
+
+#: ../../../ui.cpp:286
+msgid "Date"
+msgstr "Data"
+
+#: ../../../ui.cpp:287
+msgid "Description"
+msgstr "Descrizione"
+
+#: ../../../ui.cpp:288
+msgid "Debit"
+msgstr "Debito"
+
+#: ../../../ui.cpp:289
+msgid "Credit"
+msgstr "Credito"
+
+#: ../../../ui.cpp:489
+#, c-format
+msgid "Open for %d blocks"
+msgstr "Aperto per %d blocchi"
+
+#: ../../../ui.cpp:491
+#, c-format
+msgid "Open until %s"
+msgstr "Aperto fino a %s"
+
+#: ../../../ui.cpp:497
+#, c-format
+msgid "%d/offline?"
+msgstr "%d/fuorilinea?"
+
+#: ../../../ui.cpp:499
+#, c-format
+msgid "%d/unconfirmed"
+msgstr "%d/non confermato"
+
+#: ../../../ui.cpp:501
+#, c-format
+msgid "%d confirmations"
+msgstr "%d conferme"
+
+#: ../../../ui.cpp:584
+msgid "Generated"
+msgstr "Generato"
+
+#: ../../../ui.cpp:592
+#, c-format
+msgid "Generated (%s matures in %d more blocks)"
+msgstr "Generate (%s matureranno in %d altri blocchi)"
+
+#: ../../../ui.cpp:596
+msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
+msgstr "Generato - Attenzione: Questo blocco non è stato ricevuto da nessun altro nodo e probabilmente non sarà accettato!"
+
+#: ../../../ui.cpp:600
+msgid "Generated (not accepted)"
+msgstr "Generato (non accettato)"
+
+#: ../../../ui.cpp:610
+msgid "From: "
+msgstr "Da: "
+
+#: ../../../ui.cpp:634
+msgid "From: unknown, Received with: "
+msgstr "Da: sconosciuto, Ricevuto con: "
+
+#: ../../../ui.cpp:676
+msgid "Payment to yourself"
+msgstr "Pagamento a te stesso"
+
+#: ../../../ui.cpp:713
+msgid "To: "
+msgstr "A: "
+
+#: ../../../ui.cpp:1009
+msgid "    Generating"
+msgstr "    Generando"
+
+#: ../../../ui.cpp:1011
+msgid "(not connected)"
+msgstr "(non connesso)"
+
+#: ../../../ui.cpp:1014
+#, c-format
+msgid "     %d connections     %d blocks     %d transactions"
+msgstr "     %d connessioni     %d blocchi     %d trasferimenti"
+
+#: ../../../ui.cpp:1123
+#: ../../../ui.cpp:2351
+msgid "New Receiving Address"
+msgstr "Nuovo indirizzo ricevente"
+
+#: ../../../ui.cpp:1124
+#: ../../../ui.cpp:2352
+msgid ""
+"It's good policy to use a new address for each payment you receive.\n"
+"\n"
+"Label"
+msgstr ""
+"E' una buona abitudine usare un nuovo indirizzo per ogni pagamento che ricevuto.\n"
+"\n"
+"Label"
+
+#: ../../../ui.cpp:1193
+msgid "<b>Status:</b> "
+msgstr "<b>Stato:</b> "
+
+#: ../../../ui.cpp:1198
+msgid ", has not been successfully broadcast yet"
+msgstr ", non è ancora stato diffuso correttamente"
+
+#: ../../../ui.cpp:1200
+#, c-format
+msgid ", broadcast through %d node"
+msgstr ", diffusione attraverso %d nodo"
+
+#: ../../../ui.cpp:1202
+#, c-format
+msgid ", broadcast through %d nodes"
+msgstr ", diffusione attraverso %d nodi"
+
+#: ../../../ui.cpp:1206
+msgid "<b>Date:</b> "
+msgstr "<b>Data:</b> "
+
+#: ../../../ui.cpp:1214
+msgid "<b>Source:</b> Generated<br>"
+msgstr "<b>Sorgente:</b> Generato<br>"
+
+#: ../../../ui.cpp:1220
+#: ../../../ui.cpp:1238
+msgid "<b>From:</b> "
+msgstr "<b>Da:</b> "
+
+#: ../../../ui.cpp:1238
+msgid "unknown"
+msgstr "sconoscuto"
+
+#: ../../../ui.cpp:1239
+#: ../../../ui.cpp:1263
+#: ../../../ui.cpp:1322
+msgid "<b>To:</b> "
+msgstr "<b>A:</b> "
+
+#: ../../../ui.cpp:1242
+msgid " (yours, label: "
+msgstr " (vostro, label: "
+
+#: ../../../ui.cpp:1244
+msgid " (yours)"
+msgstr " (vostro)"
+
+#: ../../../ui.cpp:1281
+#: ../../../ui.cpp:1293
+#: ../../../ui.cpp:1356
+msgid "<b>Credit:</b> "
+msgstr "<b>Credito:</b> "
+
+#: ../../../ui.cpp:1283
+#, c-format
+msgid "(%s matures in %d more blocks)"
+msgstr "(%s matureranno in %d altri blocchi)"
+
+#: ../../../ui.cpp:1285
+msgid "(not accepted)"
+msgstr "(non accettato)"
+
+#: ../../../ui.cpp:1330
+#: ../../../ui.cpp:1353
+msgid "<b>Debit:</b> "
+msgstr "<b>Debito:</b> "
+
+#: ../../../ui.cpp:1344
+msgid "<b>Transaction fee:</b> "
+msgstr "<b>Trasferimento costo:</b> "
+
+#: ../../../ui.cpp:1360
+msgid "<b>Net amount:</b> "
+msgstr "<b>Quantità del network:</b> "
+
+#: ../../../ui.cpp:1367
+msgid "Message:"
+msgstr "Messaggio:"
+
+#: ../../../ui.cpp:1370
+msgid "Generated coins must wait 120 blocks before they can be spent.  When you generated this block, it was broadcast to the network to be added to the block chain.  If it fails to get into the chain, it will change to \"not accepted\" and not be spendable.  This may occasionally happen if another node generates a block within a few seconds of yours."
+msgstr "Le monete generate devono aspettare 120 blocchi prima di poter essere spese. Quando hai generato questo blocco, è stato diffuso sul network  per essere aggiunto alla catena dei blocchi. Se fallirà l'entrata nella catena, cambierà in \"non accettato\" e non spendibile. Questo può capitare se un altro nodo genera un blocco pochi secondi prima del tuo."
+
+#: ../../../ui.cpp:1437
+msgid "Main"
+msgstr "Principale"
+
+#: ../../../ui.cpp:1442
+msgid "&Minimize on close"
+msgstr "&Minimizza se chiuso"
+
+#: ../../../ui.cpp:1595
+#, c-format
+msgid "version 0.%d.%d beta"
+msgstr "versione 0.%d.%d beta"
+
+#: ../../../ui.cpp:1681
+msgid "Will appear as \"From: Unknown\""
+msgstr "Apparirà come \"Da: Sconosciuto\""
+
+#: ../../../ui.cpp:1682
+msgid "Can't include a message when sending to a Bitcoin address"
+msgstr "Non si può includere un messaggio quando si invia attraverso l'indirizzo Bitcoin"
+
+#: ../../../ui.cpp:1735
+msgid "Error in amount  "
+msgstr "Errore nell'ammontare  "
+
+#: ../../../ui.cpp:1735
+#: ../../../ui.cpp:1740
+#: ../../../ui.cpp:1745
+#: ../../../ui.cpp:1771
+#: ../../../uibase.cpp:61
+msgid "Send Coins"
+msgstr "Invia monete"
+
+#: ../../../ui.cpp:1740
+msgid "Amount exceeds your balance  "
+msgstr "L'ammontare è andato oltre i tuoi capitali  "
+
+#: ../../../ui.cpp:1745
+msgid "Total exceeds your balance when the "
+msgstr "Il totale va oltre i tuoi capitali quando il "
+
+#: ../../../ui.cpp:1745
+msgid " transaction fee is included  "
+msgstr " il costo trasferimento è incluso  "
+
+#: ../../../ui.cpp:1761
+msgid "Payment sent  "
+msgstr "Pagamento inviato  "
+
+#: ../../../ui.cpp:1771
+msgid "Invalid address  "
+msgstr "Indirizzo non valido  "
+
+#: ../../../ui.cpp:1825
+#, c-format
+msgid "Sending %s to %s"
+msgstr "Inviando %s a %s"
+
+#: ../../../ui.cpp:1898
+#: ../../../ui.cpp:1931
+msgid "CANCELLED"
+msgstr "CANCELLATO"
+
+#: ../../../ui.cpp:1902
+msgid "Cancelled"
+msgstr "Cancellato"
+
+#: ../../../ui.cpp:1904
+msgid "Transfer cancelled  "
+msgstr "Operazione cancellata  "
+
+#: ../../../ui.cpp:1957
+msgid "Error: "
+msgstr "Errore: "
+
+#: ../../../ui.cpp:1976
+msgid "Connecting..."
+msgstr "Connessione in corso..."
+
+#: ../../../ui.cpp:1981
+msgid "Unable to connect"
+msgstr "Impossibile connettersi"
+
+#: ../../../ui.cpp:1986
+msgid "Requesting public key..."
+msgstr "Richiesta chiave pubblica..."
+
+#: ../../../ui.cpp:1998
+msgid "Received public key..."
+msgstr "Ricezione chiave pubblica..."
+
+#: ../../../ui.cpp:2010
+msgid "Transfer was not accepted"
+msgstr "Trasferimento non accettato"
+
+#: ../../../ui.cpp:2019
+msgid "Invalid response received"
+msgstr "Risposta non valida ricevuta"
+
+#: ../../../ui.cpp:2034
+msgid "Creating transaction..."
+msgstr "Creazione trasferimento..."
+
+#: ../../../ui.cpp:2046
+#, c-format
+msgid "This is an oversized transaction that requires a transaction fee of %s"
+msgstr "Questo è un trasferimento fuoriscala che richiede un costo aggiuntivo di %s"
+
+#: ../../../ui.cpp:2048
+msgid "Transaction creation failed"
+msgstr "Creazione trasferimento fallita"
+
+#: ../../../ui.cpp:2055
+msgid "Transaction aborted"
+msgstr "Trasferimento bloccato"
+
+#: ../../../ui.cpp:2063
+msgid "Lost connection, transaction cancelled"
+msgstr "Connessione persa, trasferimento cancellato"
+
+#: ../../../ui.cpp:2079
+msgid "Sending payment..."
+msgstr "Inviando pagamento..."
+
+#: ../../../ui.cpp:2085
+msgid "The transaction was rejected.  This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."
+msgstr "Il trasferimento è stato respinto. Questo può accadere se alcune delle monete nel tuo portafoglio erano già state spese, o anche se hai usato una copia di wallet.dat e le monete erano già state spese nella copia originale ma non segnate in quest'ultima."
+
+#: ../../../ui.cpp:2092
+msgid "Waiting for confirmation..."
+msgstr "In attesa di conferma..."
+
+#: ../../../ui.cpp:2110
+msgid ""
+"The payment was sent, but the recipient was unable to verify it.\n"
+"The transaction is recorded and will credit to the recipient,\n"
+"but the comment information will be blank."
+msgstr ""
+"Il pagamento è inviato, ma il ricevente non è stato in grado di verificarlo.\n"
+"Il trasferimento è registrato e costerà sarà accreditato al ricevente,\n"
+"ma il commento verrà mostrato come vuoto."
+
+#: ../../../ui.cpp:2119
+msgid "Payment was sent, but an invalid response was received"
+msgstr "Il pagamento è stato inviato, ma è arrivata un risposta invalida"
+
+#: ../../../ui.cpp:2125
+msgid "Payment completed"
+msgstr "Pagamento completato"
+
+#: ../../../ui.cpp:2156
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2339
+msgid "Name"
+msgstr "Nome"
+
+#: ../../../ui.cpp:2157
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2339
+msgid "Address"
+msgstr "Indirizzo"
+
+#: ../../../ui.cpp:2159
+#: ../../../ui.cpp:2314
+msgid "Label"
+msgstr "Label"
+
+#: ../../../ui.cpp:2160
+#: ../../../uibase.cpp:908
+msgid "Bitcoin Address"
+msgstr "Indirizzo Bitcoin"
+
+#: ../../../ui.cpp:2284
+msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book.  "
+msgstr "Questo qui è uno dei tuoi indirizzi personali per ricevere pagamenti e non può essere inserito nella rubrica indirizzi.  "
+
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2308
+msgid "Edit Address"
+msgstr "Modifica indirizzo"
+
+#: ../../../ui.cpp:2314
+msgid "Edit Address Label"
+msgstr "Modifica spazio indirizzo"
+
+#: ../../../ui.cpp:2339
+#: ../../../ui.cpp:2345
+msgid "Add Address"
+msgstr "Aggiungi indirizzo"
+
+#: ../../../ui.cpp:2421
+msgid "Bitcoin"
+msgstr "Bitcoin"
+
+#: ../../../ui.cpp:2423
+msgid "Bitcoin - Generating"
+msgstr "Bitcoin - Generando"
+
+#: ../../../ui.cpp:2425
+msgid "Bitcoin - (not connected)"
+msgstr "Bitcoin - (non connesso)"
+
+#: ../../../ui.cpp:2500
+msgid "&Open Bitcoin"
+msgstr "&Apri Bitcoin"
+
+#: ../../../ui.cpp:2501
+msgid "O&ptions..."
+msgstr "O&pzioni..."
+
+#: ../../../ui.cpp:2502
+#: ../../../uibase.cpp:34
+msgid "&Generate Coins"
+msgstr "&Genera monete"
+
+#: ../../../ui.cpp:2505
+#: ../../../uibase.cpp:27
+msgid "E&xit"
+msgstr "E&sci"
+
+#: ../../../uibase.cpp:30
+msgid "&File"
+msgstr "&File"
+
+#: ../../../uibase.cpp:38
+msgid "&Your Receiving Addresses..."
+msgstr "&Il tuo indirizzo di ricezione..."
+
+#: ../../../uibase.cpp:42
+msgid "&Options..."
+msgstr "&Opzioni..."
+
+#: ../../../uibase.cpp:45
+msgid "&Settings"
+msgstr "I&mpostazioni"
+
+#: ../../../uibase.cpp:49
+msgid "&About..."
+msgstr "&Info..."
+
+#: ../../../uibase.cpp:52
+msgid "&Help"
+msgstr "&Aiuto"
+
+#: ../../../uibase.cpp:62
+msgid "Address Book"
+msgstr "Rubrica indirizzi"
+
+#: ../../../uibase.cpp:77
+msgid "Your Bitcoin Address:"
+msgstr "Il tuo indirizzo Bitcoin:"
+
+#: ../../../uibase.cpp:84
+msgid " &New... "
+msgstr " &Nuovo... "
+
+#: ../../../uibase.cpp:87
+#: ../../../uibase.cpp:851
+#: ../../../uibase.cpp:954
+msgid " &Copy to Clipboard "
+msgstr " &Copia nella Clipboard "
+
+#: ../../../uibase.cpp:102
+msgid "Balance:"
+msgstr "Capitali:"
+
+#: ../../../uibase.cpp:121
+msgid " All"
+msgstr " Tutte"
+
+#: ../../../uibase.cpp:121
+msgid " Sent"
+msgstr " Inviato"
+
+#: ../../../uibase.cpp:121
+msgid " Received"
+msgstr " Ricevuto"
+
+#: ../../../uibase.cpp:121
+msgid " In Progress"
+msgstr " In lavorazione"
+
+#: ../../../uibase.cpp:142
+msgid "All Transactions"
+msgstr "Tutte le operazioni"
+
+#: ../../../uibase.cpp:153
+msgid "Sent/Received"
+msgstr "Inviato/Ricevuto"
+
+#: ../../../uibase.cpp:164
+msgid "Sent"
+msgstr "Inviato"
+
+#: ../../../uibase.cpp:175
+msgid "Received"
+msgstr "Ricevuto"
+
+#: ../../../uibase.cpp:318
+#: ../../../uibase.cpp:479
+#: ../../../uibase.cpp:580
+#: ../../../uibase.cpp:793
+#: ../../../uibase.cpp:854
+#: ../../../uibase.cpp:963
+#: ../../../uibase.cpp:1052
+msgid "OK"
+msgstr "OK"
+
+#: ../../../uibase.cpp:361
+msgid "Optional transaction fee you give to the nodes that process your transactions."
+msgstr "Costo aggiuntivo opzionale che tu dai ai nodi che realizzano i tuoi trasferimenti"
+
+#: ../../../uibase.cpp:370
+msgid "Transaction fee:"
+msgstr "Costo trasferimento:"
+
+#: ../../../uibase.cpp:386
+msgid "&Limit coin generation to"
+msgstr "&Limita la generazione moneta a"
+
+#: ../../../uibase.cpp:393
+msgid "processors"
+msgstr "processori"
+
+#: ../../../uibase.cpp:399
+msgid "&Start Bitcoin on system startup"
+msgstr "A&vvia Bitcoin all'avvio del sistema"
+
+#: ../../../uibase.cpp:403
+msgid "&Minimize to the tray instead of the taskbar"
+msgstr "&Minimizza nella tray invece che nella barra"
+
+#: ../../../uibase.cpp:407
+msgid "M&inimize to the tray on close"
+msgstr "M&inimizza nella tray alla chiusura"
+
+#: ../../../uibase.cpp:414
+msgid "&Connect through socks4 proxy: "
+msgstr "%Connesso attraverso proxy socks4: "
+
+#: ../../../uibase.cpp:426
+msgid "Proxy &IP:"
+msgstr "Proxy &IP:"
+
+#: ../../../uibase.cpp:434
+msgid " &Port:"
+msgstr " &Porta:"
+
+#: ../../../uibase.cpp:456
+msgid "// [don't translate] Test panel 2 for future expansion"
+msgstr ""
+
+#: ../../../uibase.cpp:460
+msgid "// [don't translate] Let's not start multiple pages until the first page is filled up"
+msgstr ""
+
+#: ../../../uibase.cpp:482
+#: ../../../uibase.cpp:735
+#: ../../../uibase.cpp:798
+#: ../../../uibase.cpp:857
+#: ../../../uibase.cpp:966
+#: ../../../uibase.cpp:1055
+msgid "Cancel"
+msgstr "Cancella"
+
+#: ../../../uibase.cpp:485
+msgid "&Apply"
+msgstr "&Accetta"
+
+#: ../../../uibase.cpp:546
+msgid "Bitcoin "
+msgstr "Bitcoin "
+
+#: ../../../uibase.cpp:552
+msgid "version"
+msgstr "versione"
+
+#: ../../../uibase.cpp:563
+msgid ""
+"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
+"\n"
+"This is experimental software.  Do not rely on it for actual financial transactions.\n"
+"\n"
+"Distributed under the MIT/X11 software license, see the accompanying file \n"
+"license.txt or http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"This product includes software developed by the OpenSSL Project for use in the \n"
+"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
+"Eric Young (eay@cryptsoft.com)."
+msgstr ""
+"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
+"\n"
+"Questo è un software sperimentale. Non affidartici per gli attuali trasferimenti finanziari.\n"
+"\n"
+"Distribuito sotto la licenza software MIT/X11, guarda il file license.txt incluso oppure su http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"Questo prodoto include software sviluppato dal progetto OpenSSL per l'uso del  \n"
+"(http://www.openssl.org/) e il software criptografico scritto da \n"
+"Eric Young (eay@cryptsoft.com)."
+
+#: ../../../uibase.cpp:619
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"
+msgstr "Inserisci un indirizzo Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) o un indirizzo IP (e.g. 123.45.6.7)"
+
+#: ../../../uibase.cpp:633
+msgid "Pay &To:"
+msgstr "Paga %a:"
+
+#: ../../../uibase.cpp:648
+msgid "&Paste"
+msgstr "&Incolla"
+
+#: ../../../uibase.cpp:651
+msgid " Address &Book..."
+msgstr " &Rubrica degli indirizzi..."
+
+#: ../../../uibase.cpp:658
+msgid "&Amount:"
+msgstr "&Quantità"
+
+#: ../../../uibase.cpp:668
+msgid "T&ransfer:"
+msgstr "T&rasferimento:"
+
+#: ../../../uibase.cpp:674
+msgid " Standard"
+msgstr " Standard"
+
+#: ../../../uibase.cpp:696
+msgid "&From:"
+msgstr "&Proveniente da:"
+
+#: ../../../uibase.cpp:713
+msgid "&Message:"
+msgstr "&Messaggio:"
+
+#: ../../../uibase.cpp:730
+msgid "&Send"
+msgstr "&Invia"
+
+#: ../../../uibase.cpp:782
+msgid ""
+"\n"
+"\n"
+"Connecting..."
+msgstr ""
+"\n"
+"\n"
+"Connessione in corso..."
+
+#: ../../../uibase.cpp:832
+msgid "These are your Bitcoin addresses for receiving payments.  You may want to give a different one to each sender so you can keep track of who is paying you.  The highlighted address is displayed in the main window."
+msgstr "Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Potrai darne uno diverso ad ognuno per cosi tenere traccia di chi ti sta pagando. L'indirizzo selezionato sarà quello mostrato nella finestra principale."
+
+#: ../../../uibase.cpp:845
+#: ../../../uibase.cpp:957
+msgid "&Edit..."
+msgstr "&Cambia..."
+
+#: ../../../uibase.cpp:848
+#: ../../../uibase.cpp:960
+msgid " &New Address... "
+msgstr " &Nuovo indirizzo... "
+
+#: ../../../uibase.cpp:920
+msgid "Sending"
+msgstr "Inviando"
+
+#: ../../../uibase.cpp:928
+msgid "These are your Bitcoin addresses for receiving payments.  You can give a different one to each sender to keep track of who is paying you.  The highlighted address will be displayed in the main window."
+msgstr "Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Potrai darne uno diverso ad ognuno per cosi tenere traccia di chi ti sta pagando. L'indirizzo selezionato sarà quello mostrato nella finestra principale."
+
+#: ../../../uibase.cpp:941
+msgid "Receiving"
+msgstr "Ricevendo"
+
+#: ../../../uibase.cpp:951
+msgid "&Delete"
+msgstr "&Cancella"
+
+#: ../../../uibase.h:150
+msgid "Transaction Details"
+msgstr "Dettagli operazione"
+
+#: ../../../uibase.h:203
+msgid "Options"
+msgstr "Opzioni"
+
+#: ../../../uibase.h:231
+msgid "About Bitcoin"
+msgstr "Info Bitcoin"
+
+#: ../../../uibase.h:341
+msgid "Your Bitcoin Addresses"
+msgstr "Il tuo indirizzo Bitcoin"

locale/nl/LC_MESSAGES/bitcoin.po

@@ -0,0 +1,808 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-26 22:02-0000\n"
+"PO-Revision-Date: 2010-05-27 19:27+0100\n"
+"Last-Translator: Xunie\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ../../..\n"
+
+#: ../../../init.cpp:342
+msgid "Usage: bitcoin [options]"
+msgstr ""
+
+#: ../../../init.cpp:343
+msgid "Options:\n"
+msgstr "Opties:\n"
+
+#: ../../../init.cpp:344
+msgid "Generate coins\n"
+msgstr "Genereer coins\n"
+
+#: ../../../init.cpp:345
+msgid "Don't generate coins\n"
+msgstr "Genereer geen coins\n"
+
+#: ../../../init.cpp:346
+msgid "Start minimized\n"
+msgstr "Start geminimalizeerd\n"
+
+#: ../../../init.cpp:347
+msgid "Specify data directory\n"
+msgstr "Specificeer data map\n"
+
+#: ../../../init.cpp:348
+msgid "Connect through socks4 proxy\n"
+msgstr "Verbind via socks4 proxy\n"
+
+#: ../../../init.cpp:349
+msgid "Add a node to connect to\n"
+msgstr "Voeg een node om naar te verbinden toe\n"
+
+#: ../../../init.cpp:350
+msgid "Connect only to the specified node\n"
+msgstr "Verbind alleen naar deze node\n"
+
+#: ../../../init.cpp:351
+msgid "This help message\n"
+msgstr ""
+
+#: ../../../init.cpp:455
+msgid "Error loading addr.dat      \n"
+msgstr "Fout bij laden van bestand addr.dat      \n"
+
+#: ../../../init.cpp:461
+msgid "Error loading blkindex.dat      \n"
+msgstr "Fout bij laden van bestand blkindex.dat      \n"
+
+#: ../../../init.cpp:468
+msgid "Error loading wallet.dat      \n"
+msgstr "Fout bij laden van bestand wallet.dat      \n"
+
+#: ../../../init.cpp:536
+msgid "Invalid -proxy address"
+msgstr "Foutief -proxy adres"
+
+#: ../../../init.cpp:629
+msgid "Program has crashed and will terminate.  "
+msgstr "Programma is gecrashed en word afgesloten.  "
+
+#: ../../../main.cpp:1465
+msgid "Warning: Disk space is low  "
+msgstr "Waarschuwng: Gebrek aan schijf ruimte  "
+
+#: ../../../main.cpp:2994
+#, c-format
+msgid "Error: This is an oversized transaction that requires a transaction fee of %s  "
+msgstr "Fout: Dit is een te grote transactie die een fooi nodig heeft van %s  "
+
+#: ../../../main.cpp:2996
+msgid "Error: Transaction creation failed  "
+msgstr "Fout: Transactie aanmaak gefaald  "
+
+#: ../../../main.cpp:3001
+#: ../../../ui.cpp:1761
+#: ../../../ui.cpp:1763
+#: ../../../ui.cpp:1904
+#: ../../../ui.cpp:2053
+msgid "Sending..."
+msgstr "Versturen..."
+
+#: ../../../main.cpp:3005
+msgid "Error: The transaction was rejected.  This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."
+msgstr "Fout: De transactie was afgekeurd.  Dit kan komen als bepaalde coins in uw Portefeuille al zijn uitgegeven.  Dit kan komen doordat u wallet.dat heeft gekopieerd en wat coins heeft uitgegeven en niet terug gekopieerd heeft."
+
+#: ../../../main.cpp:3017
+msgid "Invalid amount"
+msgstr "Foutief aantal"
+
+#: ../../../main.cpp:3019
+#: ../../../ui.cpp:1971
+#: ../../../ui.cpp:2038
+msgid "Insufficient funds"
+msgstr "Onvoldoende coins"
+
+#: ../../../main.cpp:3024
+msgid "Invalid bitcoin address"
+msgstr "Foutief bitcoin adres"
+
+#: ../../../ui.cpp:189
+#, c-format
+msgid "This transaction is over the size limit.  You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network.  Do you want to pay the fee?"
+msgstr "Deze transactie is over het limiet.  U kunt nog door gaan met de transactie door een fooi te betalen van %s, deze word betaald aan de node die uw tranactie verwerkt.  Wilt u de fooi betalen?"
+
+#: ../../../ui.cpp:285
+msgid "Status"
+msgstr "Status"
+
+#: ../../../ui.cpp:286
+msgid "Date"
+msgstr "Datum"
+
+#: ../../../ui.cpp:287
+msgid "Description"
+msgstr "Beschrijving"
+
+#: ../../../ui.cpp:288
+msgid "Debit"
+msgstr ""
+
+#: ../../../ui.cpp:289
+msgid "Credit"
+msgstr ""
+
+#: ../../../ui.cpp:489
+#, c-format
+msgid "Open for %d blocks"
+msgstr "Open voor %d blocks"
+
+#: ../../../ui.cpp:491
+#, c-format
+msgid "Open until %s"
+msgstr "Open tot %s"
+
+#: ../../../ui.cpp:497
+#, c-format
+msgid "%d/offline?"
+msgstr "%d/offline?"
+
+#: ../../../ui.cpp:499
+#, c-format
+msgid "%d/unconfirmed"
+msgstr "%d/niet bevestigd"
+
+#: ../../../ui.cpp:501
+#, c-format
+msgid "%d confirmations"
+msgstr "%d bevestigingen"
+
+#: ../../../ui.cpp:584
+msgid "Generated"
+msgstr "Gegenereerd"
+
+#: ../../../ui.cpp:592
+#, c-format
+msgid "Generated (%s matures in %d more blocks)"
+msgstr "Gegenereerd (%s word volwassen in %d blokken)"
+
+#: ../../../ui.cpp:596
+msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
+msgstr "Gegenereerd - Waarschuwing: Dit blok is niet ontvangen door andere nodes en zal waarschijnlijk niet geaccepteerd worden!"
+
+#: ../../../ui.cpp:600
+msgid "Generated (not accepted)"
+msgstr "Gegenereerd (niet geaccepteerd)"
+
+#: ../../../ui.cpp:610
+msgid "From: "
+msgstr "Van: "
+
+#: ../../../ui.cpp:634
+msgid "From: unknown, Received with: "
+msgstr "Van: onbekend, Ontvangen met: "
+
+#: ../../../ui.cpp:676
+msgid "Payment to yourself"
+msgstr "Betaling naar u zelf"
+
+#: ../../../ui.cpp:713
+msgid "To: "
+msgstr "Naar: "
+
+#: ../../../ui.cpp:1009
+msgid "    Generating"
+msgstr "    Genereert"
+
+#: ../../../ui.cpp:1011
+msgid "(not connected)"
+msgstr "(niet verbonden)"
+
+#: ../../../ui.cpp:1014
+#, c-format
+msgid "     %d connections     %d blocks     %d transactions"
+msgstr "     %d verbindingen     %d blokken     %d transacties"
+
+#: ../../../ui.cpp:1123
+#: ../../../ui.cpp:2351
+msgid "New Receiving Address"
+msgstr "Nieuw Ontvangings Adres"
+
+#: ../../../ui.cpp:1124
+#: ../../../ui.cpp:2352
+msgid ""
+"It's good policy to use a new address for each payment you receive.\n"
+"\n"
+"Label"
+msgstr ""
+"Het is goed beleid om een nieuw adres voor elke betaling te hebben.\n"
+"\n"
+"Label"
+
+#: ../../../ui.cpp:1193
+msgid "<b>Status:</b> "
+msgstr "<b>Status:</b> "
+
+#: ../../../ui.cpp:1198
+msgid ", has not been successfully broadcast yet"
+msgstr ", is nog niet succesvol verstuurd naar het netwerk"
+
+#: ../../../ui.cpp:1200
+#, c-format
+msgid ", broadcast through %d node"
+msgstr ", verstuurd via %d node"
+
+#: ../../../ui.cpp:1202
+#, c-format
+msgid ", broadcast through %d nodes"
+msgstr ", verstuurd via %d nodes"
+
+#: ../../../ui.cpp:1206
+msgid "<b>Date:</b> "
+msgstr "<b>Datum:</b> "
+
+#: ../../../ui.cpp:1214
+msgid "<b>Source:</b> Generated<br>"
+msgstr "<b>Bron:</b> Gegenereerd<br>"
+
+#: ../../../ui.cpp:1220
+#: ../../../ui.cpp:1238
+msgid "<b>From:</b> "
+msgstr "<b>Van:</b> "
+
+#: ../../../ui.cpp:1238
+msgid "unknown"
+msgstr "onbekend"
+
+#: ../../../ui.cpp:1239
+#: ../../../ui.cpp:1263
+#: ../../../ui.cpp:1322
+msgid "<b>To:</b> "
+msgstr "<b>Naar:</b> "
+
+#: ../../../ui.cpp:1242
+msgid " (yours, label: "
+msgstr ""
+
+#: ../../../ui.cpp:1244
+#, fuzzy
+msgid " (yours)"
+msgstr ""
+
+#: ../../../ui.cpp:1281
+#: ../../../ui.cpp:1293
+#: ../../../ui.cpp:1356
+msgid "<b>Credit:</b> "
+msgstr ""
+
+#: ../../../ui.cpp:1283
+#, c-format
+msgid "(%s matures in %d more blocks)"
+msgstr "(%s word volwassen in %d blokken)"
+
+#: ../../../ui.cpp:1285
+msgid "(not accepted)"
+msgstr "(niet geaccepteerd"
+
+#: ../../../ui.cpp:1330
+#: ../../../ui.cpp:1353
+msgid "<b>Debit:</b> "
+msgstr ""
+
+#: ../../../ui.cpp:1344
+msgid "<b>Transaction fee:</b> "
+msgstr "<b>Transactie fooi:</b> "
+
+#: ../../../ui.cpp:1360
+msgid "<b>Net amount:</b> "
+msgstr "<b>Netto bedrag:</b> "
+
+#: ../../../ui.cpp:1367
+msgid "Message:"
+msgstr "Mededeling:"
+
+#: ../../../ui.cpp:1370
+msgid "Generated coins must wait 120 blocks before they can be spent.  When you generated this block, it was broadcast to the network to be added to the block chain.  If it fails to get into the chain, it will change to \"not accepted\" and not be spendable.  This may occasionally happen if another node generates a block within a few seconds of yours."
+msgstr "Gegenereerde coins moeten 120 blokken wachten voordat ze uitgegeven kunnen worden.  Wanneer je dit blok genereerde, werd het naar het netwerk gestuurd om opgenomen teworden in de rest van de blokken.  Als dit faalt, dan zal de dit veranderen in \"niet geaccepteerd\" en zal niet uitgeefbaar zijn. Dit kan soms gebeuren als een node ook een blok rond dezelfde periode genereerd."
+
+#: ../../../ui.cpp:1437
+msgid "Main"
+msgstr "Hoofd"
+
+#: ../../../ui.cpp:1442
+msgid "&Minimize on close"
+msgstr "&Minimalizeer bij sluiten"
+
+#: ../../../ui.cpp:1595
+#, c-format
+msgid "version 0.%d.%d beta"
+msgstr "versie 0.%d.%d beta"
+
+#: ../../../ui.cpp:1681
+msgid "Will appear as \"From: Unknown\""
+msgstr "Word vertoont als \"Van: Onbekend\""
+
+#: ../../../ui.cpp:1682
+msgid "Can't include a message when sending to a Bitcoin address"
+msgstr "Kan geen mededeling versturen bij gebruik van Bitcoin adressen"
+
+#: ../../../ui.cpp:1735
+msgid "Error in amount  "
+msgstr "Fout in hoeveelheid  "
+
+#: ../../../ui.cpp:1735
+#: ../../../ui.cpp:1740
+#: ../../../ui.cpp:1745
+#: ../../../ui.cpp:1771
+#: ../../../uibase.cpp:61
+msgid "Send Coins"
+msgstr "Verstuur Coins"
+
+#: ../../../ui.cpp:1740
+msgid "Amount exceeds your balance  "
+msgstr "Hoeveelheid hoger dan uw huidige balans  "
+
+#: ../../../ui.cpp:1745
+msgid "Total exceeds your balance when the "
+msgstr "Totaal groter dan uw huidige balans wanner de "
+
+#: ../../../ui.cpp:1745
+msgid " transaction fee is included  "
+msgstr " transactie fooi is bijgerekend  "
+
+#: ../../../ui.cpp:1761
+msgid "Payment sent  "
+msgstr "Betaling verstuurd  "
+
+#: ../../../ui.cpp:1771
+msgid "Invalid address  "
+msgstr "Foutief adres  "
+
+#: ../../../ui.cpp:1825
+#, c-format
+msgid "Sending %s to %s"
+msgstr "Verstuurd %s naar %s"
+
+#: ../../../ui.cpp:1898
+#: ../../../ui.cpp:1931
+msgid "CANCELLED"
+msgstr "GEANNULEERD"
+
+#: ../../../ui.cpp:1902
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#: ../../../ui.cpp:1904
+msgid "Transfer cancelled  "
+msgstr "Transactie geannuleerd  "
+
+#: ../../../ui.cpp:1957
+msgid "Error: "
+msgstr "Fout: "
+
+#: ../../../ui.cpp:1976
+msgid "Connecting..."
+msgstr "Verbinden..."
+
+#: ../../../ui.cpp:1981
+msgid "Unable to connect"
+msgstr "Kan niet verbinden"
+
+#: ../../../ui.cpp:1986
+msgid "Requesting public key..."
+msgstr "Aanvragen van publieke sleutel..."
+
+#: ../../../ui.cpp:1998
+msgid "Received public key..."
+msgstr "Publieke sleutel ontvangen..."
+
+#: ../../../ui.cpp:2010
+msgid "Transfer was not accepted"
+msgstr "Transactie niet geaccepteerd"
+
+#: ../../../ui.cpp:2019
+msgid "Invalid response received"
+msgstr "Foutief antwoord ontvangen"
+
+#: ../../../ui.cpp:2034
+msgid "Creating transaction..."
+msgstr "Maakt transactie aan..."
+
+#: ../../../ui.cpp:2046
+#, c-format
+msgid "This is an oversized transaction that requires a transaction fee of %s"
+msgstr "Dit is een te grote transactie die een transactie fooi vereist van %s"
+
+#: ../../../ui.cpp:2048
+msgid "Transaction creation failed"
+msgstr "Transactie aanmaak gefaald."
+
+#: ../../../ui.cpp:2055
+msgid "Transaction aborted"
+msgstr "Transactie geannuleerd"
+
+#: ../../../ui.cpp:2063
+msgid "Lost connection, transaction cancelled"
+msgstr "Verbinding verloren, transactie geannuleerd"
+
+#: ../../../ui.cpp:2079
+msgid "Sending payment..."
+msgstr "Versturen van betaling..."
+
+#: ../../../ui.cpp:2085
+msgid "The transaction was rejected.  This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."
+msgstr "De transactie was afgekeurd.  Dit kan komen als bepaalde coins in uw Portefeuille al zijn uitgegeven.  Dit kan komen doordat u wallet.dat heeft gekopieerd en wat coins heeft uitgegeven en niet terug gekopieerd heeft."
+
+#: ../../../ui.cpp:2092
+msgid "Waiting for confirmation..."
+msgstr "Wachten op bevestiging..."
+
+#: ../../../ui.cpp:2110
+msgid ""
+"The payment was sent, but the recipient was unable to verify it.\n"
+"The transaction is recorded and will credit to the recipient,\n"
+"but the comment information will be blank."
+msgstr ""
+"De betaling was verstuurd, maar de ontvanger kon het niet verifieeren.\n"
+"De transactie is opgenomen en word uitbetaald aan de ontvanger,\n"
+"maar de mededeling blijft blank bij de ontanger."
+
+#: ../../../ui.cpp:2119
+msgid "Payment was sent, but an invalid response was received"
+msgstr "Betaling was verstuurd, maar een foutief antword was ontvangen."
+
+#: ../../../ui.cpp:2125
+msgid "Payment completed"
+msgstr "Betaling voltooid"
+
+#: ../../../ui.cpp:2156
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2339
+msgid "Name"
+msgstr "Naam"
+
+#: ../../../ui.cpp:2157
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2339
+msgid "Address"
+msgstr "Adres"
+
+#: ../../../ui.cpp:2159
+#: ../../../ui.cpp:2314
+msgid "Label"
+msgstr "Label"
+
+#: ../../../ui.cpp:2160
+#: ../../../uibase.cpp:908
+msgid "Bitcoin Address"
+msgstr "Bitcoin Adres"
+
+#: ../../../ui.cpp:2284
+msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book.  "
+msgstr "Dit is een van uw eigen adressen voor het ontvangen van betalingen en can niet worden toegevoegd aan uw adressen boek.  "
+
+#: ../../../ui.cpp:2302
+#: ../../../ui.cpp:2308
+msgid "Edit Address"
+msgstr "Bewerk Adres"
+
+#: ../../../ui.cpp:2314
+msgid "Edit Address Label"
+msgstr "Bewerk Adres Label"
+
+#: ../../../ui.cpp:2339
+#: ../../../ui.cpp:2345
+msgid "Add Address"
+msgstr "Adres Toevoegen"
+
+#: ../../../ui.cpp:2421
+msgid "Bitcoin"
+msgstr "Bitcoin"
+
+#: ../../../ui.cpp:2423
+msgid "Bitcoin - Generating"
+msgstr "Bitcoin - Genereert"
+
+#: ../../../ui.cpp:2425
+msgid "Bitcoin - (not connected)"
+msgstr "Bitcoin - (niet verbonden)"
+
+#: ../../../ui.cpp:2500
+msgid "&Open Bitcoin"
+msgstr "&Open Bitcoin"
+
+#: ../../../ui.cpp:2501
+msgid "O&ptions..."
+msgstr "O&pties"
+
+#: ../../../ui.cpp:2502
+#: ../../../uibase.cpp:34
+msgid "&Generate Coins"
+msgstr "&Genereer Coins"
+
+#: ../../../ui.cpp:2505
+#: ../../../uibase.cpp:27
+msgid "E&xit"
+msgstr "A&fsluiten"
+
+#: ../../../uibase.cpp:30
+msgid "&File"
+msgstr "&Bestand"
+
+#: ../../../uibase.cpp:38
+msgid "&Your Receiving Addresses..."
+msgstr "&Uw Ontvang Adressen..."
+
+#: ../../../uibase.cpp:42
+msgid "&Options..."
+msgstr "&Opties..."
+
+#: ../../../uibase.cpp:45
+msgid "&Settings"
+msgstr "&Eigenschappen"
+
+#: ../../../uibase.cpp:49
+msgid "&About..."
+msgstr "&Over..."
+
+#: ../../../uibase.cpp:52
+msgid "&Help"
+msgstr "&Help"
+
+#: ../../../uibase.cpp:62
+msgid "Address Book"
+msgstr "Adressen Boek"
+
+#: ../../../uibase.cpp:77
+msgid "Your Bitcoin Address:"
+msgstr "Uw Bitcoin Address:"
+
+#: ../../../uibase.cpp:84
+msgid " &New... "
+msgstr " &Nieuw... "
+
+#: ../../../uibase.cpp:87
+#: ../../../uibase.cpp:851
+#: ../../../uibase.cpp:954
+msgid " &Copy to Clipboard "
+msgstr " &Kopieer naar Plakboord "
+
+#: ../../../uibase.cpp:102
+msgid "Balance:"
+msgstr "Balans:"
+
+#: ../../../uibase.cpp:121
+msgid " All"
+msgstr " Alles"
+
+#: ../../../uibase.cpp:121
+msgid " Sent"
+msgstr " Verstuurd"
+
+#: ../../../uibase.cpp:121
+msgid " Received"
+msgstr " Ontvangen"
+
+#: ../../../uibase.cpp:121
+msgid " In Progress"
+msgstr " Word Verwerkt"
+
+#: ../../../uibase.cpp:142
+msgid "All Transactions"
+msgstr "Alle transacties"
+
+#: ../../../uibase.cpp:153
+msgid "Sent/Received"
+msgstr "Verstuurd/Ontvangen"
+
+#: ../../../uibase.cpp:164
+msgid "Sent"
+msgstr "Verstuurd"
+
+#: ../../../uibase.cpp:175
+msgid "Received"
+msgstr "Ontvangen"
+
+#: ../../../uibase.cpp:318
+#: ../../../uibase.cpp:479
+#: ../../../uibase.cpp:580
+#: ../../../uibase.cpp:793
+#: ../../../uibase.cpp:854
+#: ../../../uibase.cpp:963
+#: ../../../uibase.cpp:1052
+msgid "OK"
+msgstr "OK"
+
+#: ../../../uibase.cpp:361
+msgid "Optional transaction fee you give to the nodes that process your transactions."
+msgstr "Optionele transactie fooi die u geeft aan de nodes doe uw betaling verwerken."
+
+#: ../../../uibase.cpp:370
+msgid "Transaction fee:"
+msgstr "Transactie fooi:"
+
+#: ../../../uibase.cpp:386
+msgid "&Limit coin generation to"
+msgstr "&Limiteer coin generatie tot"
+
+#: ../../../uibase.cpp:393
+msgid "processors"
+msgstr "processors"
+
+#: ../../../uibase.cpp:399
+msgid "&Start Bitcoin on system startup"
+msgstr "&Start Bitcoin wanneer het systeem opstart"
+
+#: ../../../uibase.cpp:403
+msgid "&Minimize to the tray instead of the taskbar"
+msgstr "&Minimalizeer tot systeemvak inplaats van taakbalk"
+
+#: ../../../uibase.cpp:407
+msgid "M&inimize to the tray on close"
+msgstr "M&inimalizeer tot taakbalk bij sluiten"
+
+#: ../../../uibase.cpp:414
+msgid "&Connect through socks4 proxy: "
+msgstr "&Verbind via socks4 proxy: "
+
+#: ../../../uibase.cpp:426
+msgid "Proxy &IP:"
+msgstr "Proxy &IP:"
+
+#: ../../../uibase.cpp:434
+msgid " &Port:"
+msgstr " &Poort:"
+
+#: ../../../uibase.cpp:456
+msgid "// [don't translate] Test panel 2 for future expansion"
+msgstr ""
+
+#: ../../../uibase.cpp:460
+msgid "// [don't translate] Let's not start multiple pages until the first page is filled up"
+msgstr ""
+
+#: ../../../uibase.cpp:482
+#: ../../../uibase.cpp:735
+#: ../../../uibase.cpp:798
+#: ../../../uibase.cpp:857
+#: ../../../uibase.cpp:966
+#: ../../../uibase.cpp:1055
+msgid "Cancel"
+msgstr "Annuleer"
+
+#: ../../../uibase.cpp:485
+msgid "&Apply"
+msgstr "&Toepassen"
+
+#: ../../../uibase.cpp:546
+msgid "Bitcoin "
+msgstr "Bitcoin "
+
+#: ../../../uibase.cpp:552
+msgid "version"
+msgstr "versie"
+
+#: ../../../uibase.cpp:563
+msgid ""
+"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
+"\n"
+"This is experimental software.  Do not rely on it for actual financial transactions.\n"
+"\n"
+"Distributed under the MIT/X11 software license, see the accompanying file \n"
+"license.txt or http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"This product includes software developed by the OpenSSL Project for use in the \n"
+"OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \n"
+"Eric Young (eay@cryptsoft.com)."
+msgstr ""
+"Copyright (c) 2009-2010 Satoshi Nakamoto.\n"
+"\n"
+"Dit is experimentele software.  Vertrouw niet op het voor echte financiele transacties.\n"
+"\n"
+"Gedistributeerd onder de MIT/X11 software licentie, see het bijbehorende bestand \n"
+"license.txt of \"http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"Dit product komt met software ontwikkeld door het OpenSSL Project for gebruik in de\n"
+"OpenSSL Toolkit (http://www.openssl.org/) and de cryptografische software geschreven door \n"
+"Eric Young (eay@cryptsoft.com)."
+
+#: ../../../uibase.cpp:619
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"
+msgstr "Voer een Bitcoin adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) of IP address (bijvoorbeeld: 123.45.6.7) in."
+
+#: ../../../uibase.cpp:633
+msgid "Pay &To:"
+msgstr "Betaal &Naar:"
+
+#: ../../../uibase.cpp:648
+msgid "&Paste"
+msgstr "&Plakken"
+
+#: ../../../uibase.cpp:651
+msgid " Address &Book..."
+msgstr " Adressen &Boek..."
+
+#: ../../../uibase.cpp:658
+msgid "&Amount:"
+msgstr "&Hoeveelheid:"
+
+#: ../../../uibase.cpp:668
+msgid "T&ransfer:"
+msgstr "O&verdracht:"
+
+#: ../../../uibase.cpp:674
+msgid " Standard"
+msgstr " Standaard"
+
+#: ../../../uibase.cpp:696
+msgid "&From:"
+msgstr "&Van:"
+
+#: ../../../uibase.cpp:713
+msgid "&Message:"
+msgstr "&Mededeling:"
+
+#: ../../../uibase.cpp:730
+msgid "&Send"
+msgstr "&Verstuur"
+
+#: ../../../uibase.cpp:782
+msgid ""
+"\n"
+"\n"
+"Connecting..."
+msgstr ""
+"\n"
+"\n"
+"Verbinden..."
+
+#: ../../../uibase.cpp:832
+msgid "These are your Bitcoin addresses for receiving payments.  You may want to give a different one to each sender so you can keep track of who is paying you.  The highlighted address is displayed in the main window."
+msgstr "Dit zijn uw Bitcoin Adressen voor het ontvangen van betalingen.  Misschien wilt u elk contact persoon een ander adres geven zodat u kunt bij houden wie er u heeft betaald.  De opgelichte adressen worden weergeven in het hoofd venster."
+
+#: ../../../uibase.cpp:845
+#: ../../../uibase.cpp:957
+msgid "&Edit..."
+msgstr "&Bewerk..."
+
+#: ../../../uibase.cpp:848
+#: ../../../uibase.cpp:960
+msgid " &New Address... "
+msgstr " &New Adres... "
+
+#: ../../../uibase.cpp:920
+msgid "Sending"
+msgstr "Versturen"
+
+#: ../../../uibase.cpp:928
+msgid "These are your Bitcoin addresses for receiving payments.  You can give a different one to each sender to keep track of who is paying you.  The highlighted address will be displayed in the main window."
+msgstr "Dit zijn uw Bitcoin adressen voor het ontvangen van betalingen.  U kunt een aan elk contact persoon geven zodat u een overzicht kunt houden wie u betaald.  Dit adres zal wergeven worden in het hoofd main venster."
+
+#: ../../../uibase.cpp:941
+msgid "Receiving"
+msgstr "Ontvangen"
+
+#: ../../../uibase.cpp:951
+msgid "&Delete"
+msgstr "&Verwijder"
+
+#: ../../../uibase.h:150
+msgid "Transaction Details"
+msgstr "Transactie Details"
+
+#: ../../../uibase.h:203
+msgid "Options"
+msgstr "Opties"
+
+#: ../../../uibase.h:231
+msgid "About Bitcoin"
+msgstr "Over Bitcoin"
+
+#: ../../../uibase.h:341
+msgid "Your Bitcoin Addresses"
+msgstr "Uw Bitcoin Adressen"

main.cpp

@@ -49,6 +49,8 @@ CCriticalSection cs_mapRequestCount;
 map<string, string> mapAddressBook;
 CCriticalSection cs_mapAddressBook;
 
+vector<unsigned char> vchDefaultKey;
+
 // Settings
 int fGenerateBitcoins = false;
 int64 nTransactionFee = 0;
@@ -142,6 +144,19 @@ bool AddToWallet(const CWalletTx& wtxIn)
             if (!wtx.WriteToDisk())
                 return false;
 
+        // If default receiving address gets used, replace it with a new one
+        CScript scriptDefaultKey;
+        scriptDefaultKey.SetBitcoinAddress(vchDefaultKey);
+        foreach(const CTxOut& txout, wtx.vout)
+        {
+            if (txout.scriptPubKey == scriptDefaultKey)
+            {
+                CWalletDB walletdb;
+                walletdb.WriteDefaultKey(GenerateNewKey());
+                walletdb.WriteName(PubKeyToAddress(vchDefaultKey), "");
+            }
+        }
+
         // Notify UI
         vWalletUpdated.push_back(hash);
     }
@@ -478,7 +493,7 @@ bool CTransaction::AcceptTransaction(CTxDB& txdb, bool fCheckInputs, bool* pfMis
     if (!CheckTransaction())
         return error("AcceptTransaction() : CheckTransaction failed");
 
-    // To help v0.1.5 clients who would see it as negative number. please delete this later.
+    // To help v0.1.5 clients who would see it as a negative number
     if (nLockTime > INT_MAX)
         return error("AcceptTransaction() : not accepting nLockTime beyond 2038");
 
@@ -1753,8 +1768,6 @@ bool ProcessMessages(CNode* pfrom)
         {
             // Rewind and wait for rest of message
             ///// need a mechanism to give up waiting for overlong message size error
-            if (fDebug)
-                printf("message-break\n");
             vRecv.insert(vRecv.begin(), vHeaderSave.begin(), vHeaderSave.end());
             break;
         }
@@ -1883,10 +1896,10 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
             pfrom->vRecv.SetVersion(min(pfrom->nVersion, VERSION));
 
         // Ask the first connected node for block updates
-        static bool fAskedForBlocks;
-        if (!fAskedForBlocks && !pfrom->fClient)
+        static int nAskedForBlocks;
+        if (!pfrom->fClient && (nAskedForBlocks < 1 || vNodes.size() <= 1))
         {
-            fAskedForBlocks = true;
+            nAskedForBlocks++;
             pfrom->PushGetBlocks(pindexBest, uint256(0));
         }
 
@@ -1913,7 +1926,9 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
     {
         vector<CAddress> vAddr;
         vRecv >> vAddr;
-        if (vAddr.size() > 50000) // lower this to 1000 later
+        if (pfrom->nVersion < 200) // don't want addresses from 0.1.5
+            return true;
+        if (vAddr.size() > 1000)
             return error("message addr size() = %d", vAddr.size());
 
         // Store the new addresses
@@ -1922,19 +1937,32 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
             if (fShutdown)
                 return true;
             addr.nTime = GetAdjustedTime() - 2 * 60 * 60;
-            if (pfrom->fGetAddr)
+            if (pfrom->fGetAddr || vAddr.size() > 10)
                 addr.nTime -= 5 * 24 * 60 * 60;
-            AddAddress(addr, false);
+            AddAddress(addr);
             pfrom->AddAddressKnown(addr);
             if (!pfrom->fGetAddr && addr.IsRoutable())
             {
-                // Put on lists to send to other nodes
+                // Relay to a limited number of other nodes
                 CRITICAL_BLOCK(cs_vNodes)
+                {
+                    // Use deterministic randomness to send to
+                    // the same places for an hour at a time
+                    static uint256 hashSalt;
+                    if (hashSalt == 0)
+                        RAND_bytes((unsigned char*)&hashSalt, sizeof(hashSalt));
+                    uint256 hashRand = addr.ip ^ (GetTime()/3600) ^ hashSalt;
+                    multimap<uint256, CNode*> mapMix;
                     foreach(CNode* pnode, vNodes)
-                        pnode->PushAddress(addr);
+                        mapMix.insert(make_pair(hashRand = Hash(BEGIN(hashRand), END(hashRand)), pnode));
+                    int nRelayNodes = 10; // reduce this to 5 when the network is large
+                    for (multimap<uint256, CNode*>::iterator mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
+                        ((*mi).second)->PushAddress(addr);
+                }
             }
         }
-        pfrom->fGetAddr = false;
+        if (vAddr.size() < 1000)
+            pfrom->fGetAddr = false;
     }
 
 
@@ -2136,8 +2164,10 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 
     else if (strCommand == "getaddr")
     {
+        // This includes all nodes that are currently online,
+        // since they rebroadcast an addr every 24 hours
         pfrom->vAddrToSend.clear();
-        int64 nSince = GetAdjustedTime() - 5 * 24 * 60 * 60; // in the last 5 days
+        int64 nSince = GetAdjustedTime() - 24 * 60 * 60; // in the last 24 hours
         CRITICAL_BLOCK(cs_mapAddresses)
         {
             unsigned int nSize = mapAddresses.size();
@@ -2177,6 +2207,7 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         uint256 hashReply;
         CWalletTx wtxNew;
         vRecv >> hashReply >> wtxNew;
+        wtxNew.fFromMe = false;
 
         // Broadcast
         if (!wtxNew.AcceptWalletTransaction())
@@ -2242,7 +2273,7 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 
 
 
-bool SendMessages(CNode* pto)
+bool SendMessages(CNode* pto, bool fSendTrickle)
 {
     CRITICAL_BLOCK(cs_main)
     {
@@ -2273,15 +2304,6 @@ bool SendMessages(CNode* pto)
             }
         }
 
-        // Delay tx inv messages to protect privacy,
-        // trickle them out to a few nodes at a time.
-        bool fSendTxInv = false;
-        if (GetTimeMillis() > pto->nNextSendTxInv)
-        {
-            pto->nNextSendTxInv = GetTimeMillis() + 3000 + GetRand(2000);
-            fSendTxInv = true;
-        }
-
         // Resend wallet transactions that haven't gotten in a block yet
         ResendWalletTransactions();
 
@@ -2289,24 +2311,28 @@ bool SendMessages(CNode* pto)
         //
         // Message: addr
         //
-        vector<CAddress> vAddr;
-        vAddr.reserve(pto->vAddrToSend.size());
-        foreach(const CAddress& addr, pto->vAddrToSend)
+        if (fSendTrickle)
         {
-            // returns true if wasn't already contained in the set
-            if (pto->setAddrKnown.insert(addr).second)
+            vector<CAddress> vAddr;
+            vAddr.reserve(pto->vAddrToSend.size());
+            foreach(const CAddress& addr, pto->vAddrToSend)
             {
-                vAddr.push_back(addr);
-                if (vAddr.size() >= 1000)
+                // returns true if wasn't already contained in the set
+                if (pto->setAddrKnown.insert(addr).second)
                 {
-                    pto->PushMessage("addr", vAddr);
-                    vAddr.clear();
+                    vAddr.push_back(addr);
+                    // receiver rejects addr messages larger than 1000
+                    if (vAddr.size() >= 1000)
+                    {
+                        pto->PushMessage("addr", vAddr);
+                        vAddr.clear();
+                    }
                 }
             }
+            pto->vAddrToSend.clear();
+            if (!vAddr.empty())
+                pto->PushMessage("addr", vAddr);
         }
-        pto->vAddrToSend.clear();
-        if (!vAddr.empty())
-            pto->PushMessage("addr", vAddr);
 
 
         //
@@ -2320,11 +2346,40 @@ bool SendMessages(CNode* pto)
             vInvWait.reserve(pto->vInventoryToSend.size());
             foreach(const CInv& inv, pto->vInventoryToSend)
             {
-                // delay txes
-                if (!fSendTxInv && inv.type == MSG_TX)
-                {
-                    vInvWait.push_back(inv);
+                if (pto->setInventoryKnown.count(inv))
                     continue;
+
+                // trickle out tx inv to protect privacy
+                if (inv.type == MSG_TX && !fSendTrickle)
+                {
+                    // 1/4 of tx invs blast to all immediately
+                    static uint256 hashSalt;
+                    if (hashSalt == 0)
+                        RAND_bytes((unsigned char*)&hashSalt, sizeof(hashSalt));
+                    uint256 hashRand = inv.hash ^ hashSalt;
+                    hashRand = Hash(BEGIN(hashRand), END(hashRand));
+                    bool fTrickleWait = ((hashRand & 3) != 0);
+
+                    // always trickle our own transactions
+                    if (!fTrickleWait)
+                    {
+                        TRY_CRITICAL_BLOCK(cs_mapWallet)
+                        {
+                            map<uint256, CWalletTx>::iterator mi = mapWallet.find(inv.hash);
+                            if (mi != mapWallet.end())
+                            {
+                                CWalletTx& wtx = (*mi).second;
+                                if (wtx.fFromMe)
+                                    fTrickleWait = true;
+                            }
+                        }
+                    }
+
+                    if (fTrickleWait)
+                    {
+                        vInvWait.push_back(inv);
+                        continue;
+                    }
                 }
 
                 // returns true if wasn't already contained in the set
@@ -2852,6 +2907,7 @@ bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CK
             {
                 wtxNew.vin.clear();
                 wtxNew.vout.clear();
+                wtxNew.fFromMe = true;
                 if (nValue < 0)
                     return false;
                 int64 nValueOut = nValue;

main.h

@@ -38,6 +38,7 @@ extern map<uint256, int> mapRequestCount;
 extern CCriticalSection cs_mapRequestCount;
 extern map<string, string> mapAddressBook;
 extern CCriticalSection cs_mapAddressBook;
+extern vector<unsigned char> vchDefaultKey;
 
 // Settings
 extern int fGenerateBitcoins;
@@ -66,7 +67,7 @@ bool LoadBlockIndex(bool fAllowNew=true);
 void PrintBlockTree();
 bool ProcessMessages(CNode* pfrom);
 bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv);
-bool SendMessages(CNode* pto);
+bool SendMessages(CNode* pto, bool fSendTrickle);
 int64 GetBalance();
 bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CKey& keyRet, int64& nFeeRequiredRet);
 bool CommitTransaction(CWalletTx& wtxNew, const CKey& key);

makefile.unix

@@ -29,7 +29,7 @@ LIBS= \
 
 WXDEFS=-D__WXGTK__ -DNOPCH
 DEBUGFLAGS=-g -D__WXDEBUG__
-CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
+CFLAGS=-O0 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
     script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h init.h sha.h
 

net.cpp

@@ -223,14 +223,12 @@ bool GetMyExternalIP(unsigned int& ipRet)
 
 
 
-bool AddAddress(CAddress addr, bool fCurrentlyOnline)
+bool AddAddress(CAddress addr)
 {
     if (!addr.IsRoutable())
         return false;
     if (addr.ip == addrLocalHost.ip)
         return false;
-    if (fCurrentlyOnline)
-        addr.nTime = GetAdjustedTime();
     CRITICAL_BLOCK(cs_mapAddresses)
     {
         map<vector<unsigned char>, CAddress>::iterator it = mapAddresses.find(addr.GetKey());
@@ -252,6 +250,7 @@ bool AddAddress(CAddress addr, bool fCurrentlyOnline)
                 addrFound.nServices |= addr.nServices;
                 fUpdated = true;
             }
+            bool fCurrentlyOnline = (GetAdjustedTime() - addr.nTime < 24 * 60 * 60);
             int64 nUpdateInterval = (fCurrentlyOnline ? 60 * 60 : 24 * 60 * 60);
             if (addrFound.nTime < addr.nTime - nUpdateInterval)
             {
@@ -798,6 +797,25 @@ void ThreadSocketHandler2(void* parg)
 
 
 
+
+
+
+unsigned int pnSeed[] =
+{
+    0x35218252, 0x9c9c9618, 0xda6bacad, 0xb9aca862, 0x97c235c6,
+    0x146f9562, 0xb67b9e4b, 0x87cf4bc0, 0xb83945d0, 0x984333ad,
+    0xbbeec555, 0x6f0eb440, 0xe0005318, 0x7797e460, 0xddc60fcc,
+    0xb3bbd24a, 0x1ac85746, 0x641846a6, 0x85ee1155, 0xbb2e7a4c,
+    0x9cb8514b, 0xfc342648, 0x62958fae, 0xd0a8c87a, 0xa800795b,
+    0xda8c814e, 0x256a0c80, 0x3f23ec63, 0xd565df43, 0x997d9044,
+    0xaa121448, 0xbed8688e, 0x59d09a5e, 0xb2931243, 0x3730ba18,
+    0xdd3462d0, 0x4e4d1448, 0x171df645, 0x84ee1155,
+    0x248ac445, 0x0e634444, 0x0ded1b63, 0x30c01e60,
+    0xa2b9a094, 0x29e4fd43, 0x9ce61b4c, 0xdae09744,
+};
+
+
+
 void ThreadOpenConnections(void* parg)
 {
     IMPLEMENT_RANDOMIZE_STACK(ThreadOpenConnections(parg));
@@ -858,6 +876,7 @@ void ThreadOpenConnections2(void* parg)
     }
 
     // Initiate network connections
+    int64 nStart = GetTime();
     loop
     {
         // Wait
@@ -874,6 +893,55 @@ void ThreadOpenConnections2(void* parg)
         if (fShutdown)
             return;
 
+        CRITICAL_BLOCK(cs_mapAddresses)
+        {
+            // Add seed nodes if IRC isn't working
+            static bool fSeedUsed;
+            bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
+            if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR))
+            {
+                for (int i = 0; i < ARRAYLEN(pnSeed); i++)
+                {
+                    // It'll only connect to one or two seed nodes because once it connects,
+                    // it'll get a pile of addresses with newer timestamps.
+                    CAddress addr;
+                    addr.ip = pnSeed[i];
+                    addr.nTime = 0;
+                    AddAddress(addr);
+                }
+                fSeedUsed = true;
+            }
+
+            if (fSeedUsed && mapAddresses.size() > ARRAYLEN(pnSeed) + 100)
+            {
+                // Disconnect seed nodes
+                set<unsigned int> setSeed(pnSeed, pnSeed + ARRAYLEN(pnSeed));
+                static int64 nSeedDisconnected;
+                if (nSeedDisconnected == 0)
+                {
+                    nSeedDisconnected = GetTime();
+                    CRITICAL_BLOCK(cs_vNodes)
+                        foreach(CNode* pnode, vNodes)
+                            if (setSeed.count(pnode->addr.ip))
+                                pnode->fDisconnect = true;
+                }
+
+                // Keep setting timestamps to 0 so they won't reconnect
+                if (GetTime() - nSeedDisconnected < 60 * 60)
+                {
+                    foreach(PAIRTYPE(const vector<unsigned char>, CAddress)& item, mapAddresses)
+                    {
+                        if (setSeed.count(item.second.ip))
+                        {
+                            item.second.nTime = 0;
+                            CAddrDB().WriteAddress(item.second);
+                        }
+                    }
+                }
+            }
+        }
+
+
         //
         // Choose an address to connect to based on most recently seen
         //
@@ -897,9 +965,9 @@ void ThreadOpenConnections2(void* parg)
                 int64 nSinceLastTry = GetAdjustedTime() - addr.nLastTry;
 
                 // Randomize the order in a deterministic way, putting the standard port first
-                int64 nRandomizer = (uint64)(addr.nLastTry * 9567851 + addr.ip * 7789) % (30 * 60);
+                int64 nRandomizer = (uint64)(nStart + addr.nLastTry * 9567851 + addr.ip * 7789) % (2 * 60 * 60);
                 if (addr.port != DEFAULT_PORT)
-                    nRandomizer += 30 * 60;
+                    nRandomizer += 2 * 60 * 60;
 
                 // Last seen  Base retry frequency
                 //   <1 hour   10 min
@@ -968,9 +1036,9 @@ bool OpenNetworkConnection(const CAddress& addrConnect)
     if (addrLocalHost.IsRoutable() && !fUseProxy)
     {
         // Advertise our address
-        vector<CAddress> vAddrToSend;
-        vAddrToSend.push_back(addrLocalHost);
-        pnode->PushMessage("addr", vAddrToSend);
+        vector<CAddress> vAddr;
+        vAddr.push_back(addrLocalHost);
+        pnode->PushMessage("addr", vAddr);
     }
 
     // Get as many addresses as we can
@@ -1019,7 +1087,6 @@ void ThreadMessageHandler2(void* parg)
     SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
     while (!fShutdown)
     {
-        // Poll the connected nodes for messages
         vector<CNode*> vNodesCopy;
         CRITICAL_BLOCK(cs_vNodes)
         {
@@ -1027,6 +1094,11 @@ void ThreadMessageHandler2(void* parg)
             foreach(CNode* pnode, vNodesCopy)
                 pnode->AddRef();
         }
+
+        // Poll the connected nodes for messages
+        CNode* pnodeTrickle = NULL;
+        if (!vNodesCopy.empty())
+            pnodeTrickle = vNodesCopy[GetRand(vNodesCopy.size())];
         foreach(CNode* pnode, vNodesCopy)
         {
             // Receive messages
@@ -1037,10 +1109,11 @@ void ThreadMessageHandler2(void* parg)
 
             // Send messages
             TRY_CRITICAL_BLOCK(pnode->cs_vSend)
-                SendMessages(pnode);
+                SendMessages(pnode, pnode == pnodeTrickle);
             if (fShutdown)
                 return;
         }
+
         CRITICAL_BLOCK(cs_vNodes)
         {
             foreach(CNode* pnode, vNodesCopy)

net.h

@@ -12,7 +12,7 @@ extern int nBestHeight;
 
 
 
-static const unsigned short DEFAULT_PORT = htons(8333);
+#define DEFAULT_PORT    htons(8333)
 static const unsigned int PUBLISH_HOPS = 5;
 enum
 {
@@ -24,7 +24,7 @@ enum
 
 bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet);
 bool GetMyExternalIP(unsigned int& ipRet);
-bool AddAddress(CAddress addr, bool fCurrentlyOnline=true);
+bool AddAddress(CAddress addr);
 void AddressCurrentlyConnected(const CAddress& addr);
 CNode* FindNode(unsigned int ip);
 CNode* ConnectNode(CAddress addrConnect, int64 nTimeout=0);
@@ -289,16 +289,24 @@ public:
 
     bool IsRoutable() const
     {
-        return !(GetByte(3) == 10 ||
-                 (GetByte(3) == 192 && GetByte(2) == 168) ||
-                 GetByte(3) == 127 ||
-                 GetByte(3) == 0 ||
-                 ip == 0 ||
-                 ip == INADDR_NONE);
+        return IsValid() &&
+            !(GetByte(3) == 10 ||
+              (GetByte(3) == 192 && GetByte(2) == 168) ||
+              GetByte(3) == 127 ||
+              GetByte(3) == 0);
     }
 
     bool IsValid() const
     {
+        // Clean up 3-byte shifted addresses caused by garbage in size field
+        // of addr messages from versions before 0.2.9 checksum.
+        // Two consecutive addr messages look like this:
+        // header20 vectorlen3 addr26 addr26 addr26 header20 vectorlen3 addr26 addr26 addr26...
+        // so if the first length field is garbled, it reads the second batch
+        // of addr misaligned by 3 bytes.
+        if (memcmp(pchReserved, pchIPv4+3, sizeof(pchIPv4)-3) == 0)
+            return false;
+
         return (ip != 0 && ip != INADDR_NONE && port != htons(USHRT_MAX));
     }
 
@@ -522,7 +530,6 @@ public:
     vector<CInv> vInventoryToSend;
     CCriticalSection cs_inventory;
     multimap<int64, CInv> mapAskFor;
-    int64 nNextSendTxInv;
 
     // publish and subscription
     vector<char> vfSubscribe;
@@ -536,6 +543,12 @@ public:
         vSend.SetVersion(0);
         vRecv.SetType(SER_NETWORK);
         vRecv.SetVersion(0);
+        // Version 0.2 obsoletes 20 Feb 2012
+        if (GetTime() > 1329696000)
+        {
+            vSend.SetVersion(209);
+            vRecv.SetVersion(209);
+        }
         nLastSend = 0;
         nLastRecv = 0;
         nLastSendEmpty = GetTime();
@@ -556,7 +569,6 @@ public:
         hashLastGetBlocksEnd = 0;
         nStartingHeight = -1;
         fGetAddr = false;
-        nNextSendTxInv = 0;
         vfSubscribe.assign(256, false);
 
         // Push a version message
@@ -615,7 +627,7 @@ public:
         // Known checking here is only to save space from duplicates.
         // SendMessages will filter it again for knowns that were added
         // after addresses were pushed.
-        if (!setAddrKnown.count(addr))
+        if (addr.IsValid() && !setAddrKnown.count(addr))
             vAddrToSend.push_back(addr);
     }
 

rpc.cpp

@@ -18,6 +18,8 @@ using boost::asio::ip::tcp;
 using namespace json_spirit;
 
 void ThreadRPCServer2(void* parg);
+typedef Value(*rpcfn_type)(const Array& params, bool fHelp);
+extern map<string, rpcfn_type> mapCallTable;
 
 
 
@@ -31,11 +33,40 @@ void ThreadRPCServer2(void* parg);
 
 
 
-Value stop(const Array& params)
+Value help(const Array& params, bool fHelp)
 {
-    if (params.size() != 0)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
-            "stop (no parameters)\n"
+            "help\n"
+            "List commands.");
+
+    string strRet;
+    for (map<string, rpcfn_type>::iterator mi = mapCallTable.begin(); mi != mapCallTable.end(); ++mi)
+    {
+        try
+        {
+            Array params;
+            (*(*mi).second)(params, true);
+        }
+        catch (std::exception& e)
+        {
+            // Help text is returned in an exception
+            string strHelp = string(e.what());
+            if (strHelp.find('\n') != -1)
+                strHelp = strHelp.substr(0, strHelp.find('\n'));
+            strRet += strHelp + "\n";
+        }
+    }
+    strRet = strRet.substr(0,strRet.size()-1);
+    return strRet;
+}
+
+
+Value stop(const Array& params, bool fHelp)
+{
+    if (fHelp || params.size() != 0)
+        throw runtime_error(
+            "stop\n"
             "Stop bitcoin server.");
 
     // Shutdown will take long enough that the response should get back
@@ -44,33 +75,33 @@ Value stop(const Array& params)
 }
 
 
-Value getblockcount(const Array& params)
+Value getblockcount(const Array& params, bool fHelp)
 {
-    if (params.size() != 0)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
-            "getblockcount (no parameters)\n"
+            "getblockcount\n"
             "Returns the number of blocks in the longest block chain.");
 
     return nBestHeight + 1;
 }
 
 
-Value getblocknumber(const Array& params)
+Value getblocknumber(const Array& params, bool fHelp)
 {
-    if (params.size() != 0)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
-            "getblocknumber (no parameters)\n"
+            "getblocknumber\n"
             "Returns the block number of the latest block in the longest block chain.");
 
     return nBestHeight;
 }
 
 
-Value getconnectioncount(const Array& params)
+Value getconnectioncount(const Array& params, bool fHelp)
 {
-    if (params.size() != 0)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
-            "getconnectioncount (no parameters)\n"
+            "getconnectioncount\n"
             "Returns the number of connections to other nodes.");
 
     return (int)vNodes.size();
@@ -89,42 +120,42 @@ double GetDifficulty()
     return dMinimum / dCurrently;
 }
 
-Value getdifficulty(const Array& params)
+Value getdifficulty(const Array& params, bool fHelp)
 {
-    if (params.size() != 0)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
-            "getdifficulty (no parameters)\n"
+            "getdifficulty\n"
             "Returns the proof-of-work difficulty as a multiple of the minimum difficulty.");
 
     return GetDifficulty();
 }
 
 
-Value getbalance(const Array& params)
+Value getbalance(const Array& params, bool fHelp)
 {
-    if (params.size() != 0)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
-            "getbalance (no parameters)\n"
+            "getbalance\n"
             "Returns the server's available balance.");
 
     return ((double)GetBalance() / (double)COIN);
 }
 
 
-Value getgenerate(const Array& params)
+Value getgenerate(const Array& params, bool fHelp)
 {
-    if (params.size() != 0)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
-            "getgenerate (no parameters)\n"
+            "getgenerate\n"
             "Returns true or false.");
 
     return (bool)fGenerateBitcoins;
 }
 
 
-Value setgenerate(const Array& params)
+Value setgenerate(const Array& params, bool fHelp)
 {
-    if (params.size() < 1 || params.size() > 2)
+    if (fHelp || params.size() < 1 || params.size() > 2)
         throw runtime_error(
             "setgenerate <generate> [genproclimit]\n"
             "<generate> is true or false to turn generation on or off.\n"
@@ -148,11 +179,11 @@ Value setgenerate(const Array& params)
 }
 
 
-Value getinfo(const Array& params)
+Value getinfo(const Array& params, bool fHelp)
 {
-    if (params.size() != 0)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
-            "getinfo (no parameters)");
+            "getinfo");
 
     Object obj;
     obj.push_back(Pair("balance",       (double)GetBalance() / (double)COIN));
@@ -166,9 +197,9 @@ Value getinfo(const Array& params)
 }
 
 
-Value getnewaddress(const Array& params)
+Value getnewaddress(const Array& params, bool fHelp)
 {
-    if (params.size() > 1)
+    if (fHelp || params.size() > 1)
         throw runtime_error(
             "getnewaddress [label]\n"
             "Returns a new bitcoin address for receiving payments.  "
@@ -188,9 +219,9 @@ Value getnewaddress(const Array& params)
 }
 
 
-Value setlabel(const Array& params)
+Value setlabel(const Array& params, bool fHelp)
 {
-    if (params.size() < 1 || params.size() > 2)
+    if (fHelp || params.size() < 1 || params.size() > 2)
         throw runtime_error(
             "setlabel <bitcoinaddress> <label>\n"
             "Sets the label associated with the given address.");
@@ -205,9 +236,9 @@ Value setlabel(const Array& params)
 }
 
 
-Value getlabel(const Array& params)
+Value getlabel(const Array& params, bool fHelp)
 {
-    if (params.size() != 1)
+    if (fHelp || params.size() != 1)
         throw runtime_error(
             "getlabel <bitcoinaddress>\n"
             "Returns the label associated with the given address.");
@@ -225,9 +256,9 @@ Value getlabel(const Array& params)
 }
 
 
-Value getaddressesbylabel(const Array& params)
+Value getaddressesbylabel(const Array& params, bool fHelp)
 {
-    if (params.size() != 1)
+    if (fHelp || params.size() != 1)
         throw runtime_error(
             "getaddressesbylabel <label>\n"
             "Returns the list of addresses with the given label.");
@@ -255,9 +286,9 @@ Value getaddressesbylabel(const Array& params)
 }
 
 
-Value sendtoaddress(const Array& params)
+Value sendtoaddress(const Array& params, bool fHelp)
 {
-    if (params.size() < 2 || params.size() > 4)
+    if (fHelp || params.size() < 2 || params.size() > 4)
         throw runtime_error(
             "sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
             "<amount> is a real and is rounded to the nearest 0.01");
@@ -283,9 +314,9 @@ Value sendtoaddress(const Array& params)
 }
 
 
-Value listtransactions(const Array& params)
+Value listtransactions(const Array& params, bool fHelp)
 {
-    if (params.size() > 2)
+    if (fHelp || params.size() > 2)
         throw runtime_error(
             "listtransactions [count=10] [includegenerated=false]\n"
             "Returns up to [count] most recent transactions.");
@@ -304,9 +335,9 @@ Value listtransactions(const Array& params)
 }
 
 
-Value getreceivedbyaddress(const Array& params)
+Value getreceivedbyaddress(const Array& params, bool fHelp)
 {
-    if (params.size() < 1 || params.size() > 2)
+    if (fHelp || params.size() < 1 || params.size() > 2)
         throw runtime_error(
             "getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
             "Returns the total amount received by <bitcoinaddress> in transactions with at least [minconf] confirmations.");
@@ -345,9 +376,9 @@ Value getreceivedbyaddress(const Array& params)
 }
 
 
-Value getreceivedbylabel(const Array& params)
+Value getreceivedbylabel(const Array& params, bool fHelp)
 {
-    if (params.size() < 1 || params.size() > 2)
+    if (fHelp || params.size() < 1 || params.size() > 2)
         throw runtime_error(
             "getreceivedbylabel <label> [minconf=1]\n"
             "Returns the total amount received by addresses with <label> in transactions with at least [minconf] confirmations.");
@@ -508,9 +539,9 @@ Value ListReceived(const Array& params, bool fByLabels)
     return ret;
 }
 
-Value listreceivedbyaddress(const Array& params)
+Value listreceivedbyaddress(const Array& params, bool fHelp)
 {
-    if (params.size() > 2)
+    if (fHelp || params.size() > 2)
         throw runtime_error(
             "listreceivedbyaddress [minconf=1] [includeempty=false]\n"
             "[minconf] is the minimum number of confirmations before payments are included.\n"
@@ -524,9 +555,9 @@ Value listreceivedbyaddress(const Array& params)
     return ListReceived(params, false);
 }
 
-Value listreceivedbylabel(const Array& params)
+Value listreceivedbylabel(const Array& params, bool fHelp)
 {
-    if (params.size() > 2)
+    if (fHelp || params.size() > 2)
         throw runtime_error(
             "listreceivedbylabel [minconf=1] [includeempty=false]\n"
             "[minconf] is the minimum number of confirmations before payments are included.\n"
@@ -555,9 +586,9 @@ Value listreceivedbylabel(const Array& params)
 // Call Table
 //
 
-typedef Value(*rpcfn_type)(const Array& params);
 pair<string, rpcfn_type> pCallTable[] =
 {
+    make_pair("help",                  &help),
     make_pair("stop",                  &stop),
     make_pair("getblockcount",         &getblockcount),
     make_pair("getblocknumber",        &getblocknumber),
@@ -760,7 +791,7 @@ void ThreadRPCServer2(void* parg)
                 map<string, rpcfn_type>::iterator mi = mapCallTable.find(strMethod);
                 if (mi == mapCallTable.end())
                     throw runtime_error("Method not found.");
-                Value result = (*(*mi).second)(params);
+                Value result = (*(*mi).second)(params, false);
 
                 // Send reply
                 string strReply = JSONRPCReply(result, Value::null, id);
@@ -847,32 +878,50 @@ int CommandLineRPC(int argc, char *argv[])
         if (!mapCallTable.count(strMethod))
             throw runtime_error(strprintf("unknown command: %s", strMethod.c_str()));
 
-        // Parameters default to strings
-        Array params;
-        for (int i = 2; i < argc; i++)
-            params.push_back(argv[i]);
-        int n = params.size();
+        Value result;
+        if (argc == 3 && strcmp(argv[2], "-?") == 0)
+        {
+            // Call help locally, help text is returned in an exception
+            try
+            {
+                map<string, rpcfn_type>::iterator mi = mapCallTable.find(strMethod);
+                Array params;
+                (*(*mi).second)(params, true);
+            }
+            catch (std::exception& e)
+            {
+                result = e.what();
+            }
+        }
+        else
+        {
+            // Parameters default to strings
+            Array params;
+            for (int i = 2; i < argc; i++)
+                params.push_back(argv[i]);
+            int n = params.size();
 
-        //
-        // Special case other types
-        //
-        if (strMethod == "setgenerate"            && n > 0) ConvertTo<bool>(params[0]);
-        if (strMethod == "setgenerate"            && n > 1) ConvertTo<boost::int64_t>(params[1]);
-        if (strMethod == "sendtoaddress"          && n > 1) ConvertTo<double>(params[1]);
-        if (strMethod == "listtransactions"       && n > 0) ConvertTo<boost::int64_t>(params[0]);
-        if (strMethod == "listtransactions"       && n > 1) ConvertTo<bool>(params[1]);
-        if (strMethod == "getamountreceived"      && n > 1) ConvertTo<boost::int64_t>(params[1]); // deprecated
-        if (strMethod == "getreceivedbyaddress"   && n > 1) ConvertTo<boost::int64_t>(params[1]);
-        if (strMethod == "getreceivedbylabel"     && n > 1) ConvertTo<boost::int64_t>(params[1]);
-        if (strMethod == "getallreceived"         && n > 0) ConvertTo<boost::int64_t>(params[0]); // deprecated
-        if (strMethod == "getallreceived"         && n > 1) ConvertTo<bool>(params[1]);
-        if (strMethod == "listreceivedbyaddress"  && n > 0) ConvertTo<boost::int64_t>(params[0]);
-        if (strMethod == "listreceivedbyaddress"  && n > 1) ConvertTo<bool>(params[1]);
-        if (strMethod == "listreceivedbylabel"    && n > 0) ConvertTo<boost::int64_t>(params[0]);
-        if (strMethod == "listreceivedbylabel"    && n > 1) ConvertTo<bool>(params[1]);
+            //
+            // Special case non-string parameter types
+            //
+            if (strMethod == "setgenerate"            && n > 0) ConvertTo<bool>(params[0]);
+            if (strMethod == "setgenerate"            && n > 1) ConvertTo<boost::int64_t>(params[1]);
+            if (strMethod == "sendtoaddress"          && n > 1) ConvertTo<double>(params[1]);
+            if (strMethod == "listtransactions"       && n > 0) ConvertTo<boost::int64_t>(params[0]);
+            if (strMethod == "listtransactions"       && n > 1) ConvertTo<bool>(params[1]);
+            if (strMethod == "getamountreceived"      && n > 1) ConvertTo<boost::int64_t>(params[1]); // deprecated
+            if (strMethod == "getreceivedbyaddress"   && n > 1) ConvertTo<boost::int64_t>(params[1]);
+            if (strMethod == "getreceivedbylabel"     && n > 1) ConvertTo<boost::int64_t>(params[1]);
+            if (strMethod == "getallreceived"         && n > 0) ConvertTo<boost::int64_t>(params[0]); // deprecated
+            if (strMethod == "getallreceived"         && n > 1) ConvertTo<bool>(params[1]);
+            if (strMethod == "listreceivedbyaddress"  && n > 0) ConvertTo<boost::int64_t>(params[0]);
+            if (strMethod == "listreceivedbyaddress"  && n > 1) ConvertTo<bool>(params[1]);
+            if (strMethod == "listreceivedbylabel"    && n > 0) ConvertTo<boost::int64_t>(params[0]);
+            if (strMethod == "listreceivedbylabel"    && n > 1) ConvertTo<bool>(params[1]);
 
-        // Execute
-        Value result = CallRPC(strMethod, params);
+            // Execute
+            result = CallRPC(strMethod, params);
+        }
 
         // Print result
         string strResult = (result.type() == str_type ? result.get_str() : write_string(result, true));

serialize.h

@@ -19,8 +19,8 @@ class CScript;
 class CDataStream;
 class CAutoFile;
 
-static const int VERSION = 209;
-static const char* pszSubVer = ".0";
+static const int VERSION = 212;
+static const char* pszSubVer = "";
 
 
 

ui.cpp

@@ -1016,6 +1016,11 @@ void CMainFrame::OnPaintListCtrl(wxPaintEvent& event)
 
     if (fDebug && GetTime() - nThreadSocketHandlerHeartbeat > 60)
         m_statusBar->SetStatusText("     ERROR: ThreadSocketHandler has stopped", 0);
+
+    // Update receiving address
+    string strDefaultAddress = PubKeyToAddress(vchDefaultKey);
+    if (m_textCtrlAddress->GetValue() != strDefaultAddress)
+        m_textCtrlAddress->SetValue(strDefaultAddress);
 }
 
 
@@ -2087,7 +2092,9 @@ void CSendingDialog::OnReply2(CDataStream& vRecv)
         }
 
         // Send payment tx to seller, with response going to OnReply3 via event handler
-        pnode->PushRequest("submitorder", wtx, SendingDialogOnReply3, this);
+        CWalletTx wtxSend = wtx;
+        wtxSend.fFromMe = false;
+        pnode->PushRequest("submitorder", wtxSend, SendingDialogOnReply3, this);
 
         Status(_("Waiting for confirmation..."));
         MainFrameRepaint();

uibase.cpp

@@ -616,7 +616,7 @@ CSendDialogBase::CSendDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
 	
 	fgSizer1->Add( 0, 0, 0, wxEXPAND, 5 );
 	
-	m_staticTextInstructions = new wxStaticText( this, wxID_ANY, _("Enter the recipient's IP address (e.g. 123.45.6.7) for online transfer with comments and confirmation, \nor Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) if recipient is not online."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextInstructions = new wxStaticText( this, wxID_ANY, _("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextInstructions->Wrap( -1 );
 	fgSizer1->Add( m_staticTextInstructions, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	

uibase.h

@@ -275,7 +275,7 @@ class CSendDialogBase : public wxDialog
 		
 	
 	public:
-		CSendDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Send Coins"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 675,312 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		CSendDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Send Coins"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 675,298 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~CSendDialogBase();
 	
 };

uint256.h

@@ -388,7 +388,6 @@ typedef base_uint<256> base_uint256;
 //
 // uint160 and uint256 could be implemented as templates, but to keep
 // compile errors and debugging cleaner, they're copy and pasted.
-// It's safe to search and replace 160 with 256 and vice versa.
 //
 
 
@@ -405,6 +404,8 @@ public:
 
     uint160()
     {
+        for (int i = 0; i < WIDTH; i++)
+            pn[i] = 0;
     }
 
     uint160(const basetype& b)
@@ -517,6 +518,8 @@ public:
 
     uint256()
     {
+        for (int i = 0; i < WIDTH; i++)
+            pn[i] = 0;
     }
 
     uint256(const basetype& b)

uiproject.fbp

@@ -18,7 +18,7 @@
         <property name="relative_path">1</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
-        <object class="Frame" expanded="1">
+        <object class="Frame" expanded="0">
             <property name="bg">wxSYS_COLOUR_BTNFACE</property>
             <property name="center"></property>
             <property name="context_help"></property>
@@ -3317,7 +3317,7 @@
             <property name="minimum_size"></property>
             <property name="name">CSendDialogBase</property>
             <property name="pos"></property>
-            <property name="size">675,312</property>
+            <property name="size">675,298</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass"></property>
             <property name="title">Send Coins</property>
@@ -3408,7 +3408,7 @@
                                 <property name="font"></property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label">Enter the recipient&apos;s IP address (e.g. 123.45.6.7) for online transfer with comments and confirmation, &#x0A;or Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) if recipient is not online.</property>
+                                <property name="label">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)</property>
                                 <property name="maximum_size"></property>
                                 <property name="minimum_size"></property>
                                 <property name="name">m_staticTextInstructions</property>

util.h

@@ -520,8 +520,13 @@ inline pthread_t CreateThread(void(*pfn)(void*), void* parg, bool fWantHandle=fa
 
 inline void SetThreadPriority(int nPriority)
 {
-    // threads are processes on linux, so PRIO_PROCESS affects just the one thread
-    setpriority(PRIO_PROCESS, getpid(), nPriority);
+    // It's unclear if it's even possible to change thread priorities on Linux,
+    // but we really and truly need it for the generation threads.
+#ifdef PRIO_THREAD
+    setpriority(PRIO_THREAD, 0, nPriority);
+#else
+    setpriority(PRIO_PROCESS, 0, nPriority);
+#endif
 }
 
 inline bool TerminateThread(pthread_t hthread, unsigned int nExitCode)