aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locale/eo/LC_MESSAGES/bitcoin.mobin0 -> 20553 bytes
-rw-r--r--locale/eo/LC_MESSAGES/bitcoin.po1081
-rw-r--r--locale/it/LC_MESSAGES/bitcoin.mobin15725 -> 20881 bytes
-rw-r--r--locale/it/LC_MESSAGES/bitcoin.po921
-rw-r--r--locale/ru/LC_MESSAGES/bitcoin.mobin21763 -> 25767 bytes
-rw-r--r--locale/ru/LC_MESSAGES/bitcoin.po917
-rw-r--r--share/setup.nsi16
-rw-r--r--src/makefile.osx2
8 files changed, 2183 insertions, 754 deletions
diff --git a/locale/eo/LC_MESSAGES/bitcoin.mo b/locale/eo/LC_MESSAGES/bitcoin.mo
new file mode 100644
index 0000000000..592aeccf8a
--- /dev/null
+++ b/locale/eo/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/eo/LC_MESSAGES/bitcoin.po b/locale/eo/LC_MESSAGES/bitcoin.po
new file mode 100644
index 0000000000..71d639e2c6
--- /dev/null
+++ b/locale/eo/LC_MESSAGES/bitcoin.po
@@ -0,0 +1,1081 @@
+#
+# Danube <none>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Bitcoin 0.3.22\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-15 18:18+0100\n"
+"PO-Revision-Date: 2011-05-23 19:47+0200\n"
+"Last-Translator: Danube <none>\n"
+"Language-Team: Esperanto <none>\n"
+"Language: Esperanto\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"
+"Plural-Forms: j\n"
+"X-Poedit-Language: Esperanto\n"
+"X-Poedit-SearchPath-0: ../../..\n"
+
+#: ../../../src/net.cpp:1499
+#, c-format
+msgid ""
+"Unable to bind to port %d on this computer. Bitcoin is probably already "
+"running."
+msgstr ""
+"Ne povis alligi al la porton %d ĉe ĉi tiu komputilo. Verŝajne la Bitmonero "
+"jam estas rulanta."
+
+#: ../../../src/ui.cpp:202
+#, 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 ""
+"Tiu ĉi transakcio transpasas la grandeclimiton. Tamen vi povas sendi ĝin "
+"pagante transakcian koston de %s. Tiun koston ricevas la nodoj, kiuj "
+"realigas vian transakcion kaj kiuj helpas subteni la reton. Ĉu vi volas pagi "
+"la transakcian koston?"
+
+#: ../../../src/ui.cpp:301
+msgid "Status"
+msgstr "Stato"
+
+#: ../../../src/ui.cpp:302
+msgid "Date"
+msgstr "Dato"
+
+#: ../../../src/ui.cpp:303
+msgid "Description"
+msgstr "Priskribo"
+
+#: ../../../src/ui.cpp:304
+msgid "Debit"
+msgstr "Debeto"
+
+#: ../../../src/ui.cpp:305
+msgid "Credit"
+msgstr "Kredito"
+
+#: ../../../src/ui.cpp:511
+#, c-format
+msgid "Open for %d blocks"
+msgstr "Malfermita por %d blokoj"
+
+#: ../../../src/ui.cpp:513
+#, c-format
+msgid "Open until %s"
+msgstr "Malfermita ĝis %s"
+
+#: ../../../src/ui.cpp:519
+#, c-format
+msgid "%d/offline?"
+msgstr "%d/senkonekta?"
+
+#: ../../../src/ui.cpp:521
+#, c-format
+msgid "%d/unconfirmed"
+msgstr "%d/ne konfirmita"
+
+#: ../../../src/ui.cpp:523
+#, c-format
+msgid "%d confirmations"
+msgstr "%d konfirmoj"
+
+#: ../../../src/ui.cpp:608
+msgid "Generated"
+msgstr "Kreita"
+
+#: ../../../src/ui.cpp:616
+#, c-format
+msgid "Generated (%s matures in %d more blocks)"
+msgstr "Kreita (%s maturiĝos post %d blokoj)"
+
+#: ../../../src/ui.cpp:620
+msgid ""
+"Generated - Warning: This block was not received by any other nodes and will "
+"probably not be accepted!"
+msgstr ""
+"Kreita - Averto: Tiu bloko ne estas ricevita de iuj ajn aliaj nodoj! "
+"Verŝajne ĝi ne estos akceptita!"
+
+#: ../../../src/ui.cpp:624
+msgid "Generated (not accepted)"
+msgstr "Kreita (ne akceptita)"
+
+#: ../../../src/ui.cpp:634
+msgid "From: "
+msgstr "De: "
+
+#: ../../../src/ui.cpp:658
+msgid "Received with: "
+msgstr "Ricevita per: "
+
+#: ../../../src/ui.cpp:704
+msgid "Payment to yourself"
+msgstr "Pago al vi mem"
+
+#: ../../../src/ui.cpp:738
+msgid "To: "
+msgstr "Al: "
+
+#: ../../../src/ui.cpp:1053
+msgid " Generating"
+msgstr " Kreanta"
+
+#: ../../../src/ui.cpp:1055
+msgid "(not connected)"
+msgstr "(ne konektita)"
+
+#: ../../../src/ui.cpp:1058
+#, c-format
+msgid " %d connections %d blocks %d transactions"
+msgstr " %d konektoj %d blokoj %d transakcioj"
+
+#: ../../../src/ui.cpp:1163 ../../../src/ui.cpp:2527
+msgid "New Receiving Address"
+msgstr "Nova Ricevadreso"
+
+#: ../../../src/ui.cpp:1164 ../../../src/ui.cpp:2528
+msgid ""
+"You should use a new address for each payment you receive.\n"
+"\n"
+"Label"
+msgstr ""
+"Uzu novan adreson por ĉiu ajn pago kiu vi ricevos.\n"
+"\n"
+"Etikedo"
+
+#: ../../../src/ui.cpp:1233
+msgid "<b>Status:</b> "
+msgstr "<b>Stato:</b> "
+
+#: ../../../src/ui.cpp:1238
+msgid ", has not been successfully broadcast yet"
+msgstr ", ankoraŭ ne estas dissendita sukcese"
+
+#: ../../../src/ui.cpp:1240
+#, c-format
+msgid ", broadcast through %d node"
+msgstr ", estas dissendita per %d nodo"
+
+#: ../../../src/ui.cpp:1242
+#, c-format
+msgid ", broadcast through %d nodes"
+msgstr ", estas dissendita per %d nodoj"
+
+#: ../../../src/ui.cpp:1246
+msgid "<b>Date:</b> "
+msgstr "<b>Dato:</b> "
+
+#: ../../../src/ui.cpp:1254
+msgid "<b>Source:</b> Generated<br>"
+msgstr "<b>Fonto:</b> Kreita<br>"
+
+#: ../../../src/ui.cpp:1260 ../../../src/ui.cpp:1278
+msgid "<b>From:</b> "
+msgstr "<b>De:</b> "
+
+#: ../../../src/ui.cpp:1278
+msgid "unknown"
+msgstr "nekonata"
+
+#: ../../../src/ui.cpp:1279 ../../../src/ui.cpp:1303 ../../../src/ui.cpp:1362
+msgid "<b>To:</b> "
+msgstr "<b>Al:</b> "
+
+#: ../../../src/ui.cpp:1282
+msgid " (yours, label: "
+msgstr " (via, etikedo: "
+
+#: ../../../src/ui.cpp:1284
+msgid " (yours)"
+msgstr " (via)"
+
+#: ../../../src/ui.cpp:1321 ../../../src/ui.cpp:1333 ../../../src/ui.cpp:1379
+#: ../../../src/ui.cpp:1396
+msgid "<b>Credit:</b> "
+msgstr "<b>Кredito:</b> "
+
+#: ../../../src/ui.cpp:1323
+#, c-format
+msgid "(%s matures in %d more blocks)"
+msgstr "(%s maturiĝos post %d blokoj)"
+
+#: ../../../src/ui.cpp:1325
+msgid "(not accepted)"
+msgstr "(ne akceptita)"
+
+#: ../../../src/ui.cpp:1370 ../../../src/ui.cpp:1378 ../../../src/ui.cpp:1393
+msgid "<b>Debit:</b> "
+msgstr "<b>Debeto:</b> "
+
+#: ../../../src/ui.cpp:1384
+msgid "<b>Transaction fee:</b> "
+msgstr "<b>Transakcia kosto:</b> "
+
+#: ../../../src/ui.cpp:1400
+msgid "<b>Net amount:</b> "
+msgstr "<b>Neta kvanto:</b> "
+
+#: ../../../src/ui.cpp:1407
+msgid "Message:"
+msgstr "Mesaĝo:"
+
+#: ../../../src/ui.cpp:1409
+msgid "Comment:"
+msgstr "Komento:"
+
+#: ../../../src/ui.cpp:1412
+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 ""
+"Kreitaj moneroj devas atendi dum 120 blokoj ĝis ili povas esti elspezita. "
+"Kiam vi kreis tiun blokon, ĝi estis dissendita al la reton por esti "
+"inkludita en la blokĉeno. Se ĝi malsukcesos esti inkludita en la ĉeno, ĝi "
+"ŝanĝiĝos al \\\"ne akceptita\\\" kaj estos neelspezebla. Kelkfoje tio povas "
+"okazi se alia nodo kreas blokon samtempe (dum kelkaj sekundoj)."
+
+#: ../../../src/ui.cpp:1592
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "Ne povas skribi la dosieron autostart/bitcoin.desktop"
+
+#: ../../../src/ui.cpp:1628
+msgid "Main"
+msgstr "Ĉefa"
+
+#: ../../../src/ui.cpp:1636
+msgid "&Start Bitcoin on window system startup"
+msgstr "&Lanĉu Bitmoneron kiam vindozo ekas"
+
+#: ../../../src/ui.cpp:1643
+msgid "&Minimize on close"
+msgstr "Nur &kaŝiĝi anstataŭ malfermiĝi"
+
+#: ../../../src/ui.cpp:1785
+#, c-format
+msgid "version %s"
+msgstr "versio %s"
+
+#: ../../../src/ui.cpp:1897
+msgid "Error in amount "
+msgstr "Eraro en kvanto "
+
+#: ../../../src/ui.cpp:1897 ../../../src/ui.cpp:1902 ../../../src/ui.cpp:1907
+#: ../../../src/ui.cpp:1942 ../../../src/uibase.cpp:55
+msgid "Send Coins"
+msgstr "Sendu monerojn"
+
+#: ../../../src/ui.cpp:1902
+msgid "Amount exceeds your balance "
+msgstr "Kvanto transpasas vian bonhavon "
+
+#: ../../../src/ui.cpp:1907
+msgid "Total exceeds your balance when the "
+msgstr "Entuta sumo transpasas vian bonhavon, se la "
+
+#: ../../../src/ui.cpp:1907
+msgid " transaction fee is included "
+msgstr " transakcia kosto estas inkludita "
+
+#: ../../../src/ui.cpp:1925
+msgid "Payment sent "
+msgstr "Pago sendita "
+
+#: ../../../src/ui.cpp:1925 ../../../src/ui.cpp:1930 ../../../src/ui.cpp:2074
+#: ../../../src/ui.cpp:2227 ../../../src/main.cpp:3999
+msgid "Sending..."
+msgstr "Sendanta..."
+
+#: ../../../src/ui.cpp:1942
+msgid "Invalid address "
+msgstr "Malvalida adreso "
+
+#: ../../../src/ui.cpp:1995
+#, c-format
+msgid "Sending %s to %s"
+msgstr "Sendanta %s al %s"
+
+#: ../../../src/ui.cpp:2068 ../../../src/ui.cpp:2101
+msgid "CANCELLED"
+msgstr "MALVALIDIGITA"
+
+#: ../../../src/ui.cpp:2072
+msgid "Cancelled"
+msgstr "Malvalidigita"
+
+#: ../../../src/ui.cpp:2074
+msgid "Transfer cancelled "
+msgstr "Transfero malvalidigita "
+
+#: ../../../src/ui.cpp:2127
+msgid "Error: "
+msgstr "Eraro: "
+
+#: ../../../src/ui.cpp:2141 ../../../src/ui.cpp:2212
+#: ../../../src/main.cpp:4018
+msgid "Insufficient funds"
+msgstr "Malsufiĉa mono"
+
+#: ../../../src/ui.cpp:2146
+msgid "Connecting..."
+msgstr "Konektanta..."
+
+#: ../../../src/ui.cpp:2151
+msgid "Unable to connect"
+msgstr "Ne povas konekti"
+
+#: ../../../src/ui.cpp:2156
+msgid "Requesting public key..."
+msgstr "Postulanta publikan ĉifroŝlosilon..."
+
+#: ../../../src/ui.cpp:2168
+msgid "Received public key..."
+msgstr "Ricevinta publikan ĉifroŝlosilon..."
+
+#: ../../../src/ui.cpp:2182
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "Adresato ne akceptas transakciojn senditajn per IP adreso"
+
+#: ../../../src/ui.cpp:2184
+msgid "Transfer was not accepted"
+msgstr "Transfero ne estis akceptita"
+
+#: ../../../src/ui.cpp:2193
+msgid "Invalid response received"
+msgstr "Malvalida respondo ricevita"
+
+#: ../../../src/ui.cpp:2208
+msgid "Creating transaction..."
+msgstr "Kreanta la transakcion..."
+
+#: ../../../src/ui.cpp:2220
+#, c-format
+msgid ""
+"This transaction requires a transaction fee of at least %s because of its "
+"amount, complexity, or use of recently received funds"
+msgstr ""
+"Tiu ĉi transakcio necesas transakcian koston de minimume %s, ĉar ĝia kvanto "
+"aŭ ĝia komplekseco aŭ la uzo de mono lastatempe ricevita."
+
+#: ../../../src/ui.cpp:2222
+msgid "Transaction creation failed"
+msgstr "La transakcio ne funkciis"
+
+#: ../../../src/ui.cpp:2229
+msgid "Transaction aborted"
+msgstr "Transakcio malvalidigita"
+
+#: ../../../src/ui.cpp:2237
+msgid "Lost connection, transaction cancelled"
+msgstr "Perdis la konekton, transakcio malvalidigita"
+
+#: ../../../src/ui.cpp:2253
+msgid "Sending payment..."
+msgstr "Sendanta pagon..."
+
+#: ../../../src/ui.cpp:2259
+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 ""
+"La transakcio estas malakceptita. Tio povas okazi se iom da moneroj en via "
+"monujo jam estis elspezata, ekzemple se vi uzis kopion de la monujo wallet."
+"dat kaj moneroj estis elspezita en la kopio, sed ne estas markata kiel "
+"elspezata ĉi tie."
+
+#: ../../../src/ui.cpp:2268
+msgid "Waiting for confirmation..."
+msgstr "Atendanta la konfirmon..."
+
+#: ../../../src/ui.cpp:2286
+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 ""
+"La pago estis sendita, sed la ricevanto ne povis atesti ĝin.\n"
+"La transakcio estas registrita kaj estos skribita en la krediton de la "
+"ricevanto,\n"
+"sed la komenta informo estas malplena."
+
+#: ../../../src/ui.cpp:2295
+msgid "Payment was sent, but an invalid response was received"
+msgstr "Pago estis sendita, sed malvalida respondo estas ricivita"
+
+#: ../../../src/ui.cpp:2301
+msgid "Payment completed"
+msgstr "Pago kompletigita"
+
+#: ../../../src/ui.cpp:2332 ../../../src/ui.cpp:2478 ../../../src/ui.cpp:2515
+msgid "Name"
+msgstr "Nomo"
+
+#: ../../../src/ui.cpp:2333 ../../../src/ui.cpp:2478 ../../../src/ui.cpp:2515
+msgid "Address"
+msgstr "Adreso"
+
+#: ../../../src/ui.cpp:2335 ../../../src/ui.cpp:2490
+msgid "Label"
+msgstr "Etikedo"
+
+#: ../../../src/ui.cpp:2336 ../../../src/uibase.cpp:837
+msgid "Bitcoin Address"
+msgstr "Bitmonera adreso"
+
+#: ../../../src/ui.cpp:2460
+msgid ""
+"This is one of your own addresses for receiving payments and cannot be "
+"entered in the address book. "
+msgstr ""
+"Tiu ĉi estas unu el viaj adresoj mem pro ricevi pagojn. Ĝi ne povas esti "
+"enskribita en la adresaro. "
+
+#: ../../../src/ui.cpp:2478 ../../../src/ui.cpp:2484
+msgid "Edit Address"
+msgstr "Editu adreson"
+
+#: ../../../src/ui.cpp:2490
+msgid "Edit Address Label"
+msgstr "Editu adresan etikedon"
+
+#: ../../../src/ui.cpp:2515 ../../../src/ui.cpp:2521
+msgid "Add Address"
+msgstr "Aldonu adreson"
+
+#: ../../../src/ui.cpp:2598
+msgid "Bitcoin"
+msgstr "Bitmonero"
+
+#: ../../../src/ui.cpp:2600
+msgid "Bitcoin - Generating"
+msgstr "Bitmonero - Kreanta"
+
+#: ../../../src/ui.cpp:2602
+msgid "Bitcoin - (not connected)"
+msgstr "Bitcoin - (ne konektita)"
+
+#: ../../../src/ui.cpp:2681
+msgid "&Open Bitcoin"
+msgstr "&Malfermu Bitmoneron"
+
+#: ../../../src/ui.cpp:2682
+msgid "&Send Bitcoins"
+msgstr "&Sendu bitmonerojn"
+
+#: ../../../src/ui.cpp:2683
+msgid "O&ptions..."
+msgstr "&Opcioj..."
+
+#: ../../../src/ui.cpp:2686 ../../../src/uibase.cpp:25
+msgid "E&xit"
+msgstr "&Fermu"
+
+#: ../../../src/ui.cpp:2902
+msgid "Program has crashed and will terminate. "
+msgstr "La programo kraŝis kaj haltiĝos. "
+
+#: ../../../src/main.cpp:1868
+msgid "Warning: Disk space is low "
+msgstr "Averto: Malmulte da storloko "
+
+#: ../../../src/main.cpp:3992
+#, c-format
+msgid ""
+"Error: This transaction requires a transaction fee of at least %s because of "
+"its amount, complexity, or use of recently received funds "
+msgstr ""
+"Eraro: Tiu ĉi transakcio necesas transakcian koston de minimume %s, ĉar ĝia "
+"kvanto aŭ ĝia komplekseco aŭ la uzo de mono lastatempe ricevitaŭ "
+
+#: ../../../src/main.cpp:3994
+msgid "Error: Transaction creation failed "
+msgstr "Eraro: La kreado de la transakcio ne funkciis "
+
+#: ../../../src/main.cpp:4003
+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 ""
+"Eraro: La transakcio estas malakceptita. Tio povas okazi se iom da moneroj "
+"en via monujo jam estas elspezita, ekzemple se vi uzis kopion de la monujo "
+"wallet.dat kaj moneroj estis elspezita en la kopio, sed ne estas markata "
+"kiel elspezata ĉi tie."
+
+#: ../../../src/main.cpp:4016
+msgid "Invalid amount"
+msgstr "Malvalida kvanto"
+
+#: ../../../src/main.cpp:4023
+msgid "Invalid bitcoin address"
+msgstr "Malvalida bitmonera adreso"
+
+#: ../../../src/rpc.cpp:1800 ../../../src/rpc.cpp:1802
+#, c-format
+msgid "To use the %s option"
+msgstr "Por uzi la %s optcion"
+
+#: ../../../src/rpc.cpp:1804
+#, c-format
+msgid ""
+"Warning: %s, you must set rpcpassword=<password>\n"
+"in the configuration file: %s\n"
+"If the file does not exist, create it with owner-readable-only file "
+"permissions.\n"
+msgstr ""
+"Averto: %s, vi devas meti rpcpassword=<pasvorto>\n"
+"en la agorda dosiero: %s\n"
+"Se la doriero ne ekzistas, kreu ĝin nurposedantlegeble.\n"
+
+#: ../../../src/rpc.cpp:1972
+#, c-format
+msgid ""
+"You must set rpcpassword=<password> in the configuration file:\n"
+"%s\n"
+"If the file does not exist, create it with owner-readable-only file "
+"permissions."
+msgstr ""
+"Vi devas meti rpcpassword=<pasvorto> en la agorda dosiero:\n"
+"%s\n"
+"Se la dosiero ne ekzistas, kreu ĝin nurposedantlegeble."
+
+#: ../../../src/util.cpp:865
+msgid ""
+"Warning: Please check that your computer's date and time are correct. If "
+"your clock is wrong Bitcoin will not work properly."
+msgstr ""
+"Averto: Bonvole kontrolu ke la dato kaj la tempo de via komputilo estas "
+"ĝusta. Se viaj horloĝo malĝustas, Bitmonero ne funkcios korekte."
+
+#: ../../../src/util.cpp:898
+msgid "-beta"
+msgstr "-beta"
+
+#: ../../../src/uibase.cpp:28
+msgid "&File"
+msgstr "&Dosiero"
+
+#: ../../../src/uibase.cpp:32
+msgid "&Your Receiving Addresses..."
+msgstr "&Viaj ricevadresoj..."
+
+#: ../../../src/uibase.cpp:36
+msgid "&Options..."
+msgstr "&Opcioj..."
+
+#: ../../../src/uibase.cpp:39
+msgid "&Settings"
+msgstr "&Agordoj"
+
+#: ../../../src/uibase.cpp:43
+msgid "&About..."
+msgstr "&Pri..."
+
+#: ../../../src/uibase.cpp:46
+msgid "&Help"
+msgstr "&Helpo"
+
+#: ../../../src/uibase.cpp:56
+msgid "Address Book"
+msgstr "Adresaro"
+
+#: ../../../src/uibase.cpp:69
+msgid "Your Bitcoin Address:"
+msgstr "Via bitmonera adreso:"
+
+#: ../../../src/uibase.cpp:76
+msgid " &New... "
+msgstr " &Nova... "
+
+#: ../../../src/uibase.cpp:79 ../../../src/uibase.cpp:780
+#: ../../../src/uibase.cpp:883
+msgid " &Copy to Clipboard "
+msgstr " &Kopiu al la poŝon "
+
+#: ../../../src/uibase.cpp:93
+msgid "Balance:"
+msgstr "Bonhavo:"
+
+#: ../../../src/uibase.cpp:109
+msgid " All"
+msgstr " Ĉiom"
+
+#: ../../../src/uibase.cpp:109
+msgid " Sent"
+msgstr " Sendita"
+
+#: ../../../src/uibase.cpp:109
+msgid " Received"
+msgstr " Ricevita"
+
+#: ../../../src/uibase.cpp:109
+msgid " In Progress"
+msgstr " Progresanta"
+
+#: ../../../src/uibase.cpp:130
+msgid "All Transactions"
+msgstr "Ĉiuj transakcioj"
+
+#: ../../../src/uibase.cpp:141
+msgid "Sent/Received"
+msgstr "Sendita/Ricevita"
+
+#: ../../../src/uibase.cpp:152
+msgid "Sent"
+msgstr "Sendita"
+
+#: ../../../src/uibase.cpp:163
+msgid "Received"
+msgstr "Ricevita"
+
+#: ../../../src/uibase.cpp:302 ../../../src/uibase.cpp:443
+#: ../../../src/uibase.cpp:542 ../../../src/uibase.cpp:722
+#: ../../../src/uibase.cpp:783 ../../../src/uibase.cpp:892
+#: ../../../src/uibase.cpp:981
+msgid "OK"
+msgstr "Bone"
+
+#: ../../../src/uibase.cpp:345
+msgid "&Start Bitcoin on system startup"
+msgstr "&Lanĉigu Bitmoneron kiam la sistemo ekas"
+
+#: ../../../src/uibase.cpp:348
+msgid "&Minimize to the tray instead of the taskbar"
+msgstr "&Kaŝu al la programan pleton anstataŭ al la programan linion"
+
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "Pordplusendo per &UPnP"
+
+#: ../../../src/uibase.cpp:354
+msgid "M&inimize to the tray on close"
+msgstr "K&aŝu al la programan pleton anstataŭ malfermu ĝin"
+
+#: ../../../src/uibase.cpp:360
+msgid "&Connect through socks4 proxy: "
+msgstr "&Konekti per socks4 prokuro: "
+
+#: ../../../src/uibase.cpp:371
+msgid "Proxy &IP:"
+msgstr "Prokura &IP:"
+
+#: ../../../src/uibase.cpp:379
+msgid " &Port:"
+msgstr " &Pordo:"
+
+#: ../../../src/uibase.cpp:392
+msgid ""
+"Optional transaction fee per KB that helps make sure your transactions are "
+"processed quickly. Most transactions are 1KB. Fee 0.01 recommended."
+msgstr ""
+"Volonta transakcia kosto po kilobajto, kiu helpas certigi ke viaj "
+"transakcioj estas plenumita rapide. La plej transacioj estas 1 kilobajto. "
+"Rekomendita transakcia kosto: 0.01"
+
+#: ../../../src/uibase.cpp:399
+msgid "Pay transaction fee:"
+msgstr "Pagu transakcian koston:"
+
+#: ../../../src/uibase.cpp:420
+msgid "// [don't translate] Test panel 2 for future expansion"
+msgstr ""
+
+#: ../../../src/uibase.cpp:424
+msgid ""
+"// [don't translate] Let's not start multiple pages until the first page is "
+"filled up"
+msgstr ""
+
+#: ../../../src/uibase.cpp:446 ../../../src/uibase.cpp:668
+#: ../../../src/uibase.cpp:727 ../../../src/uibase.cpp:786
+#: ../../../src/uibase.cpp:895 ../../../src/uibase.cpp:984
+msgid "Cancel"
+msgstr "Malvalidigu"
+
+#: ../../../src/uibase.cpp:449
+msgid "&Apply"
+msgstr "&Apliku"
+
+#: ../../../src/uibase.cpp:508
+msgid "Bitcoin "
+msgstr "Bitmonero "
+
+#: ../../../src/uibase.cpp:514
+msgid "version"
+msgstr "versio"
+
+#: ../../../src/uibase.cpp:525
+msgid ""
+"Copyright (c) 2009-2011 Bitcoin Developers\n"
+"\n"
+"This is experimental software.\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) and UPnP software written by Thomas Bernard."
+msgstr ""
+"Kopirajto (c) 2009-2011 Disvolviĝuloj de Bitmonero\n"
+"\n"
+"Tio ĉi estas eksperimenta softvaro.\n"
+"\n"
+"Distribita laŭ la MIT/X11 softvara licenco. Vidu la kundonitan dosieron \n"
+"license.txt aŭ http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"Tio ĉi produkto inkludas softvaron, kiu estas disvolviĝita de la OpenSSL "
+"projekto por uzo en la \n"
+"OpenSSL Toolkit (http://www.openssl.org/), kaj kriptografia softvaro verkita "
+"de \n"
+"Eric Young (eay@cryptsoft.com) kaj UPnP softvaro verkita de Thomas Bernard."
+
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Entajpu bitmoneran adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L)"
+
+#: ../../../src/uibase.cpp:595
+msgid "Pay &To:"
+msgstr "Pagu &al:"
+
+#: ../../../src/uibase.cpp:610
+msgid "&Paste"
+msgstr "&Elpoŝigi"
+
+#: ../../../src/uibase.cpp:613
+msgid " Address &Book..."
+msgstr " &Adresaro..."
+
+#: ../../../src/uibase.cpp:620
+msgid "&Amount:"
+msgstr "&Kvanto:"
+
+#: ../../../src/uibase.cpp:630
+msgid "T&ransfer:"
+msgstr "T&ransfero:"
+
+#: ../../../src/uibase.cpp:636
+msgid " Standard"
+msgstr " Normo"
+
+#: ../../../src/uibase.cpp:663
+msgid "&Send"
+msgstr "&Sendu"
+
+#: ../../../src/uibase.cpp:711
+msgid ""
+"\n"
+"\n"
+"Connecting..."
+msgstr ""
+"\n"
+"\n"
+"Konektanta..."
+
+#: ../../../src/uibase.cpp:761
+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 ""
+"Tiuj ĉi estas viaj bitmonerajn adresojn por ricevi pagojn. Vi povus voli "
+"doni malsaman adreson al ĉiuj sendanto, por ke vi povas vidi kiu pagis vin. "
+"La markita adreso estas vidigita en la ĉefa fenestro."
+
+#: ../../../src/uibase.cpp:774 ../../../src/uibase.cpp:886
+msgid "&Edit..."
+msgstr "&Redakti..."
+
+#: ../../../src/uibase.cpp:777 ../../../src/uibase.cpp:889
+msgid " &New Address... "
+msgstr " &Nova adreso... "
+
+#: ../../../src/uibase.cpp:849
+msgid "Sending"
+msgstr "Sendanta"
+
+#: ../../../src/uibase.cpp:857
+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 ""
+"Tiuj estas viaj bitmoneraj adresoj por ricevi pagojn. Vi povas doni malsaman "
+"adreson al ĉiuj sendanto, por ke vi povas vidi kiu pagis vin. La markita "
+"adreso estas vidigita en la ĉefa fenestro."
+
+#: ../../../src/uibase.cpp:870
+msgid "Receiving"
+msgstr "Ricevanta"
+
+#: ../../../src/uibase.cpp:880
+msgid "&Delete"
+msgstr "&Viŝu"
+
+#: ../../../src/init.cpp:145
+msgid " beta"
+msgstr " beta"
+
+#: ../../../src/init.cpp:147
+msgid "Bitcoin version"
+msgstr "Versio de Bitmonero"
+
+#: ../../../src/init.cpp:148
+msgid "Usage:"
+msgstr "Uzado:"
+
+#: ../../../src/init.cpp:150
+msgid "Send command to -server or bitcoind\n"
+msgstr "Sendu komandon al aŭ -server aŭ bitcoind\n"
+
+#: ../../../src/init.cpp:151
+msgid "List commands\n"
+msgstr "Listigu komandojn\n"
+
+#: ../../../src/init.cpp:152
+msgid "Get help for a command\n"
+msgstr "Ricevu helpon de komando\n"
+
+#: ../../../src/init.cpp:153
+msgid "Options:\n"
+msgstr "Opcioj:\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Elektu agordan dosieron (defaŭlto: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:155
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "Elektu pid dosieron (defaŭlto: bitcoind.pid)\n"
+
+#: ../../../src/init.cpp:156
+msgid "Generate coins\n"
+msgstr "Generate coins\n"
+
+#: ../../../src/init.cpp:157
+msgid "Don't generate coins\n"
+msgstr "Ne kreu monerojn\n"
+
+#: ../../../src/init.cpp:158
+msgid "Start minimized\n"
+msgstr "Lanĉiĝu kaŝe\n"
+
+#: ../../../src/init.cpp:159
+msgid "Specify data directory\n"
+msgstr "Elektu datenara dosierujon\n"
+
+#: ../../../src/init.cpp:160
+msgid "Connect through socks4 proxy\n"
+msgstr "Konektu per socks4 prokuro\n"
+
+#: ../../../src/init.cpp:161
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "Permesu DNS solvon por aldoni nodon kaj konekti\n"
+
+#: ../../../src/init.cpp:162
+msgid "Add a node to connect to\n"
+msgstr "Aldonu nodon konektotan\n"
+
+#: ../../../src/init.cpp:163
+msgid "Connect only to the specified node\n"
+msgstr "Konektu nur al specifan nodon\n"
+
+#: ../../../src/init.cpp:164
+msgid "Don't accept connections from outside\n"
+msgstr "Ne akceptu eksterajn konektojn\n"
+
+#: ../../../src/init.cpp:167
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "Ne provu uzi UPnP-on por la pordplusendo\n"
+
+#: ../../../src/init.cpp:169
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Provu uzi UPnP-on por la pordplusendo\n"
+
+#: ../../../src/init.cpp:172
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Kosto po kilobajto aldonota al viaj transakcioj sendataj\n"
+
+#: ../../../src/init.cpp:174
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Akceptu kaj komandliniajn kaj JSON-RPC-ajn komandojn\n"
+
+#: ../../../src/init.cpp:177
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Lanĉigu fone kiel demono kaj akceptu komandojn\n"
+
+#: ../../../src/init.cpp:179
+msgid "Use the test network\n"
+msgstr "Uzu la testreton\n"
+
+#: ../../../src/init.cpp:180
+msgid "Username for JSON-RPC connections\n"
+msgstr "Salutnomo por JSON-RPC-aj konektoj\n"
+
+#: ../../../src/init.cpp:181
+msgid "Password for JSON-RPC connections\n"
+msgstr "Pasvorto por JSON-RPC-aj konektoj\n"
+
+#: ../../../src/init.cpp:182
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "Aŭskultu JSON-RPC-ajn konektojn ĉe <pordo> (defaŭlto: 8332)\n"
+
+#: ../../../src/init.cpp:183
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Permesu JSON-RPC-ajn konektojn el specifa IP-adreso\n"
+
+#: ../../../src/init.cpp:184
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Sendu komandojn al nodo rulanta ĉe <ip> (defaŭlto: 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:185
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Difinu la grandecon de la ĉifroŝlosilaro kiel <n> (defaŭlto: 100)\n"
+
+#: ../../../src/init.cpp:186
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Reskandu la blokĉenon por mankantaj transakcioj en la monujo\n"
+
+#: ../../../src/init.cpp:190
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"SSL-aj opcioj: (Legu la Vikipedion de Bitmonero pri la agordaĵaj instruoj)\n"
+
+#: ../../../src/init.cpp:191
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Uzu OpenSSL (https) por JSON-RPC-aj konektoj\n"
+
+#: ../../../src/init.cpp:192
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "Argorda doesiero de la servilo (defaŭlto: server.cert)\n"
+
+#: ../../../src/init.cpp:193
+msgid "Server private key (default: server.pem)\n"
+msgstr "Privata ĉifroŝlosilo de la servilo (defaŭlto: server.pem)\n"
+
+#: ../../../src/init.cpp:194
+msgid ""
+"Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:"
+"@STRENGTH)\n"
+msgstr ""
+"\"Akcepteblaj ĉifroj (defaŭlto: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:"
+"@STRENGTH)\n"
+
+#: ../../../src/init.cpp:198
+msgid "This help message\n"
+msgstr "Ĉi tiu helpa mesaĝo\n"
+
+#: ../../../src/init.cpp:335
+#, c-format
+msgid ""
+"Cannot obtain a lock on data directory %s. Bitcoin is probably already "
+"running."
+msgstr ""
+"Ne povas ŝlosi la datenan dosierujon %s. Verŝajne alia instanco de la "
+"programo Bitmonero jam rulas."
+
+#: ../../../src/init.cpp:361
+msgid "Error loading addr.dat \n"
+msgstr "Eraro ŝarĝante la dosieron addr.dat \n"
+
+#: ../../../src/init.cpp:367
+msgid "Error loading blkindex.dat \n"
+msgstr "Eraro ŝarĝante la dosieron blkindex.dat \n"
+
+#: ../../../src/init.cpp:374
+msgid "Error loading wallet.dat \n"
+msgstr "Eraro ŝarĝante la dosieron wallet.dat \n"
+
+#: ../../../src/init.cpp:454
+msgid "Invalid -proxy address"
+msgstr "Malvalida prokuradreso (-proxy)"
+
+#: ../../../src/init.cpp:477
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Malvalida kvanto de la transakcia kosto (-paytxfee=<kvanto>)"
+
+#: ../../../src/init.cpp:481
+msgid ""
+"Warning: -paytxfee is set very high. This is the transaction fee you will "
+"pay if you send a transaction."
+msgstr ""
+"Averto: La transakcia kosto (-paytxfee) estas tre alta. Tiu ĉi estas la "
+"kosto, kiun vi devos pagi kiam vi sendos transakcion."
+
+#: ../../../src/uibase.h:147
+msgid "Transaction Details"
+msgstr "Detaloj pri transakcio"
+
+#: ../../../src/uibase.h:199
+msgid "Options"
+msgstr "Detaloj pri transakcio"
+
+#: ../../../src/uibase.h:228
+msgid "About Bitcoin"
+msgstr "Pri Bitmonero"
+
+#: ../../../src/uibase.h:337
+msgid "Your Bitcoin Addresses"
+msgstr "Viaj Bitmoneraj adresoj"
+
+#~ msgid "Usage: bitcoin [options]"
+#~ msgstr "Uzado: bitcoin [opcioj]"
+
+#~ msgid ""
+#~ "Error: This is an oversized transaction that requires a transaction fee "
+#~ "of %s "
+#~ msgstr ""
+#~ "Eraro: Tiu ĉi estas grandega transakcio, kiu necesas transakcian koston "
+#~ "de %s. "
+
+#~ msgid "version %s%s BETA"
+#~ msgstr "versio %s%s BETA"
+
+#~ msgid "Will appear as \"From: Unknown\""
+#~ msgstr "Vidigonta kiel \"De: Nekonata\""
+
+#~ msgid "n/a"
+#~ msgstr "n/d"
+
+#~ msgid "Unknown"
+#~ msgstr "Nekonata"
+
+#~ msgid "Can't include a message when sending to a Bitcoin address"
+#~ msgstr "Sendante al bitmonaran adreson ne povas inkludi mesaĝon"
+
+#~ msgid ""
+#~ "This is an oversized transaction that requires a transaction fee of %s"
+#~ msgstr "Tiu ĉi estas grandega transakcio, kiu necesas transakcian koston de %s"
+
+#~ msgid ""
+#~ "Optional transaction fee you give to the nodes that process your "
+#~ "transactions."
+#~ msgstr ""
+#~ "Opcian transakcian koston vi donas al la nodoj kiuj plenumas viajn "
+#~ "transakciojn."
+
+#~ msgid "&Limit coin generation to"
+#~ msgstr "&Limitu bitmoneran kreadon al"
+
+#~ msgid "processors"
+#~ msgstr "procesoroj"
+
+#~ msgid "&From:"
+#~ msgstr "&De:"
+
+#~ msgid "&Message:"
+#~ msgstr "&Mesaĝo:" \ No newline at end of file
diff --git a/locale/it/LC_MESSAGES/bitcoin.mo b/locale/it/LC_MESSAGES/bitcoin.mo
index 9347018037..077ed8a217 100644
--- a/locale/it/LC_MESSAGES/bitcoin.mo
+++ b/locale/it/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/it/LC_MESSAGES/bitcoin.po b/locale/it/LC_MESSAGES/bitcoin.po
index ccb74eac99..85f5349216 100644
--- a/locale/it/LC_MESSAGES/bitcoin.po
+++ b/locale/it/LC_MESSAGES/bitcoin.po
@@ -2,10 +2,11 @@ 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"
+"POT-Creation-Date: 2011-05-15 18:22+0100\n"
+"PO-Revision-Date: 2011-05-15 18:23+0100\n"
+"Last-Translator: Federico Faggiano <federico.sk@katamail.com>\n"
"Language-Team: \n"
+"Language: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -13,685 +14,672 @@ msgstr ""
"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
+#: ../../../src/net.cpp:1499
#, 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"
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "Impossibile utilizzare la porta %d su questo computer. Bitcoin probabilmente e' gia' in esecuzione"
-#: ../../../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
+#: ../../../src/ui.cpp:202
#, 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?"
+msgstr "Questo trasferimento supera 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
+#: ../../../src/ui.cpp:301
msgid "Status"
msgstr "Stato"
-#: ../../../ui.cpp:286
+#: ../../../src/ui.cpp:302
msgid "Date"
msgstr "Data"
-#: ../../../ui.cpp:287
+#: ../../../src/ui.cpp:303
msgid "Description"
msgstr "Descrizione"
-#: ../../../ui.cpp:288
+#: ../../../src/ui.cpp:304
msgid "Debit"
msgstr "Debito"
-#: ../../../ui.cpp:289
+#: ../../../src/ui.cpp:305
msgid "Credit"
msgstr "Credito"
-#: ../../../ui.cpp:489
+#: ../../../src/ui.cpp:511
#, c-format
msgid "Open for %d blocks"
msgstr "Aperto per %d blocchi"
-#: ../../../ui.cpp:491
+#: ../../../src/ui.cpp:513
#, c-format
msgid "Open until %s"
msgstr "Aperto fino a %s"
-#: ../../../ui.cpp:497
+#: ../../../src/ui.cpp:519
#, c-format
msgid "%d/offline?"
-msgstr "%d/fuorilinea?"
+msgstr "%d/disconnesso?"
-#: ../../../ui.cpp:499
+#: ../../../src/ui.cpp:521
#, c-format
msgid "%d/unconfirmed"
msgstr "%d/non confermato"
-#: ../../../ui.cpp:501
+#: ../../../src/ui.cpp:523
#, c-format
msgid "%d confirmations"
msgstr "%d conferme"
-#: ../../../ui.cpp:584
+#: ../../../src/ui.cpp:608
msgid "Generated"
msgstr "Generato"
-#: ../../../ui.cpp:592
+#: ../../../src/ui.cpp:616
#, c-format
msgid "Generated (%s matures in %d more blocks)"
-msgstr "Generate (%s matureranno in %d altri blocchi)"
+msgstr "Generato (%s matureranno in %d altri blocchi)"
-#: ../../../ui.cpp:596
+#: ../../../src/ui.cpp:620
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
+#: ../../../src/ui.cpp:624
msgid "Generated (not accepted)"
msgstr "Generato (non accettato)"
-#: ../../../ui.cpp:610
+#: ../../../src/ui.cpp:634
msgid "From: "
msgstr "Da: "
-#: ../../../ui.cpp:634
+#: ../../../src/ui.cpp:658
msgid "Received with: "
msgstr "Ricevuto con: "
-#: ../../../ui.cpp:676
+#: ../../../src/ui.cpp:704
msgid "Payment to yourself"
msgstr "Pagamento a te stesso"
-#: ../../../ui.cpp:713
+#: ../../../src/ui.cpp:738
msgid "To: "
msgstr "A: "
-#: ../../../ui.cpp:1009
+#: ../../../src/ui.cpp:1053
msgid " Generating"
msgstr " Generando"
-#: ../../../ui.cpp:1011
+#: ../../../src/ui.cpp:1055
msgid "(not connected)"
msgstr "(non connesso)"
-#: ../../../ui.cpp:1014
+#: ../../../src/ui.cpp:1058
#, c-format
msgid " %d connections %d blocks %d transactions"
msgstr " %d connessioni %d blocchi %d trasferimenti"
-#: ../../../ui.cpp:1123
-#: ../../../ui.cpp:2351
+#: ../../../src/ui.cpp:1163
+#: ../../../src/ui.cpp:2527
msgid "New Receiving Address"
-msgstr "Nuovo indirizzo ricevente"
+msgstr "Nuovo indirizzo di ricezione"
-#: ../../../ui.cpp:1124
-#: ../../../ui.cpp:2352
+#: ../../../src/ui.cpp:1164
+#: ../../../src/ui.cpp:2528
msgid ""
"You should 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"
+"Si dovrebbe usare un nuovo indirizzo per ogni pagamento che ricevi.\n"
"\n"
"Label"
-#: ../../../ui.cpp:1193
+#: ../../../src/ui.cpp:1233
msgid "<b>Status:</b> "
msgstr "<b>Stato:</b> "
-#: ../../../ui.cpp:1198
+#: ../../../src/ui.cpp:1238
msgid ", has not been successfully broadcast yet"
-msgstr ", non è ancora stato diffuso correttamente"
+msgstr ", non è ancora stato trasmesso correttamente"
-#: ../../../ui.cpp:1200
+#: ../../../src/ui.cpp:1240
#, c-format
msgid ", broadcast through %d node"
-msgstr ", diffusione attraverso %d nodo"
+msgstr ", trasmissione attraverso %d nodo"
-#: ../../../ui.cpp:1202
+#: ../../../src/ui.cpp:1242
#, c-format
msgid ", broadcast through %d nodes"
-msgstr ", diffusione attraverso %d nodi"
+msgstr ", trasmissione attraverso %d nodi"
-#: ../../../ui.cpp:1206
+#: ../../../src/ui.cpp:1246
msgid "<b>Date:</b> "
msgstr "<b>Data:</b> "
-#: ../../../ui.cpp:1214
+#: ../../../src/ui.cpp:1254
msgid "<b>Source:</b> Generated<br>"
msgstr "<b>Sorgente:</b> Generato<br>"
-#: ../../../ui.cpp:1220
-#: ../../../ui.cpp:1238
+#: ../../../src/ui.cpp:1260
+#: ../../../src/ui.cpp:1278
msgid "<b>From:</b> "
msgstr "<b>Da:</b> "
-#: ../../../ui.cpp:1238
+#: ../../../src/ui.cpp:1278
msgid "unknown"
-msgstr "sconoscuto"
+msgstr "sconosciuto"
-#: ../../../ui.cpp:1239
-#: ../../../ui.cpp:1263
-#: ../../../ui.cpp:1322
+#: ../../../src/ui.cpp:1279
+#: ../../../src/ui.cpp:1303
+#: ../../../src/ui.cpp:1362
msgid "<b>To:</b> "
msgstr "<b>A:</b> "
-#: ../../../ui.cpp:1242
+#: ../../../src/ui.cpp:1282
msgid " (yours, label: "
msgstr " (vostro, label: "
-#: ../../../ui.cpp:1244
+#: ../../../src/ui.cpp:1284
msgid " (yours)"
msgstr " (vostro)"
-#: ../../../ui.cpp:1281
-#: ../../../ui.cpp:1293
-#: ../../../ui.cpp:1356
+#: ../../../src/ui.cpp:1321
+#: ../../../src/ui.cpp:1333
+#: ../../../src/ui.cpp:1379
+#: ../../../src/ui.cpp:1396
msgid "<b>Credit:</b> "
msgstr "<b>Credito:</b> "
-#: ../../../ui.cpp:1283
+#: ../../../src/ui.cpp:1323
#, c-format
msgid "(%s matures in %d more blocks)"
msgstr "(%s matureranno in %d altri blocchi)"
-#: ../../../ui.cpp:1285
+#: ../../../src/ui.cpp:1325
msgid "(not accepted)"
msgstr "(non accettato)"
-#: ../../../ui.cpp:1330
-#: ../../../ui.cpp:1353
+#: ../../../src/ui.cpp:1370
+#: ../../../src/ui.cpp:1378
+#: ../../../src/ui.cpp:1393
msgid "<b>Debit:</b> "
msgstr "<b>Debito:</b> "
-#: ../../../ui.cpp:1344
+#: ../../../src/ui.cpp:1384
msgid "<b>Transaction fee:</b> "
-msgstr "<b>Trasferimento costo:</b> "
+msgstr "<b>Costo del trasferimento :</b> "
-#: ../../../ui.cpp:1360
+#: ../../../src/ui.cpp:1400
msgid "<b>Net amount:</b> "
msgstr "<b>Quantità del network:</b> "
-#: ../../../ui.cpp:1367
+#: ../../../src/ui.cpp:1407
msgid "Message:"
msgstr "Messaggio:"
-#: ../../../ui.cpp:1370
+#: ../../../src/ui.cpp:1409
+msgid "Comment:"
+msgstr "Commento:"
+
+#: ../../../src/ui.cpp:1412
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
+#: ../../../src/ui.cpp:1592
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "Impossibile creare il file autostart/bitcoin.desktop"
+
+#: ../../../src/ui.cpp:1628
msgid "Main"
msgstr "Principale"
-#: ../../../ui.cpp:1442
+#: ../../../src/ui.cpp:1636
+msgid "&Start Bitcoin on window system startup"
+msgstr "&Avvia Bitcoin all'avvio del sistema"
+
+#: ../../../src/ui.cpp:1643
msgid "&Minimize on close"
msgstr "&Minimizza se chiuso"
-#: ../../../ui.cpp:1595
+#: ../../../src/ui.cpp:1785
#, c-format
-msgid "version %s%s BETA"
-msgstr "versione %s%s BETA"
-
-#: ../../../ui.cpp:1681
-msgid "Will appear as \"From: Unknown\""
-msgstr "Apparirà come \"Da: Sconosciuto\""
-
-#: ../../../ui.cpp:1681
-msgid "n/a"
-msgstr "Sconosciuto"
+msgid "version %s"
+msgstr "versione %s"
-#: ../../../ui.cpp:1681
-msgid "Unknown"
-msgstr "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
+#: ../../../src/ui.cpp:1897
msgid "Error in amount "
msgstr "Errore nell'ammontare "
-#: ../../../ui.cpp:1735
-#: ../../../ui.cpp:1740
-#: ../../../ui.cpp:1745
-#: ../../../ui.cpp:1771
-#: ../../../uibase.cpp:61
+#: ../../../src/ui.cpp:1897
+#: ../../../src/ui.cpp:1902
+#: ../../../src/ui.cpp:1907
+#: ../../../src/ui.cpp:1942
+#: ../../../src/uibase.cpp:55
msgid "Send Coins"
msgstr "Invia monete"
-#: ../../../ui.cpp:1740
+#: ../../../src/ui.cpp:1902
msgid "Amount exceeds your balance "
msgstr "L'ammontare è andato oltre i tuoi capitali "
-#: ../../../ui.cpp:1745
+#: ../../../src/ui.cpp:1907
msgid "Total exceeds your balance when the "
-msgstr "Il totale va oltre i tuoi capitali quando il "
+msgstr "Il totale supera il tuo bilancio quando il "
-#: ../../../ui.cpp:1745
+#: ../../../src/ui.cpp:1907
msgid " transaction fee is included "
-msgstr " il costo trasferimento è incluso "
+msgstr " il costo del trasferimento è incluso "
-#: ../../../ui.cpp:1761
+#: ../../../src/ui.cpp:1925
msgid "Payment sent "
msgstr "Pagamento inviato "
-#: ../../../ui.cpp:1771
+#: ../../../src/ui.cpp:1925
+#: ../../../src/ui.cpp:1930
+#: ../../../src/ui.cpp:2074
+#: ../../../src/ui.cpp:2227
+#: ../../../src/main.cpp:3999
+msgid "Sending..."
+msgstr "Invio in corso..."
+
+#: ../../../src/ui.cpp:1942
msgid "Invalid address "
msgstr "Indirizzo non valido "
-#: ../../../ui.cpp:1825
+#: ../../../src/ui.cpp:1995
#, c-format
msgid "Sending %s to %s"
msgstr "Inviando %s a %s"
-#: ../../../ui.cpp:1898
-#: ../../../ui.cpp:1931
+#: ../../../src/ui.cpp:2068
+#: ../../../src/ui.cpp:2101
msgid "CANCELLED"
msgstr "CANCELLATO"
-#: ../../../ui.cpp:1902
+#: ../../../src/ui.cpp:2072
msgid "Cancelled"
msgstr "Cancellato"
-#: ../../../ui.cpp:1904
+#: ../../../src/ui.cpp:2074
msgid "Transfer cancelled "
msgstr "Operazione cancellata "
-#: ../../../ui.cpp:1957
+#: ../../../src/ui.cpp:2127
msgid "Error: "
msgstr "Errore: "
-#: ../../../ui.cpp:1976
+#: ../../../src/ui.cpp:2141
+#: ../../../src/ui.cpp:2212
+#: ../../../src/main.cpp:4018
+msgid "Insufficient funds"
+msgstr "Fondi insufficenti"
+
+#: ../../../src/ui.cpp:2146
msgid "Connecting..."
msgstr "Connessione in corso..."
-#: ../../../ui.cpp:1981
+#: ../../../src/ui.cpp:2151
msgid "Unable to connect"
msgstr "Impossibile connettersi"
-#: ../../../ui.cpp:1986
+#: ../../../src/ui.cpp:2156
msgid "Requesting public key..."
msgstr "Richiesta chiave pubblica..."
-#: ../../../ui.cpp:1998
+#: ../../../src/ui.cpp:2168
msgid "Received public key..."
msgstr "Ricezione chiave pubblica..."
-#: ../../../ui.cpp:2010
+#: ../../../src/ui.cpp:2182
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "Il destinatario non accetta transazioni effettuate tramite questo IP"
+
+#: ../../../src/ui.cpp:2184
msgid "Transfer was not accepted"
msgstr "Trasferimento non accettato"
-#: ../../../ui.cpp:2019
+#: ../../../src/ui.cpp:2193
msgid "Invalid response received"
msgstr "Risposta non valida ricevuta"
-#: ../../../ui.cpp:2034
+#: ../../../src/ui.cpp:2208
msgid "Creating transaction..."
-msgstr "Creazione trasferimento..."
+msgstr "Creo transazione..."
-#: ../../../ui.cpp:2046
+#: ../../../src/ui.cpp:2220
#, 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"
+msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds"
+msgstr "Questa transazione richiede un costo di transazione di almeno %s a causa della sua quantità, complessità, o per l'uso di fondi recentemente ricevuti"
-#: ../../../ui.cpp:2048
+#: ../../../src/ui.cpp:2222
msgid "Transaction creation failed"
msgstr "Creazione trasferimento fallita"
-#: ../../../ui.cpp:2055
+#: ../../../src/ui.cpp:2229
msgid "Transaction aborted"
msgstr "Trasferimento bloccato"
-#: ../../../ui.cpp:2063
+#: ../../../src/ui.cpp:2237
msgid "Lost connection, transaction cancelled"
msgstr "Connessione persa, trasferimento cancellato"
-#: ../../../ui.cpp:2079
+#: ../../../src/ui.cpp:2253
msgid "Sending payment..."
-msgstr "Inviando pagamento..."
+msgstr "Invio del pagamento..."
-#: ../../../ui.cpp:2085
+#: ../../../src/ui.cpp:2259
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
+#: ../../../src/ui.cpp:2268
msgid "Waiting for confirmation..."
msgstr "In attesa di conferma..."
-#: ../../../ui.cpp:2110
+#: ../../../src/ui.cpp:2286
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."
+"Il pagamento è stato inviato, ma il destinatario non è stato in grado di verificarlo.\n"
+"Il trasferimento è registrato e sarà accreditato al destinatario,\n"
+"ma il commento informativo verrà mostrato come vuoto."
-#: ../../../ui.cpp:2119
+#: ../../../src/ui.cpp:2295
msgid "Payment was sent, but an invalid response was received"
msgstr "Il pagamento è stato inviato, ma è arrivata un risposta invalida"
-#: ../../../ui.cpp:2125
+#: ../../../src/ui.cpp:2301
msgid "Payment completed"
msgstr "Pagamento completato"
-#: ../../../ui.cpp:2156
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2339
+#: ../../../src/ui.cpp:2332
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2515
msgid "Name"
msgstr "Nome"
-#: ../../../ui.cpp:2157
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2339
+#: ../../../src/ui.cpp:2333
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2515
msgid "Address"
msgstr "Indirizzo"
-#: ../../../ui.cpp:2159
-#: ../../../ui.cpp:2314
+#: ../../../src/ui.cpp:2335
+#: ../../../src/ui.cpp:2490
msgid "Label"
msgstr "Label"
-#: ../../../ui.cpp:2160
-#: ../../../uibase.cpp:908
+#: ../../../src/ui.cpp:2336
+#: ../../../src/uibase.cpp:837
msgid "Bitcoin Address"
msgstr "Indirizzo Bitcoin"
-#: ../../../ui.cpp:2284
+#: ../../../src/ui.cpp:2460
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
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2484
msgid "Edit Address"
msgstr "Modifica indirizzo"
-#: ../../../ui.cpp:2314
+#: ../../../src/ui.cpp:2490
msgid "Edit Address Label"
msgstr "Modifica spazio indirizzo"
-#: ../../../ui.cpp:2339
-#: ../../../ui.cpp:2345
+#: ../../../src/ui.cpp:2515
+#: ../../../src/ui.cpp:2521
msgid "Add Address"
msgstr "Aggiungi indirizzo"
-#: ../../../ui.cpp:2421
+#: ../../../src/ui.cpp:2598
msgid "Bitcoin"
msgstr "Bitcoin"
-#: ../../../ui.cpp:2423
+#: ../../../src/ui.cpp:2600
msgid "Bitcoin - Generating"
msgstr "Bitcoin - Generando"
-#: ../../../ui.cpp:2425
+#: ../../../src/ui.cpp:2602
msgid "Bitcoin - (not connected)"
msgstr "Bitcoin - (non connesso)"
-#: ../../../ui.cpp:2500
+#: ../../../src/ui.cpp:2681
msgid "&Open Bitcoin"
msgstr "&Apri Bitcoin"
-#: ../../../ui.cpp:2501
+#: ../../../src/ui.cpp:2682
+msgid "&Send Bitcoins"
+msgstr "&Apri Bitcoin"
+
+#: ../../../src/ui.cpp:2683
msgid "O&ptions..."
-msgstr "O&pzioni..."
+msgstr "&Opzioni..."
-#: ../../../ui.cpp:2505
-#: ../../../uibase.cpp:27
+#: ../../../src/ui.cpp:2686
+#: ../../../src/uibase.cpp:25
msgid "E&xit"
-msgstr "E&sci"
+msgstr "&Esci"
+
+#: ../../../src/ui.cpp:2902
+msgid "Program has crashed and will terminate. "
+msgstr "Il programma è crashato e sarà terminato. "
+
+#: ../../../src/main.cpp:1868
+msgid "Warning: Disk space is low "
+msgstr "Attenzione: c'è poco spazio sul disco "
+
+#: ../../../src/main.cpp:3992
+#, c-format
+msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds "
+msgstr "Errore: Questa transazione richiede un costo di transazione di almeno %s a causa della sua quantità, complessità, o per l'uso di fondi recentemente ricevuti"
+
+#: ../../../src/main.cpp:3994
+msgid "Error: Transaction creation failed "
+msgstr "Errore: Creazione del trasferimento fallito "
+
+#: ../../../src/main.cpp:4003
+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."
+
+#: ../../../src/main.cpp:4016
+msgid "Invalid amount"
+msgstr "Quantità non valida"
+
+#: ../../../src/main.cpp:4023
+msgid "Invalid bitcoin address"
+msgstr "Indirizzo bitcoin non valido"
+
+#: ../../../src/rpc.cpp:1800
+#: ../../../src/rpc.cpp:1802
+#, c-format
+msgid "To use the %s option"
+msgstr "Usare l'opzione %s"
+
+#: ../../../src/rpc.cpp:1804
+#, c-format
+msgid ""
+"Warning: %s, you must set rpcpassword=<password>\n"
+"in the configuration file: %s\n"
+"If the file does not exist, create it with owner-readable-only file permissions.\n"
+msgstr ""
+"Attenzione: %s, devi impostare rpcpassword=<password>\n "
+"nel file di configurazione: %s\n"
+"Se questo file non esiste, puoi crearlo come un file di sola lettura.\n"
-#: ../../../uibase.cpp:30
+#: ../../../src/rpc.cpp:1972
+#, c-format
+msgid ""
+"You must set rpcpassword=<password> in the configuration file:\n"
+"%s\n"
+"If the file does not exist, create it with owner-readable-only file permissions."
+msgstr ""
+"Devi settare rpcpassword=<password> nel file di configurazione:\n"
+"%s\n"
+"Se questo file non esiste, puoi crearlo come un file di sola lettura"
+
+#: ../../../src/util.cpp:865
+msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly."
+msgstr "Attenzione: Controlla che data/ora del tuo computer siano corrette. Se il tuo orologio è sbagliato bitcoin non funzionerà correttamente"
+
+#: ../../../src/util.cpp:898
+msgid "-beta"
+msgstr "-beta"
+
+#: ../../../src/uibase.cpp:28
msgid "&File"
msgstr "&File"
-#: ../../../uibase.cpp:38
+#: ../../../src/uibase.cpp:32
msgid "&Your Receiving Addresses..."
msgstr "&Il tuo indirizzo di ricezione..."
-#: ../../../uibase.cpp:42
+#: ../../../src/uibase.cpp:36
msgid "&Options..."
msgstr "&Opzioni..."
-#: ../../../uibase.cpp:45
+#: ../../../src/uibase.cpp:39
msgid "&Settings"
msgstr "I&mpostazioni"
-#: ../../../uibase.cpp:49
+#: ../../../src/uibase.cpp:43
msgid "&About..."
msgstr "&Info..."
-#: ../../../uibase.cpp:52
+#: ../../../src/uibase.cpp:46
msgid "&Help"
msgstr "&Aiuto"
-#: ../../../uibase.cpp:62
+#: ../../../src/uibase.cpp:56
msgid "Address Book"
msgstr "Rubrica indirizzi"
-#: ../../../uibase.cpp:77
+#: ../../../src/uibase.cpp:69
msgid "Your Bitcoin Address:"
msgstr "Il tuo indirizzo Bitcoin:"
-#: ../../../uibase.cpp:84
+#: ../../../src/uibase.cpp:76
msgid " &New... "
msgstr " &Nuovo... "
-#: ../../../uibase.cpp:87
-#: ../../../uibase.cpp:851
-#: ../../../uibase.cpp:954
+#: ../../../src/uibase.cpp:79
+#: ../../../src/uibase.cpp:780
+#: ../../../src/uibase.cpp:883
msgid " &Copy to Clipboard "
msgstr " &Copia nella Clipboard "
-#: ../../../uibase.cpp:102
+#: ../../../src/uibase.cpp:93
msgid "Balance:"
-msgstr "Capitali:"
+msgstr "Bilancio:"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " All"
msgstr " Tutte"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " Sent"
msgstr " Inviato"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " Received"
msgstr " Ricevuto"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " In Progress"
msgstr " In lavorazione"
-#: ../../../uibase.cpp:142
+#: ../../../src/uibase.cpp:130
msgid "All Transactions"
-msgstr "Tutte le operazioni"
+msgstr "Tutte le transazioni"
-#: ../../../uibase.cpp:153
+#: ../../../src/uibase.cpp:141
msgid "Sent/Received"
msgstr "Inviato/Ricevuto"
-#: ../../../uibase.cpp:164
+#: ../../../src/uibase.cpp:152
msgid "Sent"
msgstr "Inviato"
-#: ../../../uibase.cpp:175
+#: ../../../src/uibase.cpp:163
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
+#: ../../../src/uibase.cpp:302
+#: ../../../src/uibase.cpp:443
+#: ../../../src/uibase.cpp:542
+#: ../../../src/uibase.cpp:722
+#: ../../../src/uibase.cpp:783
+#: ../../../src/uibase.cpp:892
+#: ../../../src/uibase.cpp:981
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
+#: ../../../src/uibase.cpp:345
msgid "&Start Bitcoin on system startup"
-msgstr "A&vvia Bitcoin all'avvio del sistema"
+msgstr "&Avvia Bitcoin all'avvio del sistema"
-#: ../../../uibase.cpp:403
+#: ../../../src/uibase.cpp:348
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"
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "Imposta le porte del firewall utilizzando &UPnP"
-#: ../../../uibase.cpp:414
+#: ../../../src/uibase.cpp:354
+msgid "&Minimize to the tray on close"
+msgstr "&Minimizza nella tray alla chiusura"
+
+#: ../../../src/uibase.cpp:360
msgid "&Connect through socks4 proxy: "
msgstr "%Connesso attraverso proxy socks4: "
-#: ../../../uibase.cpp:426
+#: ../../../src/uibase.cpp:371
msgid "Proxy &IP:"
msgstr "Proxy &IP:"
-#: ../../../uibase.cpp:434
+#: ../../../src/uibase.cpp:379
msgid " &Port:"
msgstr " &Porta:"
-#: ../../../uibase.cpp:456
+#: ../../../src/uibase.cpp:392
+msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended."
+msgstr "Tassa di transazione per ogni KB opzionale che consente di assicurarsi che le transazioni siano trattate con rapidità. La maggior parte delle operazioni sono 1KB. Quota 0,01 raccomandata."
+
+#: ../../../src/uibase.cpp:399
+msgid "Pay transaction fee:"
+msgstr "Costo trasferimento:"
+
+#: ../../../src/uibase.cpp:420
msgid "// [don't translate] Test panel 2 for future expansion"
msgstr ""
-#: ../../../uibase.cpp:460
+#: ../../../src/uibase.cpp:424
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
+#: ../../../src/uibase.cpp:446
+#: ../../../src/uibase.cpp:668
+#: ../../../src/uibase.cpp:727
+#: ../../../src/uibase.cpp:786
+#: ../../../src/uibase.cpp:895
+#: ../../../src/uibase.cpp:984
msgid "Cancel"
msgstr "Cancella"
-#: ../../../uibase.cpp:485
+#: ../../../src/uibase.cpp:449
msgid "&Apply"
msgstr "&Accetta"
-#: ../../../uibase.cpp:546
+#: ../../../src/uibase.cpp:508
msgid "Bitcoin "
msgstr "Bitcoin "
-#: ../../../uibase.cpp:552
+#: ../../../src/uibase.cpp:514
msgid "version"
msgstr "versione"
-#: ../../../uibase.cpp:563
+#: ../../../src/uibase.cpp:525
msgid ""
-"Copyright (c) 2009-2010 Bitcoin Developers\n"
+"Copyright (c) 2009-2011 Bitcoin Developers\n"
"\n"
"This is experimental software.\n"
"\n"
@@ -713,47 +701,39 @@ msgstr ""
"l'uso del (http://www.openssl.org/) e il software criptografico scritto\n"
"da Eric Young (eay@cryptsoft.com) e UPnP software scritto da Thomas Bernard."
-#: ../../../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)"
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Inserisci un indirizzo Bitcoin (es. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L)"
-#: ../../../uibase.cpp:633
+#: ../../../src/uibase.cpp:595
msgid "Pay &To:"
msgstr "Paga %a:"
-#: ../../../uibase.cpp:648
+#: ../../../src/uibase.cpp:610
msgid "&Paste"
msgstr "&Incolla"
-#: ../../../uibase.cpp:651
+#: ../../../src/uibase.cpp:613
msgid " Address &Book..."
msgstr " &Rubrica degli indirizzi..."
-#: ../../../uibase.cpp:658
+#: ../../../src/uibase.cpp:620
msgid "&Amount:"
msgstr "&Quantità"
-#: ../../../uibase.cpp:668
-msgid "T&ransfer:"
-msgstr "T&rasferimento:"
+#: ../../../src/uibase.cpp:630
+msgid "&Transfer:"
+msgstr "&Trasferimento:"
-#: ../../../uibase.cpp:674
+#: ../../../src/uibase.cpp:636
msgid " Standard"
msgstr " Standard"
-#: ../../../uibase.cpp:696
-msgid "&From:"
-msgstr "&Proveniente da:"
-
-#: ../../../uibase.cpp:713
-msgid "&Message:"
-msgstr "&Messaggio:"
-
-#: ../../../uibase.cpp:730
+#: ../../../src/uibase.cpp:663
msgid "&Send"
msgstr "&Invia"
-#: ../../../uibase.cpp:782
+#: ../../../src/uibase.cpp:711
msgid ""
"\n"
"\n"
@@ -763,48 +743,281 @@ msgstr ""
"\n"
"Connessione in corso..."
-#: ../../../uibase.cpp:832
+#: ../../../src/uibase.cpp:761
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
+#: ../../../src/uibase.cpp:774
+#: ../../../src/uibase.cpp:886
msgid "&Edit..."
msgstr "&Cambia..."
-#: ../../../uibase.cpp:848
-#: ../../../uibase.cpp:960
+#: ../../../src/uibase.cpp:777
+#: ../../../src/uibase.cpp:889
msgid " &New Address... "
msgstr " &Nuovo indirizzo... "
-#: ../../../uibase.cpp:920
+#: ../../../src/uibase.cpp:849
msgid "Sending"
-msgstr "Inviando"
+msgstr "Invio in corso.."
-#: ../../../uibase.cpp:928
+#: ../../../src/uibase.cpp:857
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
+#: ../../../src/uibase.cpp:870
msgid "Receiving"
msgstr "Ricevendo"
-#: ../../../uibase.cpp:951
+#: ../../../src/uibase.cpp:880
msgid "&Delete"
msgstr "&Cancella"
-#: ../../../uibase.h:150
+#: ../../../src/init.cpp:145
+msgid " beta"
+msgstr " beta"
+
+#: ../../../src/init.cpp:147
+msgid "Bitcoin version"
+msgstr "Versione Bitcoin "
+
+#: ../../../src/init.cpp:148
+msgid "Usage:"
+msgstr "Uso:"
+
+#: ../../../src/init.cpp:150
+msgid "Send command to -server or bitcoind\n"
+msgstr "Invia comando a -server o a bitcoin\n"
+
+#: ../../../src/init.cpp:151
+msgid "List commands\n"
+msgstr "Lista comandi\n"
+
+#: ../../../src/init.cpp:152
+msgid "Get help for a command\n"
+msgstr "Chiedi aiuto per i comandi\n"
+
+#: ../../../src/init.cpp:153
+msgid "Options:\n"
+msgstr "Opzioni:\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Specifica il file di configurazione (normalmente e': bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:155
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "Specifica il fil pid (normalmente: bitcoin.pid)\n"
+
+#: ../../../src/init.cpp:156
+msgid "Generate coins\n"
+msgstr "Genera monete\n"
+
+#: ../../../src/init.cpp:157
+msgid "Don't generate coins\n"
+msgstr "Non generare monete\n"
+
+#: ../../../src/init.cpp:158
+msgid "Start minimized\n"
+msgstr "Avvia minimizzato\n"
+
+#: ../../../src/init.cpp:159
+msgid "Specify data directory\n"
+msgstr "Indica la cartella per i dati\n"
+
+#: ../../../src/init.cpp:160
+msgid "Connect through socks4 proxy\n"
+msgstr "Connetti attraverso proxy socks4\n"
+
+#: ../../../src/init.cpp:161
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "Permetti DNS lookups per aggiungere un nodo e collegarsi\n"
+
+#: ../../../src/init.cpp:162
+msgid "Add a node to connect to\n"
+msgstr "Aggiungi un nodoper la connessione a\n"
+
+#: ../../../src/init.cpp:163
+msgid "Connect only to the specified node\n"
+msgstr "Collegati solo al nodo specificato\n"
+
+#: ../../../src/init.cpp:164
+msgid "Don't accept connections from outside\n"
+msgstr "Non accettare connessioni dall'esterno\n"
+
+#: ../../../src/init.cpp:167
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "Non provare a usare UPnP per mappare le porte in ascolto\n"
+
+#: ../../../src/init.cpp:169
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Prova ad usare l' UPnP per mappare la porte in ascolto\n"
+
+#: ../../../src/init.cpp:172
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Tassa per KB da aggiungere alle operazioni di invio\n"
+
+#: ../../../src/init.cpp:174
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Accetta linea di comando e i comando JSON-RPC\n"
+
+#: ../../../src/init.cpp:177
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Avvia in background come processo e accetta i comandi\n"
+
+#: ../../../src/init.cpp:179
+msgid "Use the test network\n"
+msgstr "Usa il network test\n"
+
+#: ../../../src/init.cpp:180
+msgid "Username for JSON-RPC connections\n"
+msgstr "Username per le connessioni JSON-RPC\n"
+
+#: ../../../src/init.cpp:181
+msgid "Password for JSON-RPC connections\n"
+msgstr "Password per le connessioni JSON-RPC\n"
+
+#: ../../../src/init.cpp:182
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "In ascolta per connessioni JSON-RPC sulla porta <port> (default: 8332)\n"
+
+#: ../../../src/init.cpp:183
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Permetti connessioni JSON-RPC da un indirizzo IP specifico\n"
+
+#: ../../../src/init.cpp:184
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Invia comandi al nodo in esecuzione su <ip> (default: 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:185
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Imposta la dimensione della key pool a <n> (default: 100)\n"
+
+#: ../../../src/init.cpp:186
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Ricontrolla il blocco della catena transazioni del portafoglio mancate\n"
+
+#: ../../../src/init.cpp:190
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"opzioni SSL: (Consulta Bitcoin Wiki per le istruzioni di configurazione dell' SSL)\n"
+
+#: ../../../src/init.cpp:191
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Usa OpenSSL (https) per connessioni JSON-RPC\n"
+
+#: ../../../src/init.cpp:192
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "File del certificato del server (default: server.cert)\n"
+
+#: ../../../src/init.cpp:193
+msgid "Server private key (default: server.pem)\n"
+msgstr "Chiave del server privata ((default: server.pem)\n"
+
+#: ../../../src/init.cpp:194
+msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+msgstr "Cifrari accettati (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+
+#: ../../../src/init.cpp:198
+msgid "This help message\n"
+msgstr "Questo messaggio di aiuto\n"
+
+#: ../../../src/init.cpp:335
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "Impossibile ottenere un blocco sulla directory %s. Bitcoin e' probabilmente gia' in esecuzione"
+
+#: ../../../src/init.cpp:361
+msgid "Error loading addr.dat \n"
+msgstr "Errore nel caricamento addr.dat \n"
+
+#: ../../../src/init.cpp:367
+msgid "Error loading blkindex.dat \n"
+msgstr "Errore nel caricamento blkindex.dat \n"
+
+#: ../../../src/init.cpp:374
+msgid "Error loading wallet.dat \n"
+msgstr "Errore nel caricamento wallet.dat \n"
+
+#: ../../../src/init.cpp:454
+msgid "Invalid -proxy address"
+msgstr "Indirizzo proxy non valido"
+
+#: ../../../src/init.cpp:477
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Quantita' non valida per -paytxfee=<amount>"
+
+#: ../../../src/init.cpp:481
+msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."
+msgstr "Attenzione: -paytxfee e' molto alta. Questo e' la tassa che pagherai se invii la transazione"
+
+#: ../../../src/uibase.h:147
msgid "Transaction Details"
-msgstr "Dettagli operazione"
+msgstr "Dettagli transazione"
-#: ../../../uibase.h:203
+#: ../../../src/uibase.h:199
msgid "Options"
msgstr "Opzioni"
-#: ../../../uibase.h:231
+#: ../../../src/uibase.h:228
msgid "About Bitcoin"
msgstr "Info Bitcoin"
-#: ../../../uibase.h:341
+#: ../../../src/uibase.h:337
msgid "Your Bitcoin Addresses"
msgstr "Il tuo indirizzo Bitcoin"
+
+#~ msgid "Usage: bitcoin [options]"
+#~ msgstr "Uso: bitcoin [options]"
+
+#~ msgid ""
+#~ "Error: This is an oversized transaction that requires a transaction fee "
+#~ "of %s "
+#~ msgstr ""
+#~ "Errore: Questa è un operazione fuorimisura che richiede un sovrapprezzo"
+#~ "di %s "
+
+#~ msgid "version %s%s BETA"
+#~ msgstr "versione %s%s BETA"
+
+#~ msgid "Will appear as \"From: Unknown\""
+#~ msgstr "Apparirà come \"Da: Sconosciuto\""
+
+#~ msgid "n/a"
+#~ msgstr "Non disponibile"
+
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ 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"
+
+#~ msgid ""
+#~ "This is an oversized transaction that requires a transaction fee of %s"
+#~ msgstr ""
+#~ "Questo è un trasferimento fuorimisura che richiede un costo aggiuntivo di %s "
+
+
+#~ 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"
+
+#~ msgid "&Limit coin generation to"
+#~ msgstr "&Limita la generazione di Bitcoin a"
+
+#~ msgid "processors"
+#~ msgstr "processori"
+
+#~ msgid "&From:"
+#~ msgstr "&Proveniente da:"
+
+#~ msgid "&Message:"
+#~ msgstr "&Messaggio:"
diff --git a/locale/ru/LC_MESSAGES/bitcoin.mo b/locale/ru/LC_MESSAGES/bitcoin.mo
index b44c10ad47..1b502fad02 100644
--- a/locale/ru/LC_MESSAGES/bitcoin.mo
+++ b/locale/ru/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/ru/LC_MESSAGES/bitcoin.po b/locale/ru/LC_MESSAGES/bitcoin.po
index 545f54db2e..0aa3173aef 100644
--- a/locale/ru/LC_MESSAGES/bitcoin.po
+++ b/locale/ru/LC_MESSAGES/bitcoin.po
@@ -1,11 +1,12 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-05 10:53+0300\n"
-"PO-Revision-Date: 2010-10-05 11:43+0300\n"
-"Last-Translator: eurekafag\n"
+"Report-Msgid-Bugs-To: m0Ray <m0ray@nm.ru>\n"
+"POT-Creation-Date: 2011-05-15 18:24+0100\n"
+"PO-Revision-Date: 2011-05-23 07:06+0500\n"
+"Last-Translator: m0Ray <m0ray@nm.ru>\n"
"Language-Team: \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -13,503 +14,365 @@ msgstr ""
"X-Poedit-Basepath: .\n"
"X-Poedit-SearchPath-0: ../../..\n"
-#: ../../../init.cpp:162
-msgid "Usage:"
-msgstr "Использование"
-
-#: ../../../init.cpp:164
-msgid "Send command to -server or bitcoind\n"
-msgstr "Отправить команду bitcoin, запущенному с -server\n"
-
-#: ../../../init.cpp:165
-msgid "List commands\n"
-msgstr "Список команд\n"
-
-#: ../../../init.cpp:166
-msgid "Get help for a command\n"
-msgstr "Получить помощь для команды\n"
-
-#: ../../../init.cpp:167
-msgid "Options:\n"
-msgstr "Параметры:\n"
-
-#: ../../../init.cpp:168
-msgid "Specify configuration file (default: bitcoin.conf)\n"
-msgstr "Укажите конфигурационный файл (по умолчанию: bitcoin.conf)\n"
-
-#: ../../../init.cpp:169
-msgid "Generate coins\n"
-msgstr "Генерировать монеты\n"
-
-#: ../../../init.cpp:170
-msgid "Don't generate coins\n"
-msgstr "Не генерировать монеты\n"
-
-#: ../../../init.cpp:171
-msgid "Start minimized\n"
-msgstr "Запускать свёрнутым\n"
-
-#: ../../../init.cpp:172
-msgid "Specify data directory\n"
-msgstr "Указать каталог данных\n"
-
-#: ../../../init.cpp:173
-msgid "Connect through socks4 proxy\n"
-msgstr "Подключаться через socks4 прокси\n"
-
-#: ../../../init.cpp:174
-msgid "Add a node to connect to\n"
-msgstr "Добавить узел для подключения\n"
-
-#: ../../../init.cpp:175
-msgid "Connect only to the specified node\n"
-msgstr "Подключаться только к указанному узлу\n"
-
-#: ../../../init.cpp:176
-msgid "Accept command line and JSON-RPC commands\n"
-msgstr "Принимать команды из командной строки и через JSON-RPC\n"
-
-#: ../../../init.cpp:177
-msgid "Run in the background as a daemon and accept commands\n"
-msgstr "Запустить в фоне как демон и принимать команды\n"
-
-#: ../../../init.cpp:178
-msgid "This help message\n"
-msgstr "Эта справка\n"
-
-#: ../../../init.cpp:284
-msgid "Error loading addr.dat \n"
-msgstr "Ошибка загрузки addr.dat \n"
-
-#: ../../../init.cpp:290
-msgid "Error loading blkindex.dat \n"
-msgstr "Ошибка загрузки blkindex.dat \n"
-
-#: ../../../init.cpp:297
-msgid "Error loading wallet.dat \n"
-msgstr "Ошибка загрузки wallet.dat \n"
-
-#: ../../../init.cpp:365
-msgid "Invalid -proxy address"
-msgstr "Неверный адрес -proxy"
-
-#: ../../../init.cpp:385
-msgid "Invalid amount for -paytxfee=<amount>"
-msgstr "Неверное значение для -paytxfee=<amount>"
-
-#: ../../../init.cpp:389
-msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."
-msgstr "Внимание: -paytxfee установлено в очень большое значение. Это комиссия, которую вы будете платить при переводе."
-
-#: ../../../main.cpp:1641
-msgid "Warning: Disk space is low "
-msgstr "Внимание: мало места на диске "
-
-#: ../../../main.cpp:3505
+#: ../../../src/net.cpp:1499
#, c-format
-msgid "Error: This is an oversized transaction that requires a transaction fee of %s "
-msgstr "Ошибка: этот перевод слишком большого размера, который требует комиссию %s "
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "Не могу открыть порт %d. Возможно, Bitcoin уже запущен."
-#: ../../../main.cpp:3507
-msgid "Error: Transaction creation failed "
-msgstr "Ошибка: не удалось создать перевод "
-
-#: ../../../main.cpp:3512
-#: ../../../ui.cpp:1964
-#: ../../../ui.cpp:1966
-#: ../../../ui.cpp:2107
-#: ../../../ui.cpp:2260
-msgid "Sending..."
-msgstr "Отправка..."
-
-#: ../../../main.cpp:3516
-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 "Перевод был отклонен. Это могло произойти, если некоторые из монет в вашем кошельке уже были потрачены, например, если вы использовали копию wallet.dat, и монеты были потрачены в копии, но не отмечены израсходованными здесь."
-
-#: ../../../main.cpp:3528
-msgid "Invalid amount"
-msgstr "Неверное количество"
-
-#: ../../../main.cpp:3530
-#: ../../../ui.cpp:2174
-#: ../../../ui.cpp:2245
-msgid "Insufficient funds"
-msgstr "Недостаточно средств"
-
-#: ../../../main.cpp:3535
-msgid "Invalid bitcoin address"
-msgstr "Неверный адрес bitcoin"
-
-#: ../../../rpc.cpp:963
-#: ../../../rpc.cpp:965
-#, c-format
-msgid "To use the %s option"
-msgstr "Чтобы использовать опцию %s"
-
-#: ../../../rpc.cpp:967
-#, c-format
-msgid ""
-"Warning: %s, you must set rpcpassword=<password>\n"
-"in the configuration file: %s\n"
-"If the file does not exist, create it with owner-readable-only file permissions.\n"
-msgstr ""
-"Внимание: %s, вы должны установить rpcpassword=<пароль>\n"
-"в конфигурационном файле: %s\n"
-"Если файл не существует, создайте его с правами \"чтение только владельцем\".\n"
-
-#: ../../../rpc.cpp:1100
-#, c-format
-msgid ""
-"You must set rpcpassword=<password> in the configuration file:\n"
-"%s\n"
-"If the file does not exist, create it with owner-readable-only file permissions."
-msgstr ""
-"Вы должны установить rpcpassword=<пароль> в конфигурационном файле:\n"
-"%s\n"
-"Если файл не существует, создайте его с правами \"чтение только владельцем\"."
-
-#: ../../../ui.cpp:202
+#: ../../../src/ui.cpp:202
#, 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 "Этот перевод превышает допустимый лимит. Вы можете провести его с комиссией %s, которую получат узлы, обрабатывающие перевод, и поможет поддерживать сеть. Вы хотите заплатить комиссию?"
-#: ../../../ui.cpp:301
+#: ../../../src/ui.cpp:301
msgid "Status"
msgstr "Статус"
-#: ../../../ui.cpp:302
+#: ../../../src/ui.cpp:302
msgid "Date"
msgstr "Дата"
-#: ../../../ui.cpp:303
+#: ../../../src/ui.cpp:303
msgid "Description"
msgstr "Описание"
-#: ../../../ui.cpp:304
+#: ../../../src/ui.cpp:304
msgid "Debit"
-msgstr "Дебет"
+msgstr "Расход"
-#: ../../../ui.cpp:305
+#: ../../../src/ui.cpp:305
msgid "Credit"
-msgstr "Кредит"
+msgstr "Приход"
-#: ../../../ui.cpp:511
+#: ../../../src/ui.cpp:511
#, c-format
msgid "Open for %d blocks"
-msgstr "Открыто для %d блоков"
+msgstr "Открыто на %d блоков"
-#: ../../../ui.cpp:513
+#: ../../../src/ui.cpp:513
#, c-format
msgid "Open until %s"
msgstr "Открыто до %s"
-#: ../../../ui.cpp:519
+#: ../../../src/ui.cpp:519
#, c-format
msgid "%d/offline?"
msgstr "%d/оффлайн?"
-#: ../../../ui.cpp:521
+#: ../../../src/ui.cpp:521
#, c-format
msgid "%d/unconfirmed"
msgstr "%d/не подтверждено"
-#: ../../../ui.cpp:523
+#: ../../../src/ui.cpp:523
#, c-format
msgid "%d confirmations"
msgstr "%d подтверждений"
-#: ../../../ui.cpp:608
+#: ../../../src/ui.cpp:608
msgid "Generated"
msgstr "Сгенерировано"
-#: ../../../ui.cpp:616
+#: ../../../src/ui.cpp:616
#, c-format
msgid "Generated (%s matures in %d more blocks)"
msgstr "Сгенерировано (%s станет доступно через %d блоков)"
-#: ../../../ui.cpp:620
+#: ../../../src/ui.cpp:620
msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
msgstr "Сгенерировано - Внимание: этот блок не был получен ни одним узлом и, скорее всего, не будет принят!"
-#: ../../../ui.cpp:624
+#: ../../../src/ui.cpp:624
msgid "Generated (not accepted)"
msgstr "Сгенерировано (не принято)"
-#: ../../../ui.cpp:634
+#: ../../../src/ui.cpp:634
msgid "From: "
msgstr "От: "
-#: ../../../ui.cpp:658
+#: ../../../src/ui.cpp:658
msgid "Received with: "
msgstr "Получено для: "
-#: ../../../ui.cpp:704
+#: ../../../src/ui.cpp:704
msgid "Payment to yourself"
msgstr "Платёж самому себе"
-#: ../../../ui.cpp:741
+#: ../../../src/ui.cpp:738
msgid "To: "
msgstr "Кому: "
-#: ../../../ui.cpp:1049
+#: ../../../src/ui.cpp:1053
msgid " Generating"
msgstr " Генерация"
-#: ../../../ui.cpp:1051
+#: ../../../src/ui.cpp:1055
msgid "(not connected)"
msgstr "(не подключен)"
-#: ../../../ui.cpp:1054
+#: ../../../src/ui.cpp:1058
#, c-format
msgid " %d connections %d blocks %d transactions"
msgstr " %d подключений %d блоков %d переводов"
-#: ../../../ui.cpp:1165
-#: ../../../ui.cpp:2560
+#: ../../../src/ui.cpp:1163
+#: ../../../src/ui.cpp:2527
msgid "New Receiving Address"
msgstr "Новый адрес получения"
-#: ../../../ui.cpp:1166
-#: ../../../ui.cpp:2561
+#: ../../../src/ui.cpp:1164
+#: ../../../src/ui.cpp:2528
msgid ""
"You should use a new address for each payment you receive.\n"
"\n"
"Label"
msgstr ""
-"Вы должны использовать новый адрес для каждого получаемого платежа.\n"
+"Рекомендуется использовать новый адрес для каждого получаемого платежа.\n"
"\n"
"Метка"
-#: ../../../ui.cpp:1235
+#: ../../../src/ui.cpp:1233
msgid "<b>Status:</b> "
msgstr "<b>Статус:</b> "
-#: ../../../ui.cpp:1240
+#: ../../../src/ui.cpp:1238
msgid ", has not been successfully broadcast yet"
msgstr ", ещё не был успешно разослан"
-#: ../../../ui.cpp:1242
+#: ../../../src/ui.cpp:1240
#, c-format
msgid ", broadcast through %d node"
msgstr ", рассылка через %d узел"
-#: ../../../ui.cpp:1244
+#: ../../../src/ui.cpp:1242
#, c-format
msgid ", broadcast through %d nodes"
msgstr ", рассылка через %d узлов"
-#: ../../../ui.cpp:1248
+#: ../../../src/ui.cpp:1246
msgid "<b>Date:</b> "
msgstr "<b>Дата:</b> "
-#: ../../../ui.cpp:1256
+#: ../../../src/ui.cpp:1254
msgid "<b>Source:</b> Generated<br>"
msgstr "<b>Источник:</b> Сгенерировано<br>"
-#: ../../../ui.cpp:1262
-#: ../../../ui.cpp:1280
+#: ../../../src/ui.cpp:1260
+#: ../../../src/ui.cpp:1278
msgid "<b>From:</b> "
msgstr "<b>От:</b> "
-#: ../../../ui.cpp:1280
+#: ../../../src/ui.cpp:1278
msgid "unknown"
msgstr "аноним"
-#: ../../../ui.cpp:1281
-#: ../../../ui.cpp:1305
-#: ../../../ui.cpp:1364
+#: ../../../src/ui.cpp:1279
+#: ../../../src/ui.cpp:1303
+#: ../../../src/ui.cpp:1362
msgid "<b>To:</b> "
msgstr "<b>Кому:</b> "
-#: ../../../ui.cpp:1284
+#: ../../../src/ui.cpp:1282
msgid " (yours, label: "
msgstr " (ваш, метка: "
-#: ../../../ui.cpp:1286
+#: ../../../src/ui.cpp:1284
msgid " (yours)"
msgstr " (ваш)"
-#: ../../../ui.cpp:1323
-#: ../../../ui.cpp:1335
-#: ../../../ui.cpp:1398
+#: ../../../src/ui.cpp:1321
+#: ../../../src/ui.cpp:1333
+#: ../../../src/ui.cpp:1379
+#: ../../../src/ui.cpp:1396
msgid "<b>Credit:</b> "
-msgstr "<b>Кредит:</b> "
+msgstr "<b>Приход:</b> "
-#: ../../../ui.cpp:1325
+#: ../../../src/ui.cpp:1323
#, c-format
msgid "(%s matures in %d more blocks)"
msgstr "(%s станет доступно через %d блоков)"
-#: ../../../ui.cpp:1327
+#: ../../../src/ui.cpp:1325
msgid "(not accepted)"
msgstr "(не принято)"
-#: ../../../ui.cpp:1372
-#: ../../../ui.cpp:1395
+#: ../../../src/ui.cpp:1370
+#: ../../../src/ui.cpp:1378
+#: ../../../src/ui.cpp:1393
msgid "<b>Debit:</b> "
-msgstr "<b>Дебет:</b> "
+msgstr "<b>Расход:</b> "
-#: ../../../ui.cpp:1386
+#: ../../../src/ui.cpp:1384
msgid "<b>Transaction fee:</b> "
msgstr "<b>Комиссия:</b> "
-#: ../../../ui.cpp:1402
+#: ../../../src/ui.cpp:1400
msgid "<b>Net amount:</b> "
-msgstr "<b>Количество сети:</b> "
+msgstr "<b>Чистая сумма:</b> "
-#: ../../../ui.cpp:1409
+#: ../../../src/ui.cpp:1407
msgid "Message:"
msgstr "Сообщение:"
-#: ../../../ui.cpp:1412
+#: ../../../src/ui.cpp:1409
+msgid "Comment:"
+msgstr "Комментарий:"
+
+#: ../../../src/ui.cpp:1412
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 "Сгенерированные монеты должны ждать 120 блоков, прежде чем они могут быть потрачены. Когда вы сгенерировали этот блок, он был разослан в сети для добавления в цепь блоков. Если не удалось добавить этот блок в цепь, он будет обозначен как \"не принятый\" и не может быть потрачен. Такое может случиться, если другой узел сгенерировал блок через несколько секунд после вас."
+msgstr "Сгенерированные монеты должны ждать 120 блоков, прежде чем они могут быть потрачены. Когда вы сгенерировали этот блок, он был разослан в сети для добавления в цепь блоков. Если не удалось добавить этот блок в цепь, он будет обозначен как \"не принятый\" и не может быть потрачен. Такое может случиться, если другой узел сгенерировал блок примерно в то же время, что и вы."
-#: ../../../ui.cpp:1593
+#: ../../../src/ui.cpp:1592
msgid "Cannot write autostart/bitcoin.desktop file"
msgstr "Не удаётся записать файл autostart/bitcoin.desktop"
-#: ../../../ui.cpp:1629
+#: ../../../src/ui.cpp:1628
msgid "Main"
msgstr "Основные"
-#: ../../../ui.cpp:1634
+#: ../../../src/ui.cpp:1636
msgid "&Start Bitcoin on window system startup"
msgstr "&Запускать Bitcoin при запуске оконной системы"
-#: ../../../ui.cpp:1641
+#: ../../../src/ui.cpp:1643
msgid "&Minimize on close"
msgstr "&Сворачивать при закрытии"
-#: ../../../ui.cpp:1798
+#: ../../../src/ui.cpp:1785
#, c-format
-msgid "version %s%s BETA"
-msgstr "версия %s%s бета"
-
-#: ../../../ui.cpp:1884
-msgid "n/a"
-msgstr "н/д"
-
-#: ../../../ui.cpp:1885
-msgid "Can't include a message when sending to a Bitcoin address"
-msgstr "Не удаётся включить сообщение при отправке на адрес Bitcoin"
+msgid "version %s"
+msgstr "версия %s"
-#: ../../../ui.cpp:1938
+#: ../../../src/ui.cpp:1897
msgid "Error in amount "
msgstr "Ошибка в количестве "
-#: ../../../ui.cpp:1938
-#: ../../../ui.cpp:1943
-#: ../../../ui.cpp:1948
-#: ../../../ui.cpp:1974
-#: ../../../uibase.cpp:59
+#: ../../../src/ui.cpp:1897
+#: ../../../src/ui.cpp:1902
+#: ../../../src/ui.cpp:1907
+#: ../../../src/ui.cpp:1942
+#: ../../../src/uibase.cpp:55
msgid "Send Coins"
msgstr "Отправить монеты"
-#: ../../../ui.cpp:1943
+#: ../../../src/ui.cpp:1902
msgid "Amount exceeds your balance "
msgstr "Количество превышает ваш баланс "
-#: ../../../ui.cpp:1948
+#: ../../../src/ui.cpp:1907
msgid "Total exceeds your balance when the "
msgstr "Общая сумма превышает ваш баланс, когда "
-#: ../../../ui.cpp:1948
+#: ../../../src/ui.cpp:1907
msgid " transaction fee is included "
msgstr " комиссия включена "
-#: ../../../ui.cpp:1964
+#: ../../../src/ui.cpp:1925
msgid "Payment sent "
msgstr "Платёж отправлен "
-#: ../../../ui.cpp:1974
+#: ../../../src/ui.cpp:1925
+#: ../../../src/ui.cpp:1930
+#: ../../../src/ui.cpp:2074
+#: ../../../src/ui.cpp:2227
+#: ../../../src/main.cpp:3999
+msgid "Sending..."
+msgstr "Отправка..."
+
+#: ../../../src/ui.cpp:1942
msgid "Invalid address "
msgstr "Неверный адрес "
-#: ../../../ui.cpp:2028
+#: ../../../src/ui.cpp:1995
#, c-format
msgid "Sending %s to %s"
msgstr "Отправка %s для %s"
-#: ../../../ui.cpp:2101
-#: ../../../ui.cpp:2134
+#: ../../../src/ui.cpp:2068
+#: ../../../src/ui.cpp:2101
msgid "CANCELLED"
msgstr "ОТМЕНЕНО"
-#: ../../../ui.cpp:2105
+#: ../../../src/ui.cpp:2072
msgid "Cancelled"
msgstr "Отменено"
-#: ../../../ui.cpp:2107
+#: ../../../src/ui.cpp:2074
msgid "Transfer cancelled "
msgstr "Передача отменена "
-#: ../../../ui.cpp:2160
+#: ../../../src/ui.cpp:2127
msgid "Error: "
msgstr "Ошибка: "
-#: ../../../ui.cpp:2179
+#: ../../../src/ui.cpp:2141
+#: ../../../src/ui.cpp:2212
+#: ../../../src/main.cpp:4018
+msgid "Insufficient funds"
+msgstr "Недостаточно средств"
+
+#: ../../../src/ui.cpp:2146
msgid "Connecting..."
msgstr "Подключение..."
-#: ../../../ui.cpp:2184
+#: ../../../src/ui.cpp:2151
msgid "Unable to connect"
msgstr "Невозможно подключиться"
-#: ../../../ui.cpp:2189
+#: ../../../src/ui.cpp:2156
msgid "Requesting public key..."
msgstr "Запрос публичного ключа..."
-#: ../../../ui.cpp:2201
+#: ../../../src/ui.cpp:2168
msgid "Received public key..."
msgstr "Получен публичный ключ..."
-#: ../../../ui.cpp:2215
+#: ../../../src/ui.cpp:2182
msgid "Recipient is not accepting transactions sent by IP address"
msgstr "Получатель не принимает переводы на IP-адрес"
-#: ../../../ui.cpp:2217
+#: ../../../src/ui.cpp:2184
msgid "Transfer was not accepted"
msgstr "Передача не принята"
-#: ../../../ui.cpp:2226
+#: ../../../src/ui.cpp:2193
msgid "Invalid response received"
msgstr "Получен неверный отклик"
-#: ../../../ui.cpp:2241
+#: ../../../src/ui.cpp:2208
msgid "Creating transaction..."
msgstr "Создание перевода..."
-#: ../../../ui.cpp:2253
+#: ../../../src/ui.cpp:2220
#, c-format
-msgid "This is an oversized transaction that requires a transaction fee of %s"
-msgstr "Это слишком большой перевод, который требует комиссию в размере %s"
+msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds"
+msgstr "Этот перевод требует уплаты комиссии минимум в %s, так как имеет большой объём, сложность или использует недавно полученные средства"
-#: ../../../ui.cpp:2255
+#: ../../../src/ui.cpp:2222
msgid "Transaction creation failed"
msgstr "Не удалось создать перевод"
-#: ../../../ui.cpp:2262
+#: ../../../src/ui.cpp:2229
msgid "Transaction aborted"
msgstr "Перевод прерван"
-#: ../../../ui.cpp:2270
+#: ../../../src/ui.cpp:2237
msgid "Lost connection, transaction cancelled"
msgstr "Соединение разорвано, перевод отменён"
-#: ../../../ui.cpp:2286
+#: ../../../src/ui.cpp:2253
msgid "Sending payment..."
msgstr "Отправка платежа..."
-#: ../../../ui.cpp:2292
+#: ../../../src/ui.cpp:2259
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 "Перевод был отклонён. Это могло произойти, если некоторые из монет в вашем кошельке уже были потрачены, например, если вы использовали копию wallet.dat, и монеты были потрачены в копии, но не отмечены израсходованными здесь."
-#: ../../../ui.cpp:2301
+#: ../../../src/ui.cpp:2268
msgid "Waiting for confirmation..."
msgstr "Ожидание подтверждения..."
-#: ../../../ui.cpp:2319
+#: ../../../src/ui.cpp:2286
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"
@@ -519,243 +382,304 @@ msgstr ""
"Перевод был записан и будет начислен получателю,\n"
"но поле комментария будет пустое."
-#: ../../../ui.cpp:2328
+#: ../../../src/ui.cpp:2295
msgid "Payment was sent, but an invalid response was received"
msgstr "Платёж отправлен, но был получен неверный отклик"
-#: ../../../ui.cpp:2334
+#: ../../../src/ui.cpp:2301
msgid "Payment completed"
msgstr "Платёж проведён"
-#: ../../../ui.cpp:2365
-#: ../../../ui.cpp:2511
-#: ../../../ui.cpp:2548
+#: ../../../src/ui.cpp:2332
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2515
msgid "Name"
msgstr "Имя"
-#: ../../../ui.cpp:2366
-#: ../../../ui.cpp:2511
-#: ../../../ui.cpp:2548
+#: ../../../src/ui.cpp:2333
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2515
msgid "Address"
msgstr "Адрес"
-#: ../../../ui.cpp:2368
-#: ../../../ui.cpp:2523
+#: ../../../src/ui.cpp:2335
+#: ../../../src/ui.cpp:2490
msgid "Label"
msgstr "Метка"
-#: ../../../ui.cpp:2369
-#: ../../../uibase.cpp:902
+#: ../../../src/ui.cpp:2336
+#: ../../../src/uibase.cpp:837
msgid "Bitcoin Address"
msgstr "Адрес Bitcoin"
-#: ../../../ui.cpp:2493
+#: ../../../src/ui.cpp:2460
msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. "
msgstr "Это один из ваших собственных адресов для получения платежей, он не может быть внесён в адресную книгу. "
-#: ../../../ui.cpp:2511
-#: ../../../ui.cpp:2517
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2484
msgid "Edit Address"
msgstr "Правка адреса"
-#: ../../../ui.cpp:2523
+#: ../../../src/ui.cpp:2490
msgid "Edit Address Label"
msgstr "Правка метки адреса"
-#: ../../../ui.cpp:2548
-#: ../../../ui.cpp:2554
+#: ../../../src/ui.cpp:2515
+#: ../../../src/ui.cpp:2521
msgid "Add Address"
msgstr "Добавить адрес"
-#: ../../../ui.cpp:2630
+#: ../../../src/ui.cpp:2598
msgid "Bitcoin"
msgstr "Bitcoin"
-#: ../../../ui.cpp:2632
+#: ../../../src/ui.cpp:2600
msgid "Bitcoin - Generating"
msgstr "Bitcoin - Генерация"
-#: ../../../ui.cpp:2634
+#: ../../../src/ui.cpp:2602
msgid "Bitcoin - (not connected)"
msgstr "Bitcoin - (не подключен)"
-#: ../../../ui.cpp:2711
+#: ../../../src/ui.cpp:2681
msgid "&Open Bitcoin"
msgstr "&Открыть Bitcoin"
-#: ../../../ui.cpp:2712
+#: ../../../src/ui.cpp:2682
+msgid "&Send Bitcoins"
+msgstr "&Открыть Bitcoin"
+
+#: ../../../src/ui.cpp:2683
msgid "O&ptions..."
msgstr "О&пции..."
-#: ../../../ui.cpp:2716
-#: ../../../uibase.cpp:25
+#: ../../../src/ui.cpp:2686
+#: ../../../src/uibase.cpp:25
msgid "E&xit"
msgstr "&Выход"
-#: ../../../ui.cpp:2931
+#: ../../../src/ui.cpp:2902
msgid "Program has crashed and will terminate. "
msgstr "Сбой программы, завершение. "
-#: ../../../uibase.cpp:28
+#: ../../../src/main.cpp:1868
+msgid "Warning: Disk space is low "
+msgstr "Внимание: мало места на диске "
+
+#: ../../../src/main.cpp:3992
+#, c-format
+msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds "
+msgstr "Ошибка: Этот перевод требует уплаты комиссии минимум в %s, так как имеет большой объём, сложность или использует недавно полученные средства "
+
+#: ../../../src/main.cpp:3994
+msgid "Error: Transaction creation failed "
+msgstr "Ошибка: не удалось создать перевод "
+
+#: ../../../src/main.cpp:4003
+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 "Перевод был отклонен. Это могло произойти, если некоторые из монет в вашем кошельке уже были потрачены, например, если вы использовали копию wallet.dat, и монеты были потрачены в копии, но не отмечены израсходованными здесь."
+
+#: ../../../src/main.cpp:4016
+msgid "Invalid amount"
+msgstr "Неверное количество"
+
+#: ../../../src/main.cpp:4023
+msgid "Invalid bitcoin address"
+msgstr "Неверный адрес bitcoin"
+
+#: ../../../src/rpc.cpp:1800
+#: ../../../src/rpc.cpp:1802
+#, c-format
+msgid "To use the %s option"
+msgstr "Чтобы использовать опцию %s"
+
+#: ../../../src/rpc.cpp:1804
+#, c-format
+msgid ""
+"Warning: %s, you must set rpcpassword=<password>\n"
+"in the configuration file: %s\n"
+"If the file does not exist, create it with owner-readable-only file permissions.\n"
+msgstr ""
+"Внимание: %s, вы должны установить rpcpassword=<пароль>\n"
+"в конфигурационном файле: %s\n"
+"Если файл не существует, создайте его с правами \"чтение только владельцем\".\n"
+
+#: ../../../src/rpc.cpp:1972
+#, c-format
+msgid ""
+"You must set rpcpassword=<password> in the configuration file:\n"
+"%s\n"
+"If the file does not exist, create it with owner-readable-only file permissions."
+msgstr ""
+"Вы должны установить rpcpassword=<пароль> в конфигурационном файле:\n"
+"%s\n"
+"Если файл не существует, создайте его с правами \"чтение только владельцем\"."
+
+#: ../../../src/util.cpp:865
+msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly."
+msgstr "Внимание: пожалуйста, проверьте дату и время на вашем компьютере. Если часы идут неверно, Bitcoin не будет работать правильно."
+
+#: ../../../src/util.cpp:898
+msgid "-beta"
+msgstr "-beta"
+
+#: ../../../src/uibase.cpp:28
msgid "&File"
msgstr "&Файл"
-#: ../../../uibase.cpp:36
+#: ../../../src/uibase.cpp:32
msgid "&Your Receiving Addresses..."
msgstr "&Ваши адреса получения..."
-#: ../../../uibase.cpp:40
+#: ../../../src/uibase.cpp:36
msgid "&Options..."
msgstr "&Опции"
-#: ../../../uibase.cpp:43
+#: ../../../src/uibase.cpp:39
msgid "&Settings"
msgstr "&Настройки"
-#: ../../../uibase.cpp:47
+#: ../../../src/uibase.cpp:43
msgid "&About..."
msgstr "&О программе..."
-#: ../../../uibase.cpp:50
+#: ../../../src/uibase.cpp:46
msgid "&Help"
msgstr "&Справка"
-#: ../../../uibase.cpp:60
+#: ../../../src/uibase.cpp:56
msgid "Address Book"
msgstr "Адресная книга"
-#: ../../../uibase.cpp:75
+#: ../../../src/uibase.cpp:69
msgid "Your Bitcoin Address:"
msgstr "Ваш адрес Bitcoin:"
-#: ../../../uibase.cpp:82
+#: ../../../src/uibase.cpp:76
msgid " &New... "
msgstr " &Новый... "
-#: ../../../uibase.cpp:85
-#: ../../../uibase.cpp:845
-#: ../../../uibase.cpp:948
+#: ../../../src/uibase.cpp:79
+#: ../../../src/uibase.cpp:780
+#: ../../../src/uibase.cpp:883
msgid " &Copy to Clipboard "
msgstr " &Копировать в буфер обмена "
-#: ../../../uibase.cpp:99
+#: ../../../src/uibase.cpp:93
msgid "Balance:"
msgstr "Баланс:"
-#: ../../../uibase.cpp:115
+#: ../../../src/uibase.cpp:109
msgid " All"
msgstr " Все"
-#: ../../../uibase.cpp:115
+#: ../../../src/uibase.cpp:109
msgid " Sent"
msgstr " Отправленные"
-#: ../../../uibase.cpp:115
+#: ../../../src/uibase.cpp:109
msgid " Received"
msgstr " Полученные"
-#: ../../../uibase.cpp:115
+#: ../../../src/uibase.cpp:109
msgid " In Progress"
msgstr " В процессе"
-#: ../../../uibase.cpp:136
+#: ../../../src/uibase.cpp:130
msgid "All Transactions"
msgstr "Все переводы"
-#: ../../../uibase.cpp:147
+#: ../../../src/uibase.cpp:141
msgid "Sent/Received"
msgstr "Отправленные/Полученные"
-#: ../../../uibase.cpp:158
+#: ../../../src/uibase.cpp:152
msgid "Sent"
msgstr "Отправленные"
-#: ../../../uibase.cpp:169
+#: ../../../src/uibase.cpp:163
msgid "Received"
msgstr "Полученные"
-#: ../../../uibase.cpp:312
-#: ../../../uibase.cpp:473
-#: ../../../uibase.cpp:574
-#: ../../../uibase.cpp:787
-#: ../../../uibase.cpp:848
-#: ../../../uibase.cpp:957
-#: ../../../uibase.cpp:1046
+#: ../../../src/uibase.cpp:302
+#: ../../../src/uibase.cpp:443
+#: ../../../src/uibase.cpp:542
+#: ../../../src/uibase.cpp:722
+#: ../../../src/uibase.cpp:783
+#: ../../../src/uibase.cpp:892
+#: ../../../src/uibase.cpp:981
msgid "OK"
msgstr "ОК"
-#: ../../../uibase.cpp:355
-msgid "Optional transaction fee you give to the nodes that process your transactions."
-msgstr "Необязательная комиссия, которую вы даёте узлам, проводящим ваш перевод."
-
-#: ../../../uibase.cpp:364
-msgid "Transaction fee:"
-msgstr "Комиссия:"
-
-#: ../../../uibase.cpp:380
-msgid "&Limit coin generation to"
-msgstr "&Ограничить генерацию монет до"
-
-#: ../../../uibase.cpp:387
-msgid "processors"
-msgstr "процессоров"
-
-#: ../../../uibase.cpp:393
+#: ../../../src/uibase.cpp:345
msgid "&Start Bitcoin on system startup"
msgstr "&Запускать Bitcoin при старте системы"
-#: ../../../uibase.cpp:397
+#: ../../../src/uibase.cpp:348
msgid "&Minimize to the tray instead of the taskbar"
msgstr "&Сворачивать в трей вместо панели задач"
-#: ../../../uibase.cpp:401
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "Использовать &UPnP"
+
+#: ../../../src/uibase.cpp:354
msgid "M&inimize to the tray on close"
msgstr "С&ворачивать в трей при закрытии"
-#: ../../../uibase.cpp:408
+#: ../../../src/uibase.cpp:360
msgid "&Connect through socks4 proxy: "
msgstr "&Подключаться через socks4 прокси: "
-#: ../../../uibase.cpp:420
+#: ../../../src/uibase.cpp:371
msgid "Proxy &IP:"
-msgstr "IP п&рокси:"
+msgstr "IP п&рокси-сервера:"
-#: ../../../uibase.cpp:428
+#: ../../../src/uibase.cpp:379
msgid " &Port:"
msgstr " &Порт"
-#: ../../../uibase.cpp:450
+#: ../../../src/uibase.cpp:392
+msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended."
+msgstr "Необязательная комиссия за килобайт обеспечивает приоритет обработки перевода. Большинство транзакций имеют размер в 1КБ. Рекомендуется значение в 0.01."
+
+#: ../../../src/uibase.cpp:399
+msgid "Pay transaction fee:"
+msgstr "Комиссия:"
+
+#: ../../../src/uibase.cpp:420
msgid "// [don't translate] Test panel 2 for future expansion"
msgstr ""
-#: ../../../uibase.cpp:454
+#: ../../../src/uibase.cpp:424
msgid "// [don't translate] Let's not start multiple pages until the first page is filled up"
msgstr ""
-#: ../../../uibase.cpp:476
-#: ../../../uibase.cpp:729
-#: ../../../uibase.cpp:792
-#: ../../../uibase.cpp:851
-#: ../../../uibase.cpp:960
-#: ../../../uibase.cpp:1049
+#: ../../../src/uibase.cpp:446
+#: ../../../src/uibase.cpp:668
+#: ../../../src/uibase.cpp:727
+#: ../../../src/uibase.cpp:786
+#: ../../../src/uibase.cpp:895
+#: ../../../src/uibase.cpp:984
msgid "Cancel"
msgstr "Отмена"
-#: ../../../uibase.cpp:479
+#: ../../../src/uibase.cpp:449
msgid "&Apply"
msgstr "&Применить"
-#: ../../../uibase.cpp:540
+#: ../../../src/uibase.cpp:508
msgid "Bitcoin "
msgstr "Bitcoin "
-#: ../../../uibase.cpp:546
+#: ../../../src/uibase.cpp:514
msgid "version"
msgstr "версия"
-#: ../../../uibase.cpp:557
+#: ../../../src/uibase.cpp:525
msgid ""
-"Copyright (c) 2009-2010 Bitcoin Developers\n"
+"Copyright (c) 2009-2011 Bitcoin Developers\n"
"\n"
"This is experimental software.\n"
"\n"
@@ -777,47 +701,39 @@ msgstr ""
"OpenSSL Toolkit (http://www.openssl.org/), и криптографическое ПО, написанное\n"
"Eric Young (eay@cryptsoft.com) и UPnP программного обеспечения, написанного Thomas Bernard."
-#: ../../../uibase.cpp:613
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"
-msgstr "Введите адрес Bitcoin (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) или IP адрес (напр. 123.45.6.7)"
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Введите адрес Bitcoin (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L)"
-#: ../../../uibase.cpp:627
+#: ../../../src/uibase.cpp:595
msgid "Pay &To:"
msgstr "&Кому:"
-#: ../../../uibase.cpp:642
+#: ../../../src/uibase.cpp:610
msgid "&Paste"
msgstr "&Вставить"
-#: ../../../uibase.cpp:645
+#: ../../../src/uibase.cpp:613
msgid " Address &Book..."
msgstr " А&дресная книга..."
-#: ../../../uibase.cpp:652
+#: ../../../src/uibase.cpp:620
msgid "&Amount:"
msgstr "К&оличество:"
-#: ../../../uibase.cpp:662
+#: ../../../src/uibase.cpp:630
msgid "T&ransfer:"
msgstr "&Передача:"
-#: ../../../uibase.cpp:668
+#: ../../../src/uibase.cpp:636
msgid " Standard"
msgstr " Стандарт"
-#: ../../../uibase.cpp:690
-msgid "&From:"
-msgstr "О&т:"
-
-#: ../../../uibase.cpp:707
-msgid "&Message:"
-msgstr "&Сообщение:"
-
-#: ../../../uibase.cpp:724
+#: ../../../src/uibase.cpp:663
msgid "&Send"
msgstr "Отп&равить"
-#: ../../../uibase.cpp:776
+#: ../../../src/uibase.cpp:711
msgid ""
"\n"
"\n"
@@ -827,57 +743,276 @@ msgstr ""
"\n"
"Подключение..."
-#: ../../../uibase.cpp:826
+#: ../../../src/uibase.cpp:761
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 "Это ваши адреса для получения платежей. Вы можете использовать разные для каждого отправителя, чтобы отслеживать, кто вам платит. Выделенный адрес отображается в главном окне."
-#: ../../../uibase.cpp:839
-#: ../../../uibase.cpp:951
+#: ../../../src/uibase.cpp:774
+#: ../../../src/uibase.cpp:886
msgid "&Edit..."
msgstr "&Правка..."
-#: ../../../uibase.cpp:842
-#: ../../../uibase.cpp:954
+#: ../../../src/uibase.cpp:777
+#: ../../../src/uibase.cpp:889
msgid " &New Address... "
msgstr " &Новый адрес... "
-#: ../../../uibase.cpp:914
+#: ../../../src/uibase.cpp:849
msgid "Sending"
msgstr "Отправка"
-#: ../../../uibase.cpp:922
+#: ../../../src/uibase.cpp:857
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 "Это ваши адреса для получения платежей. Вы можете использовать разные для каждого отправителя, чтобы отслеживать, кто вам платит. Выделенный адрес отображается в главном окне."
-#: ../../../uibase.cpp:935
+#: ../../../src/uibase.cpp:870
msgid "Receiving"
msgstr "Получение"
-#: ../../../uibase.cpp:945
+#: ../../../src/uibase.cpp:880
msgid "&Delete"
msgstr "&Удалить"
-#: ../../../util.cpp:807
-msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly."
-msgstr "Внимание: пожалуйста, проверьте дату и время на вашем компьютере. Если часы идут неверно, Bitcoin не будет работать правильно."
+#: ../../../src/init.cpp:145
+msgid " beta"
+msgstr " beta"
+
+#: ../../../src/init.cpp:147
+msgid "Bitcoin version"
+msgstr "Bitcoin версия"
+
+#: ../../../src/init.cpp:148
+msgid "Usage:"
+msgstr "Использование"
+
+#: ../../../src/init.cpp:150
+msgid "Send command to -server or bitcoind\n"
+msgstr "Отправить команду bitcoin, запущенному с -server\n"
+
+#: ../../../src/init.cpp:151
+msgid "List commands\n"
+msgstr "Список команд\n"
+
+#: ../../../src/init.cpp:152
+msgid "Get help for a command\n"
+msgstr "Получить помощь для команды\n"
+
+#: ../../../src/init.cpp:153
+msgid "Options:\n"
+msgstr "Параметры:\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Укажите конфигурационный файл (по умолчанию: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:155
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "Укажите конфигурационный файл (по умолчанию: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:156
+msgid "Generate coins\n"
+msgstr "Генерировать монеты\n"
+
+#: ../../../src/init.cpp:157
+msgid "Don't generate coins\n"
+msgstr "Не генерировать монеты\n"
+
+#: ../../../src/init.cpp:158
+msgid "Start minimized\n"
+msgstr "Запускать свёрнутым\n"
+
+#: ../../../src/init.cpp:159
+msgid "Specify data directory\n"
+msgstr "Указать каталог данных\n"
+
+#: ../../../src/init.cpp:160
+msgid "Connect through socks4 proxy\n"
+msgstr "Подключаться через socks4 прокси\n"
+
+#: ../../../src/init.cpp:161
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "Использовать DNS для добавления узлов и соединения\n"
-#: ../../../uibase.h:149
+#: ../../../src/init.cpp:162
+msgid "Add a node to connect to\n"
+msgstr "Добавить узел для подключения\n"
+
+#: ../../../src/init.cpp:163
+msgid "Connect only to the specified node\n"
+msgstr "Подключаться только к указанному узлу\n"
+
+#: ../../../src/init.cpp:164
+msgid "Don't accept connections from outside\n"
+msgstr "Не принимать входящие соединения\n"
+
+#: ../../../src/init.cpp:167
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "Не использовать UPnP для отображения порта входящих соединений\n"
+
+#: ../../../src/init.cpp:169
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Использовать UPnP для отображения порта входящих соединений\n"
+
+#: ../../../src/init.cpp:172
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Комиссия за 1 килобайт отправляемых транзакций\n"
+
+#: ../../../src/init.cpp:174
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Принимать команды из командной строки и через JSON-RPC\n"
+
+#: ../../../src/init.cpp:177
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Запустить в фоне как демон и принимать команды\n"
+
+#: ../../../src/init.cpp:179
+msgid "Use the test network\n"
+msgstr "Использовать тестовую сеть (testnet)\n"
+
+#: ../../../src/init.cpp:180
+msgid "Username for JSON-RPC connections\n"
+msgstr "Имя пользователя для JSON-RPC\n"
+
+#: ../../../src/init.cpp:181
+msgid "Password for JSON-RPC connections\n"
+msgstr "Пароль для JSON-RPC\n"
+
+#: ../../../src/init.cpp:182
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "Порт входящих соединений JSON-RPC (по умолчанию 8332)\n"
+
+#: ../../../src/init.cpp:183
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Разрешить соединения JSON-RPC со следующих IP-адресов\n"
+
+#: ../../../src/init.cpp:184
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Посылать команды узлу с указанным адресом (по умолчанию 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:185
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Установить размер пула адресов (по умолчанию 100)\n"
+
+#: ../../../src/init.cpp:181
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Просканировать цепочку блоков в поисках утерянных переводов\n"
+
+#: ../../../src/init.cpp:182
+msgid "Purge all transactions from wallet and rescan\n"
+msgstr "Удалить все транзакции из кошелька и пересканировать цепочку блоков в поисках транзакций\n"
+
+#: ../../../src/init.cpp:190
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"Опции SSL: (прочтите документацию для правильной настройки)\n"
+
+#: ../../../src/init.cpp:191
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Использовать OpenSSL (протокол https) для соединений JSON-RPC\n"
+
+#: ../../../src/init.cpp:192
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "Файл сертификата сервера (по умолчанию server.cert)\n"
+
+#: ../../../src/init.cpp:193
+msgid "Server private key (default: server.pem)\n"
+msgstr "Приватный ключ сервера (по умолчанию server.pem)\n"
+
+#: ../../../src/init.cpp:194
+msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+msgstr "Приемлемые шифры (по умолчанию TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+
+#: ../../../src/init.cpp:198
+msgid "This help message\n"
+msgstr "Эта справка\n"
+
+#: ../../../src/init.cpp:335
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "Не удаётся получить блокировку каталога с данными %s. Возможно, Bitcoin уже запущен."
+
+#: ../../../src/init.cpp:361
+msgid "Error loading addr.dat \n"
+msgstr "Ошибка загрузки addr.dat \n"
+
+#: ../../../src/init.cpp:367
+msgid "Error loading blkindex.dat \n"
+msgstr "Ошибка загрузки blkindex.dat \n"
+
+#: ../../../src/init.cpp:374
+msgid "Error loading wallet.dat \n"
+msgstr "Ошибка загрузки wallet.dat \n"
+
+#: ../../../src/init.cpp:454
+msgid "Invalid -proxy address"
+msgstr "Неверный адрес -proxy"
+
+#: ../../../src/init.cpp:477
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Неверное значение для -paytxfee=<amount>"
+
+#: ../../../src/init.cpp:481
+msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."
+msgstr "Внимание: -paytxfee установлено в очень большое значение. Это комиссия, которую вы будете платить при переводе."
+
+#: ../../../src/uibase.h:147
msgid "Transaction Details"
msgstr "Подробности транзакции"
-#: ../../../uibase.h:202
+#: ../../../src/uibase.h:199
msgid "Options"
msgstr "Опции"
-#: ../../../uibase.h:230
+#: ../../../src/uibase.h:228
msgid "About Bitcoin"
msgstr "О Bitcoin"
-#: ../../../uibase.h:340
+#: ../../../src/uibase.h:337
msgid "Your Bitcoin Addresses"
msgstr "Ваш адрес Bitcoin"
#~ msgid ""
+#~ "Error: This is an oversized transaction that requires a transaction fee "
+#~ "of %s "
+#~ msgstr ""
+#~ "Ошибка: этот перевод слишком большого размера, который требует комиссию "
+#~ "%s "
+
+#~ msgid "version %s%s BETA"
+#~ msgstr "версия %s%s бета"
+
+#~ msgid "n/a"
+#~ msgstr "н/д"
+
+#~ msgid "Can't include a message when sending to a Bitcoin address"
+#~ msgstr "Не удаётся включить сообщение при отправке на адрес Bitcoin"
+
+#~ msgid ""
+#~ "This is an oversized transaction that requires a transaction fee of %s"
+#~ msgstr "Это слишком большой перевод, который требует комиссию в размере %s"
+
+#~ msgid ""
+#~ "Optional transaction fee you give to the nodes that process your "
+#~ "transactions."
+#~ msgstr ""
+#~ "Необязательная комиссия, которую вы даёте узлам, проводящим ваш перевод."
+
+#~ msgid "&Limit coin generation to"
+#~ msgstr "&Ограничить генерацию монет до"
+
+#~ msgid "processors"
+#~ msgstr "процессоров"
+
+#~ msgid "&From:"
+#~ msgstr "О&т:"
+
+#~ msgid "&Message:"
+#~ msgstr "&Сообщение:"
+
+#~ msgid ""
#~ "It's good policy to use a new address for each payment you receive.\n"
#~ "\n"
#~ "Label"
diff --git a/share/setup.nsi b/share/setup.nsi
index b17e553372..4239f53207 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -9,7 +9,7 @@ RequestExecutionLevel highest
!define URL http://www.bitcoin.org/
# MUI Symbol Definitions
-!define MUI_ICON "src\rc\bitcoin.ico"
+!define MUI_ICON "../share/pixmaps/bitcoin.ico"
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
@@ -59,16 +59,16 @@ ShowUninstDetails show
Section -Main SEC0000
SetOutPath $INSTDIR
SetOverwrite on
- File bitcoin.exe
- File libeay32.dll
- File license.txt
- File readme.txt
+ File ../src/bitcoin.exe
+ File ../../openssl-1.0.0d/libeay32.dll
+ File /oname=license.txt ../COPYING
+ File /oname=readme.txt ../doc/README_windows.txt
SetOutPath $INSTDIR\daemon
- File /r daemon\*.*
+ File ../src/bitcoind.exe
SetOutPath $INSTDIR\locale
- File /r locale\*.*
+ File /r ../locale/*.*
SetOutPath $INSTDIR\src
- File /r src\*.*
+ File /r /x *.exe /x *.o ../src\*.*
SetOutPath $INSTDIR
WriteRegStr HKCU "${REGKEY}\Components" Main 1
SectionEnd
diff --git a/src/makefile.osx b/src/makefile.osx
index 1e6993d69b..4836ea3f4f 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -47,7 +47,7 @@ OBJS= \
cryptopp/obj/sha.o \
cryptopp/obj/cpu.o
-ifeq (USE_UPNP, 1)
+ifdef USE_UPNP
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
DEFS += -DUSE_UPNP=$(USE_UPNP)
endif