aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--contrib/gitian.yml4
-rw-r--r--doc/README2
-rw-r--r--doc/README_windows.txt2
-rw-r--r--doc/build-msw.txt11
-rw-r--r--doc/release-process.txt29
-rw-r--r--locale/cs/LC_MESSAGES/bitcoin.mobin0 -> 20725 bytes
-rw-r--r--locale/cs/LC_MESSAGES/bitcoin.po975
-rw-r--r--locale/de/LC_MESSAGES/bitcoin.mobin16242 -> 21501 bytes
-rw-r--r--locale/de/LC_MESSAGES/bitcoin.po920
-rw-r--r--locale/eo/LC_MESSAGES/bitcoin.mobin0 -> 20553 bytes
-rw-r--r--locale/eo/LC_MESSAGES/bitcoin.po1081
-rw-r--r--locale/es/LC_MESSAGES/bitcoin.mobin16064 -> 20748 bytes
-rw-r--r--locale/es/LC_MESSAGES/bitcoin.po980
-rw-r--r--locale/it/LC_MESSAGES/bitcoin.mobin15725 -> 20862 bytes
-rw-r--r--locale/it/LC_MESSAGES/bitcoin.po925
-rw-r--r--locale/lt/LC_MESSAGES/bitcoin.mobin0 -> 19124 bytes
-rw-r--r--locale/lt/LC_MESSAGES/bitcoin.po1027
-rw-r--r--locale/nl/LC_MESSAGES/bitcoin.mobin15598 -> 20796 bytes
-rw-r--r--locale/nl/LC_MESSAGES/bitcoin.po865
-rw-r--r--locale/ru/LC_MESSAGES/bitcoin.mobin21763 -> 25767 bytes
-rw-r--r--locale/ru/LC_MESSAGES/bitcoin.po917
-rw-r--r--locale/sv/LC_MESSAGES/bitcoin.po978
-rw-r--r--locale/zh_cn/LC_MESSAGES/bitcoin.mobin0 -> 19537 bytes
-rw-r--r--locale/zh_cn/LC_MESSAGES/bitcoin.po1017
-rw-r--r--share/setup.nsi22
-rw-r--r--src/base58.h2
-rw-r--r--src/bignum.h3
-rw-r--r--src/db.cpp11
-rw-r--r--src/init.cpp11
-rw-r--r--src/irc.cpp17
-rw-r--r--src/main.cpp25
-rw-r--r--src/main.h18
-rw-r--r--src/makefile.mingw9
-rw-r--r--src/net.cpp111
-rw-r--r--src/net.h27
-rw-r--r--src/rpc.cpp22
-rw-r--r--src/serialize.h2
-rw-r--r--src/ui.cpp61
-rw-r--r--src/util.cpp10
-rw-r--r--src/util.h2
41 files changed, 8164 insertions, 1924 deletions
diff --git a/.gitignore b/.gitignore
index eec3751aa6..aeeef170e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
src/*.exe
src/bitcoin
src/bitcoind
+.*.swp
+*.*~*
diff --git a/contrib/gitian.yml b/contrib/gitian.yml
index 5d12f72700..bf9975030b 100644
--- a/contrib/gitian.yml
+++ b/contrib/gitian.yml
@@ -40,7 +40,9 @@ script: |
cp -a . $OUTDIR/src
rm -rf $OUTDIR/src/.git
mv $OUTDIR/src/locale $OUTDIR
- cp $OUTDIR/src/license.txt $OUTDIR
+ cp $OUTDIR/src/doc/README $OUTDIR
+ cp $OUTDIR/src/COPYING $OUTDIR
+ cd src
PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin bitcoind
mkdir -p $OUTDIR/bin/$GBUILD_BITS
install -s bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS
diff --git a/doc/README b/doc/README
index 3137d0adc7..776f6aaa1b 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-Bitcoin 0.3.21 BETA
+Bitcoin 0.3.23 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 4c2065235b..110ba717d9 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.3.21 BETA
+Bitcoin 0.3.23 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/build-msw.txt b/doc/build-msw.txt
index e30b4ee726..1911008d1f 100644
--- a/doc/build-msw.txt
+++ b/doc/build-msw.txt
@@ -28,7 +28,7 @@ Libraries you need to download separately and build:
default path download
wxWidgets \wxwidgets-2.9.1-mgw http://www.wxwidgets.org/downloads/
-OpenSSL \openssl-1.0.0c-mgw http://www.openssl.org/source/
+OpenSSL \openssl-1.0.0d-mgw http://www.openssl.org/source/
Berkeley DB \db-4.7.25.NC-mgw http://www.oracle.com/technology/software/products/berkeley-db/index.html
Boost \boost-1.43.0-mgw http://www.boost.org/users/download/
miniupnpc \upnpc-exe-win32-20110215 http://miniupnp.tuxfamily.org/files/
@@ -42,7 +42,7 @@ miniupnpc New (3-clause) BSD license
Versions used in this release:
wxWidgets 2.9.1
-OpenSSL 1.0.0c
+OpenSSL 1.0.0d
Berkeley DB 4.7.25.NC
Boost 1.43.0
miniupnpc 1.5-20110215
@@ -66,15 +66,10 @@ MSYS shell:
un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377)
change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe'
-cd /c/openssl-1.0.0c-mgw
+cd /c/openssl-1.0.0d-mgw
./config
make
-perl util/mkdef.pl 32 libeay enable-static-engine > libeay32.def
-dllwrap --dllname libeay32.dll --output-lib libeay32.a --def libeay32.def libcrypto.a -lws2_32 -lgdi32
-
-after that openssl libeay is in main source dir (openssl-1.0.0c-mgw)
-
Berkeley DB
-----------
MSYS shell:
diff --git a/doc/release-process.txt b/doc/release-process.txt
new file mode 100644
index 0000000000..f8882399bb
--- /dev/null
+++ b/doc/release-process.txt
@@ -0,0 +1,29 @@
+
+* tag version in git
+
+ $ git tag -a v0.3.23
+
+* write release notes. git shortlog helps a lot:
+
+ $ git shortlog --no-merges v0.3.22..
+
+* create source-only archive
+
+ $ git archive --format=tar --prefix=bitcoin-0.3.23/ HEAD | \
+ gzip -9c > ~/tmp/bitcoin-0.3.23-src.tar.gz
+
+* perform gitian builds
+
+ { insert useful info here }
+
+* upload source and builds to SF
+
+* update bitcoin.org version
+
+* update forum version
+
+* update wiki
+
+* update wiki download links
+
+
diff --git a/locale/cs/LC_MESSAGES/bitcoin.mo b/locale/cs/LC_MESSAGES/bitcoin.mo
new file mode 100644
index 0000000000..4388fcce00
--- /dev/null
+++ b/locale/cs/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/cs/LC_MESSAGES/bitcoin.po b/locale/cs/LC_MESSAGES/bitcoin.po
new file mode 100644
index 0000000000..13529b368a
--- /dev/null
+++ b/locale/cs/LC_MESSAGES/bitcoin.po
@@ -0,0 +1,975 @@
+# This file is distributed under the same license as the Bitcoin package.
+# xHire <xhire@mujmalysvet.cz>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-26 21:44+0200\n"
+"PO-Revision-Date: 2011-05-26 22:31+0100\n"
+"Last-Translator: xHire <xhire@mujmalysvet.cz>\n"
+"Language-Team: \n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ../../..\n"
+
+#: ../../../src/net.cpp:1503
+#, c-format
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "Nedaří se mi připojit na port %d na tomhle počítači. Bitcoin už pravděpodobně jednou běží."
+
+#: ../../../src/ui.cpp:204
+#, 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 "Tahle transakce přesahuje velikostní limit. Pořád ji ale můžeš poslat, pokud za ni zaplatíš poplatek %s, který půjde uzlům, které tvou transakci zpracují, a navíc tak podpoříš síť. Chceš zaplatit poplatek?"
+
+#: ../../../src/ui.cpp:303
+msgid "Status"
+msgstr "Stav"
+
+#: ../../../src/ui.cpp:304
+msgid "Date"
+msgstr "Datum"
+
+#: ../../../src/ui.cpp:305
+msgid "Description"
+msgstr "Popis"
+
+#: ../../../src/ui.cpp:306
+msgid "Debit"
+msgstr "Výdaje"
+
+#: ../../../src/ui.cpp:307
+msgid "Credit"
+msgstr "Příjmy"
+
+#: ../../../src/ui.cpp:513
+#, c-format
+msgid "Open for %d blocks"
+msgstr "Otevřeno pro %d bloků"
+
+#: ../../../src/ui.cpp:515
+#, c-format
+msgid "Open until %s"
+msgstr "Otřevřeno dokud %s"
+
+#: ../../../src/ui.cpp:521
+#, c-format
+msgid "%d/offline?"
+msgstr "%d/offline?"
+
+#: ../../../src/ui.cpp:523
+#, c-format
+msgid "%d/unconfirmed"
+msgstr "%d/nepotvrzeno"
+
+#: ../../../src/ui.cpp:525
+#, c-format
+msgid "%d confirmations"
+msgstr "%d potvrzení"
+
+#: ../../../src/ui.cpp:610
+msgid "Generated"
+msgstr "Vygenerováno"
+
+#: ../../../src/ui.cpp:618
+#, c-format
+msgid "Generated (%s matures in %d more blocks)"
+msgstr "Vygenerováno (%s dozraje po %d blocích)"
+
+#: ../../../src/ui.cpp:622
+msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
+msgstr "Vygenerovaný - Varování: Tehnle blok nebyl obdržen žádným jiným uzlem a pravděpodobně nebude akceptován!"
+
+#: ../../../src/ui.cpp:626
+msgid "Generated (not accepted)"
+msgstr "Vygenerováno (neakceptováno)"
+
+#: ../../../src/ui.cpp:636
+msgid "From: "
+msgstr "Od: "
+
+#: ../../../src/ui.cpp:660
+msgid "Received with: "
+msgstr "Přijato adresou: "
+
+#: ../../../src/ui.cpp:706
+msgid "Payment to yourself"
+msgstr "Platba pro sebe sama"
+
+#: ../../../src/ui.cpp:740
+msgid "To: "
+msgstr "Pro: "
+
+#: ../../../src/ui.cpp:1055
+msgid " Generating"
+msgstr " Generuji"
+
+#: ../../../src/ui.cpp:1057
+msgid "(not connected)"
+msgstr "(nepřipojen)"
+
+#: ../../../src/ui.cpp:1060
+#, c-format
+msgid " %d connections %d blocks %d transactions"
+msgstr " %d spojení %d bloků %d transakcí"
+
+#: ../../../src/ui.cpp:1165
+#: ../../../src/ui.cpp:2529
+msgid "New Receiving Address"
+msgstr "Nová Bitcoinová adresa"
+
+#: ../../../src/ui.cpp:1166
+#: ../../../src/ui.cpp:2530
+msgid ""
+"You should use a new address for each payment you receive.\n"
+"\n"
+"Label"
+msgstr ""
+"Měl bys vždy použít novou adresu pro každou platbu, kterou přijímáš.\n"
+"\n"
+"Označení"
+
+#: ../../../src/ui.cpp:1235
+msgid "<b>Status:</b> "
+msgstr "<b>Stav:</b> "
+
+#: ../../../src/ui.cpp:1240
+msgid ", has not been successfully broadcast yet"
+msgstr ", ještě nebylo rozesláno"
+
+#: ../../../src/ui.cpp:1242
+#, c-format
+msgid ", broadcast through %d node"
+msgstr ", rozesláno přes %d uzel"
+
+#: ../../../src/ui.cpp:1244
+#, c-format
+msgid ", broadcast through %d nodes"
+msgstr ", rozesláno přes %d uzlů"
+
+#: ../../../src/ui.cpp:1248
+msgid "<b>Date:</b> "
+msgstr "<b>Datum:</b> "
+
+#: ../../../src/ui.cpp:1256
+msgid "<b>Source:</b> Generated<br>"
+msgstr "<b>Zdroj:</b> Vygenerováno<br>"
+
+#: ../../../src/ui.cpp:1262
+#: ../../../src/ui.cpp:1280
+msgid "<b>From:</b> "
+msgstr "<b>Od:</b> "
+
+#: ../../../src/ui.cpp:1280
+msgid "unknown"
+msgstr "neznámo"
+
+#: ../../../src/ui.cpp:1281
+#: ../../../src/ui.cpp:1305
+#: ../../../src/ui.cpp:1364
+msgid "<b>To:</b> "
+msgstr "<b>Pro:</b> "
+
+#: ../../../src/ui.cpp:1284
+msgid " (yours, label: "
+msgstr " (tvoje, označení: "
+
+#: ../../../src/ui.cpp:1286
+msgid " (yours)"
+msgstr " (tvoje)"
+
+#: ../../../src/ui.cpp:1323
+#: ../../../src/ui.cpp:1335
+#: ../../../src/ui.cpp:1381
+#: ../../../src/ui.cpp:1398
+msgid "<b>Credit:</b> "
+msgstr "<b>Příjem:</b> "
+
+#: ../../../src/ui.cpp:1325
+#, c-format
+msgid "(%s matures in %d more blocks)"
+msgstr "(%s dozraje po %d blocích)"
+
+#: ../../../src/ui.cpp:1327
+msgid "(not accepted)"
+msgstr "(neakceptováno)"
+
+#: ../../../src/ui.cpp:1372
+#: ../../../src/ui.cpp:1380
+#: ../../../src/ui.cpp:1395
+msgid "<b>Debit:</b> "
+msgstr "<b>Výdaj:</b> "
+
+#: ../../../src/ui.cpp:1386
+msgid "<b>Transaction fee:</b> "
+msgstr "<b>Transakční poplatek:</b> "
+
+#: ../../../src/ui.cpp:1402
+msgid "<b>Net amount:</b> "
+msgstr "<b>Čistá částka:</b> "
+
+#: ../../../src/ui.cpp:1409
+msgid "Message:"
+msgstr "Zpráva:"
+
+#: ../../../src/ui.cpp:1411
+msgid "Comment:"
+msgstr "Komentář:"
+
+#: ../../../src/ui.cpp:1414
+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 "Vygenerované mince musí čekat 120 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na \"neakceptovaný\" a nebude utratitelný. To se občas může přihodit, pokud jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty."
+
+#: ../../../src/ui.cpp:1594
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "Nemohu zapisovat do souboru autostart/bitcoin.desktop"
+
+#: ../../../src/ui.cpp:1630
+msgid "Main"
+msgstr "Hlavní"
+
+#: ../../../src/ui.cpp:1638
+msgid "&Start Bitcoin on window system startup"
+msgstr "&Spustit Bitcoin při startu okenního systému"
+
+#: ../../../src/ui.cpp:1645
+msgid "&Minimize on close"
+msgstr "&Zavřením pouze skrýt"
+
+#: ../../../src/ui.cpp:1787
+#, c-format
+msgid "version %s"
+msgstr "verze %s"
+
+#: ../../../src/ui.cpp:1899
+msgid "Error in amount "
+msgstr "Chyba v částce"
+
+#: ../../../src/ui.cpp:1899
+#: ../../../src/ui.cpp:1904
+#: ../../../src/ui.cpp:1909
+#: ../../../src/ui.cpp:1944
+#: ../../../src/uibase.cpp:55
+msgid "Send Coins"
+msgstr "Pošli mince"
+
+#: ../../../src/ui.cpp:1904
+msgid "Amount exceeds your balance "
+msgstr "Částka překračuje stav účtu"
+
+#: ../../../src/ui.cpp:1909
+msgid "Total exceeds your balance when the "
+msgstr "Celková částka přesahuje stav tvého účtu, když "
+
+#: ../../../src/ui.cpp:1909
+msgid " transaction fee is included "
+msgstr " transakční poplatek je zahrnut"
+
+#: ../../../src/ui.cpp:1927
+msgid "Payment sent "
+msgstr "Platba odeslána"
+
+#: ../../../src/ui.cpp:1927
+#: ../../../src/ui.cpp:1932
+#: ../../../src/ui.cpp:2076
+#: ../../../src/ui.cpp:2229
+#: ../../../src/main.cpp:3997
+msgid "Sending..."
+msgstr "Posílám..."
+
+#: ../../../src/ui.cpp:1944
+msgid "Invalid address "
+msgstr "Neplatná adresa"
+
+#: ../../../src/ui.cpp:1997
+#, c-format
+msgid "Sending %s to %s"
+msgstr "Posílám %s %s"
+
+#: ../../../src/ui.cpp:2070
+#: ../../../src/ui.cpp:2103
+msgid "CANCELLED"
+msgstr "ZRUŠENO"
+
+#: ../../../src/ui.cpp:2074
+msgid "Cancelled"
+msgstr "Zrušeno"
+
+#: ../../../src/ui.cpp:2076
+msgid "Transfer cancelled "
+msgstr "Převod zrušen"
+
+#: ../../../src/ui.cpp:2129
+msgid "Error: "
+msgstr "Chyba: "
+
+#: ../../../src/ui.cpp:2143
+#: ../../../src/ui.cpp:2214
+#: ../../../src/main.cpp:4016
+msgid "Insufficient funds"
+msgstr "Nedostatek peněz"
+
+#: ../../../src/ui.cpp:2148
+msgid "Connecting..."
+msgstr "Připojuji..."
+
+#: ../../../src/ui.cpp:2153
+msgid "Unable to connect"
+msgstr "Nemohu se připojit"
+
+#: ../../../src/ui.cpp:2158
+msgid "Requesting public key..."
+msgstr "Požaduji veřejný klíč..."
+
+#: ../../../src/ui.cpp:2170
+msgid "Received public key..."
+msgstr "Přijat veřejný klíč..."
+
+#: ../../../src/ui.cpp:2184
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "Příjemce neakceptuje transakce poslané IP adresou"
+
+#: ../../../src/ui.cpp:2186
+msgid "Transfer was not accepted"
+msgstr "Převod nebyl akceptován"
+
+#: ../../../src/ui.cpp:2195
+msgid "Invalid response received"
+msgstr "Přišla neplatná odpověď"
+
+#: ../../../src/ui.cpp:2210
+msgid "Creating transaction..."
+msgstr "Vytvářím transakci..."
+
+#: ../../../src/ui.cpp:2222
+#, 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 "Tato transakce vyžaduje transakční poplatek nejméně %s kvůli svému objemu, komplexnosti nebo utrácení nedávno přijaté hotovosti"
+
+#: ../../../src/ui.cpp:2224
+msgid "Transaction creation failed"
+msgstr "Vytvoření transakce selhalo"
+
+#: ../../../src/ui.cpp:2231
+msgid "Transaction aborted"
+msgstr "Transakce zrušena"
+
+#: ../../../src/ui.cpp:2239
+msgid "Lost connection, transaction cancelled"
+msgstr "Spojení se ztratilo, takže transakce byla zrušena"
+
+#: ../../../src/ui.cpp:2255
+msgid "Sending payment..."
+msgstr "Posílám platbu..."
+
+#: ../../../src/ui.cpp:2261
+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 "Transakce byla odmítnuta. Tohle může nastat, pokud nějaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly označeny jako utracené v této."
+
+#: ../../../src/ui.cpp:2270
+msgid "Waiting for confirmation..."
+msgstr "Čekám na potvrzení..."
+
+#: ../../../src/ui.cpp:2288
+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 ""
+"Platba byla poslána, ale příjemce není schopen ji ověřit.\n"
+"Transakce je zaznamenána a bude připsána příjemci,\n"
+"ale poznámka u platby bude prázdná."
+
+#: ../../../src/ui.cpp:2297
+msgid "Payment was sent, but an invalid response was received"
+msgstr "Platba byla odeslána, ale přišla neplatná odpověď"
+
+#: ../../../src/ui.cpp:2303
+msgid "Payment completed"
+msgstr "Platba je kompletní"
+
+#: ../../../src/ui.cpp:2334
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2517
+msgid "Name"
+msgstr "Jméno"
+
+#: ../../../src/ui.cpp:2335
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2517
+msgid "Address"
+msgstr "Adresa"
+
+#: ../../../src/ui.cpp:2337
+#: ../../../src/ui.cpp:2492
+msgid "Label"
+msgstr "Označení"
+
+#: ../../../src/ui.cpp:2338
+#: ../../../src/uibase.cpp:837
+msgid "Bitcoin Address"
+msgstr "Bitcoinová adresa"
+
+#: ../../../src/ui.cpp:2462
+msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. "
+msgstr "Tohle je jedna z tvých vlastních adres pro příjem plateb a nemůže být zadána do adresáře."
+
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2486
+msgid "Edit Address"
+msgstr "Upravit adresu"
+
+#: ../../../src/ui.cpp:2492
+msgid "Edit Address Label"
+msgstr "Upravit označení adresy"
+
+#: ../../../src/ui.cpp:2517
+#: ../../../src/ui.cpp:2523
+msgid "Add Address"
+msgstr "Přidat adresu"
+
+#: ../../../src/ui.cpp:2600
+msgid "Bitcoin"
+msgstr "Bitcoin"
+
+#: ../../../src/ui.cpp:2602
+msgid "Bitcoin - Generating"
+msgstr "Bitcoin - Generování"
+
+#: ../../../src/ui.cpp:2604
+msgid "Bitcoin - (not connected)"
+msgstr "Bitcoin - (nepřipojen)"
+
+#: ../../../src/ui.cpp:2683
+msgid "&Open Bitcoin"
+msgstr "&Otevřít Bitcoin"
+
+#: ../../../src/ui.cpp:2684
+msgid "&Send Bitcoins"
+msgstr "&Poslat Bitcoiny"
+
+#: ../../../src/ui.cpp:2685
+msgid "O&ptions..."
+msgstr "&Možnosti..."
+
+#: ../../../src/ui.cpp:2688
+#: ../../../src/uibase.cpp:25
+msgid "E&xit"
+msgstr "&Konec"
+
+#: ../../../src/ui.cpp:2904
+msgid "Program has crashed and will terminate. "
+msgstr "Program havaroval a bude ukončen."
+
+#: ../../../src/main.cpp:1866
+msgid "Warning: Disk space is low "
+msgstr "Upozornění: Na disku je málo místa"
+
+#: ../../../src/main.cpp:3990
+#, 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 "Chyba: Tato transakce vyžaduje transakční poplatek nejméně %s kvůli svému objemu, komplexnosti nebo utrácení nedávno přijaté hotovosti"
+
+#: ../../../src/main.cpp:3992
+msgid "Error: Transaction creation failed "
+msgstr "Chyba: Vytvoření transakce selhalo"
+
+#: ../../../src/main.cpp:4001
+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 "Chyba: Transakce byla odmítnuta. Tohle může nastat, pokud nějaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly označeny jako utracené v této."
+
+#: ../../../src/main.cpp:4014
+msgid "Invalid amount"
+msgstr "Neplatná částka"
+
+#: ../../../src/main.cpp:4021
+msgid "Invalid bitcoin address"
+msgstr "Neplatná Bitcoinová adresa"
+
+#: ../../../src/rpc.cpp:1802
+#: ../../../src/rpc.cpp:1804
+#, c-format
+msgid "To use the %s option"
+msgstr "Pro použití volby %s"
+
+#: ../../../src/rpc.cpp:1806
+#, 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 ""
+"Varování: %s, musíš nastavit rpcpassword=<heslo>\n"
+"v konfiguračním souboru: %s\n"
+"Pokud tenhle soubor neexistuje, vytvoř ho s oprávněním pro čtení pouze pro vlastníka.\n"
+
+#: ../../../src/rpc.cpp:1974
+#, 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 ""
+"Musíš nastavit rpcpassword=<heslo> v konfiguračním souboru:\n"
+"%s\n"
+"Pokud tenhle soubor neexistuje, vytvoř ho s oprávněním pro čtení pouze pro vlastníka."
+
+#: ../../../src/util.cpp:866
+msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly."
+msgstr "Varování: Prosím zkontroluj, že datum a čas jsou na tvém počítači správně nastaveny. Pokud jsou nastaveny špatně, Bitcoin nebude fungovat správně."
+
+#: ../../../src/util.cpp:899
+msgid "-beta"
+msgstr "-beta"
+
+#: ../../../src/uibase.cpp:28
+msgid "&File"
+msgstr "&Soubor"
+
+#: ../../../src/uibase.cpp:32
+msgid "&Your Receiving Addresses..."
+msgstr "Tvá Bitcoinová &adresa..."
+
+#: ../../../src/uibase.cpp:36
+msgid "&Options..."
+msgstr "M&ožnosti"
+
+#: ../../../src/uibase.cpp:39
+msgid "&Settings"
+msgstr "Nas&tavení"
+
+#: ../../../src/uibase.cpp:43
+msgid "&About..."
+msgstr "&O programu"
+
+#: ../../../src/uibase.cpp:46
+msgid "&Help"
+msgstr "&Nápověda"
+
+#: ../../../src/uibase.cpp:56
+msgid "Address Book"
+msgstr "Adresář"
+
+#: ../../../src/uibase.cpp:69
+msgid "Your Bitcoin Address:"
+msgstr "Tvá Bitcoinová adresa:"
+
+#: ../../../src/uibase.cpp:76
+msgid " &New... "
+msgstr " &Nová..."
+
+#: ../../../src/uibase.cpp:79
+#: ../../../src/uibase.cpp:780
+#: ../../../src/uibase.cpp:883
+msgid " &Copy to Clipboard "
+msgstr " &Kopírovat do schránky"
+
+#: ../../../src/uibase.cpp:93
+msgid "Balance:"
+msgstr "Stav účtu:"
+
+#: ../../../src/uibase.cpp:109
+msgid " All"
+msgstr " Vše"
+
+#: ../../../src/uibase.cpp:109
+msgid " Sent"
+msgstr " Odeslané"
+
+#: ../../../src/uibase.cpp:109
+msgid " Received"
+msgstr " Přijaté"
+
+#: ../../../src/uibase.cpp:109
+msgid " In Progress"
+msgstr " Pracuje se na tom"
+
+#: ../../../src/uibase.cpp:130
+msgid "All Transactions"
+msgstr "Všechny transakce"
+
+#: ../../../src/uibase.cpp:141
+msgid "Sent/Received"
+msgstr "Odeslané/Přijaté"
+
+#: ../../../src/uibase.cpp:152
+msgid "Sent"
+msgstr "Odeslané"
+
+#: ../../../src/uibase.cpp:163
+msgid "Received"
+msgstr "Přijaté"
+
+#: ../../../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 "&Budiž"
+
+#: ../../../src/uibase.cpp:345
+msgid "&Start Bitcoin on system startup"
+msgstr "&Spustit Bitcoin při startu systému"
+
+#: ../../../src/uibase.cpp:348
+msgid "&Minimize to the tray instead of the taskbar"
+msgstr "&Minimalizovávat do ikony v panelu"
+
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "Namapovat port přes &UPnP"
+
+#: ../../../src/uibase.cpp:354
+msgid "M&inimize to the tray on close"
+msgstr "Zavřením &minimalizovat do ikony"
+
+#: ../../../src/uibase.cpp:360
+msgid "&Connect through socks4 proxy: "
+msgstr "&Připojit přes socks4 proxy:"
+
+#: ../../../src/uibase.cpp:371
+msgid "Proxy &IP:"
+msgstr "&IP adresa proxy:"
+
+#: ../../../src/uibase.cpp:379
+msgid " &Port:"
+msgstr " &Port:"
+
+#: ../../../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 "Dobrovolný transakční poplatek za každý započatý KB napomáhá tomu, aby tvé transakce byly rychle zpracovány. Většina transakcí má do 1 KB. Doporučená výše poplatku je 0.01."
+
+#: ../../../src/uibase.cpp:399
+msgid "Pay transaction fee:"
+msgstr "Výše transakčního poplatku:"
+
+#: ../../../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 "&Zrušit"
+
+#: ../../../src/uibase.cpp:449
+msgid "&Apply"
+msgstr "&Použít"
+
+#: ../../../src/uibase.cpp:508
+msgid "Bitcoin "
+msgstr "Bitcoin"
+
+#: ../../../src/uibase.cpp:514
+msgid "version"
+msgstr "verze"
+
+#: ../../../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 ""
+"Copyright (c) 2009-2011 Vývojáři Bitcoinu\n"
+"\n"
+"Tohle je experimentální program.\n"
+"\n"
+"Šířen pod licencí MIT/X11, viz přiložený soubor license.txt nebo \n"
+"http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití \n"
+"v OpenSSL Toolkitu (http://www.openssl.org/) a kryptografický program od \n"
+"Erika Younga (eay@cryptsoft.com) a program UPnP od Thomase Bernarda."
+
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Vlož Bitcoinovou adresu (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+
+#: ../../../src/uibase.cpp:595
+msgid "Pay &To:"
+msgstr "&Komu:"
+
+#: ../../../src/uibase.cpp:610
+msgid "&Paste"
+msgstr "&Vložit"
+
+#: ../../../src/uibase.cpp:613
+msgid " Address &Book..."
+msgstr " &Adresář..."
+
+#: ../../../src/uibase.cpp:620
+msgid "&Amount:"
+msgstr "&Částka"
+
+#: ../../../src/uibase.cpp:630
+msgid "T&ransfer:"
+msgstr "&Převod:"
+
+#: ../../../src/uibase.cpp:636
+msgid " Standard"
+msgstr " Standard"
+
+#: ../../../src/uibase.cpp:663
+msgid "&Send"
+msgstr "&Poslat"
+
+#: ../../../src/uibase.cpp:711
+msgid ""
+"\n"
+"\n"
+"Connecting..."
+msgstr ""
+"\n"
+"\n"
+"Připojuji..."
+
+#: ../../../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 "Tohle jsou tvé Bitcoinové adresy na příjem plateb. Asi budeš chtít dát jinou adresu každému odesílateli, abys věděl, kdo ti kolik platil. Označená adresa bude zobrazena v hlavním okně."
+
+#: ../../../src/uibase.cpp:774
+#: ../../../src/uibase.cpp:886
+msgid "&Edit..."
+msgstr "&Upravit..."
+
+#: ../../../src/uibase.cpp:777
+#: ../../../src/uibase.cpp:889
+msgid " &New Address... "
+msgstr " &Nová adresa..."
+
+#: ../../../src/uibase.cpp:849
+msgid "Sending"
+msgstr "Cizí adresy (pro odesílání)"
+
+#: ../../../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 "Tohle jsou tvé Bitcoinové adresy na příjem plateb. Můžeš dát jinou adresu každému odesílateli, abys věděl, kdo ti kolik platil. Označená adresa bude zobrazena v hlavním okně."
+
+#: ../../../src/uibase.cpp:870
+msgid "Receiving"
+msgstr "Tvoje adresy (pro příjem)"
+
+#: ../../../src/uibase.cpp:880
+msgid "&Delete"
+msgstr "&Smazat"
+
+#: ../../../src/init.cpp:140
+msgid " beta"
+msgstr " beta"
+
+#: ../../../src/init.cpp:142
+msgid "Bitcoin version"
+msgstr "Bitcoin verze"
+
+#: ../../../src/init.cpp:143
+msgid "Usage:"
+msgstr "Užití:"
+
+#: ../../../src/init.cpp:145
+msgid "Send command to -server or bitcoind\n"
+msgstr "Poslat příkaz pro -server nebo bitcoind\n"
+
+#: ../../../src/init.cpp:146
+msgid "List commands\n"
+msgstr "Výpis příkazů\n"
+
+#: ../../../src/init.cpp:147
+msgid "Get help for a command\n"
+msgstr "Získat nápovědu pro příkaz\n"
+
+#: ../../../src/init.cpp:148
+msgid "Options:\n"
+msgstr "Možnosti:\n"
+
+#: ../../../src/init.cpp:149
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Konfigurační soubor (výchozí: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:150
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "PID soubor (výchozí: bitcoind.pid)\n"
+
+#: ../../../src/init.cpp:151
+msgid "Generate coins\n"
+msgstr "Generovat mince\n"
+
+#: ../../../src/init.cpp:152
+msgid "Don't generate coins\n"
+msgstr "Negenerovat mince\n"
+
+#: ../../../src/init.cpp:153
+msgid "Start minimized\n"
+msgstr "Startovat minimalizovaně\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify data directory\n"
+msgstr "Adresář pro data\n"
+
+#: ../../../src/init.cpp:155
+msgid "Connect through socks4 proxy\n"
+msgstr "Připojovat se skrz socks4 proxy\n"
+
+#: ../../../src/init.cpp:156
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "Povolit DNS dotazy pro addnode (přidání uzlu) a connect (připojení)\n"
+
+#: ../../../src/init.cpp:157
+msgid "Add a node to connect to\n"
+msgstr "Přidat uzel, ke kterému se připojit\n"
+
+#: ../../../src/init.cpp:158
+msgid "Connect only to the specified node\n"
+msgstr "Připojovat se pouze k udanému uzlu\n"
+
+#: ../../../src/init.cpp:159
+msgid "Don't accept connections from outside\n"
+msgstr "Nepřijímat připojení zvenčí\n"
+
+#: ../../../src/init.cpp:162
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "Nesnažit se použít UPnP k namapování naslouchacího portu\n"
+
+#: ../../../src/init.cpp:164
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Snažit se použít UPnP k namapování naslouchacího portu\n"
+
+#: ../../../src/init.cpp:167
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Poplatek za KB, který se přidá ke každé odeslané transakci\n"
+
+#: ../../../src/init.cpp:169
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Akceptovat příkazy z příkazové řádky a přes JSON-RPC\n"
+
+#: ../../../src/init.cpp:172
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Běžet na pozadí jako démon a akceptovat příkazy\n"
+
+#: ../../../src/init.cpp:174
+msgid "Use the test network\n"
+msgstr "Použít testovací síť\n"
+
+#: ../../../src/init.cpp:175
+msgid "Username for JSON-RPC connections\n"
+msgstr "Uživatelské jméno pro JSON-RPC spojení\n"
+
+#: ../../../src/init.cpp:176
+msgid "Password for JSON-RPC connections\n"
+msgstr "Heslo pro JSON-RPC spojení\n"
+
+#: ../../../src/init.cpp:177
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "Čekat na JSON-RPC spojení na <portu> (výchozí: 8332)\n"
+
+#: ../../../src/init.cpp:178
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Povolit JSON-RPC spojení ze specifikované IP adresy\n"
+
+#: ../../../src/init.cpp:179
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Posílat příkazy uzlu běžícím na <ip> (výchozí: 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:180
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Nastavit zásobník klíčů na velikost <n> (výchozí: 100)\n"
+
+#: ../../../src/init.cpp:181
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Přeskenovat řetězec bloků na chybějící transakce peněženky\n"
+
+#: ../../../src/init.cpp:185
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"Možnosti SSL: (viz instrukce nastavení SSL v Bitcoin Wiki)\n"
+
+#: ../../../src/init.cpp:186
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Použít OpenSSL (https) pro JSON-RPC spojení\n"
+
+#: ../../../src/init.cpp:187
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "Soubor se serverovým certifikátem (výchozí: server.cert)\n"
+
+#: ../../../src/init.cpp:188
+msgid "Server private key (default: server.pem)\n"
+msgstr "Soubor se serverovým soukromým klíčem (výchozí: server.pem)\n"
+
+#: ../../../src/init.cpp:189
+msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+msgstr "Akceptovatelné šifry (výchozí: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+
+#: ../../../src/init.cpp:193
+msgid "This help message\n"
+msgstr "Tato nápověda\n"
+
+#: ../../../src/init.cpp:330
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "Nedaří se mi získat zámek na datový adresář %s. Bitcoin pravděpodobně už jednou běží."
+
+#: ../../../src/init.cpp:356
+msgid "Error loading addr.dat \n"
+msgstr "Chyba při načítání addr.dat \n"
+
+#: ../../../src/init.cpp:362
+msgid "Error loading blkindex.dat \n"
+msgstr "Chyba při načítání blkindex.dat \n"
+
+#: ../../../src/init.cpp:369
+msgid "Error loading wallet.dat \n"
+msgstr "Chyba při načítání wallet.dat \n"
+
+#: ../../../src/init.cpp:449
+msgid "Invalid -proxy address"
+msgstr "Neplatná -proxy adresa"
+
+#: ../../../src/init.cpp:472
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Neplatná částka pro -paytxfee=<částka>"
+
+#: ../../../src/init.cpp:476
+msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."
+msgstr "Varování: -paytxfee je nastaveno velmi vysoko. Toto je transakční poplatek, který zaplatíš za každou poslanou transakci."
+
+#: ../../../src/uibase.h:147
+msgid "Transaction Details"
+msgstr "Detaily transakce"
+
+#: ../../../src/uibase.h:199
+msgid "Options"
+msgstr "Možnosti"
+
+#: ../../../src/uibase.h:228
+msgid "About Bitcoin"
+msgstr "O Bitcoinu"
+
+#: ../../../src/uibase.h:337
+msgid "Your Bitcoin Addresses"
+msgstr "Tvá Bitcoinová adresa"
+
diff --git a/locale/de/LC_MESSAGES/bitcoin.mo b/locale/de/LC_MESSAGES/bitcoin.mo
index 5d5ec90e23..ee2cad41e6 100644
--- a/locale/de/LC_MESSAGES/bitcoin.mo
+++ b/locale/de/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/de/LC_MESSAGES/bitcoin.po b/locale/de/LC_MESSAGES/bitcoin.po
index 7504db1fcf..ee723a73c4 100644
--- a/locale/de/LC_MESSAGES/bitcoin.po
+++ b/locale/de/LC_MESSAGES/bitcoin.po
@@ -1,459 +1,381 @@
-# DataWraith <DataWraith@web.de>, 2010.
+# Jakob Kramer <censored@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-05-26 22:02-0000\n"
-"PO-Revision-Date: 2010-06-03 13:11+0200\n"
-"Last-Translator: DataWraith\n"
-"Language-Team: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-15 18:18+0100\n"
+"PO-Revision-Date: 2011-05-26 22:34+0100\n"
+"Last-Translator: Jakob Kramer <censored@gmail.com>\n"
+"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
"X-Poedit-Basepath: .\n"
"X-Poedit-SearchPath-0: ../../..\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../../init.cpp:342
-msgid "Usage: bitcoin [options]"
-msgstr "Verwendung: bitcoin [optionen]"
-
-#: ../../../init.cpp:343
-msgid "Options:\n"
-msgstr "Optionen:\n"
-
-#: ../../../init.cpp:344
-msgid "Generate coins\n"
-msgstr "Münzen erzeugen\n"
-
-#: ../../../init.cpp:345
-msgid "Don't generate coins\n"
-msgstr "Keine Münzen erzeugen\n"
-
-#: ../../../init.cpp:346
-msgid "Start minimized\n"
-msgstr "Minimiert starten\n"
-
-#: ../../../init.cpp:347
-msgid "Specify data directory\n"
-msgstr "Datenverzeichnis festlegen\n"
-
-#: ../../../init.cpp:348
-msgid "Connect through socks4 proxy\n"
-msgstr "Socks4 Proxy verwenden\n"
-
-#: ../../../init.cpp:349
-msgid "Add a node to connect to\n"
-msgstr "Einen Teilnehmer hinzufügen, zu dem verbunden werden soll\n"
-
-#: ../../../init.cpp:350
-msgid "Connect only to the specified node\n"
-msgstr "Nur zu dem angegebenen Teilnehmer verbinden\n"
-
-#: ../../../init.cpp:351
-msgid "This help message\n"
-msgstr "Diese Anleitung\n"
-
-#: ../../../init.cpp:455
-msgid "Error loading addr.dat \n"
-msgstr "Fehler beim Laden von addr.dat \n"
-
-#: ../../../init.cpp:461
-msgid "Error loading blkindex.dat \n"
-msgstr "Fehler beim Laden von blkindex.dat \n"
-
-#: ../../../init.cpp:468
-msgid "Error loading wallet.dat \n"
-msgstr "Fehler beim Laden von wallet.dat \n"
-
-#: ../../../init.cpp:536
-msgid "Invalid -proxy address"
-msgstr "Ungültige -Proxy Adresse"
-
-#: ../../../init.cpp:629
-msgid "Program has crashed and will terminate. "
-msgstr "Das Programm ist abgestürzt und wird beendet. "
-
-#: ../../../main.cpp:1465
-msgid "Warning: Disk space is low "
-msgstr "Warnung: Festplatte fast voll "
-
-#: ../../../main.cpp:2994
+#: ../../../src/net.cpp:1499
#, c-format
-msgid "Error: This is an oversized transaction that requires a transaction fee of %s "
-msgstr "Fehler: Die Überweisung ist sehr groß. Es wird eine Gebühr von %s erhoben. "
-
-#: ../../../main.cpp:2996
-msgid "Error: Transaction creation failed "
-msgstr "Fehler: Überweisung konnte nicht erzeugt werden. "
-
-#: ../../../main.cpp:3001
-#: ../../../ui.cpp:1761
-#: ../../../ui.cpp:1763
-#: ../../../ui.cpp:1904
-#: ../../../ui.cpp:2053
-msgid "Sending..."
-msgstr "Überweise..."
-
-#: ../../../main.cpp:3005
-msgid "Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."
-msgstr "Fehler: Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden."
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "Kann nicht zu Port %d auf diesem Computer verbinden. Bitcoin läuft wahrscheinlich bereits."
-#: ../../../main.cpp:3017
-msgid "Invalid amount"
-msgstr "Ungültiger Betrag"
-
-#: ../../../main.cpp:3019
-#: ../../../ui.cpp:1971
-#: ../../../ui.cpp:2038
-msgid "Insufficient funds"
-msgstr "Unzureichende Geldmittel"
-
-#: ../../../main.cpp:3024
-msgid "Invalid bitcoin address"
-msgstr "Ungültige Bitcoin-Adresse"
-
-#: ../../../ui.cpp:189
+#: ../../../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 "Diese Überweisung übersteigt das Betragslimit. Sie können sie trotzdem tätigen, aber es wird eine Gebühr von %s erhoben, die an den Teilnehmer ausgeschüttet wird, der Ihre Überweisung bearbeitet und dadurch hilft das Netzwerk am laufen zu halten. Möchten Sie die Gebühr entrichten?"
+msgstr "Diese Überweisung übersteigt das Betragslimit. Sie können sie trotzdem tätigen, aber es wird eine Gebühr von %s erhoben, die an den Teilnehmer ausgeschüttet wird, der Ihre Überweisung bearbeitet und dadurch hilft, das Netzwerk am laufen zu halten. Möchten Sie die Gebühr entrichten?"
-#: ../../../ui.cpp:285
+#: ../../../src/ui.cpp:301
msgid "Status"
msgstr "Status"
-#: ../../../ui.cpp:286
+#: ../../../src/ui.cpp:302
msgid "Date"
msgstr "Datum"
-#: ../../../ui.cpp:287
+#: ../../../src/ui.cpp:303
msgid "Description"
msgstr "Beschreibung"
-#: ../../../ui.cpp:288
+#: ../../../src/ui.cpp:304
msgid "Debit"
msgstr "Belastungen"
-#: ../../../ui.cpp:289
+#: ../../../src/ui.cpp:305
msgid "Credit"
msgstr "Gutschriften"
-#: ../../../ui.cpp:489
+#: ../../../src/ui.cpp:511
#, c-format
msgid "Open for %d blocks"
msgstr "Offen für %d Blöcke"
-#: ../../../ui.cpp:491
+#: ../../../src/ui.cpp:513
#, c-format
msgid "Open until %s"
msgstr "Offen bis %s"
-#: ../../../ui.cpp:497
+#: ../../../src/ui.cpp:519
#, c-format
msgid "%d/offline?"
msgstr "%d/Offline?"
-#: ../../../ui.cpp:499
+#: ../../../src/ui.cpp:521
#, c-format
msgid "%d/unconfirmed"
msgstr "%d/nicht bestätigt"
-#: ../../../ui.cpp:501
+#: ../../../src/ui.cpp:523
#, c-format
msgid "%d confirmations"
msgstr "%d Bestätigungen"
-#: ../../../ui.cpp:584
+#: ../../../src/ui.cpp:608
msgid "Generated"
msgstr "Erzeugt"
-#: ../../../ui.cpp:592
+#: ../../../src/ui.cpp:616
#, c-format
msgid "Generated (%s matures in %d more blocks)"
msgstr "Erzeugt (%s reifen nach %d weiteren Blöcken)"
-#: ../../../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 "Erzeugt - Warnung: Dieser Block wurde von keinem anderen Teilnehmer empfangen und wird wahrscheinlich nicht akzeptiert werden!"
-#: ../../../ui.cpp:600
+#: ../../../src/ui.cpp:624
msgid "Generated (not accepted)"
msgstr "Erzeugt (nicht akzeptiert)"
-#: ../../../ui.cpp:610
+#: ../../../src/ui.cpp:634
msgid "From: "
msgstr "Von: "
-#: ../../../ui.cpp:634
+#: ../../../src/ui.cpp:658
msgid "Received with: "
msgstr "Empfangen durch: "
-#: ../../../ui.cpp:676
+#: ../../../src/ui.cpp:704
msgid "Payment to yourself"
msgstr "Überweisung an Sie selbst"
-#: ../../../ui.cpp:713
+#: ../../../src/ui.cpp:738
msgid "To: "
msgstr "An: "
-#: ../../../ui.cpp:1009
+#: ../../../src/ui.cpp:1053
msgid " Generating"
msgstr " Erzeugen"
-#: ../../../ui.cpp:1011
+#: ../../../src/ui.cpp:1055
msgid "(not connected)"
msgstr "(nicht verbunden)"
-#: ../../../ui.cpp:1014
+#: ../../../src/ui.cpp:1058
#, c-format
msgid " %d connections %d blocks %d transactions"
msgstr " %d Verbindungen %d Blöcke %d Überweisungen"
-#: ../../../ui.cpp:1123
-#: ../../../ui.cpp:2351
+#: ../../../src/ui.cpp:1163
+#: ../../../src/ui.cpp:2527
msgid "New Receiving Address"
msgstr "&Neue Empfangs-Adresse"
-#: ../../../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 ""
-"Am besten verwenden Sie für jede Zahlung die Sie erhalten eine neue Adresse.\n"
+"Am besten verwenden Sie für jede Zahlung, die Sie erhalten, eine neue Adresse.\n"
"\n"
"Beschreibung"
-#: ../../../ui.cpp:1193
+#: ../../../src/ui.cpp:1233
msgid "<b>Status:</b> "
msgstr "<b>Status:</b> "
-#: ../../../ui.cpp:1198
+#: ../../../src/ui.cpp:1238
msgid ", has not been successfully broadcast yet"
msgstr ", wurde noch nicht erfolgreich übertragen"
-#: ../../../ui.cpp:1200
+#: ../../../src/ui.cpp:1240
#, c-format
msgid ", broadcast through %d node"
msgstr ", durch %d Teilnehmer übertragen"
-#: ../../../ui.cpp:1202
+#: ../../../src/ui.cpp:1242
#, c-format
msgid ", broadcast through %d nodes"
msgstr ", durch %d Teilnehmer übertragen"
-#: ../../../ui.cpp:1206
+#: ../../../src/ui.cpp:1246
msgid "<b>Date:</b> "
msgstr "<b>Datum</b> "
-#: ../../../ui.cpp:1214
+#: ../../../src/ui.cpp:1254
msgid "<b>Source:</b> Generated<br>"
-msgstr "<b>Quelle:</b>Erzeugt<br>"
+msgstr "<b>Quelle:</b> Erzeugt<br>"
-#: ../../../ui.cpp:1220
-#: ../../../ui.cpp:1238
+#: ../../../src/ui.cpp:1260
+#: ../../../src/ui.cpp:1278
msgid "<b>From:</b> "
msgstr "<b>Von:</b> "
-#: ../../../ui.cpp:1238
+#: ../../../src/ui.cpp:1278
msgid "unknown"
msgstr "Unbekannt"
-#: ../../../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>An:</b> "
-#: ../../../ui.cpp:1242
+#: ../../../src/ui.cpp:1282
msgid " (yours, label: "
msgstr " (Eigene, Beschreibung: "
-#: ../../../ui.cpp:1244
+#: ../../../src/ui.cpp:1284
msgid " (yours)"
msgstr " (Eigene)"
-#: ../../../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>Gutschrift:</b> "
-#: ../../../ui.cpp:1283
+#: ../../../src/ui.cpp:1323
#, c-format
msgid "(%s matures in %d more blocks)"
msgstr "(%s reifen nach %d weiteren Blöcken)"
-#: ../../../ui.cpp:1285
+#: ../../../src/ui.cpp:1325
msgid "(not accepted)"
msgstr "(nicht akzeptiert)"
-#: ../../../ui.cpp:1330
-#: ../../../ui.cpp:1353
+#: ../../../src/ui.cpp:1370
+#: ../../../src/ui.cpp:1378
+#: ../../../src/ui.cpp:1393
msgid "<b>Debit:</b> "
msgstr "<b>Belastung:</b> "
-#: ../../../ui.cpp:1344
+#: ../../../src/ui.cpp:1384
msgid "<b>Transaction fee:</b> "
msgstr "<b>Überweisungsgebühr:</b> "
-#: ../../../ui.cpp:1360
+#: ../../../src/ui.cpp:1400
msgid "<b>Net amount:</b> "
msgstr "<b>Nettobetrag:</b> "
-#: ../../../ui.cpp:1367
+#: ../../../src/ui.cpp:1407
msgid "Message:"
msgstr "Nachricht:"
-#: ../../../ui.cpp:1370
+#: ../../../src/ui.cpp:1409
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: ../../../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 ""
-"Erzeugte Münzen müssen 120 Blöcke lang reifen. Als Sie diesen Block erzeugt haben, wurde er an alle Teilnehmer übertragen, damit er zur Block-Kette hinzugefügt werden kann. Falls der Block es nicht in die Block-Kette schafft, wird die Beschreibung zu \"nicht akzeptiert\" geändert, und Sie können die Münzen nicht ausgeben. Dies kann manchmal "
-"passieren, wenn Sie und ein anderer Teilnehmer annähernd zeitgleich einen Block erzeugen."
+msgstr "Erzeugte Münzen müssen 120 Blöcke lang reifen. Als Sie diesen Block erzeugt haben, wurde er an alle Teilnehmer übertragen, damit er zur Block-Kette hinzugefügt werden kann. Falls der Block es nicht in die Block-Kette schafft, wird die Beschreibung zu \"nicht akzeptiert\" geändert, und Sie können die Münzen nicht ausgeben. Dies kann manchmal passieren, wenn Sie und ein anderer Teilnehmer annähernd zeitgleich einen Block erzeugen."
-#: ../../../ui.cpp:1437
+#: ../../../src/ui.cpp:1592
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "Kann Datei autostart/bitcoin.desktop nicht schreiben"
+
+#: ../../../src/ui.cpp:1628
msgid "Main"
msgstr "Haupt"
-#: ../../../ui.cpp:1442
+#: ../../../src/ui.cpp:1636
+msgid "&Start Bitcoin on window system startup"
+msgstr "Bitcoin beim &Systemstart ausführen"
+
+#: ../../../src/ui.cpp:1643
msgid "&Minimize on close"
msgstr "Beim schließen &Minimieren"
-#: ../../../ui.cpp:1595
+#: ../../../src/ui.cpp:1785
#, c-format
-msgid "version %s%s BETA"
-msgstr "Version %s%s BETA"
+msgid "version %s"
+msgstr "version %s"
-#: ../../../ui.cpp:1681
-msgid "Will appear as \"From: Unknown\""
-msgstr "Wird als \"Von: Unbekannt\" erscheinen"
-
-#: ../../../ui.cpp:1681
-msgid "n/a"
-msgstr "Unbekannt"
-
-#: ../../../ui.cpp:1681
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: ../../../ui.cpp:1682
-msgid "Can't include a message when sending to a Bitcoin address"
-msgstr "Beim überweisen an eine Bitcoin-Adresse kann keine Nachricht angegeben werden."
-
-#: ../../../ui.cpp:1735
+#: ../../../src/ui.cpp:1897
msgid "Error in amount "
msgstr "Fehler in Betrag "
-#: ../../../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 "Überweisen"
-#: ../../../ui.cpp:1740
+#: ../../../src/ui.cpp:1902
msgid "Amount exceeds your balance "
msgstr "Der Betrag übersteigt Ihr Guthaben "
-#: ../../../ui.cpp:1745
+#: ../../../src/ui.cpp:1907
msgid "Total exceeds your balance when the "
-msgstr "Der Betrag übersteigt Ihr Guthaben, wenn man die Überweisungsgebühr von "
+msgstr "Der Betrag übersteigt Ihr Guthaben, wenn man die "
-#: ../../../ui.cpp:1745
+#: ../../../src/ui.cpp:1907
msgid " transaction fee is included "
-msgstr " berücksichtigt "
+msgstr " Überweisungsgebühr berücksichtigt "
-#: ../../../ui.cpp:1761
+#: ../../../src/ui.cpp:1925
msgid "Payment sent "
msgstr "Zahlung überwiesen "
-#: ../../../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 "Überweise ..."
+
+#: ../../../src/ui.cpp:1942
msgid "Invalid address "
msgstr "Ungültige Adresse "
-#: ../../../ui.cpp:1825
+#: ../../../src/ui.cpp:1995
#, c-format
msgid "Sending %s to %s"
msgstr "Überweise %s an %s"
-#: ../../../ui.cpp:1898
-#: ../../../ui.cpp:1931
+#: ../../../src/ui.cpp:2068
+#: ../../../src/ui.cpp:2101
msgid "CANCELLED"
msgstr "ANNULLIERT"
-#: ../../../ui.cpp:1902
+#: ../../../src/ui.cpp:2072
msgid "Cancelled"
msgstr "Annulliert"
-#: ../../../ui.cpp:1904
+#: ../../../src/ui.cpp:2074
msgid "Transfer cancelled "
msgstr "Überweisung annulliert "
-#: ../../../ui.cpp:1957
+#: ../../../src/ui.cpp:2127
msgid "Error: "
msgstr "Fehler: "
-#: ../../../ui.cpp:1976
+#: ../../../src/ui.cpp:2141
+#: ../../../src/ui.cpp:2212
+#: ../../../src/main.cpp:4018
+msgid "Insufficient funds"
+msgstr "Unzureichende Geldmittel"
+
+#: ../../../src/ui.cpp:2146
msgid "Connecting..."
-msgstr "Verbinde..."
+msgstr "Verbinde ..."
-#: ../../../ui.cpp:1981
+#: ../../../src/ui.cpp:2151
msgid "Unable to connect"
msgstr "Kann nicht verbinden"
-#: ../../../ui.cpp:1986
+#: ../../../src/ui.cpp:2156
msgid "Requesting public key..."
-msgstr "Fordere öffentlichen Schlüssel an..."
+msgstr "Fordere öffentlichen Schlüssel an ..."
-#: ../../../ui.cpp:1998
+#: ../../../src/ui.cpp:2168
msgid "Received public key..."
-msgstr "Öffentlichen Schlüssel empfangen..."
+msgstr "Öffentlicher Schlüssel empfangen ..."
+
+#: ../../../src/ui.cpp:2182
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "Empfänger akzeptiert keine Überweisungen von IP-Adressen"
-#: ../../../ui.cpp:2010
+#: ../../../src/ui.cpp:2184
msgid "Transfer was not accepted"
msgstr "Überweisung wurde nicht akzeptiert"
-#: ../../../ui.cpp:2019
+#: ../../../src/ui.cpp:2193
msgid "Invalid response received"
msgstr "Ungültige Antwort erhalten"
-#: ../../../ui.cpp:2034
+#: ../../../src/ui.cpp:2208
msgid "Creating transaction..."
-msgstr "Erstelle Überweisung..."
+msgstr "Erstelle Überweisung ..."
-#: ../../../ui.cpp:2046
+#: ../../../src/ui.cpp:2220
#, c-format
-msgid "This is an oversized transaction that requires a transaction fee of %s"
-msgstr "Die Überweisung ist sehr groß. Es wird eine Gebühr von %s erhoben."
+msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds"
+msgstr "Diese Überweisung benötigt eine Überweisungsgebühr von mindestens %s wegen ihres Betrags, Komplexität oder der Benutzung kürzlich erhaltener Geldmittel"
-#: ../../../ui.cpp:2048
+#: ../../../src/ui.cpp:2222
msgid "Transaction creation failed"
msgstr "Überweisung konnte nicht erzeugt werden."
-#: ../../../ui.cpp:2055
+#: ../../../src/ui.cpp:2229
msgid "Transaction aborted"
msgstr "Überweisung abgebrochen"
-#: ../../../ui.cpp:2063
+#: ../../../src/ui.cpp:2237
msgid "Lost connection, transaction cancelled"
msgstr "Verbindung verloren, Überweisungsvorgang abgebrochen"
-#: ../../../ui.cpp:2079
+#: ../../../src/ui.cpp:2253
msgid "Sending payment..."
-msgstr "Überweise Zahlung..."
+msgstr "Überweise Zahlung ..."
-#: ../../../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 "Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden."
-#: ../../../ui.cpp:2092
+#: ../../../src/ui.cpp:2268
msgid "Waiting for confirmation..."
-msgstr "Warte auf Bestätigung..."
+msgstr "Warte auf Bestätigung ..."
-#: ../../../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"
@@ -463,239 +385,304 @@ msgstr ""
"Die Überweisung wurde gespeichert und wird dem Empfänger gutgeschrieben,\n"
"aber die begleitende Nachricht wird nicht ankommen."
-#: ../../../ui.cpp:2119
+#: ../../../src/ui.cpp:2295
msgid "Payment was sent, but an invalid response was received"
msgstr "Die Zahlung wurde überwiesen, aber die Antwort war fehlerhaft"
-#: ../../../ui.cpp:2125
+#: ../../../src/ui.cpp:2301
msgid "Payment completed"
msgstr "Zahlung ausgeführt"
-#: ../../../ui.cpp:2156
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2339
+#: ../../../src/ui.cpp:2332
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2515
msgid "Name"
msgstr "Name"
-#: ../../../ui.cpp:2157
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2339
+#: ../../../src/ui.cpp:2333
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2515
msgid "Address"
msgstr "Adresse"
-#: ../../../ui.cpp:2159
-#: ../../../ui.cpp:2314
+#: ../../../src/ui.cpp:2335
+#: ../../../src/ui.cpp:2490
msgid "Label"
msgstr "Beschreibung"
-#: ../../../ui.cpp:2160
-#: ../../../uibase.cpp:908
+#: ../../../src/ui.cpp:2336
+#: ../../../src/uibase.cpp:837
msgid "Bitcoin Address"
msgstr "Bitcoin-Adresse"
-#: ../../../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 "Dies ist eine Ihrer eigenen Adressen für den Zahlungseingang und kann deshalb nicht in das Adressbuch übernommen werden. "
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2308
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2484
msgid "Edit Address"
msgstr "Adresse bearbeiten"
-#: ../../../ui.cpp:2314
+#: ../../../src/ui.cpp:2490
msgid "Edit Address Label"
msgstr "Beschreibung der Adresse bearbeiten"
-#: ../../../ui.cpp:2339
-#: ../../../ui.cpp:2345
+#: ../../../src/ui.cpp:2515
+#: ../../../src/ui.cpp:2521
msgid "Add Address"
msgstr "Adresse hinzufügen"
-#: ../../../ui.cpp:2421
+#: ../../../src/ui.cpp:2598
msgid "Bitcoin"
msgstr "Bitcoin"
-#: ../../../ui.cpp:2423
+#: ../../../src/ui.cpp:2600
msgid "Bitcoin - Generating"
msgstr "Bitcoin - Erzeuge"
-#: ../../../ui.cpp:2425
+#: ../../../src/ui.cpp:2602
msgid "Bitcoin - (not connected)"
msgstr "Bitcoin - (nicht verbunden)"
-#: ../../../ui.cpp:2500
+#: ../../../src/ui.cpp:2681
msgid "&Open Bitcoin"
msgstr "Bitcoin Ö&ffnen"
-#: ../../../ui.cpp:2501
+#: ../../../src/ui.cpp:2682
+msgid "&Send Bitcoins"
+msgstr "Bitcoins &senden"
+
+#: ../../../src/ui.cpp:2683
msgid "O&ptions..."
-msgstr "O&ptionen..."
+msgstr "O&ptionen ..."
-#: ../../../ui.cpp:2505
-#: ../../../uibase.cpp:27
+#: ../../../src/ui.cpp:2686
+#: ../../../src/uibase.cpp:25
msgid "E&xit"
msgstr "B&eenden"
-#: ../../../uibase.cpp:30
+#: ../../../src/ui.cpp:2902
+msgid "Program has crashed and will terminate. "
+msgstr "Das Programm ist abgestürzt und wird beendet. "
+
+#: ../../../src/main.cpp:1868
+msgid "Warning: Disk space is low "
+msgstr "Warnung: Festplatte fast voll "
+
+#: ../../../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 "Fehler: Diese Überweisung benötigt eine Überweisungsgebühr von mindestens %s wegen ihrer Größe, Komplexität oder der Benutzung erst kürzlich erhaltener Geldmittel "
+
+#: ../../../src/main.cpp:3994
+msgid "Error: Transaction creation failed "
+msgstr "Fehler: Überweisung konnte nicht erzeugt werden. "
+
+#: ../../../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 "Fehler: Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden."
+
+#: ../../../src/main.cpp:4016
+msgid "Invalid amount"
+msgstr "Ungültiger Betrag"
+
+#: ../../../src/main.cpp:4023
+msgid "Invalid bitcoin address"
+msgstr "Ungültige Bitcoin-Adresse"
+
+#: ../../../src/rpc.cpp:1800
+#: ../../../src/rpc.cpp:1802
+#, c-format
+msgid "To use the %s option"
+msgstr "Um die %s Option zu nutzen"
+
+#: ../../../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 ""
+"Warnung: %s, Sie müssen rpcpassword=<password> einstellen\n"
+"in der Konfigurationsdatei: %s\n"
+"Wenn die Datei nicht existiert, erstellen Sie sie mit ausschließlich Besitzer-Leserechten.\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 ""
+"Sie müssen rpcpassword=<password> in der Konfigurationsdatei einstellen:\n"
+"%s\n"
+"Wenn die Datei nicht existiert, erstellen Sie sie mit ausschließlich Besitzer-Leserechten."
+
+#: ../../../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 "Warnung: Bitte überprüfen Sie die Richtigkeit des Datums und der Uhrzeit Ihres Computers. Falls Ihre Uhr falsch läuft, wird Bitcoin nicht richtig funktionieren."
+
+#: ../../../src/util.cpp:898
+msgid "-beta"
+msgstr "-Beta"
+
+#: ../../../src/uibase.cpp:28
msgid "&File"
msgstr "&Datei"
-#: ../../../uibase.cpp:38
+#: ../../../src/uibase.cpp:32
msgid "&Your Receiving Addresses..."
-msgstr "&Ihre Empfangs-Adressen..."
+msgstr "&Ihre Empfangs-Adressen ..."
-#: ../../../uibase.cpp:42
+#: ../../../src/uibase.cpp:36
msgid "&Options..."
-msgstr "&Optionen..."
+msgstr "&Optionen ..."
-#: ../../../uibase.cpp:45
+#: ../../../src/uibase.cpp:39
msgid "&Settings"
msgstr "&Einstellungen"
-#: ../../../uibase.cpp:49
+#: ../../../src/uibase.cpp:43
msgid "&About..."
msgstr "Ü&ber..."
-#: ../../../uibase.cpp:52
+#: ../../../src/uibase.cpp:46
msgid "&Help"
msgstr "&Hilfe"
-#: ../../../uibase.cpp:62
+#: ../../../src/uibase.cpp:56
msgid "Address Book"
msgstr "Adressbuch"
-#: ../../../uibase.cpp:77
+#: ../../../src/uibase.cpp:69
msgid "Your Bitcoin Address:"
msgstr "Ihre Bitcoin-Adresse:"
-#: ../../../uibase.cpp:84
+#: ../../../src/uibase.cpp:76
msgid " &New... "
-msgstr " &Neu... "
+msgstr " &Neu ... "
-#: ../../../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 " In die Zwischenablage &kopieren "
-#: ../../../uibase.cpp:102
+#: ../../../src/uibase.cpp:93
msgid "Balance:"
msgstr "Kontostand:"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " All"
msgstr " Alle"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " Sent"
msgstr " Überwiesen"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " Received"
msgstr " Erhalten"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " In Progress"
msgstr " In Bearbeitung"
-#: ../../../uibase.cpp:142
+#: ../../../src/uibase.cpp:130
msgid "All Transactions"
msgstr "Alle Überweisungen"
-#: ../../../uibase.cpp:153
+#: ../../../src/uibase.cpp:141
msgid "Sent/Received"
msgstr "Überwiesen/Erhalten"
-#: ../../../uibase.cpp:164
+#: ../../../src/uibase.cpp:152
msgid "Sent"
msgstr "Überwiesen"
-#: ../../../uibase.cpp:175
+#: ../../../src/uibase.cpp:163
msgid "Received"
msgstr "Erhalten"
-#: ../../../uibase.cpp:318
-#: ../../../uibase.cpp:479
-#: ../../../uibase.cpp:580
-#: ../../../uibase.cpp:793
-#: ../../../uibase.cpp:854
-#: ../../../uibase.cpp:963
-#: ../../../uibase.cpp:1052
+#: ../../../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 "Optionale Überweisungsgebühr, die Sie an den Teilnehmer entrichten, der Ihre Überweisungen bearbeitet."
-
-#: ../../../uibase.cpp:370
-msgid "Transaction fee:"
-msgstr "Überweisungsgebühr:"
-
-#: ../../../uibase.cpp:386
-msgid "&Limit coin generation to"
-msgstr "Erzeugung von Münzen auf"
-
-#: ../../../uibase.cpp:393
-msgid "processors"
-msgstr "Prozessoren &beschränken"
-
-#: ../../../uibase.cpp:399
+#: ../../../src/uibase.cpp:345
msgid "&Start Bitcoin on system startup"
msgstr "Bitcoin beim &Systemstart ausführen"
-#: ../../../uibase.cpp:403
+#: ../../../src/uibase.cpp:348
msgid "&Minimize to the tray instead of the taskbar"
msgstr "In den Infobereich statt in die Taskleiste &minimieren"
-#: ../../../uibase.cpp:407
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "Portweiterleitung via &UPnP"
+
+#: ../../../src/uibase.cpp:354
msgid "M&inimize to the tray on close"
-msgstr "Beim schließen in den Infobereich m&inimieren"
+msgstr "Beim Schließen in den Infobereich m&inimieren"
-#: ../../../uibase.cpp:414
+#: ../../../src/uibase.cpp:360
msgid "&Connect through socks4 proxy: "
-msgstr "&Verbinden per Socks4-Proxy: "
+msgstr "&Per Socks4-Proxy verbinden: "
-#: ../../../uibase.cpp:426
+#: ../../../src/uibase.cpp:371
msgid "Proxy &IP:"
msgstr "Proxy &IP:"
-#: ../../../uibase.cpp:434
+#: ../../../src/uibase.cpp:379
msgid " &Port:"
msgstr " &Port:"
-#: ../../../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 "Eine freiwillige Überweisungsgebühr pro KB, die dabei hilft, dass Ihre Überweisungen schnell durchgeführt werden. Die meisten Überweisungen sind 1 KB groß. Eine Gebühr von 0,01 ist empfohlen."
+
+#: ../../../src/uibase.cpp:399
+msgid "Pay transaction fee:"
+msgstr "Überweisungsgebühr:"
+
+#: ../../../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 "Abbrechen"
-#: ../../../uibase.cpp:485
+#: ../../../src/uibase.cpp:449
msgid "&Apply"
msgstr "&Anwenden"
-#: ../../../uibase.cpp:546
+#: ../../../src/uibase.cpp:508
msgid "Bitcoin "
msgstr "Bitcoin "
-#: ../../../uibase.cpp:552
+#: ../../../src/uibase.cpp:514
msgid "version"
msgstr "Version"
-#: ../../../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"
@@ -706,7 +693,7 @@ msgid ""
"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 ""
-"Copyright (c) 2009-2010 Bitcoin Developers\n"
+"Copyright (c) 2009-2011 Bitcoin Developers\n"
"\n"
"Dies ist experimentelle Software.\n"
"\n"
@@ -714,51 +701,43 @@ msgstr ""
"Datei license.txt oder http://www.opensource.org/licenses/mit-license.php.\n"
"\n"
"Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Nutzung im\n"
-"OpenSSL Toolkit (http://www.openssl.org/) geschrieben wurde sowie\n"
+"OpenSSL Toolkit (http://www.openssl.org/) geschrieben wurde, sowie\n"
"kryptographische Software von Eric Young (eay@cryptsoft.com)\n"
"und UPnP-Software, entwickelt von Thomas Bernard."
-#: ../../../uibase.cpp:619
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"
-msgstr "Geben Sie eine Bitcoin-Adresse (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) oder IP-Adresse (z.B. 123.45.6.7) ein"
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Geben Sie eine Bitcoin-Adresse ein (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-#: ../../../uibase.cpp:633
+#: ../../../src/uibase.cpp:595
msgid "Pay &To:"
msgstr "Überweisen &An:"
-#: ../../../uibase.cpp:648
+#: ../../../src/uibase.cpp:610
msgid "&Paste"
msgstr "&Einfügen"
-#: ../../../uibase.cpp:651
+#: ../../../src/uibase.cpp:613
msgid " Address &Book..."
msgstr " Address&buch..."
-#: ../../../uibase.cpp:658
+#: ../../../src/uibase.cpp:620
msgid "&Amount:"
msgstr "&Betrag:"
-#: ../../../uibase.cpp:668
+#: ../../../src/uibase.cpp:630
msgid "T&ransfer:"
msgstr "Ü&berweisung:"
-#: ../../../uibase.cpp:674
+#: ../../../src/uibase.cpp:636
msgid " Standard"
msgstr " Standard"
-#: ../../../uibase.cpp:696
-msgid "&From:"
-msgstr "&Von:"
-
-#: ../../../uibase.cpp:713
-msgid "&Message:"
-msgstr "&Nachricht:"
-
-#: ../../../uibase.cpp:730
+#: ../../../src/uibase.cpp:663
msgid "&Send"
msgstr "Ü&berweisen"
-#: ../../../uibase.cpp:782
+#: ../../../src/uibase.cpp:711
msgid ""
"\n"
"\n"
@@ -766,50 +745,281 @@ msgid ""
msgstr ""
"\n"
"\n"
-"Verbinde..."
+"Verbinde ..."
-#: ../../../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 "Dies sind Ihre Bitcoin-Adressen zum Empfang von Zahlungen. Sie sollten vielleicht jedem Überweisenden eine andere Adresse geben um nachvollziehen zu können von wem eine Zahlung stammt. Die markierte Adresse wird im Hauptfenster angezeigt."
-#: ../../../uibase.cpp:845
-#: ../../../uibase.cpp:957
+#: ../../../src/uibase.cpp:774
+#: ../../../src/uibase.cpp:886
msgid "&Edit..."
-msgstr "&Bearbeiten..."
+msgstr "&Bearbeiten ..."
-#: ../../../uibase.cpp:848
-#: ../../../uibase.cpp:960
+#: ../../../src/uibase.cpp:777
+#: ../../../src/uibase.cpp:889
msgid " &New Address... "
-msgstr " &Neue Adresse... "
+msgstr " &Neue Adresse ... "
-#: ../../../uibase.cpp:920
+#: ../../../src/uibase.cpp:849
msgid "Sending"
msgstr "Überweise"
-#: ../../../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 "Dies sind Ihre Bitcoin-Adressen zum Empfang von Zahlungen. Sie können jedem Überweisenden eine andere Adresse geben um nachvollziehen zu können von wem eine Zahlung stammt. Die markierte Adresse wird im Hauptfenster angezeigt."
-#: ../../../uibase.cpp:941
+#: ../../../src/uibase.cpp:870
msgid "Receiving"
msgstr "Empfange"
-#: ../../../uibase.cpp:951
+#: ../../../src/uibase.cpp:880
msgid "&Delete"
msgstr "&Löschen"
-#: ../../../uibase.h:150
+#: ../../../src/init.cpp:145
+msgid " beta"
+msgstr " Beta"
+
+#: ../../../src/init.cpp:147
+msgid "Bitcoin version"
+msgstr "Bitcoin "
+
+#: ../../../src/init.cpp:148
+msgid "Usage:"
+msgstr "Benutz:"
+
+#: ../../../src/init.cpp:150
+msgid "Send command to -server or bitcoind\n"
+msgstr "Sende Befehl zu -server oder bitcoind\n"
+
+#: ../../../src/init.cpp:151
+msgid "List commands\n"
+msgstr "Liste Befehle auf\n"
+
+#: ../../../src/init.cpp:152
+msgid "Get help for a command\n"
+msgstr "Hilfe für einen Befehl erhalten\n"
+
+#: ../../../src/init.cpp:153
+msgid "Options:\n"
+msgstr "Optionen:\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Konfigurationsdatei bestimmen (Standard: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:155
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "pid-Datei bestimmen (Standard: bitcoind.pid)\n"
+
+#: ../../../src/init.cpp:156
+msgid "Generate coins\n"
+msgstr "Münzen erzeugen\n"
+
+#: ../../../src/init.cpp:157
+msgid "Don't generate coins\n"
+msgstr "Keine Münzen erzeugen\n"
+
+#: ../../../src/init.cpp:158
+msgid "Start minimized\n"
+msgstr "Minimiert starten\n"
+
+#: ../../../src/init.cpp:159
+msgid "Specify data directory\n"
+msgstr "Datenverzeichnis festlegen\n"
+
+#: ../../../src/init.cpp:160
+msgid "Connect through socks4 proxy\n"
+msgstr "Socks4-Proxy verwenden\n"
+
+#: ../../../src/init.cpp:161
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "DNS-Auflösung für addnode und connect erlauben\n"
+
+#: ../../../src/init.cpp:162
+msgid "Add a node to connect to\n"
+msgstr "Einen Teilnehmer hinzufügen, zu dem verbunden werden soll\n"
+
+#: ../../../src/init.cpp:163
+msgid "Connect only to the specified node\n"
+msgstr "Nur zu dem angegebenen Teilnehmer verbinden\n"
+
+#: ../../../src/init.cpp:164
+msgid "Don't accept connections from outside\n"
+msgstr "Akzeptiere keine externen Verbindungen\n"
+
+#: ../../../src/init.cpp:167
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "Versuche nicht, UPnP zur Portweiterleitung zu nutzen\n"
+
+#: ../../../src/init.cpp:169
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Versuche, UPnP zur Portweiterleitung zu nutzen\n"
+
+#: ../../../src/init.cpp:172
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Gebühr pro KB für Überweisungen, die Sie tätigen\n"
+
+#: ../../../src/init.cpp:174
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Akzeptiere Kommandozeile und JSON-RPC-Befehle\n"
+
+#: ../../../src/init.cpp:177
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Laufe im Hintergrund als Daemon und akzeptiere Befehle\n"
+
+#: ../../../src/init.cpp:179
+msgid "Use the test network\n"
+msgstr "Nutze das Testnetzwerk\n"
+
+#: ../../../src/init.cpp:180
+msgid "Username for JSON-RPC connections\n"
+msgstr "Benutzername für JSON-RPC-Verbindungen\n"
+
+#: ../../../src/init.cpp:181
+msgid "Password for JSON-RPC connections\n"
+msgstr "Passwort für JSON-RPC-Verbindungen\n"
+
+#: ../../../src/init.cpp:182
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "Horche für JSON-RPC-Verbindungen auf <port> (Standard: 8332)\n"
+
+#: ../../../src/init.cpp:183
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Erlaube JSON-RPC-Verbindungen von bestimmter IP-Adresse\n"
+
+#: ../../../src/init.cpp:184
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Sende Befehle zum Knoten mit <ip> (Standard: 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:185
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Setze Key-Pool-Größe auf <n> (Standard: 100)\n"
+
+#: ../../../src/init.cpp:186
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Frage die Block-Kette nach fehlenden Brieftaschen-Überweisungen ab\n"
+
+#: ../../../src/init.cpp:190
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"SSL-Optionen: (siehe das Bitcoin-Wiki für SSL-Installationsanleitungen)\n"
+
+#: ../../../src/init.cpp:191
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Nutze OpenSSL (https) für JSON-RPC-Verbindungen\n"
+
+#: ../../../src/init.cpp:192
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "Server-Zertifikatsdatei (Standard: server.cert)\n"
+
+#: ../../../src/init.cpp:193
+msgid "Server private key (default: server.pem)\n"
+msgstr "Server-Geheimschlüssel (Standard: server.pem)\n"
+
+#: ../../../src/init.cpp:194
+msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+msgstr "Anzunehmende Verschlüsselungen (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+
+#: ../../../src/init.cpp:198
+msgid "This help message\n"
+msgstr "Diese Anleitung\n"
+
+#: ../../../src/init.cpp:335
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "Erhalte keinen Lock für Datenverzeichnis %s. Bitcoin läuft wahrscheinlich bereits."
+
+#: ../../../src/init.cpp:361
+msgid "Error loading addr.dat \n"
+msgstr "Fehler beim Laden von addr.dat \n"
+
+#: ../../../src/init.cpp:367
+msgid "Error loading blkindex.dat \n"
+msgstr "Fehler beim Laden von blkindex.dat \n"
+
+#: ../../../src/init.cpp:374
+msgid "Error loading wallet.dat \n"
+msgstr "Fehler beim Laden von wallet.dat \n"
+
+#: ../../../src/init.cpp:454
+msgid "Invalid -proxy address"
+msgstr "Ungültige -Proxy Adresse"
+
+#: ../../../src/init.cpp:477
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Ungültiger Betrag für -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 "Warnung: -paytxfee ist sehr hoch gesetzt. Das ist die Überweisungsgebühr, die Sie fürs Senden einer Überweisung zahlen."
+
+#: ../../../src/uibase.h:147
msgid "Transaction Details"
msgstr "Überweisungsdetails"
-#: ../../../uibase.h:203
+#: ../../../src/uibase.h:199
msgid "Options"
msgstr "Optionen"
-#: ../../../uibase.h:231
+#: ../../../src/uibase.h:228
msgid "About Bitcoin"
msgstr "Über Bitcoin"
-#: ../../../uibase.h:341
+#: ../../../src/uibase.h:337
msgid "Your Bitcoin Addresses"
msgstr "Ihre Bitcoin-Adressen"
+
+#~ msgid "Usage: bitcoin [options]"
+#~ msgstr "Verwendung: bitcoin [optionen]"
+
+#~ msgid ""
+#~ "Error: This is an oversized transaction that requires a transaction fee "
+#~ "of %s "
+#~ msgstr ""
+#~ "Fehler: Die Überweisung ist sehr groß. Es wird eine Gebühr von %s "
+#~ "erhoben. "
+
+#~ msgid "version %s%s BETA"
+#~ msgstr "Version %s%s BETA"
+
+#~ msgid "Will appear as \"From: Unknown\""
+#~ msgstr "Wird als \"Von: Unbekannt\" erscheinen"
+
+#~ msgid "n/a"
+#~ msgstr "Unbekannt"
+
+#~ msgid "Unknown"
+#~ msgstr "Unbekannt"
+
+#~ msgid "Can't include a message when sending to a Bitcoin address"
+#~ msgstr ""
+#~ "Beim Überweisen an eine Bitcoin-Adresse kann keine Nachricht angegeben "
+#~ "werden."
+
+#~ msgid ""
+#~ "This is an oversized transaction that requires a transaction fee of %s"
+#~ msgstr "Die Überweisung ist sehr groß. Es wird eine Gebühr von %s erhoben."
+
+#~ msgid ""
+#~ "Optional transaction fee you give to the nodes that process your "
+#~ "transactions."
+#~ msgstr ""
+#~ "Optionale Überweisungsgebühr, die Sie an den Teilnehmer entrichten, der "
+#~ "Ihre Überweisungen bearbeitet."
+
+#~ msgid "&Limit coin generation to"
+#~ msgstr "Erzeugung von Münzen auf"
+
+#~ msgid "processors"
+#~ msgstr "Prozessoren &beschränken"
+
+#~ msgid "&From:"
+#~ msgstr "&Von:"
+
+#~ msgid "&Message:"
+#~ msgstr "&Nachricht:"
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..f30d462fe7
--- /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. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+
+#: ../../../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/es/LC_MESSAGES/bitcoin.mo b/locale/es/LC_MESSAGES/bitcoin.mo
index 234acbd011..f9d84ce9b2 100644
--- a/locale/es/LC_MESSAGES/bitcoin.mo
+++ b/locale/es/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/es/LC_MESSAGES/bitcoin.po b/locale/es/LC_MESSAGES/bitcoin.po
index 5f4bef8732..d821953f28 100644
--- a/locale/es/LC_MESSAGES/bitcoin.po
+++ b/locale/es/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: 2011-03-16 20:55+0100\n"
-"Last-Translator: Santiago M. Mola <coldwind@coldwind.org>\n"
+"POT-Creation-Date: 2011-05-24 20:21-0500\n"
+"PO-Revision-Date: 2011-05-24 20:23-0500\n"
+"Last-Translator: Ariel Patiño <ariel@ficticio.com>\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,714 +14,672 @@ msgstr ""
"X-Poedit-Basepath: .\n"
"X-Poedit-SearchPath-0: ../../..\n"
-#: ../../../init.cpp:174
-msgid "Cannot write autostart/bitcoin.desktop file"
-msgstr "No se puede escribir el fichero autostart/bitcoin.desktop"
-
-#: ../../../init.cpp:388
-msgid "Usage:"
-msgstr "Uso:"
-
-#: ../../../init.cpp:390
-msgid "Send command to bitcoin running with -server or -daemon\n"
-msgstr "Enviar comando a bitcoin corriendo con -server o -daemon\n"
-
-#: ../../../init.cpp:391
-msgid "Get help for a command\n"
-msgstr "Recibir ayuda para un comando\n"
-
-#: ../../../init.cpp:392
-msgid "List commands\n"
-msgstr "Lista de comandos\n"
-
-#: ../../../init.cpp:393
-msgid "Options:\n"
-msgstr "Opciones:\n"
-
-#: ../../../init.cpp:394
-msgid "Generate coins\n"
-msgstr "Generar monedas\n"
-
-#: ../../../init.cpp:395
-msgid "Don't generate coins\n"
-msgstr "No generar monedas\n"
-
-#: ../../../init.cpp:396
-msgid "Start minimized\n"
-msgstr "Arrancar minimizado\n"
-
-#: ../../../init.cpp:397
-msgid "Specify data directory\n"
-msgstr "Especificar directorio para los datos\n"
-
-#: ../../../init.cpp:398
-msgid "Connect through socks4 proxy\n"
-msgstr "Conectar mediante proxy socks4\n"
-
-#: ../../../init.cpp:399
-msgid "Add a node to connect to\n"
-msgstr "Agregar un nodo para conectarse\n"
-
-#: ../../../init.cpp:400
-msgid "Connect only to the specified node\n"
-msgstr "Conectar solo al nodo especificado\n"
-
-#: ../../../init.cpp:401
-msgid "Accept command line and JSON-RPC commands\n"
-msgstr "Aceptar comandos por linea de comandos y JSON-RPC\n"
-
-#: ../../../init.cpp:402
-msgid "Run in the background as a daemon and accept commands\n"
-msgstr "Correr en el fondo como demonio y aceptar comandos\n"
-
-#: ../../../init.cpp:403
-msgid "This help message\n"
-msgstr "Este mensaje de ayuda\n"
-
-#: ../../../init.cpp:503
-msgid "Error loading addr.dat \n"
-msgstr "Error cargando addr.dat \n"
-
-#: ../../../init.cpp:509
-msgid "Error loading blkindex.dat \n"
-msgstr "Error cargando blkindex.dat \n"
-
-#: ../../../init.cpp:516
-msgid "Error loading wallet.dat \n"
-msgstr "Error cargando wallet.dat \n"
-
-#: ../../../init.cpp:584
-msgid "Invalid -proxy address"
-msgstr "Direccion -proxy invalida"
-
-#: ../../../init.cpp:677
-msgid "Program has crashed and will terminate. "
-msgstr "El programa ha detectado un error y va a cerrarse. "
-
-#: ../../../main.cpp:1480
-#: ../../../main.cpp:1482
-msgid "Warning: Disk space is low "
-msgstr "Cuidado: Poco espacio en disco "
-
-#: ../../../main.cpp:3094
+#: ../../../src/net.cpp:1503
#, c-format
-msgid "Error: This is an oversized transaction that requires a transaction fee of %s "
-msgstr "Error: Esta es una gran transaccion que requiere una comision de %s "
-
-#: ../../../main.cpp:3096
-msgid "Error: Transaction creation failed "
-msgstr "Error: La creacion de la transaccion fallo "
-
-#: ../../../main.cpp:3101
-#: ../../../ui.cpp:1776
-#: ../../../ui.cpp:1778
-#: ../../../ui.cpp:1919
-#: ../../../ui.cpp:2068
-msgid "Sending..."
-msgstr "Enviando..."
-
-#: ../../../main.cpp:3105
-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 "Error: La transaccion fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya fue gastada, o si ha usado un copia de wallet.dat y las monedas fueron gastadas en la copia pero no han sido marcadas como gastadas aqui."
-
-#: ../../../main.cpp:3117
-msgid "Invalid amount"
-msgstr "Cantidad erronea"
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "No es posible escuchar en el puerto %d en este computador. Probablemente el cliente Bitcoin ya se está ejecutando."
-#: ../../../main.cpp:3119
-#: ../../../ui.cpp:1986
-#: ../../../ui.cpp:2053
-msgid "Insufficient funds"
-msgstr "Fondos insuficientes"
-
-#: ../../../main.cpp:3124
-msgid "Invalid bitcoin address"
-msgstr "Direccion Bitcoin invalida"
-
-#: ../../../ui.cpp:189
+#: ../../../src/ui.cpp:204
#, 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 "Esta transaccion supera el limite. Puede seguir enviandola con una comision de %s, que va a los nodos que procesan su transaccion y ayuda a mantener la red. ¿Quiere pagar la comision?"
+msgstr "Esta transacción supera el límite. Puede seguir enviandola con una comisión de %s, que va a los nodos que procesan su transacción y ayuda a mantener la red. ¿Quiere pagar la comisión?"
-#: ../../../ui.cpp:286
+#: ../../../src/ui.cpp:303
msgid "Status"
-msgstr "Status"
+msgstr "Estado"
-#: ../../../ui.cpp:287
+#: ../../../src/ui.cpp:304
msgid "Date"
msgstr "Fecha"
-#: ../../../ui.cpp:288
+#: ../../../src/ui.cpp:305
msgid "Description"
-msgstr "Descripcion"
+msgstr "Descripción"
-#: ../../../ui.cpp:289
+#: ../../../src/ui.cpp:306
msgid "Debit"
-msgstr "Debito"
+msgstr "Débito"
-#: ../../../ui.cpp:290
+#: ../../../src/ui.cpp:307
msgid "Credit"
-msgstr "Credito"
+msgstr "Crédito"
-#: ../../../ui.cpp:489
+#: ../../../src/ui.cpp:513
#, c-format
msgid "Open for %d blocks"
msgstr "Abrir para %d bloques"
-#: ../../../ui.cpp:491
+#: ../../../src/ui.cpp:515
#, c-format
msgid "Open until %s"
msgstr "Abrir hasta %s"
-#: ../../../ui.cpp:497
+#: ../../../src/ui.cpp:521
#, c-format
msgid "%d/offline?"
msgstr "%d/desconectado?"
-#: ../../../ui.cpp:499
+#: ../../../src/ui.cpp:523
#, c-format
msgid "%d/unconfirmed"
msgstr "%d/no confirmado"
-#: ../../../ui.cpp:501
+#: ../../../src/ui.cpp:525
#, c-format
msgid "%d confirmations"
msgstr "%d confirmaciones"
-#: ../../../ui.cpp:584
+#: ../../../src/ui.cpp:610
msgid "Generated"
msgstr "Generado"
-#: ../../../ui.cpp:592
+#: ../../../src/ui.cpp:618
#, c-format
msgid "Generated (%s matures in %d more blocks)"
-msgstr "Generado (%s hechos en %d bloques)"
+msgstr "Generado (%s madura en %d bloques)"
-#: ../../../ui.cpp:596
+#: ../../../src/ui.cpp:622
msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
-msgstr "Generado - Cuidado: Este bloque no se recibio de otros nodos y probablemente no sea aceptado!"
+msgstr "Generado - Cuidado: Este bloque no se recibió de otros nodos y probablemente no sea aceptado!"
-#: ../../../ui.cpp:600
+#: ../../../src/ui.cpp:626
msgid "Generated (not accepted)"
msgstr "Generado (no aceptado)"
-#: ../../../ui.cpp:610
+#: ../../../src/ui.cpp:636
msgid "From: "
msgstr "De: "
-#: ../../../ui.cpp:634
+#: ../../../src/ui.cpp:660
msgid "Received with: "
msgstr "Recibido con: "
-#: ../../../ui.cpp:676
+#: ../../../src/ui.cpp:706
msgid "Payment to yourself"
msgstr "Pago para usted mismo"
-#: ../../../ui.cpp:713
+#: ../../../src/ui.cpp:740
msgid "To: "
msgstr "Para: "
-#: ../../../ui.cpp:1009
+#: ../../../src/ui.cpp:1055
msgid " Generating"
msgstr " Generando"
-#: ../../../ui.cpp:1011
+#: ../../../src/ui.cpp:1057
msgid "(not connected)"
msgstr "(no conectado)"
-#: ../../../ui.cpp:1014
+#: ../../../src/ui.cpp:1060
#, c-format
msgid " %d connections %d blocks %d transactions"
msgstr " %d conexiones %d bloques %d transacciones"
-#: ../../../ui.cpp:1128
-#: ../../../ui.cpp:2368
+#: ../../../src/ui.cpp:1165
+#: ../../../src/ui.cpp:2529
msgid "New Receiving Address"
-msgstr "Nueva direccion de recepcion"
+msgstr "Nueva dirección de recepción"
-#: ../../../ui.cpp:1129
-#: ../../../ui.cpp:2369
+#: ../../../src/ui.cpp:1166
+#: ../../../src/ui.cpp:2530
msgid ""
"You should use a new address for each payment you receive.\n"
"\n"
"Label"
msgstr ""
-"Es una buena idea usar una nueva direccion para cada pago que usted recibe.\n"
+"Debes usar una nueva dirección para cada pago que usted recibe.\n"
"\n"
"Etiqueta"
-#: ../../../ui.cpp:1198
+#: ../../../src/ui.cpp:1235
msgid "<b>Status:</b> "
-msgstr "<b>Status:</b> "
+msgstr "<b>Estado:</b> "
-#: ../../../ui.cpp:1203
+#: ../../../src/ui.cpp:1240
msgid ", has not been successfully broadcast yet"
-msgstr ", no ha sido emitido satisfactoriamente todavia"
+msgstr ", no ha sido emitido satisfactoriamente todavía"
-#: ../../../ui.cpp:1205
+#: ../../../src/ui.cpp:1242
#, c-format
msgid ", broadcast through %d node"
msgstr ", emitido mediante %d nodo"
-#: ../../../ui.cpp:1207
+#: ../../../src/ui.cpp:1244
#, c-format
msgid ", broadcast through %d nodes"
msgstr ", emitido mediante %d nodos"
-#: ../../../ui.cpp:1211
+#: ../../../src/ui.cpp:1248
msgid "<b>Date:</b> "
msgstr "<b>Fecha:</b> "
-#: ../../../ui.cpp:1219
+#: ../../../src/ui.cpp:1256
msgid "<b>Source:</b> Generated<br>"
msgstr "<b>Fuente:</b> Generado<br>"
-#: ../../../ui.cpp:1225
-#: ../../../ui.cpp:1243
+#: ../../../src/ui.cpp:1262
+#: ../../../src/ui.cpp:1280
msgid "<b>From:</b> "
msgstr "<b>De:</b> "
-#: ../../../ui.cpp:1243
+#: ../../../src/ui.cpp:1280
msgid "unknown"
msgstr "desconocido"
-#: ../../../ui.cpp:1244
-#: ../../../ui.cpp:1268
-#: ../../../ui.cpp:1327
+#: ../../../src/ui.cpp:1281
+#: ../../../src/ui.cpp:1305
+#: ../../../src/ui.cpp:1364
msgid "<b>To:</b> "
msgstr "<b>Para:</b> "
-#: ../../../ui.cpp:1247
+#: ../../../src/ui.cpp:1284
msgid " (yours, label: "
msgstr "(suya, etiqueta: "
-#: ../../../ui.cpp:1249
+#: ../../../src/ui.cpp:1286
msgid " (yours)"
msgstr "(suya)"
-#: ../../../ui.cpp:1286
-#: ../../../ui.cpp:1298
-#: ../../../ui.cpp:1361
+#: ../../../src/ui.cpp:1323
+#: ../../../src/ui.cpp:1335
+#: ../../../src/ui.cpp:1381
+#: ../../../src/ui.cpp:1398
msgid "<b>Credit:</b> "
-msgstr "<b>Credito:</b> "
+msgstr "<b>Crédito:</b> "
-#: ../../../ui.cpp:1288
+#: ../../../src/ui.cpp:1325
#, c-format
msgid "(%s matures in %d more blocks)"
-msgstr "(%s hechos en %d bloques)"
+msgstr "(%s madura en %d bloques)"
-#: ../../../ui.cpp:1290
+#: ../../../src/ui.cpp:1327
msgid "(not accepted)"
msgstr "(no aceptada)"
-#: ../../../ui.cpp:1335
-#: ../../../ui.cpp:1358
+#: ../../../src/ui.cpp:1372
+#: ../../../src/ui.cpp:1380
+#: ../../../src/ui.cpp:1395
msgid "<b>Debit:</b> "
-msgstr "<b>Debito:</b> "
+msgstr "<b>Débito:</b> "
-#: ../../../ui.cpp:1349
+#: ../../../src/ui.cpp:1386
msgid "<b>Transaction fee:</b> "
-msgstr "<b>Comision transaccion:</b> "
+msgstr "<b>Comisión transacción:</b> "
-#: ../../../ui.cpp:1365
+#: ../../../src/ui.cpp:1402
msgid "<b>Net amount:</b> "
msgstr "<b>Cantidad de la red:</b> "
-#: ../../../ui.cpp:1372
+#: ../../../src/ui.cpp:1409
msgid "Message:"
msgstr "Mensaje:"
-#: ../../../ui.cpp:1375
+#: ../../../src/ui.cpp:1411
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: ../../../src/ui.cpp:1414
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 "Las monedas generadas deben esperar 120 bloques antes de ser gastadas. Cuando usted genero este bloque, fue emitido a la red para ser agregado a la cadena de bloques. Si falla al incluirse en la cadena, cambiara a \"no aceptado\" y no se podra gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque apenas a unos segundos del suyo."
+msgstr "Las monedas generadas deben esperar 120 bloques antes de ser gastadas. Cuando usted generó este bloque, fue emitido a la red para ser agregado a la cadena de bloques. Si falla al incluirse en la cadena, cambiará a \"no aceptado\" y no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque apenas a unos segundos del suyo."
+
+#: ../../../src/ui.cpp:1594
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "No se puede escribir el fichero autostart/bitcoin.desktop"
-#: ../../../ui.cpp:1442
+#: ../../../src/ui.cpp:1630
msgid "Main"
msgstr "Principal"
-#: ../../../ui.cpp:1447
+#: ../../../src/ui.cpp:1638
msgid "&Start Bitcoin on window system startup"
-msgstr "&Arrancar Bitcoin al arrancar el sistema de ventanas"
+msgstr "&Arrancar Bitcoin al iniciar el sistema"
-#: ../../../ui.cpp:1454
+#: ../../../src/ui.cpp:1645
msgid "&Minimize on close"
msgstr "&Minimizar al cerrar"
-#: ../../../ui.cpp:1610
+#: ../../../src/ui.cpp:1787
#, c-format
-msgid "version %s%s BETA"
-msgstr "version %s%s BETA"
-
-#: ../../../ui.cpp:1696
-msgid "Will appear as \"From: Unknown\""
-msgstr "Aparecera como \"De: Desconocido\""
-
-#: ../../../ui.cpp:1696
-msgid "n/a"
-msgstr "Desconocido"
+msgid "version %s"
+msgstr "versión %s"
-#: ../../../ui.cpp:1696
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: ../../../ui.cpp:1697
-msgid "Can't include a message when sending to a Bitcoin address"
-msgstr "No se ha podido incluir un mensaje mientras se enviaba la direccion Bitcoin"
-
-#: ../../../ui.cpp:1750
+#: ../../../src/ui.cpp:1899
msgid "Error in amount "
msgstr "Error en la cantidad "
-#: ../../../ui.cpp:1750
-#: ../../../ui.cpp:1755
-#: ../../../ui.cpp:1760
-#: ../../../ui.cpp:1786
-#: ../../../uibase.cpp:59
+#: ../../../src/ui.cpp:1899
+#: ../../../src/ui.cpp:1904
+#: ../../../src/ui.cpp:1909
+#: ../../../src/ui.cpp:1944
+#: ../../../src/uibase.cpp:55
msgid "Send Coins"
msgstr "Enviar monedas"
-#: ../../../ui.cpp:1755
+#: ../../../src/ui.cpp:1904
msgid "Amount exceeds your balance "
-msgstr "La cantidad excede de su balance "
+msgstr "La cantidad excede su balance "
-#: ../../../ui.cpp:1760
+#: ../../../src/ui.cpp:1909
msgid "Total exceeds your balance when the "
msgstr "El total excede su balance cuando el "
-#: ../../../ui.cpp:1760
+#: ../../../src/ui.cpp:1909
msgid " transaction fee is included "
-msgstr " la comision de la transaccion esta incluida "
+msgstr " la comisión de la transaccion está incluida "
-#: ../../../ui.cpp:1776
+#: ../../../src/ui.cpp:1927
msgid "Payment sent "
msgstr "Pago enviado "
-#: ../../../ui.cpp:1786
+#: ../../../src/ui.cpp:1927
+#: ../../../src/ui.cpp:1932
+#: ../../../src/ui.cpp:2076
+#: ../../../src/ui.cpp:2229
+#: ../../../src/main.cpp:3997
+msgid "Sending..."
+msgstr "Enviando..."
+
+#: ../../../src/ui.cpp:1944
msgid "Invalid address "
-msgstr "Direccion invalida "
+msgstr "Dirección inválida "
-#: ../../../ui.cpp:1840
+#: ../../../src/ui.cpp:1997
#, c-format
msgid "Sending %s to %s"
msgstr "Enviando %s a %s"
-#: ../../../ui.cpp:1913
-#: ../../../ui.cpp:1946
+#: ../../../src/ui.cpp:2070
+#: ../../../src/ui.cpp:2103
msgid "CANCELLED"
msgstr "CANCELADO"
-#: ../../../ui.cpp:1917
+#: ../../../src/ui.cpp:2074
msgid "Cancelled"
msgstr "Cancelado"
-#: ../../../ui.cpp:1919
+#: ../../../src/ui.cpp:2076
msgid "Transfer cancelled "
msgstr "Transferencia cancelada "
-#: ../../../ui.cpp:1972
+#: ../../../src/ui.cpp:2129
msgid "Error: "
msgstr "Error: "
-#: ../../../ui.cpp:1991
+#: ../../../src/ui.cpp:2143
+#: ../../../src/ui.cpp:2214
+#: ../../../src/main.cpp:4016
+msgid "Insufficient funds"
+msgstr "Fondos insuficientes"
+
+#: ../../../src/ui.cpp:2148
msgid "Connecting..."
msgstr "Conectando..."
-#: ../../../ui.cpp:1996
+#: ../../../src/ui.cpp:2153
msgid "Unable to connect"
msgstr "No es posible conectar"
-#: ../../../ui.cpp:2001
+#: ../../../src/ui.cpp:2158
msgid "Requesting public key..."
-msgstr "Pidiendo clave publica..."
+msgstr "Pidiendo clave pública..."
-#: ../../../ui.cpp:2013
+#: ../../../src/ui.cpp:2170
msgid "Received public key..."
-msgstr "Clave publica recibida..."
+msgstr "Clave pública recibida..."
+
+#: ../../../src/ui.cpp:2184
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "El destinatario no está aceptando transacciones enviadas por direcciones IP"
-#: ../../../ui.cpp:2025
+#: ../../../src/ui.cpp:2186
msgid "Transfer was not accepted"
msgstr "La transferencia no fue aceptada"
-#: ../../../ui.cpp:2034
+#: ../../../src/ui.cpp:2195
msgid "Invalid response received"
-msgstr "Respuesta invalida recibida"
+msgstr "Respuesta inválida recibida"
-#: ../../../ui.cpp:2049
+#: ../../../src/ui.cpp:2210
msgid "Creating transaction..."
-msgstr "Creando transaccion..."
+msgstr "Creando transacción..."
-#: ../../../ui.cpp:2061
+#: ../../../src/ui.cpp:2222
#, c-format
-msgid "This is an oversized transaction that requires a transaction fee of %s"
-msgstr "Esta es una gran transaccion que requiere una comision de %s"
+msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds"
+msgstr "Esta transacción requiere de una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente"
-#: ../../../ui.cpp:2063
+#: ../../../src/ui.cpp:2224
msgid "Transaction creation failed"
-msgstr "Fallo al crear la transaccion."
+msgstr "Fallo al crear la transacción."
-#: ../../../ui.cpp:2070
+#: ../../../src/ui.cpp:2231
msgid "Transaction aborted"
-msgstr "Transaccion abortada"
+msgstr "Transacción abortada"
-#: ../../../ui.cpp:2078
+#: ../../../src/ui.cpp:2239
msgid "Lost connection, transaction cancelled"
-msgstr "Conexion perdida, transacción cancelada"
+msgstr "Conexión perdida, transacción cancelada"
-#: ../../../ui.cpp:2094
+#: ../../../src/ui.cpp:2255
msgid "Sending payment..."
msgstr "Enviando pago..."
-#: ../../../ui.cpp:2100
+#: ../../../src/ui.cpp:2261
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 transaccion fue rechazada. Esto puede haber ocurrido si alguna de las monedas fue gastada, o si ha usado una copia de wallet.dat y las monedas fueron gastadas en la copia pero no fueron marcadas como gastadas aqui."
+msgstr "La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas fue gastada, o si ha usado una copia de wallet.dat y las monedas fueron gastadas en la copia pero no fueron marcadas como gastadas aqui."
-#: ../../../ui.cpp:2109
+#: ../../../src/ui.cpp:2270
msgid "Waiting for confirmation..."
-msgstr "Esperando confirmacion..."
+msgstr "Esperando confirmación..."
-#: ../../../ui.cpp:2127
+#: ../../../src/ui.cpp:2288
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 ""
-"El pago fue enviado, pero el receptor no pudo verificarla.\n"
-"La transaccion es grabada y dara credito al receptor,\n"
-"pero la informacion quedara en blanco."
+"El pago fue enviado, pero el receptor no pudo verificarlo.\n"
+"La transacción se grabó y dará el crédito al receptor,\n"
+"pero la información en los comentarios quedará en blanco."
-#: ../../../ui.cpp:2136
+#: ../../../src/ui.cpp:2297
msgid "Payment was sent, but an invalid response was received"
-msgstr "El pago fue enviado, pero se recibio una respuesta invalida"
+msgstr "El pago fue enviado, pero se recibió una respuesta inválida"
-#: ../../../ui.cpp:2142
+#: ../../../src/ui.cpp:2303
msgid "Payment completed"
msgstr "Pago completado"
-#: ../../../ui.cpp:2173
-#: ../../../ui.cpp:2319
-#: ../../../ui.cpp:2356
+#: ../../../src/ui.cpp:2334
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2517
msgid "Name"
msgstr "Nombre"
-#: ../../../ui.cpp:2174
-#: ../../../ui.cpp:2319
-#: ../../../ui.cpp:2356
+#: ../../../src/ui.cpp:2335
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2517
msgid "Address"
-msgstr "Direccion"
+msgstr "Dirección"
-#: ../../../ui.cpp:2176
-#: ../../../ui.cpp:2331
+#: ../../../src/ui.cpp:2337
+#: ../../../src/ui.cpp:2492
msgid "Label"
msgstr "Etiqueta"
-#: ../../../ui.cpp:2177
-#: ../../../uibase.cpp:902
+#: ../../../src/ui.cpp:2338
+#: ../../../src/uibase.cpp:837
msgid "Bitcoin Address"
-msgstr "Direccion Bitcoin"
+msgstr "Dirección Bitcoin"
-#: ../../../ui.cpp:2301
+#: ../../../src/ui.cpp:2462
msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. "
msgstr "Esta es una de sus direcciones para recibir pagos y no puede incluirse en la libreta de direcciones. "
-#: ../../../ui.cpp:2319
-#: ../../../ui.cpp:2325
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2486
msgid "Edit Address"
-msgstr "Editar direccion"
+msgstr "Editar dirección"
-#: ../../../ui.cpp:2331
+#: ../../../src/ui.cpp:2492
msgid "Edit Address Label"
-msgstr "Editar etiqueta direccion"
+msgstr "Editar etiqueta dirección"
-#: ../../../ui.cpp:2356
-#: ../../../ui.cpp:2362
+#: ../../../src/ui.cpp:2517
+#: ../../../src/ui.cpp:2523
msgid "Add Address"
-msgstr "Agregar direccion"
+msgstr "Agregar dirección"
-#: ../../../ui.cpp:2438
+#: ../../../src/ui.cpp:2600
msgid "Bitcoin"
msgstr "Bitcoin"
-#: ../../../ui.cpp:2440
+#: ../../../src/ui.cpp:2602
msgid "Bitcoin - Generating"
msgstr "Bitcoin - Generando"
-#: ../../../ui.cpp:2442
+#: ../../../src/ui.cpp:2604
msgid "Bitcoin - (not connected)"
msgstr "Bitcoin - (no conectado)"
-#: ../../../ui.cpp:2519
+#: ../../../src/ui.cpp:2683
msgid "&Open Bitcoin"
msgstr "&Abrir Bitcoin"
-#: ../../../ui.cpp:2520
+#: ../../../src/ui.cpp:2684
+msgid "&Send Bitcoins"
+msgstr "&Enviar Bitcoin"
+
+#: ../../../src/ui.cpp:2685
msgid "O&ptions..."
msgstr "O&pciones"
-#: ../../../ui.cpp:2524
-#: ../../../uibase.cpp:25
+#: ../../../src/ui.cpp:2688
+#: ../../../src/uibase.cpp:25
msgid "E&xit"
msgstr "S&alir"
-#: ../../../uibase.cpp:28
+#: ../../../src/ui.cpp:2904
+msgid "Program has crashed and will terminate. "
+msgstr "El programa ha detectado un error y va a cerrarse. "
+
+#: ../../../src/main.cpp:1866
+msgid "Warning: Disk space is low "
+msgstr "Cuidado: Poco espacio en disco "
+
+#: ../../../src/main.cpp:3990
+#, 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 "Error: Esta transacción requiere de una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente "
+
+#: ../../../src/main.cpp:3992
+msgid "Error: Transaction creation failed "
+msgstr "Error: La creación de la transacción falló "
+
+#: ../../../src/main.cpp:4001
+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 "Error: La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya fue gastada, o si ha usado un copia de wallet.dat y las monedas fueron gastadas en la copia pero no han sido marcadas como gastadas aqui."
+
+#: ../../../src/main.cpp:4014
+msgid "Invalid amount"
+msgstr "Cantidad erronea"
+
+#: ../../../src/main.cpp:4021
+msgid "Invalid bitcoin address"
+msgstr "Dirección Bitcoin inválida"
+
+#: ../../../src/rpc.cpp:1802
+#: ../../../src/rpc.cpp:1804
+#, c-format
+msgid "To use the %s option"
+msgstr "Para usar la opción %s"
+
+#: ../../../src/rpc.cpp:1806
+#, 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 ""
+"Precaución: %s, debes especificar rpcpassword=<password>\n"
+"en el archivo de configuración: %s\n"
+"Si el archivo no existe, debes crearlo con permisos de lectura al autor solamente.\n"
+
+#: ../../../src/rpc.cpp:1974
+#, 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 ""
+"Debes especificar rpcpassword=<password> en el archivo de configuración:\n"
+"%s\n"
+"Si el archivo no existe, debes crearlo con permisos de lectura al autor solamente."
+
+#: ../../../src/util.cpp:866
+msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly."
+msgstr "Precaución: Por favor revisa que la fecha y hora de tu computador son correctas. Si tu reloj está mal, Bitcoin no funcionará correctamente."
+
+#: ../../../src/util.cpp:899
+msgid "-beta"
+msgstr "-beta"
+
+#: ../../../src/uibase.cpp:28
msgid "&File"
msgstr "&Archivo"
-#: ../../../uibase.cpp:36
+#: ../../../src/uibase.cpp:32
msgid "&Your Receiving Addresses..."
-msgstr "&Tus direcciones de recepcion..."
+msgstr "&Tus direcciones de recepción..."
-#: ../../../uibase.cpp:40
+#: ../../../src/uibase.cpp:36
msgid "&Options..."
msgstr "&Opciones..."
-#: ../../../uibase.cpp:43
+#: ../../../src/uibase.cpp:39
msgid "&Settings"
-msgstr "&Configuracion"
+msgstr "&Configuración"
-#: ../../../uibase.cpp:47
+#: ../../../src/uibase.cpp:43
msgid "&About..."
msgstr "&Acerca de..."
-#: ../../../uibase.cpp:50
+#: ../../../src/uibase.cpp:46
msgid "&Help"
msgstr "&Ayuda"
-#: ../../../uibase.cpp:60
+#: ../../../src/uibase.cpp:56
msgid "Address Book"
msgstr "Libreta de direcciones"
-#: ../../../uibase.cpp:75
+#: ../../../src/uibase.cpp:69
msgid "Your Bitcoin Address:"
-msgstr "Su direccion Bitcoin:"
+msgstr "Su dirección Bitcoin:"
-#: ../../../uibase.cpp:82
+#: ../../../src/uibase.cpp:76
msgid " &New... "
msgstr " &Nuevo... "
-#: ../../../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 " &Copiar al portapapeles "
-#: ../../../uibase.cpp:99
+#: ../../../src/uibase.cpp:93
msgid "Balance:"
msgstr "Balance:"
-#: ../../../uibase.cpp:115
+#: ../../../src/uibase.cpp:109
msgid " All"
msgstr " Todo"
-#: ../../../uibase.cpp:115
+#: ../../../src/uibase.cpp:109
msgid " Sent"
msgstr " Enviado"
-#: ../../../uibase.cpp:115
+#: ../../../src/uibase.cpp:109
msgid " Received"
msgstr " Recibido"
-#: ../../../uibase.cpp:115
+#: ../../../src/uibase.cpp:109
msgid " In Progress"
msgstr " En progreso"
-#: ../../../uibase.cpp:136
+#: ../../../src/uibase.cpp:130
msgid "All Transactions"
msgstr "Todas las transacciones"
-#: ../../../uibase.cpp:147
+#: ../../../src/uibase.cpp:141
msgid "Sent/Received"
msgstr "Enviado/Recibido"
-#: ../../../uibase.cpp:158
+#: ../../../src/uibase.cpp:152
msgid "Sent"
msgstr "Enviado"
-#: ../../../uibase.cpp:169
+#: ../../../src/uibase.cpp:163
msgid "Received"
msgstr "Recibido"
-#: ../../../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 "OK"
-#: ../../../uibase.cpp:355
-msgid "Optional transaction fee you give to the nodes that process your transactions."
-msgstr "Comision opcional que se da a los nodos que procesan sus transacciones"
-
-#: ../../../uibase.cpp:364
-msgid "Transaction fee:"
-msgstr "Comision de la transaccion:"
-
-#: ../../../uibase.cpp:380
-msgid "&Limit coin generation to"
-msgstr "&Limitar la generacion de monedas a"
-
-#: ../../../uibase.cpp:387
-msgid "processors"
-msgstr "procesadores"
-
-#: ../../../uibase.cpp:393
+#: ../../../src/uibase.cpp:345
msgid "&Start Bitcoin on system startup"
-msgstr "&Arrancar Bitcoin al arrancar el sistema"
+msgstr "&Arrancar Bitcoin al iniciar el sistema"
-#: ../../../uibase.cpp:397
+#: ../../../src/uibase.cpp:348
msgid "&Minimize to the tray instead of the taskbar"
msgstr "&Minimizar a la bandeja en vez de a la barra de tareas"
-#: ../../../uibase.cpp:401
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "Mapear el puerto usando &UPnP"
+
+#: ../../../src/uibase.cpp:354
msgid "M&inimize to the tray on close"
msgstr "M&inimizar a la bandeja al cerrar"
-#: ../../../uibase.cpp:408
+#: ../../../src/uibase.cpp:360
msgid "&Connect through socks4 proxy: "
msgstr "&Conectar usando un proxy socks4: "
-#: ../../../uibase.cpp:420
+#: ../../../src/uibase.cpp:371
msgid "Proxy &IP:"
msgstr "Proxy &IP:"
-#: ../../../uibase.cpp:428
+#: ../../../src/uibase.cpp:379
msgid " &Port:"
msgstr " &Puerto:"
-#: ../../../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 "Comisión opcional a las transacciones por KB que ayuda a asegurar que tus transacciones son procesadas rápidamente. La mayoría de las transacciones son de 1KB. Se recomienda una comisión de 0.01."
+
+#: ../../../src/uibase.cpp:399
+msgid "Pay transaction fee:"
+msgstr "Comisión de la transacción:"
+
+#: ../../../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 "Cancelar"
-#: ../../../uibase.cpp:479
+#: ../../../src/uibase.cpp:449
msgid "&Apply"
msgstr "&Aplicar"
-#: ../../../uibase.cpp:540
+#: ../../../src/uibase.cpp:508
msgid "Bitcoin "
msgstr "Bitcoin "
-#: ../../../uibase.cpp:546
+#: ../../../src/uibase.cpp:514
msgid "version"
-msgstr "version"
+msgstr "versión"
-#: ../../../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"
@@ -739,50 +698,42 @@ msgstr ""
"license.txt o http://www.opensource.org/licenses/mit-license.php.\n"
"\n"
"Este producto incluye software desarrollado por OpenSSL Project para su uso en el\n"
-"OpenSSL Toolkit (http://www.openssl.org/) y software criptografico escrito por \n"
+"OpenSSL Toolkit (http://www.openssl.org/) y software criptográfico escrito por \n"
"Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard."
-#: ../../../uibase.cpp:613
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"
-msgstr "Ponga una direccion Bitcoin (ejemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) o una direccion IP (ejemplo: 123.45.6.7)"
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Ponga una dirección Bitcoin (ejemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-#: ../../../uibase.cpp:627
+#: ../../../src/uibase.cpp:595
msgid "Pay &To:"
msgstr "Pagar &A:"
-#: ../../../uibase.cpp:642
+#: ../../../src/uibase.cpp:610
msgid "&Paste"
msgstr "&Pegar"
-#: ../../../uibase.cpp:645
+#: ../../../src/uibase.cpp:613
msgid " Address &Book..."
msgstr " Libreta &Direcciones..."
-#: ../../../uibase.cpp:652
+#: ../../../src/uibase.cpp:620
msgid "&Amount:"
msgstr "&Cantidad:"
-#: ../../../uibase.cpp:662
+#: ../../../src/uibase.cpp:630
msgid "T&ransfer:"
msgstr "T&ransferir:"
-#: ../../../uibase.cpp:668
+#: ../../../src/uibase.cpp:636
msgid " Standard"
-msgstr " Estandar"
-
-#: ../../../uibase.cpp:690
-msgid "&From:"
-msgstr "&De:"
+msgstr " Estándar"
-#: ../../../uibase.cpp:707
-msgid "&Message:"
-msgstr "&Mensaje:"
-
-#: ../../../uibase.cpp:724
+#: ../../../src/uibase.cpp:663
msgid "&Send"
msgstr "&Enviar"
-#: ../../../uibase.cpp:776
+#: ../../../src/uibase.cpp:711
msgid ""
"\n"
"\n"
@@ -792,52 +743,277 @@ msgstr ""
"\n"
"Conenctando..."
-#: ../../../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 "Estas son sus direcciones Bitcoin para recibir pagos. Puede darle una diferente a cada emisor para saber quien le esta pagando. La direccion resaltada se muestra en la ventana principal."
+msgstr "Estas son tus direcciones Bitcoin para recibir pagos. Puedes darle una diferente a cada emisor para saber quien te está pagando. La dirección resaltada se muestra en la ventana principal."
-#: ../../../uibase.cpp:839
-#: ../../../uibase.cpp:951
+#: ../../../src/uibase.cpp:774
+#: ../../../src/uibase.cpp:886
msgid "&Edit..."
msgstr "&Editar..."
-#: ../../../uibase.cpp:842
-#: ../../../uibase.cpp:954
+#: ../../../src/uibase.cpp:777
+#: ../../../src/uibase.cpp:889
msgid " &New Address... "
-msgstr " &Nueva direccion... "
+msgstr " &Nueva dirección... "
-#: ../../../uibase.cpp:914
+#: ../../../src/uibase.cpp:849
msgid "Sending"
msgstr "Enviando"
-#: ../../../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 "Estas son sus direcciones Bitcoin para recibir pagos. Puede darle una diferente a cada emisor para saber quien le esta pagando. La direccion resaltada se muestra en la ventana principal."
+msgstr "Estas son tus direcciones Bitcoin para recibir pagos. Puedes darle una diferente a cada emisor para saber quien te está pagando. La dirección resaltada se muestra en la ventana principal."
-#: ../../../uibase.cpp:935
+#: ../../../src/uibase.cpp:870
msgid "Receiving"
msgstr "Recibiendo"
-#: ../../../uibase.cpp:945
+#: ../../../src/uibase.cpp:880
msgid "&Delete"
msgstr "&Borrar"
-#: ../../../uibase.h:149
+#: ../../../src/init.cpp:140
+msgid " beta"
+msgstr " beta"
+
+#: ../../../src/init.cpp:142
+msgid "Bitcoin version"
+msgstr "versión Bitcoin"
+
+#: ../../../src/init.cpp:143
+msgid "Usage:"
+msgstr "Uso:"
+
+#: ../../../src/init.cpp:145
+msgid "Send command to -server or bitcoind\n"
+msgstr "Enviar comando a bitcoin corriendo con -server o a bitcoind\n"
+
+#: ../../../src/init.cpp:146
+msgid "List commands\n"
+msgstr "Lista de comandos\n"
+
+#: ../../../src/init.cpp:147
+msgid "Get help for a command\n"
+msgstr "Recibir ayuda para un comando\n"
+
+#: ../../../src/init.cpp:148
+msgid "Options:\n"
+msgstr "Opciones:\n"
+
+#: ../../../src/init.cpp:149
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Especificar archivo de configuración (predeterminado: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:150
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "Especificar archivo pid (predeterminado: bitcoin.pid)\n"
+
+#: ../../../src/init.cpp:151
+msgid "Generate coins\n"
+msgstr "Generar monedas\n"
+
+#: ../../../src/init.cpp:152
+msgid "Don't generate coins\n"
+msgstr "No generar monedas\n"
+
+#: ../../../src/init.cpp:153
+msgid "Start minimized\n"
+msgstr "Arrancar minimizado\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify data directory\n"
+msgstr "Especificar directorio para los datos\n"
+
+#: ../../../src/init.cpp:155
+msgid "Connect through socks4 proxy\n"
+msgstr "Conectar mediante proxy socks4\n"
+
+#: ../../../src/init.cpp:156
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "Permitir búsqueda DNS para addnode y connect\n"
+
+#: ../../../src/init.cpp:157
+msgid "Add a node to connect to\n"
+msgstr "Agregar un nodo para conectarse\n"
+
+#: ../../../src/init.cpp:158
+msgid "Connect only to the specified node\n"
+msgstr "Conectar solo al nodo especificado\n"
+
+#: ../../../src/init.cpp:159
+msgid "Don't accept connections from outside\n"
+msgstr "No aceptar conexiones desde el exterior\n"
+
+#: ../../../src/init.cpp:162
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "No intentar usar UPnP para mapear el puerto de entrada\n"
+
+#: ../../../src/init.cpp:164
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Intentar usar UPnP para mapear el puerto de escucha.\n"
+
+#: ../../../src/init.cpp:167
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Comisión por KB para agregar a las transacciones que envias\n"
+
+#: ../../../src/init.cpp:169
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Aceptar comandos por línea de comandos y JSON-RPC\n"
+
+#: ../../../src/init.cpp:172
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Correr en el fondo como demonio y aceptar comandos\n"
+
+#: ../../../src/init.cpp:174
+msgid "Use the test network\n"
+msgstr "Usar la red de pruebas\n"
+
+#: ../../../src/init.cpp:175
+msgid "Username for JSON-RPC connections\n"
+msgstr "Usuario para las conexiones JSON-RPC\n"
+
+#: ../../../src/init.cpp:176
+msgid "Password for JSON-RPC connections\n"
+msgstr "Contraseña para las conexiones JSON-RPC\n"
+
+#: ../../../src/init.cpp:177
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "Escuchar conexiones JSON-RPC en el puerto <puerto> (predeterminado: 8332)\n"
+
+#: ../../../src/init.cpp:178
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Permitir conexiones JSON-RPC desde la dirección IP especificada\n"
+
+#: ../../../src/init.cpp:179
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Enviar comando al nodo ejecutándose en <ip> (predeterminado: 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:180
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Ajustar el tamaño de la llave (key) de la piscina (pool) a <n> (predeterminado: 100)\n"
+
+#: ../../../src/init.cpp:181
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Re-escanear la cadena de bloques para transacciones perdidas de la billetera\n"
+
+#: ../../../src/init.cpp:185
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)\n"
+
+#: ../../../src/init.cpp:186
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Usar OpenSSL (https) para las conexiones JSON-RPC\n"
+
+#: ../../../src/init.cpp:187
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "Archivo de certificado del servidor (Predeterminado: server.cert)\n"
+
+#: ../../../src/init.cpp:188
+msgid "Server private key (default: server.pem)\n"
+msgstr "Clave privada del servidor (Predeterminado: server.pem)\n"
+
+#: ../../../src/init.cpp:189
+msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+msgstr "Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+
+#: ../../../src/init.cpp:193
+msgid "This help message\n"
+msgstr "Este mensaje de ayuda\n"
+
+#: ../../../src/init.cpp:330
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "No se puede obtener el bloqueo en el directorio de datos %s. Probablemente el cliente de Bitcoin ya se está ejecutando."
+
+#: ../../../src/init.cpp:356
+msgid "Error loading addr.dat \n"
+msgstr "Error cargando addr.dat \n"
+
+#: ../../../src/init.cpp:362
+msgid "Error loading blkindex.dat \n"
+msgstr "Error cargando blkindex.dat \n"
+
+#: ../../../src/init.cpp:369
+msgid "Error loading wallet.dat \n"
+msgstr "Error cargando wallet.dat \n"
+
+#: ../../../src/init.cpp:449
+msgid "Invalid -proxy address"
+msgstr "Dirección proxy - inválida"
+
+#: ../../../src/init.cpp:472
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Cantidad inválida para -paytxfee=<cantidad>"
+
+#: ../../../src/init.cpp:476
+msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."
+msgstr "Precaución: -paytxfee está configurado muy alto. Esta es la comisión que pagarás si envias una transacción."
+
+#: ../../../src/uibase.h:147
msgid "Transaction Details"
-msgstr "Detalles de la transaccion"
+msgstr "Detalles de la transacción"
-#: ../../../uibase.h:202
+#: ../../../src/uibase.h:199
msgid "Options"
msgstr "Opciones"
-#: ../../../uibase.h:230
+#: ../../../src/uibase.h:228
msgid "About Bitcoin"
msgstr "Acerca de Bitcoin"
-#: ../../../uibase.h:340
+#: ../../../src/uibase.h:337
msgid "Your Bitcoin Addresses"
msgstr "Sus direcciones Bitcoin"
+#~ msgid ""
+#~ "Error: This is an oversized transaction that requires a transaction fee "
+#~ "of %s "
+#~ msgstr ""
+#~ "Error: Esta es una gran transaccion que requiere una comision de %s "
+
+#~ msgid "version %s%s BETA"
+#~ msgstr "version %s%s BETA"
+
+#~ msgid "Will appear as \"From: Unknown\""
+#~ msgstr "Aparecera como \"De: Desconocido\""
+
+#~ msgid "n/a"
+#~ msgstr "Desconocido"
+
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
+#~ msgid "Can't include a message when sending to a Bitcoin address"
+#~ msgstr ""
+#~ "No se ha podido incluir un mensaje mientras se enviaba la direccion "
+#~ "Bitcoin"
+
+#~ msgid ""
+#~ "This is an oversized transaction that requires a transaction fee of %s"
+#~ msgstr "Esta es una gran transaccion que requiere una comision de %s"
+
+#~ msgid ""
+#~ "Optional transaction fee you give to the nodes that process your "
+#~ "transactions."
+#~ msgstr ""
+#~ "Comision opcional que se da a los nodos que procesan sus transacciones"
+
+#~ msgid "&Limit coin generation to"
+#~ msgstr "&Limitar la generacion de monedas a"
+
+#~ msgid "processors"
+#~ msgstr "procesadores"
+
+#~ msgid "&From:"
+#~ msgstr "&De:"
+
+#~ msgid "&Message:"
+#~ msgstr "&Mensaje:"
+
#~ msgid "Usage: bitcoin [options]"
#~ msgstr "Uso: bitcoin [opciones]"
-
diff --git a/locale/it/LC_MESSAGES/bitcoin.mo b/locale/it/LC_MESSAGES/bitcoin.mo
index 9347018037..24a749535c 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..76f205a1bb 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-26 09:46+0100\n"
+"Last-Translator: Joozero <hostfat@gmail.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"
-
-#: ../../../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"
+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"
-#: ../../../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"
-
-#: ../../../ui.cpp:1681
-msgid "Unknown"
-msgstr "Sconosciuto"
+msgid "version %s"
+msgstr "versione %s"
-#: ../../../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"
+
+#: ../../../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"
-#: ../../../uibase.cpp:30
+#: ../../../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"
+
+#: ../../../src/uibase.cpp:354
+msgid "&Minimize to the tray on close"
+msgstr "&Minimizza nella tray alla chiusura"
-#: ../../../uibase.cpp:414
+#: ../../../src/uibase.cpp:360
msgid "&Connect through socks4 proxy: "
-msgstr "%Connesso attraverso proxy socks4: "
+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. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-#: ../../../uibase.cpp:633
+#: ../../../src/uibase.cpp:595
msgid "Pay &To:"
-msgstr "Paga %a:"
+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/lt/LC_MESSAGES/bitcoin.mo b/locale/lt/LC_MESSAGES/bitcoin.mo
new file mode 100644
index 0000000000..22a42c5938
--- /dev/null
+++ b/locale/lt/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/lt/LC_MESSAGES/bitcoin.po b/locale/lt/LC_MESSAGES/bitcoin.po
new file mode 100644
index 0000000000..aea7a892fd
--- /dev/null
+++ b/locale/lt/LC_MESSAGES/bitcoin.po
@@ -0,0 +1,1027 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-17 14:07+0100\n"
+"PO-Revision-Date: 2011-05-17 14:09+0100\n"
+"Last-Translator: Anonymous <anon@none>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ../../..\n"
+
+#: ../../../src/net.cpp:1503
+#, c-format
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "Neįmanoma prisijungti prie šio kompiuterio porto %d. Bitcoin programa tikriausiai jau yra paleista"
+
+#: ../../../src/ui.cpp:204
+#, 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 "Šis pervedimas viršija dydžio limitą. Jūs galite siūsti šią suma sumokėję %s mokestį, kuris bus skirtas nodams už persiuntimą ir padėti tinklui. Ar sutinkate pridėti ši mokestį?"
+
+#: ../../../src/ui.cpp:303
+msgid "Status"
+msgstr "Būklė"
+
+#: ../../../src/ui.cpp:304
+msgid "Date"
+msgstr "Data"
+
+#: ../../../src/ui.cpp:305
+msgid "Description"
+msgstr "Apibūdinimas"
+
+#: ../../../src/ui.cpp:306
+msgid "Debit"
+msgstr "Debetas"
+
+#: ../../../src/ui.cpp:307
+msgid "Credit"
+msgstr "Kreditas"
+
+#: ../../../src/ui.cpp:513
+#, c-format
+msgid "Open for %d blocks"
+msgstr "Atidaryta %d blokams"
+
+#: ../../../src/ui.cpp:515
+#, c-format
+msgid "Open until %s"
+msgstr "Atidaryta iki %s"
+
+#: ../../../src/ui.cpp:521
+#, c-format
+msgid "%d/offline?"
+msgstr "%d/neprisijunges?"
+
+#: ../../../src/ui.cpp:523
+#, c-format
+msgid "%d/unconfirmed"
+msgstr "%d/ nepatvirtinta"
+
+#: ../../../src/ui.cpp:525
+#, c-format
+msgid "%d confirmations"
+msgstr "%d patvirtinta"
+
+#: ../../../src/ui.cpp:610
+msgid "Generated"
+msgstr "Sugeneruota"
+
+#: ../../../src/ui.cpp:618
+#, c-format
+msgid "Generated (%s matures in %d more blocks)"
+msgstr "Sugeneruota (%s bus galima naudoti už %d blokų)"
+
+#: ../../../src/ui.cpp:622
+msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
+msgstr "Sugeneruota - Perspėjimas: Šio bloko negavo kiti nodai ir jis tikriausiai nebus priimtas!"
+
+#: ../../../src/ui.cpp:626
+msgid "Generated (not accepted)"
+msgstr "Sugeneruota (nepriimta)"
+
+#: ../../../src/ui.cpp:636
+msgid "From: "
+msgstr "Nuo: "
+
+#: ../../../src/ui.cpp:660
+msgid "Received with: "
+msgstr "Priimta su: "
+
+#: ../../../src/ui.cpp:706
+msgid "Payment to yourself"
+msgstr "Pervedimas sau"
+
+#: ../../../src/ui.cpp:740
+msgid "To: "
+msgstr "Kam: "
+
+#: ../../../src/ui.cpp:1055
+msgid " Generating"
+msgstr " Generuojama"
+
+#: ../../../src/ui.cpp:1057
+msgid "(not connected)"
+msgstr "(neprijungta)"
+
+#: ../../../src/ui.cpp:1060
+#, c-format
+msgid " %d connections %d blocks %d transactions"
+msgstr " %d Jungtys %d Blokai %d pervedimai"
+
+#: ../../../src/ui.cpp:1165
+#: ../../../src/ui.cpp:2529
+msgid "New Receiving Address"
+msgstr "Naujas priėmimo adresas"
+
+#: ../../../src/ui.cpp:1166
+#: ../../../src/ui.cpp:2530
+msgid ""
+"You should use a new address for each payment you receive.\n"
+"\n"
+"Label"
+msgstr ""
+"Naudokite naują adresas kiekvienam pervedimui.\n"
+"\n"
+"Pavadinimas"
+
+#: ../../../src/ui.cpp:1235
+msgid "<b>Status:</b> "
+msgstr "<b>Būklė:</b> "
+
+#: ../../../src/ui.cpp:1240
+msgid ", has not been successfully broadcast yet"
+msgstr ", dar nėra paskelbta"
+
+#: ../../../src/ui.cpp:1242
+#, c-format
+msgid ", broadcast through %d node"
+msgstr ", paskelbta per %d nodą"
+
+#: ../../../src/ui.cpp:1244
+#, c-format
+msgid ", broadcast through %d nodes"
+msgstr ", paskelbta per %d nodus"
+
+#: ../../../src/ui.cpp:1248
+msgid "<b>Date:</b> "
+msgstr "<b>Data:</b> "
+
+#: ../../../src/ui.cpp:1256
+msgid "<b>Source:</b> Generated<br>"
+msgstr "<b>Iš:</b> Sugeneruota<br>"
+
+#: ../../../src/ui.cpp:1262
+#: ../../../src/ui.cpp:1280
+msgid "<b>From:</b> "
+msgstr "<b>Nuo:</b> "
+
+#: ../../../src/ui.cpp:1280
+msgid "unknown"
+msgstr "nežinomas"
+
+#: ../../../src/ui.cpp:1281
+#: ../../../src/ui.cpp:1305
+#: ../../../src/ui.cpp:1364
+msgid "<b>To:</b> "
+msgstr "<b>Kam:</b> "
+
+#: ../../../src/ui.cpp:1284
+msgid " (yours, label: "
+msgstr " (jūsų, pavadinimas: "
+
+#: ../../../src/ui.cpp:1286
+msgid " (yours)"
+msgstr " (jūsų)"
+
+#: ../../../src/ui.cpp:1323
+#: ../../../src/ui.cpp:1335
+#: ../../../src/ui.cpp:1381
+#: ../../../src/ui.cpp:1398
+msgid "<b>Credit:</b> "
+msgstr "<b>Kreditas:</b> "
+
+#: ../../../src/ui.cpp:1325
+#, c-format
+msgid "(%s matures in %d more blocks)"
+msgstr "(%s bus galima naudoti už %d blokų)"
+
+#: ../../../src/ui.cpp:1327
+msgid "(not accepted)"
+msgstr "(nepriimta)"
+
+#: ../../../src/ui.cpp:1372
+#: ../../../src/ui.cpp:1380
+#: ../../../src/ui.cpp:1395
+msgid "<b>Debit:</b> "
+msgstr "<b>Debetas:</b> "
+
+#: ../../../src/ui.cpp:1386
+msgid "<b>Transaction fee:</b> "
+msgstr "<b>Pervedimo mokestis:</b> "
+
+#: ../../../src/ui.cpp:1402
+msgid "<b>Net amount:</b> "
+msgstr "<b>Neto suma:</b> "
+
+#: ../../../src/ui.cpp:1409
+msgid "Message:"
+msgstr "Žinutė:"
+
+#: ../../../src/ui.cpp:1411
+msgid "Comment:"
+msgstr "Komentaras:"
+
+#: ../../../src/ui.cpp:1414
+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 "Turite palaukti 120 blokų, kol galėsite išleisti sugeneruotas monetas. Kai sugeneravotė šį blokai, jis buvo paskelbtas tinklui ir bus pridėtas į blokų grandinę. Jei šio bloko tinklas nepriims i grandinė, jis pasikeis į \"nepriimtas\" ir negali būti išleidžiamas. Tai gali kartais nutikti jei kitas nodas sugeneravo bloką keliom sekundėm anksčiau."
+
+#: ../../../src/ui.cpp:1594
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "Nepavyksta įrašyti į autostart/bitcoin.desktop failą"
+
+#: ../../../src/ui.cpp:1630
+msgid "Main"
+msgstr "Pagrindinis"
+
+#: ../../../src/ui.cpp:1638
+msgid "&Start Bitcoin on window system startup"
+msgstr "&Paleisti Bitcoin kai pasileižia operacinė sistema"
+
+#: ../../../src/ui.cpp:1645
+msgid "&Minimize on close"
+msgstr "&Sumažinti kai uždaroma"
+
+#: ../../../src/ui.cpp:1787
+#, c-format
+msgid "version %s"
+msgstr "versija %s"
+
+#: ../../../src/ui.cpp:1899
+msgid "Error in amount "
+msgstr "Klaidinga suma"
+
+#: ../../../src/ui.cpp:1899
+#: ../../../src/ui.cpp:1904
+#: ../../../src/ui.cpp:1909
+#: ../../../src/ui.cpp:1944
+#: ../../../src/uibase.cpp:55
+msgid "Send Coins"
+msgstr "Siūsti monetas"
+
+#: ../../../src/ui.cpp:1904
+msgid "Amount exceeds your balance "
+msgstr "Suma viršija jūsų balasą"
+
+#: ../../../src/ui.cpp:1909
+msgid "Total exceeds your balance when the "
+msgstr "Bendra suma viršija jūsu balansą kai"
+
+#: ../../../src/ui.cpp:1909
+msgid " transaction fee is included "
+msgstr "pervedimo suma įskaičiuota"
+
+#: ../../../src/ui.cpp:1927
+msgid "Payment sent "
+msgstr "Mokestis išsiųstas"
+
+#: ../../../src/ui.cpp:1927
+#: ../../../src/ui.cpp:1932
+#: ../../../src/ui.cpp:2076
+#: ../../../src/ui.cpp:2229
+#: ../../../src/main.cpp:3997
+msgid "Sending..."
+msgstr "Siunčia..."
+
+#: ../../../src/ui.cpp:1944
+msgid "Invalid address "
+msgstr "Klaidingas adresas"
+
+#: ../../../src/ui.cpp:1997
+#, c-format
+msgid "Sending %s to %s"
+msgstr "Siunčia %s į %s"
+
+#: ../../../src/ui.cpp:2070
+#: ../../../src/ui.cpp:2103
+msgid "CANCELLED"
+msgstr "NUTRAUKTA"
+
+#: ../../../src/ui.cpp:2074
+msgid "Cancelled"
+msgstr "Nutraukta"
+
+#: ../../../src/ui.cpp:2076
+msgid "Transfer cancelled "
+msgstr "Siuntimas nutrauktas"
+
+#: ../../../src/ui.cpp:2129
+msgid "Error: "
+msgstr "Klaida:"
+
+#: ../../../src/ui.cpp:2143
+#: ../../../src/ui.cpp:2214
+#: ../../../src/main.cpp:4016
+msgid "Insufficient funds"
+msgstr "Nepakankamai monetų"
+
+#: ../../../src/ui.cpp:2148
+msgid "Connecting..."
+msgstr "Jungiasi..."
+
+#: ../../../src/ui.cpp:2153
+msgid "Unable to connect"
+msgstr "Negali prisijungti"
+
+#: ../../../src/ui.cpp:2158
+msgid "Requesting public key..."
+msgstr "Prašo \"viešojo rakto\"(public key)..."
+
+#: ../../../src/ui.cpp:2170
+msgid "Received public key..."
+msgstr "Gautas \"viešasis raktas\"(public key)..."
+
+#: ../../../src/ui.cpp:2184
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "Gavėjas nepriima pervedimų siunčiamų iš IP adresų"
+
+#: ../../../src/ui.cpp:2186
+msgid "Transfer was not accepted"
+msgstr "Persiuntimas nepriimtas"
+
+#: ../../../src/ui.cpp:2195
+msgid "Invalid response received"
+msgstr "Gautas klaidingas atsakymas"
+
+#: ../../../src/ui.cpp:2210
+msgid "Creating transaction..."
+msgstr "Kuriamas pervedimas..."
+
+#: ../../../src/ui.cpp:2222
+#, 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 "Šis pervedimas reikalauja %s mokesčio dėl jo sumos, sudėtingumo arba dėl to, kad šie pinigai buvo neseniai gauti"
+
+#: ../../../src/ui.cpp:2224
+msgid "Transaction creation failed"
+msgstr "Pervedimo sukurti nepavyko"
+
+#: ../../../src/ui.cpp:2231
+msgid "Transaction aborted"
+msgstr "Pervedimas nutrauktas"
+
+#: ../../../src/ui.cpp:2239
+msgid "Lost connection, transaction cancelled"
+msgstr "Prarastas ryšys, pervedimas nutrauktas"
+
+#: ../../../src/ui.cpp:2255
+msgid "Sending payment..."
+msgstr "Monetos siunčiamos..."
+
+#: ../../../src/ui.cpp:2261
+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 "Pervedimas buvo atmestas. Tai galėjo atsitikti jei dalis jūsų monetų jau buvo išleista. Pvz.: Jei nodojote kopija wallet.dat kitame kliente ir monetos buvo išleistos ten, bet nepažymėtos kaip išleistos čia."
+
+#: ../../../src/ui.cpp:2270
+msgid "Waiting for confirmation..."
+msgstr "Laukia patvirtinimo..."
+
+#: ../../../src/ui.cpp:2288
+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 ""
+"Pervedimas išsiūstas, bet gavėjas negalėjo jo patvirtinti.\n"
+"Pervedimas įrašytas ir suma bus kredituojama gavėjui,\n"
+"bet komentaro informacija nebus rodoma."
+
+#: ../../../src/ui.cpp:2297
+msgid "Payment was sent, but an invalid response was received"
+msgstr "Pervedimas išsiūstas, bet klaidingas atsakymas gautas"
+
+#: ../../../src/ui.cpp:2303
+msgid "Payment completed"
+msgstr "Pervedimas pavyko"
+
+#: ../../../src/ui.cpp:2334
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2517
+msgid "Name"
+msgstr "Vardas"
+
+#: ../../../src/ui.cpp:2335
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2517
+msgid "Address"
+msgstr "Adresas"
+
+#: ../../../src/ui.cpp:2337
+#: ../../../src/ui.cpp:2492
+msgid "Label"
+msgstr "Pavadinimas"
+
+#: ../../../src/ui.cpp:2338
+#: ../../../src/uibase.cpp:837
+msgid "Bitcoin Address"
+msgstr "Bitcoin Adresas"
+
+#: ../../../src/ui.cpp:2462
+msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. "
+msgstr "Tai vienas iš jūsų adresų priimti pervedimams ir negali būti įvestas i adresų knygą"
+
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2486
+msgid "Edit Address"
+msgstr "Pakeisti Adresą"
+
+#: ../../../src/ui.cpp:2492
+msgid "Edit Address Label"
+msgstr "Pakeisti adreso pavadinimą"
+
+#: ../../../src/ui.cpp:2517
+#: ../../../src/ui.cpp:2523
+msgid "Add Address"
+msgstr "Pridėti adresą"
+
+#: ../../../src/ui.cpp:2600
+msgid "Bitcoin"
+msgstr "Bitcoin"
+
+#: ../../../src/ui.cpp:2602
+msgid "Bitcoin - Generating"
+msgstr "Bitcoin - Generuoja"
+
+#: ../../../src/ui.cpp:2604
+msgid "Bitcoin - (not connected)"
+msgstr "Bitcoin - (neprijungta)"
+
+#: ../../../src/ui.cpp:2683
+msgid "&Open Bitcoin"
+msgstr "&Atidaryti Bitcoin"
+
+#: ../../../src/ui.cpp:2684
+#, fuzzy
+msgid "&Send Bitcoins"
+msgstr "&Atidaryti Bitcoin"
+
+#: ../../../src/ui.cpp:2685
+msgid "O&ptions..."
+msgstr "P&arametrai..."
+
+#: ../../../src/ui.cpp:2688
+#: ../../../src/uibase.cpp:25
+msgid "E&xit"
+msgstr "&Išeiti"
+
+#: ../../../src/ui.cpp:2904
+msgid "Program has crashed and will terminate. "
+msgstr "Programa neveikia ir bus uždaryta"
+
+#: ../../../src/main.cpp:1866
+msgid "Warning: Disk space is low "
+msgstr "Perspėjimas: Diske trūksta vietos"
+
+#: ../../../src/main.cpp:3990
+#, 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 "Klaida: Šis pervedimas reikalauja %s mokesčio dėl jo sumos, sudėtingumo arba dėl to, kad šie pinigai buvo neseniai gauti "
+
+#: ../../../src/main.cpp:3992
+msgid "Error: Transaction creation failed "
+msgstr "Klaida: Pervedimo sukurti nepavyko "
+
+#: ../../../src/main.cpp:4001
+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 "Klaida: Pervedimas nepavyko. Tai galėjo atsitikti jei dalis jūsų monetų jau buvo išleista. Pvz.: Jei nodojote kopija wallet.dat kitame kliente ir monetos buvo išleistos ten, bet nepažymėtos kaip išleistos čia."
+
+#: ../../../src/main.cpp:4014
+msgid "Invalid amount"
+msgstr "Neteisinga suma"
+
+#: ../../../src/main.cpp:4021
+msgid "Invalid bitcoin address"
+msgstr "Klaidingas bitcoin adresas"
+
+#: ../../../src/rpc.cpp:1802
+#: ../../../src/rpc.cpp:1804
+#, c-format
+msgid "To use the %s option"
+msgstr "Kad naudoti %s parametrą"
+
+#: ../../../src/rpc.cpp:1806
+#, 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 ""
+"Perspėjimas: %s, jūs privalote nustatyti rpcpassword=<slaptažodis>\n"
+"Konfiguracijos faile: %s\n"
+"Jei failas neegzistuoja, sukurkite jį su owner-readable-only failo teisėmis.\n"
+
+#: ../../../src/rpc.cpp:1974
+#, 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 ""
+"Jūs privalote nustatyti rpcpassword=<slaptažodis> Konfiguracijos faile:\n"
+"%s\n"
+"Jei failas neegzistuoja, sukurkite jį su owner-readable-only failo teisėm."
+
+#: ../../../src/util.cpp:866
+msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly."
+msgstr "Perspėjimas: Prašome patikrinti kompiuterio laiką ir datą. Jei laikas neteisingai nustatytas, Bitcoin neveiks."
+
+#: ../../../src/util.cpp:899
+msgid "-beta"
+msgstr "-beta"
+
+#: ../../../src/uibase.cpp:28
+msgid "&File"
+msgstr "&Byla"
+
+#: ../../../src/uibase.cpp:32
+msgid "&Your Receiving Addresses..."
+msgstr "&Jūsų priimantys adresai..."
+
+#: ../../../src/uibase.cpp:36
+msgid "&Options..."
+msgstr "&Parametrai"
+
+#: ../../../src/uibase.cpp:39
+msgid "&Settings"
+msgstr "N&ustatymai"
+
+#: ../../../src/uibase.cpp:43
+msgid "&About..."
+msgstr "&О Apie..."
+
+#: ../../../src/uibase.cpp:46
+msgid "&Help"
+msgstr "&Pagalba"
+
+#: ../../../src/uibase.cpp:56
+msgid "Address Book"
+msgstr "Adresų knyga"
+
+#: ../../../src/uibase.cpp:69
+msgid "Your Bitcoin Address:"
+msgstr "Jūsų Bitcoin Adresas:"
+
+#: ../../../src/uibase.cpp:76
+msgid " &New... "
+msgstr " &Naujas... "
+
+#: ../../../src/uibase.cpp:79
+#: ../../../src/uibase.cpp:780
+#: ../../../src/uibase.cpp:883
+msgid " &Copy to Clipboard "
+msgstr "&Kopijuoti"
+
+#: ../../../src/uibase.cpp:93
+msgid "Balance:"
+msgstr "Balansas:"
+
+#: ../../../src/uibase.cpp:109
+msgid " All"
+msgstr "Visi"
+
+#: ../../../src/uibase.cpp:109
+msgid " Sent"
+msgstr "Išsiūsta"
+
+#: ../../../src/uibase.cpp:109
+msgid " Received"
+msgstr "Priimta"
+
+#: ../../../src/uibase.cpp:109
+msgid " In Progress"
+msgstr "Progrese"
+
+#: ../../../src/uibase.cpp:130
+msgid "All Transactions"
+msgstr "Visi pervedimai"
+
+#: ../../../src/uibase.cpp:141
+msgid "Sent/Received"
+msgstr "Išsiųsti/Priimti"
+
+#: ../../../src/uibase.cpp:152
+msgid "Sent"
+msgstr "Išsiūsti"
+
+#: ../../../src/uibase.cpp:163
+msgid "Received"
+msgstr "Priimti"
+
+#: ../../../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 "Gerai"
+
+#: ../../../src/uibase.cpp:345
+msgid "&Start Bitcoin on system startup"
+msgstr "&Paleisti Bitcoin kai pasileidžia operacinė sistema"
+
+#: ../../../src/uibase.cpp:348
+msgid "&Minimize to the tray instead of the taskbar"
+msgstr "&Sumažinti į \"tray\" vietoj \"taskbar\""
+
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "Peradresuoti porta naudojant &UPnP"
+
+#: ../../../src/uibase.cpp:354
+msgid "M&inimize to the tray on close"
+msgstr "Su&mažinti į \"tray\" kai uždaroma"
+
+#: ../../../src/uibase.cpp:360
+msgid "&Connect through socks4 proxy: "
+msgstr "&Prisijungti per socks4 proksį: "
+
+#: ../../../src/uibase.cpp:371
+msgid "Proxy &IP:"
+msgstr "P&roksio IP:"
+
+#: ../../../src/uibase.cpp:379
+msgid " &Port:"
+msgstr " &Portas"
+
+#: ../../../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 "Pasirintinis pervedimo mokestis per KB, kuris padeda jį ivykdyti greičiau. Dauguma pervedimų yra 1KB. Rekomencuojamas mokestis 0.01."
+
+#: ../../../src/uibase.cpp:399
+#, fuzzy
+msgid "Pay transaction fee:"
+msgstr "Pervedimo mokestis:"
+
+#: ../../../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 "Nutraukti"
+
+#: ../../../src/uibase.cpp:449
+msgid "&Apply"
+msgstr "&Nustatyti"
+
+#: ../../../src/uibase.cpp:508
+msgid "Bitcoin "
+msgstr "Bitcoin "
+
+#: ../../../src/uibase.cpp:514
+msgid "version"
+msgstr "versija"
+
+#: ../../../src/uibase.cpp:525
+#, fuzzy
+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 ""
+"Autorinė teisė (c) 2009-2010 Bitcoin Developers\n"
+"\n"
+"Ši programa yra eksperimentinė.\n"
+"\n"
+"Išleista ir teisės saugomos pagal MIT/X11 programų licenziją, kuri detaliau aprašyra faile \n"
+"license.txt ir http://www.opensource.org/licenses/mit-license.php.\n"
+"\n"
+"Šis produktas turi programą iš OpenSSL projekto, kuri naudojamas \n"
+"OpenSSL Toolkit (http://www.openssl.org/), kriptografinę programą parašyta \n"
+"Eric Young (eay@cryptsoft.com) ir UPnP programą parašyta Thomas Bernard."
+
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Įveskite Bitcoin adresą (pvz.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+
+#: ../../../src/uibase.cpp:595
+msgid "Pay &To:"
+msgstr "&Kam:"
+
+#: ../../../src/uibase.cpp:610
+msgid "&Paste"
+msgstr "&Įrašyti"
+
+#: ../../../src/uibase.cpp:613
+msgid " Address &Book..."
+msgstr " &Adresų knyga..."
+
+#: ../../../src/uibase.cpp:620
+msgid "&Amount:"
+msgstr "S&uma:"
+
+#: ../../../src/uibase.cpp:630
+msgid "T&ransfer:"
+msgstr "&Pervedimas:"
+
+#: ../../../src/uibase.cpp:636
+msgid " Standard"
+msgstr "Standartinis"
+
+#: ../../../src/uibase.cpp:663
+msgid "&Send"
+msgstr "&Siūsti"
+
+#: ../../../src/uibase.cpp:711
+msgid ""
+"\n"
+"\n"
+"Connecting..."
+msgstr ""
+"\n"
+"\n"
+"Jungiasi..."
+
+#: ../../../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 "Tai yra jūsų Bitcoin adresai priimti pervedimus. Galite duoti skirtinga adresa kiekvienam siuntėjui, kad žinotumėte kas jums moka. Pažymėtas adresas bus rodomas pagrindiniame lange."
+
+#: ../../../src/uibase.cpp:774
+#: ../../../src/uibase.cpp:886
+msgid "&Edit..."
+msgstr "&Pakeisti..."
+
+#: ../../../src/uibase.cpp:777
+#: ../../../src/uibase.cpp:889
+msgid " &New Address... "
+msgstr " &Naujas Adresas... "
+
+#: ../../../src/uibase.cpp:849
+msgid "Sending"
+msgstr "Siunčiama"
+
+#: ../../../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 "Tai yra jūsų Bitcoin adresai priimti pervedimus. Galite duoti skirtinga adresa kiekvienam siuntėjui, kad žinotumėte kas jums moka. Pažymėtas adresas bus rodomas pagrindiniame lange."
+
+#: ../../../src/uibase.cpp:870
+msgid "Receiving"
+msgstr "Priėmimo"
+
+#: ../../../src/uibase.cpp:880
+msgid "&Delete"
+msgstr "&Ištrinti"
+
+#: ../../../src/init.cpp:140
+msgid " beta"
+msgstr " beta"
+
+#: ../../../src/init.cpp:142
+msgid "Bitcoin version"
+msgstr "Bitcoin version"
+
+#: ../../../src/init.cpp:143
+msgid "Usage:"
+msgstr "Komandų vartojimas:"
+
+#: ../../../src/init.cpp:145
+msgid "Send command to -server or bitcoind\n"
+msgstr "Siūsti komandą i -server arba bitcoind\n"
+
+#: ../../../src/init.cpp:146
+msgid "List commands\n"
+msgstr "Parodyti visas komandas\n"
+
+#: ../../../src/init.cpp:147
+msgid "Get help for a command\n"
+msgstr "Komandos paaiškinimas\n"
+
+#: ../../../src/init.cpp:148
+msgid "Options:\n"
+msgstr "Parametrai\n"
+
+#: ../../../src/init.cpp:149
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Nurodyti konfiguracijos failą (pagal nutylėjimą: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:150
+#, fuzzy
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "Nurodyti konfiguracijos failą (pagal nutylėjimą: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:151
+msgid "Generate coins\n"
+msgstr "Generuoti monetas\n"
+
+#: ../../../src/init.cpp:152
+msgid "Don't generate coins\n"
+msgstr "Negeneruoti monetų\n"
+
+#: ../../../src/init.cpp:153
+msgid "Start minimized\n"
+msgstr "Paleisti minimizuotą klientą\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify data directory\n"
+msgstr "Nurodyti duomenų direktoriją\n"
+
+#: ../../../src/init.cpp:155
+msgid "Connect through socks4 proxy\n"
+msgstr "Prisijungti per socks4 proksį\n"
+
+#: ../../../src/init.cpp:156
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "Leisti DNS lookups addnode ir connect komandoms\n"
+
+#: ../../../src/init.cpp:157
+msgid "Add a node to connect to\n"
+msgstr "Pridėti nodą prie kurio bus jungiamasi\n"
+
+#: ../../../src/init.cpp:158
+msgid "Connect only to the specified node\n"
+msgstr "Prisijungti tik prie šio nodo\n"
+
+#: ../../../src/init.cpp:159
+msgid "Don't accept connections from outside\n"
+msgstr "Neleisti prisijungti iš išorės\n"
+
+#: ../../../src/init.cpp:162
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "Nenaudoti UPnP klausančio porto peradresavimui\n"
+
+#: ../../../src/init.cpp:164
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Pamėginti naudoti UPnP klausančio porto peradresavimui\n"
+
+#: ../../../src/init.cpp:167
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Mokestis per KB pridedamas prie siunčiamo pervedimo\n"
+
+#: ../../../src/init.cpp:169
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Priimti komandas iš terminalo ir JSON-RPC\n"
+
+#: ../../../src/init.cpp:172
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Paleisti daemon\n"
+
+#: ../../../src/init.cpp:174
+msgid "Use the test network\n"
+msgstr "Naudoti bandomajį tinklą\n"
+
+#: ../../../src/init.cpp:175
+msgid "Username for JSON-RPC connections\n"
+msgstr "Naudotojo vardas JSON-RPC prisijungimui\n"
+
+#: ../../../src/init.cpp:176
+msgid "Password for JSON-RPC connections\n"
+msgstr "Slaptažodis JSON-RPC prisijungimui\n"
+
+#: ../../../src/init.cpp:177
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "Klausyti JSON-RPC prisijungimų ant <port> (pagal nutylėjimą: 8332)\n"
+
+#: ../../../src/init.cpp:178
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Leisti JSON-RPC prisijungimą iš tam tikrų IP adresų\n"
+
+#: ../../../src/init.cpp:179
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Siūsti komandas į nodą kuris yra <ip> (pagal nutylėjimą: 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:180
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Nustatyti kiek raktų skaičių <n> (pagal nutylėjimą: 100)\n"
+
+#: ../../../src/init.cpp:181
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Perskanuoti blokų grandinę dėl trūkstamų pervedimų\n"
+
+#: ../../../src/init.cpp:185
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"SSL parametrai: (aplankykite Bitcoin Wiki dėl SSL nustatymų)\n"
+
+#: ../../../src/init.cpp:186
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Naudoti OpenSSL (https) JSON-RPC prisijungimui\n"
+
+#: ../../../src/init.cpp:187
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "Serverio sertifikato failas (pagal nutylėjimą: server.cert)\n"
+
+#: ../../../src/init.cpp:188
+msgid "Server private key (default: server.pem)\n"
+msgstr "Serverio privatus raktas (pagal nutylėjimą: server.pem)\n"
+
+#: ../../../src/init.cpp:189
+msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+msgstr "Priimtinas šifras (pagal nutylėjimą: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+
+#: ../../../src/init.cpp:193
+msgid "This help message\n"
+msgstr "Ši pagalbos žinutė\n"
+
+#: ../../../src/init.cpp:330
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "Neranda duomenų directorijos %s. Bitcoin programa tikriausiai jau paleista."
+
+#: ../../../src/init.cpp:356
+msgid "Error loading addr.dat \n"
+msgstr "Klaida nuskaitant addr.dat \n"
+
+#: ../../../src/init.cpp:362
+msgid "Error loading blkindex.dat \n"
+msgstr "Klaida nuskaitant blkindex.dat \n"
+
+#: ../../../src/init.cpp:369
+msgid "Error loading wallet.dat \n"
+msgstr "Klaida nuskaitant wallet.dat \n"
+
+#: ../../../src/init.cpp:449
+msgid "Invalid -proxy address"
+msgstr "Klaidingas -proxy adresas"
+
+#: ../../../src/init.cpp:472
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Klaidinga suma -paytxfee=<amount>"
+
+#: ../../../src/init.cpp:476
+msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."
+msgstr "Perspėjimas: -paytxfee yra nustatyta labai aukšta suma. Ši suma bus nuskaičiuota kaip mokestis darant pervedimą"
+
+#: ../../../src/uibase.h:147
+msgid "Transaction Details"
+msgstr "Pervedimų detalės"
+
+#: ../../../src/uibase.h:199
+msgid "Options"
+msgstr "Parametrai"
+
+#: ../../../src/uibase.h:228
+msgid "About Bitcoin"
+msgstr "Apie Bitcoin"
+
+#: ../../../src/uibase.h:337
+msgid "Your Bitcoin Addresses"
+msgstr "Jūsų Bitcoin Adresas"
+
+#~ msgid ""
+#~ "Error: This is an oversized transaction that requires a transaction fee "
+#~ "of %s "
+#~ msgstr ""
+#~ "Klaida: Šis pervedimas yra labai didelis ir reikalauja %s pervedimo mokesčio "
+#~ "%s "
+
+#~ msgid "version %s%s BETA"
+#~ msgstr "versija %s%s beta"
+
+#~ msgid "n/a"
+#~ msgstr "netaikoma"
+
+#~ msgid "Can't include a message when sending to a Bitcoin address"
+#~ msgstr "Negalite pridėti žinutės kai siunčiate i Bitcoin adresą"
+
+#~ msgid ""
+#~ "This is an oversized transaction that requires a transaction fee of %s"
+#~ msgstr "Šis pervedimas yra per didelis ir reikalauja pervedimo mokesčio %s"
+
+#~ msgid "&Generate Coins"
+#~ msgstr "&Generuoti monetas"
+
+#~ msgid ""
+#~ "Optional transaction fee you give to the nodes that process your "
+#~ "transactions."
+#~ msgstr "Pasirinktinas pervedimo mokestis, kurį duodate tinklo nodams."
+
+#~ msgid "&Limit coin generation to"
+#~ msgstr "&Apriboti monetų generavima iki"
+
+#~ msgid "processors"
+#~ msgstr "procesorių"
+
+#~ msgid "&From:"
+#~ msgstr "&Nuo:"
+
+#~ msgid "&Message:"
+#~ msgstr "Ž&inutė:"
+
+#~ msgid ""
+#~ "It's good policy to use a new address for each payment you receive.\n"
+#~ "\n"
+#~ "Label"
+#~ msgstr ""
+#~ "Rekomenduojama naudoti naują adresą kiekvienam pervedimui, kurį jūs gaunate.\n"
+#~ "\n"
+#~ "Pavadinimas"
+
+#~ msgid "Will appear as \"From: Unknown\""
+#~ msgstr "Bus rodoma kaip \"Nuo: Nežinomo\""
diff --git a/locale/nl/LC_MESSAGES/bitcoin.mo b/locale/nl/LC_MESSAGES/bitcoin.mo
index 11a547e411..3a80d8f74d 100644
--- a/locale/nl/LC_MESSAGES/bitcoin.mo
+++ b/locale/nl/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/nl/LC_MESSAGES/bitcoin.po b/locale/nl/LC_MESSAGES/bitcoin.po
index 399ad8b871..a896b45dd2 100644
--- a/locale/nl/LC_MESSAGES/bitcoin.po
+++ b/locale/nl/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 19:27+0100\n"
-"Last-Translator: Xunie\n"
+"POT-Creation-Date: 2011-05-15 18:23+0100\n"
+"PO-Revision-Date: 2011-05-15 18:23+0100\n"
+"Last-Translator: Pieter Wuille <sipa@ulyssis.org>\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,444 +14,365 @@ msgstr ""
"X-Poedit-Basepath: .\n"
"X-Poedit-SearchPath-0: ../../..\n"
-#: ../../../init.cpp:342
-msgid "Usage: bitcoin [options]"
-msgstr "Commandoregel: bitcoin [opties]"
-
-#: ../../../init.cpp:343
-msgid "Options:\n"
-msgstr "Opties:\n"
-
-#: ../../../init.cpp:344
-msgid "Generate coins\n"
-msgstr "Genereer coins\n"
-
-#: ../../../init.cpp:345
-msgid "Don't generate coins\n"
-msgstr "Genereer geen coins\n"
-
-#: ../../../init.cpp:346
-msgid "Start minimized\n"
-msgstr "Geminimaliseerd starten\n"
-
-#: ../../../init.cpp:347
-msgid "Specify data directory\n"
-msgstr "Stel datamap in\n"
-
-#: ../../../init.cpp:348
-msgid "Connect through socks4 proxy\n"
-msgstr "Verbind via socks4 proxy\n"
-
-#: ../../../init.cpp:349
-msgid "Add a node to connect to\n"
-msgstr "Voeg een node toe om mee te verbinden\n"
-
-#: ../../../init.cpp:350
-msgid "Connect only to the specified node\n"
-msgstr "Verbind alleen met deze node\n"
-
-#: ../../../init.cpp:351
-msgid "This help message\n"
-msgstr "Dit helpbericht\n"
-
-#: ../../../init.cpp:455
-msgid "Error loading addr.dat \n"
-msgstr "Fout bij laden van bestand addr.dat \n"
-
-#: ../../../init.cpp:461
-msgid "Error loading blkindex.dat \n"
-msgstr "Fout bij laden van bestand blkindex.dat \n"
-
-#: ../../../init.cpp:468
-msgid "Error loading wallet.dat \n"
-msgstr "Fout bij laden van bestand wallet.dat \n"
-
-#: ../../../init.cpp:536
-msgid "Invalid -proxy address"
-msgstr "Foutief -proxy adres"
-
-#: ../../../init.cpp:629
-msgid "Program has crashed and will terminate. "
-msgstr "Het programma is gecrasht en wordt afgesloten. "
-
-#: ../../../main.cpp:1465
-msgid "Warning: Disk space is low "
-msgstr "Waarschuwing: Weinig schijfruimte over "
-
-#: ../../../main.cpp:2994
+#: ../../../src/net.cpp:1499
#, c-format
-msgid "Error: This is an oversized transaction that requires a transaction fee of %s "
-msgstr "Fout: Dit is een te grote transactie, die een fooi vereist van %s "
-
-#: ../../../main.cpp:2996
-msgid "Error: Transaction creation failed "
-msgstr "Fout: Aanmaken van transactie mislukt "
-
-#: ../../../main.cpp:3001
-#: ../../../ui.cpp:1761
-#: ../../../ui.cpp:1763
-#: ../../../ui.cpp:1904
-#: ../../../ui.cpp:2053
-msgid "Sending..."
-msgstr "Versturen..."
-
-#: ../../../main.cpp:3005
-msgid "Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."
-msgstr "Fout: De transactie is afgekeurd. Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven. Dit kan veroorzaakt worden doordat je een kopie van wallet.dat gebruikt hebt en enkel daar je uitgave geregistreerd is."
-
-#: ../../../main.cpp:3017
-msgid "Invalid amount"
-msgstr "Foutieve hoeveelheid"
-
-#: ../../../main.cpp:3019
-#: ../../../ui.cpp:1971
-#: ../../../ui.cpp:2038
-msgid "Insufficient funds"
-msgstr "Onvoldoende saldo"
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "Kan niet binden met poort %d op deze computer. Bitcoin draait vermoedelijk reeds."
-#: ../../../main.cpp:3024
-msgid "Invalid bitcoin address"
-msgstr "Foutief bitcoin-adres"
-
-#: ../../../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 "Deze transactie overschrijdt de limiet. Om de transactie alsnog te verwerken kun je een fooi betalen van %s. Deze zal betaald worden aan de node die uw transactie verwerkt. Wil je doorgaan en deze fooi betalen?"
-#: ../../../ui.cpp:285
+#: ../../../src/ui.cpp:301
msgid "Status"
msgstr "Status"
-#: ../../../ui.cpp:286
+#: ../../../src/ui.cpp:302
msgid "Date"
msgstr "Datum"
-#: ../../../ui.cpp:287
+#: ../../../src/ui.cpp:303
msgid "Description"
msgstr "Beschrijving"
-#: ../../../ui.cpp:288
+#: ../../../src/ui.cpp:304
msgid "Debit"
msgstr "Debet"
-#: ../../../ui.cpp:289
+#: ../../../src/ui.cpp:305
msgid "Credit"
msgstr "Credit"
-#: ../../../ui.cpp:489
+#: ../../../src/ui.cpp:511
#, c-format
msgid "Open for %d blocks"
msgstr "Open gedurende %d blokken"
-#: ../../../ui.cpp:491
+#: ../../../src/ui.cpp:513
#, c-format
msgid "Open until %s"
msgstr "Open tot %s"
-#: ../../../ui.cpp:497
+#: ../../../src/ui.cpp:519
#, c-format
msgid "%d/offline?"
msgstr "%d/offline?"
-#: ../../../ui.cpp:499
+#: ../../../src/ui.cpp:521
#, c-format
msgid "%d/unconfirmed"
msgstr "%d/niet bevestigd"
-#: ../../../ui.cpp:501
+#: ../../../src/ui.cpp:523
#, c-format
msgid "%d confirmations"
msgstr "%d bevestigingen"
-#: ../../../ui.cpp:584
+#: ../../../src/ui.cpp:608
msgid "Generated"
msgstr "Gegenereerd"
-#: ../../../ui.cpp:592
+#: ../../../src/ui.cpp:616
#, c-format
msgid "Generated (%s matures in %d more blocks)"
msgstr "Gegenereerd (%s wordt volwassen over %d blokken)"
-#: ../../../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 "Gegenereerd - Waarschuwing: Dit blok is niet ontvangen door andere nodes en zal waarschijnlijk niet geaccepteerd worden!"
-#: ../../../ui.cpp:600
+#: ../../../src/ui.cpp:624
msgid "Generated (not accepted)"
msgstr "Gegenereerd (niet geaccepteerd)"
-#: ../../../ui.cpp:610
+#: ../../../src/ui.cpp:634
msgid "From: "
msgstr "Van: "
-#: ../../../ui.cpp:634
+#: ../../../src/ui.cpp:658
msgid "Received with: "
msgstr "Ontvangen op: "
-#: ../../../ui.cpp:676
+#: ../../../src/ui.cpp:704
msgid "Payment to yourself"
-msgstr "Betaling naar uzelf"
+msgstr "Betaling aan uzelf"
-#: ../../../ui.cpp:713
+#: ../../../src/ui.cpp:738
msgid "To: "
msgstr "Naar: "
-#: ../../../ui.cpp:1009
+#: ../../../src/ui.cpp:1053
msgid " Generating"
msgstr " Genereren..."
-#: ../../../ui.cpp:1011
+#: ../../../src/ui.cpp:1055
msgid "(not connected)"
msgstr "(niet verbonden)"
-#: ../../../ui.cpp:1014
+#: ../../../src/ui.cpp:1058
#, c-format
msgid " %d connections %d blocks %d transactions"
msgstr " %d verbindingen %d blokken %d transacties"
-#: ../../../ui.cpp:1123
-#: ../../../ui.cpp:2351
+#: ../../../src/ui.cpp:1163
+#: ../../../src/ui.cpp:2527
msgid "New Receiving Address"
msgstr "Nieuw Ontvangstadres"
-#: ../../../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 ""
-"Het is een goede gewoonte om voor iedere betaling die je ontvangt een nieuw adres aan te maken.\n"
+"Het is een goede gewoonte om voor iedere betaling die je ontvangt een nieuw adres te gebruiken.\n"
"\n"
"Label"
-#: ../../../ui.cpp:1193
+#: ../../../src/ui.cpp:1233
msgid "<b>Status:</b> "
msgstr "<b>Status:</b> "
-#: ../../../ui.cpp:1198
+#: ../../../src/ui.cpp:1238
msgid ", has not been successfully broadcast yet"
msgstr ", is nog niet succesvol verstuurd naar het netwerk"
-#: ../../../ui.cpp:1200
+#: ../../../src/ui.cpp:1240
#, c-format
msgid ", broadcast through %d node"
msgstr ", verstuurd via %d node"
-#: ../../../ui.cpp:1202
+#: ../../../src/ui.cpp:1242
#, c-format
msgid ", broadcast through %d nodes"
msgstr ", verstuurd via %d nodes"
-#: ../../../ui.cpp:1206
+#: ../../../src/ui.cpp:1246
msgid "<b>Date:</b> "
msgstr "<b>Datum:</b> "
-#: ../../../ui.cpp:1214
+#: ../../../src/ui.cpp:1254
msgid "<b>Source:</b> Generated<br>"
msgstr "<b>Bron:</b> Gegenereerd<br>"
-#: ../../../ui.cpp:1220
-#: ../../../ui.cpp:1238
+#: ../../../src/ui.cpp:1260
+#: ../../../src/ui.cpp:1278
msgid "<b>From:</b> "
msgstr "<b>Van:</b> "
-#: ../../../ui.cpp:1238
+#: ../../../src/ui.cpp:1278
msgid "unknown"
msgstr "onbekend"
-#: ../../../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>Naar:</b> "
-#: ../../../ui.cpp:1242
+#: ../../../src/ui.cpp:1282
msgid " (yours, label: "
msgstr " (van jou, label: "
-#: ../../../ui.cpp:1244
-#, fuzzy
+#: ../../../src/ui.cpp:1284
msgid " (yours)"
msgstr " (van jou)"
-#: ../../../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>Credit:</b>"
-#: ../../../ui.cpp:1283
+#: ../../../src/ui.cpp:1323
#, c-format
msgid "(%s matures in %d more blocks)"
msgstr "(%s wordt volwassen over %d blokken)"
-#: ../../../ui.cpp:1285
+#: ../../../src/ui.cpp:1325
msgid "(not accepted)"
msgstr "(niet geaccepteerd)"
-#: ../../../ui.cpp:1330
-#: ../../../ui.cpp:1353
+#: ../../../src/ui.cpp:1370
+#: ../../../src/ui.cpp:1378
+#: ../../../src/ui.cpp:1393
msgid "<b>Debit:</b> "
msgstr "<b>Debet:</b>"
-#: ../../../ui.cpp:1344
+#: ../../../src/ui.cpp:1384
msgid "<b>Transaction fee:</b> "
msgstr "<b>Transactiefooi:</b> "
-#: ../../../ui.cpp:1360
+#: ../../../src/ui.cpp:1400
msgid "<b>Net amount:</b> "
msgstr "<b>Nettobedrag:</b> "
-#: ../../../ui.cpp:1367
+#: ../../../src/ui.cpp:1407
msgid "Message:"
msgstr "Mededeling:"
-#: ../../../ui.cpp:1370
+#: ../../../src/ui.cpp:1409
+msgid "Comment:"
+msgstr "Commentaar:"
+
+#: ../../../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 "Gegenereerde coins mogen pas na een wachttijd van 120 blokken uitgegeven worden. Op het moment dat dit blok gegenereerd werd, is het naar het netwerk verzonden om aan de blokkenreeks toegevoegd te worden. Als het niet succesvol in de blokkenreeks opgenomen kan worden verandert de status in \"niet geaccepteerd\" en kan het niet uitegegeven worden. Dit kan soms gebeuren als een andere node op ongeveer hetzelfde moment een blok genereert."
-#: ../../../ui.cpp:1437
+#: ../../../src/ui.cpp:1592
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "Kan niet schrijven naar het bestand autostart/bitcoin.desktop"
+
+#: ../../../src/ui.cpp:1628
msgid "Main"
msgstr "Algemeen"
-#: ../../../ui.cpp:1442
+#: ../../../src/ui.cpp:1636
+msgid "&Start Bitcoin on window system startup"
+msgstr "&Start Bitcoin wanneer het systeem opstart"
+
+#: ../../../src/ui.cpp:1643
msgid "&Minimize on close"
msgstr "&Minimaliseer bij sluiten van het venster"
-#: ../../../ui.cpp:1595
+#: ../../../src/ui.cpp:1785
#, c-format
-msgid "version %s%s BETA"
-msgstr "versie %s%s BETA"
+msgid "version %s"
+msgstr "versie %s"
-#: ../../../ui.cpp:1681
-msgid "Will appear as \"From: Unknown\""
-msgstr "Wordt weergegeven als \"Van: Onbekend\""
-
-#: ../../../ui.cpp:1681
-msgid "n/a"
-msgstr "Onbekend"
-
-#: ../../../ui.cpp:1681
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: ../../../ui.cpp:1682
-msgid "Can't include a message when sending to a Bitcoin address"
-msgstr "Kan geen mededeling bijvoegen bij gebruik van bitcoin-adressen"
-
-#: ../../../ui.cpp:1735
+#: ../../../src/ui.cpp:1897
msgid "Error in amount "
msgstr "Fout in hoeveelheid "
-#: ../../../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 "Verstuur coins"
-#: ../../../ui.cpp:1740
+#: ../../../src/ui.cpp:1902
msgid "Amount exceeds your balance "
msgstr "Hoeveelheid overschrijdt uw huidige balans "
-#: ../../../ui.cpp:1745
+#: ../../../src/ui.cpp:1907
msgid "Total exceeds your balance when the "
msgstr "Totaal overschrijdt uw huidige balans wanneer de "
-#: ../../../ui.cpp:1745
+#: ../../../src/ui.cpp:1907
msgid " transaction fee is included "
msgstr " transactiefooi is meegerekend "
-#: ../../../ui.cpp:1761
+#: ../../../src/ui.cpp:1925
msgid "Payment sent "
msgstr "Betaling verzonden "
-#: ../../../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 "Versturen..."
+
+#: ../../../src/ui.cpp:1942
msgid "Invalid address "
msgstr "Foutief adres "
-#: ../../../ui.cpp:1825
+#: ../../../src/ui.cpp:1995
#, c-format
msgid "Sending %s to %s"
msgstr "%s versturen naar %s"
-#: ../../../ui.cpp:1898
-#: ../../../ui.cpp:1931
+#: ../../../src/ui.cpp:2068
+#: ../../../src/ui.cpp:2101
msgid "CANCELLED"
msgstr "GEANNULEERD"
-#: ../../../ui.cpp:1902
+#: ../../../src/ui.cpp:2072
msgid "Cancelled"
msgstr "Geannuleerd"
-#: ../../../ui.cpp:1904
+#: ../../../src/ui.cpp:2074
msgid "Transfer cancelled "
msgstr "Transactie geannuleerd "
-#: ../../../ui.cpp:1957
+#: ../../../src/ui.cpp:2127
msgid "Error: "
msgstr "Fout: "
-#: ../../../ui.cpp:1976
+#: ../../../src/ui.cpp:2141
+#: ../../../src/ui.cpp:2212
+#: ../../../src/main.cpp:4018
+msgid "Insufficient funds"
+msgstr "Onvoldoende saldo"
+
+#: ../../../src/ui.cpp:2146
msgid "Connecting..."
msgstr "Verbinden..."
-#: ../../../ui.cpp:1981
+#: ../../../src/ui.cpp:2151
msgid "Unable to connect"
msgstr "Kan niet verbinden"
-#: ../../../ui.cpp:1986
+#: ../../../src/ui.cpp:2156
msgid "Requesting public key..."
msgstr "Aanvragen van publieke sleutel..."
-#: ../../../ui.cpp:1998
+#: ../../../src/ui.cpp:2168
msgid "Received public key..."
msgstr "Publieke sleutel ontvangen..."
-#: ../../../ui.cpp:2010
+#: ../../../src/ui.cpp:2182
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "Ontvanger aanvaardt geen transacties via IP adres"
+
+#: ../../../src/ui.cpp:2184
msgid "Transfer was not accepted"
msgstr "Transactie niet geaccepteerd"
-#: ../../../ui.cpp:2019
+#: ../../../src/ui.cpp:2193
msgid "Invalid response received"
msgstr "Foutief antwoord ontvangen"
-#: ../../../ui.cpp:2034
+#: ../../../src/ui.cpp:2208
msgid "Creating transaction..."
msgstr "Transactie aanmaken..."
-#: ../../../ui.cpp:2046
+#: ../../../src/ui.cpp:2220
#, c-format
-msgid "This is an oversized transaction that requires a transaction fee of %s"
-msgstr "Fout: Dit is een te grote transactie, die een fooi vereist van %s"
+msgid "This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds"
+msgstr "Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen fonden"
-#: ../../../ui.cpp:2048
+#: ../../../src/ui.cpp:2222
msgid "Transaction creation failed"
msgstr "Aanmaken van transactie mislukt"
-#: ../../../ui.cpp:2055
+#: ../../../src/ui.cpp:2229
msgid "Transaction aborted"
msgstr "Transactie geannuleerd"
-#: ../../../ui.cpp:2063
+#: ../../../src/ui.cpp:2237
msgid "Lost connection, transaction cancelled"
msgstr "Verbinding verloren, transactie geannuleerd"
-#: ../../../ui.cpp:2079
+#: ../../../src/ui.cpp:2253
msgid "Sending payment..."
msgstr "Betaling versturen..."
-#: ../../../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 "Fout: De transactie is afgekeurd. Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven. Dit kan veroorzaakt worden doordat je een kopie van wallet.dat gebruikt hebt en enkel daar je uitgave geregistreerd is."
-#: ../../../ui.cpp:2092
+#: ../../../src/ui.cpp:2268
msgid "Waiting for confirmation..."
msgstr "Wachten op bevestiging..."
-#: ../../../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"
@@ -460,239 +382,305 @@ msgstr ""
"De transactie is opgenomen en wordt uitbetaald aan de ontvanger,\n"
"maar het mededelings-veld blijft blanco."
-#: ../../../ui.cpp:2119
+#: ../../../src/ui.cpp:2295
msgid "Payment was sent, but an invalid response was received"
msgstr "Betaling is verstuurd, maar een foutief antword is ontvangen."
-#: ../../../ui.cpp:2125
+#: ../../../src/ui.cpp:2301
msgid "Payment completed"
msgstr "Betaling voltooid"
-#: ../../../ui.cpp:2156
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2339
+#: ../../../src/ui.cpp:2332
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2515
msgid "Name"
msgstr "Naam"
-#: ../../../ui.cpp:2157
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2339
+#: ../../../src/ui.cpp:2333
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2515
msgid "Address"
msgstr "Adres"
-#: ../../../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 "Bitcoin-adres"
-#: ../../../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 "Dit is een van uw eigen adressen voor het ontvangen van betalingen, en kan niet worden toegevoegd aan uw adresboek. "
-#: ../../../ui.cpp:2302
-#: ../../../ui.cpp:2308
+#: ../../../src/ui.cpp:2478
+#: ../../../src/ui.cpp:2484
msgid "Edit Address"
msgstr "Bewerk adres"
-#: ../../../ui.cpp:2314
+#: ../../../src/ui.cpp:2490
msgid "Edit Address Label"
msgstr "Bewerk adreslabel"
-#: ../../../ui.cpp:2339
-#: ../../../ui.cpp:2345
+#: ../../../src/ui.cpp:2515
+#: ../../../src/ui.cpp:2521
msgid "Add Address"
msgstr "Adres toevoegen"
-#: ../../../ui.cpp:2421
+#: ../../../src/ui.cpp:2598
msgid "Bitcoin"
msgstr "Bitcoin"
-#: ../../../ui.cpp:2423
+#: ../../../src/ui.cpp:2600
msgid "Bitcoin - Generating"
msgstr "Bitcoin - Genereren..."
-#: ../../../ui.cpp:2425
+#: ../../../src/ui.cpp:2602
msgid "Bitcoin - (not connected)"
msgstr "Bitcoin - (niet verbonden)"
-#: ../../../ui.cpp:2500
+#: ../../../src/ui.cpp:2681
msgid "&Open Bitcoin"
msgstr "&Open Bitcoin"
-#: ../../../ui.cpp:2501
+#: ../../../src/ui.cpp:2682
+msgid "&Send Bitcoins"
+msgstr "&Open Bitcoin"
+
+#: ../../../src/ui.cpp:2683
msgid "O&ptions..."
msgstr "O&pties"
-#: ../../../ui.cpp:2505
-#: ../../../uibase.cpp:27
+#: ../../../src/ui.cpp:2686
+#: ../../../src/uibase.cpp:25
msgid "E&xit"
msgstr "A&fsluiten"
-#: ../../../uibase.cpp:30
+#: ../../../src/ui.cpp:2902
+msgid "Program has crashed and will terminate. "
+msgstr "Het programma is gecrasht en wordt afgesloten. "
+
+#: ../../../src/main.cpp:1868
+msgid "Warning: Disk space is low "
+msgstr "Waarschuwing: Weinig schijfruimte over "
+
+#: ../../../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 "Fout: Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen fonden "
+
+#: ../../../src/main.cpp:3994
+msgid "Error: Transaction creation failed "
+msgstr "Fout: Aanmaken van transactie mislukt "
+
+#: ../../../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 "Fout: De transactie is afgekeurd. Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven. Dit kan veroorzaakt worden doordat je een kopie van wallet.dat gebruikt hebt en enkel daar je uitgave geregistreerd is."
+
+#: ../../../src/main.cpp:4016
+msgid "Invalid amount"
+msgstr "Foutieve hoeveelheid"
+
+#: ../../../src/main.cpp:4023
+msgid "Invalid bitcoin address"
+msgstr "Foutief bitcoin-adres"
+
+#: ../../../src/rpc.cpp:1800
+#: ../../../src/rpc.cpp:1802
+#, c-format
+msgid "To use the %s option"
+msgstr "Om de %s optie te gebruiken"
+
+#: ../../../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 ""
+"Waarschuwing: %s, rpcpassword=<password> moet ingesteld zijn\n"
+"in het configuratie bestand: %s\n"
+"Als het bestand nog niet bestaat, maak het dan aan met enkel-leesbaar-door-eigenaar rechten.\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.\n"
+msgstr ""
+"rpcpassword=<password> moet ingesteld in het configuratie bestand:\n"
+"%s\n"
+"Als het bestand nog niet bestaat, maak het dan aan met enkel-leesbaar-door-eigenaar rechten.\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 "Waarschuwing: Controleer of uw computers datum en tijd correct ingesteld zijn. Als uw klok fout staat zal Bitcoin niet correct werken."
+
+#: ../../../src/util.cpp:898
+msgid "-beta"
+msgstr "-beta"
+
+#: ../../../src/uibase.cpp:28
msgid "&File"
msgstr "&Bestand"
-#: ../../../uibase.cpp:38
+#: ../../../src/uibase.cpp:32
msgid "&Your Receiving Addresses..."
msgstr "&Uw ontvangstadressen..."
-#: ../../../uibase.cpp:42
+#: ../../../src/uibase.cpp:36
msgid "&Options..."
msgstr "&Opties..."
-#: ../../../uibase.cpp:45
+#: ../../../src/uibase.cpp:39
msgid "&Settings"
msgstr "&Eigenschappen"
-#: ../../../uibase.cpp:49
+#: ../../../src/uibase.cpp:43
msgid "&About..."
msgstr "&Over..."
-#: ../../../uibase.cpp:52
+#: ../../../src/uibase.cpp:46
msgid "&Help"
msgstr "&Help"
-#: ../../../uibase.cpp:62
+#: ../../../src/uibase.cpp:56
msgid "Address Book"
msgstr "Adresboek"
-#: ../../../uibase.cpp:77
+#: ../../../src/uibase.cpp:69
msgid "Your Bitcoin Address:"
msgstr "Uw bitcoin-adres:"
-#: ../../../uibase.cpp:84
+#: ../../../src/uibase.cpp:76
msgid " &New... "
msgstr " &Nieuw... "
-#: ../../../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 " &Kopieer naar plakbord "
-#: ../../../uibase.cpp:102
+#: ../../../src/uibase.cpp:93
msgid "Balance:"
msgstr "Balans:"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " All"
msgstr " Alles"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " Sent"
msgstr " Verstuurd"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " Received"
msgstr " Ontvangen"
-#: ../../../uibase.cpp:121
+#: ../../../src/uibase.cpp:109
msgid " In Progress"
msgstr " Wordt verwerkt"
-#: ../../../uibase.cpp:142
+#: ../../../src/uibase.cpp:130
msgid "All Transactions"
msgstr "Alle transacties"
-#: ../../../uibase.cpp:153
+#: ../../../src/uibase.cpp:141
msgid "Sent/Received"
msgstr "Verstuurd/Ontvangen"
-#: ../../../uibase.cpp:164
+#: ../../../src/uibase.cpp:152
msgid "Sent"
msgstr "Verstuurd"
-#: ../../../uibase.cpp:175
+#: ../../../src/uibase.cpp:163
msgid "Received"
msgstr "Ontvangen"
-#: ../../../uibase.cpp:318
-#: ../../../uibase.cpp:479
-#: ../../../uibase.cpp:580
-#: ../../../uibase.cpp:793
-#: ../../../uibase.cpp:854
-#: ../../../uibase.cpp:963
-#: ../../../uibase.cpp:1052
+#: ../../../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 "Optionele transactiefooi die u geeft aan de nodes die uw transacties verwerken."
-
-#: ../../../uibase.cpp:370
-msgid "Transaction fee:"
-msgstr "Transactiefooi:"
-
-#: ../../../uibase.cpp:386
-msgid "&Limit coin generation to"
-msgstr "&Limiteer coin-generatie tot"
-
-#: ../../../uibase.cpp:393
-msgid "processors"
-msgstr "processors"
-
-#: ../../../uibase.cpp:399
+#: ../../../src/uibase.cpp:345
msgid "&Start Bitcoin on system startup"
msgstr "&Start Bitcoin wanneer het systeem opstart"
-#: ../../../uibase.cpp:403
+#: ../../../src/uibase.cpp:348
msgid "&Minimize to the tray instead of the taskbar"
msgstr "&Minimaliseer tot systeemvak in plaats van de taakbalk"
-#: ../../../uibase.cpp:407
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "Portmapping via &UPnP"
+
+#: ../../../src/uibase.cpp:354
msgid "M&inimize to the tray on close"
msgstr "M&inimaliseer tot taakbalk bij sluiten"
-#: ../../../uibase.cpp:414
+#: ../../../src/uibase.cpp:360
msgid "&Connect through socks4 proxy: "
msgstr "&Verbind via socks4 proxy: "
-#: ../../../uibase.cpp:426
+#: ../../../src/uibase.cpp:371
msgid "Proxy &IP:"
msgstr "Proxy &IP:"
-#: ../../../uibase.cpp:434
+#: ../../../src/uibase.cpp:379
msgid " &Port:"
msgstr " &Poort:"
-#: ../../../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 "Optionele transactiefooi per KB die helpt ervoor zorgen dat uw transacties snel verwerkt worden. De meeste transacties zijn 1KB. Fooi 0.01 is aangeraden."
+
+#: ../../../src/uibase.cpp:399
+msgid "Pay transaction fee:"
+msgstr "Transactiefooi:"
+
+#: ../../../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 "Annuleren"
-#: ../../../uibase.cpp:485
+#: ../../../src/uibase.cpp:449
msgid "&Apply"
msgstr "&Toepassen"
-#: ../../../uibase.cpp:546
+#: ../../../src/uibase.cpp:508
msgid "Bitcoin "
msgstr "Bitcoin "
-#: ../../../uibase.cpp:552
+#: ../../../src/uibase.cpp:514
msgid "version"
msgstr "versie"
-#: ../../../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"
@@ -715,47 +703,39 @@ msgstr ""
"software geschreven door Eric Young (eay@cryptsoft.com)) en UPnP software geschreven\n"
"door Thomas Bernard."
-#: ../../../uibase.cpp:619
-msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)"
-msgstr "Voer een bitcoin-adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) of IP-adres (bijvoorbeeld: 123.45.6.7) in."
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Voer een bitcoin-adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-#: ../../../uibase.cpp:633
+#: ../../../src/uibase.cpp:595
msgid "Pay &To:"
msgstr "Betaal &aan:"
-#: ../../../uibase.cpp:648
+#: ../../../src/uibase.cpp:610
msgid "&Paste"
msgstr "&Plakken"
-#: ../../../uibase.cpp:651
+#: ../../../src/uibase.cpp:613
msgid " Address &Book..."
msgstr " Adres&boek..."
-#: ../../../uibase.cpp:658
+#: ../../../src/uibase.cpp:620
msgid "&Amount:"
msgstr "&Hoeveelheid:"
-#: ../../../uibase.cpp:668
+#: ../../../src/uibase.cpp:630
msgid "T&ransfer:"
msgstr "O&verdracht:"
-#: ../../../uibase.cpp:674
+#: ../../../src/uibase.cpp:636
msgid " Standard"
msgstr " Standaard"
-#: ../../../uibase.cpp:696
-msgid "&From:"
-msgstr "&Van:"
-
-#: ../../../uibase.cpp:713
-msgid "&Message:"
-msgstr "&Mededeling:"
-
-#: ../../../uibase.cpp:730
+#: ../../../src/uibase.cpp:663
msgid "&Send"
msgstr "&Versturen"
-#: ../../../uibase.cpp:782
+#: ../../../src/uibase.cpp:711
msgid ""
"\n"
"\n"
@@ -765,48 +745,275 @@ msgstr ""
"\n"
"Verbinden..."
-#: ../../../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 "Dit zijn je bitcoin-adressen voor het ontvangen van betalingen. Het is een goed idee iedere afzender een ander adres te geven zodat je bij kunt houden wie je een betaling stuurt. Het geselecteerde adres is zichtbaar in het hoofdscherm."
-#: ../../../uibase.cpp:845
-#: ../../../uibase.cpp:957
+#: ../../../src/uibase.cpp:774
+#: ../../../src/uibase.cpp:886
msgid "&Edit..."
msgstr "&Bewerken..."
-#: ../../../uibase.cpp:848
-#: ../../../uibase.cpp:960
+#: ../../../src/uibase.cpp:777
+#: ../../../src/uibase.cpp:889
msgid " &New Address... "
msgstr " &Nieuw adres... "
-#: ../../../uibase.cpp:920
+#: ../../../src/uibase.cpp:849
msgid "Sending"
msgstr "Versturen..."
-#: ../../../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 "Dit zijn je bitcoin-adressen voor het ontvangen van betalingen. Het is een goed idee iedere afzender een ander adres te geven zodat je bij kunt houden wie je een betaling stuurt. Het geselecteerde adres is zichtbaar in het hoofdscherm."
-#: ../../../uibase.cpp:941
+#: ../../../src/uibase.cpp:870
msgid "Receiving"
msgstr "Ontvangen..."
-#: ../../../uibase.cpp:951
+#: ../../../src/uibase.cpp:880
msgid "&Delete"
msgstr "&Verwijderen"
-#: ../../../uibase.h:150
+#: ../../../src/init.cpp:145
+msgid " beta"
+msgstr " beta"
+
+#: ../../../src/init.cpp:147
+msgid "Bitcoin version"
+msgstr "Bitcoin "
+
+#: ../../../src/init.cpp:148
+msgid "Usage:"
+msgstr "Mededeling:"
+
+#: ../../../src/init.cpp:150
+msgid "Send command to -server or bitcoind\n"
+msgstr "Zend commando naar -server of bitcoind\n"
+
+#: ../../../src/init.cpp:151
+msgid "List commands\n"
+msgstr "List van commando's\n"
+
+#: ../../../src/init.cpp:152
+msgid "Get help for a command\n"
+msgstr "Toon hulp voor een commando\n"
+
+#: ../../../src/init.cpp:153
+msgid "Options:\n"
+msgstr "Opties:\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Specifieer configuratiebestand (standaard: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:155
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "Specifieer pid-bestand (standaard: bitcoind.pid)\n"
+
+#: ../../../src/init.cpp:156
+msgid "Generate coins\n"
+msgstr "Genereer coins\n"
+
+#: ../../../src/init.cpp:157
+msgid "Don't generate coins\n"
+msgstr "Genereer geen coins\n"
+
+#: ../../../src/init.cpp:158
+msgid "Start minimized\n"
+msgstr "Geminimaliseerd starten\n"
+
+#: ../../../src/init.cpp:159
+msgid "Specify data directory\n"
+msgstr "Stel datamap in\n"
+
+#: ../../../src/init.cpp:160
+msgid "Connect through socks4 proxy\n"
+msgstr "Verbind via socks4 proxy\n"
+
+#: ../../../src/init.cpp:161
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "Sta DNS-opzoeking toe voor addnode en connect\n"
+
+#: ../../../src/init.cpp:162
+msgid "Add a node to connect to\n"
+msgstr "Voeg een node toe om mee te verbinden\n"
+
+#: ../../../src/init.cpp:163
+msgid "Connect only to the specified node\n"
+msgstr "Verbind alleen met deze node\n"
+
+#: ../../../src/init.cpp:164
+msgid "Don't accept connections from outside\n"
+msgstr "Sta geen verbindingen van buitenaf toe\n"
+
+#: ../../../src/init.cpp:167
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "Probeer geen UPnP te gebruiken om de poort waarop geluisterd wordt te mappen\n"
+
+#: ../../../src/init.cpp:169
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Probeer UPnP te gebruiken om de poort waarop geluisterd wordt te mappen\n"
+
+#: ../../../src/init.cpp:172
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Fooi per KB om aan transacties die gezonden worden toe te voegen\n"
+
+#: ../../../src/init.cpp:174
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Aanvaard commandolijn en JSON-RPC commando's\n"
+
+#: ../../../src/init.cpp:177
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Draai in de achtergrond als daemon en aanvaard commando's\n"
+
+#: ../../../src/init.cpp:179
+msgid "Use the test network\n"
+msgstr "Gebruik het test-netwerk\n"
+
+#: ../../../src/init.cpp:180
+msgid "Username for JSON-RPC connections\n"
+msgstr "Gebruikersnaam voor JSON-RPC verbindingen\n"
+
+#: ../../../src/init.cpp:181
+msgid "Password for JSON-RPC connections\n"
+msgstr "Wachtwoord voor JSON-RPC verbindingen\n"
+
+#: ../../../src/init.cpp:182
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "Luister voor JSON-RPC verbindingen op <poort> (standaard: 8332)\n"
+
+#: ../../../src/init.cpp:183
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Enkel JSON-RPC verbindingen van opgegeven IP adres toestaan\n"
+
+#: ../../../src/init.cpp:184
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Zend commando's naar proces dat op <ip> draait (standaard: 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:185
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Stel sleutelpoelgrootte in op <n> (standaard: 100)\n"
+
+#: ../../../src/init.cpp:186
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Doorzoek de blokken database voor ontbrekende portefeuille-transacties\n"
+
+#: ../../../src/init.cpp:190
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"SSL opties: (zie de Bitcoin wiki voor SSL instructies)\n"
+
+#: ../../../src/init.cpp:191
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Gebruik OpenSSL (https) voor JSON-RPC verbindingen\n"
+
+#: ../../../src/init.cpp:192
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "Certificaat-bestand voor server (standaard: server.cert)\n"
+
+#: ../../../src/init.cpp:193
+msgid "Server private key (default: server.pem)\n"
+msgstr "Geheime sleutel voor server (standaard: server.pem)\n"
+
+#: ../../../src/init.cpp:194
+msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+msgstr "Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+
+#: ../../../src/init.cpp:198
+msgid "This help message\n"
+msgstr "Dit helpbericht\n"
+
+#: ../../../src/init.cpp:335
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "Kan geen lock op de gegevensdirectory %s verkrijgen. Bitcoin draait vermoedelijk reeds."
+
+#: ../../../src/init.cpp:361
+msgid "Error loading addr.dat \n"
+msgstr "Fout bij laden van bestand addr.dat \n"
+
+#: ../../../src/init.cpp:367
+msgid "Error loading blkindex.dat \n"
+msgstr "Fout bij laden van bestand blkindex.dat \n"
+
+#: ../../../src/init.cpp:374
+msgid "Error loading wallet.dat \n"
+msgstr "Fout bij laden van bestand wallet.dat \n"
+
+#: ../../../src/init.cpp:454
+msgid "Invalid -proxy address"
+msgstr "Foutief -proxy adres"
+
+#: ../../../src/init.cpp:477
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Ongeldig bedrag voor -paytxfee=<bedrag>"
+
+#: ../../../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 "Waarschuwing: -paytxfee is zeer hoog ingesteld. Dit is de fooi die betaald wordt bij het zenden van een transactie."
+
+#: ../../../src/uibase.h:147
msgid "Transaction Details"
msgstr "Transactiedetails"
-#: ../../../uibase.h:203
+#: ../../../src/uibase.h:199
msgid "Options"
msgstr "Opties"
-#: ../../../uibase.h:231
+#: ../../../src/uibase.h:228
msgid "About Bitcoin"
msgstr "Over Bitcoin"
-#: ../../../uibase.h:341
+#: ../../../src/uibase.h:337
msgid "Your Bitcoin Addresses"
msgstr "Uw bitcoin-adressen"
+
+#~ msgid "Usage: bitcoin [options]"
+#~ msgstr "Commandoregel: bitcoin [opties]"
+
+#~ msgid ""
+#~ "Error: This is an oversized transaction that requires a transaction fee "
+#~ "of %s "
+#~ msgstr "Fout: Dit is een te grote transactie, die een fooi vereist van %s "
+
+#~ msgid "version %s%s BETA"
+#~ msgstr "versie %s%s BETA"
+
+#~ msgid "Will appear as \"From: Unknown\""
+#~ msgstr "Wordt weergegeven als \"Van: Onbekend\""
+
+#~ msgid "n/a"
+#~ msgstr "Onbekend"
+
+#~ msgid "Unknown"
+#~ msgstr "Onbekend"
+
+#~ msgid "Can't include a message when sending to a Bitcoin address"
+#~ msgstr "Kan geen mededeling bijvoegen bij gebruik van bitcoin-adressen"
+
+#~ msgid ""
+#~ "This is an oversized transaction that requires a transaction fee of %s"
+#~ msgstr "Fout: Dit is een te grote transactie, die een fooi vereist van %s"
+
+#~ msgid ""
+#~ "Optional transaction fee you give to the nodes that process your "
+#~ "transactions."
+#~ msgstr ""
+#~ "Optionele transactiefooi die u geeft aan de nodes die uw transacties "
+#~ "verwerken."
+
+#~ msgid "&Limit coin generation to"
+#~ msgstr "&Limiteer coin-generatie tot"
+
+#~ msgid "processors"
+#~ msgstr "processors"
+
+#~ msgid "&From:"
+#~ msgstr "&Van:"
+
+#~ msgid "&Message:"
+#~ msgstr "&Mededeling:"
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..6b186054cb 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 (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
-#: ../../../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/locale/sv/LC_MESSAGES/bitcoin.po b/locale/sv/LC_MESSAGES/bitcoin.po
new file mode 100644
index 0000000000..fb46e15426
--- /dev/null
+++ b/locale/sv/LC_MESSAGES/bitcoin.po
@@ -0,0 +1,978 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-11 21:58+0100\n"
+"PO-Revision-Date: 2011-06-14 09:01+0100\n"
+"Last-Translator: Codler <github>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-Bookmarks: 35,145,-1,-1,-1,-1,-1,-1,-1,-1\n"
+"X-Poedit-SearchPath-0: ../../..\n"
+
+#: ../../../init.cpp:141
+msgid "Bitcoin version"
+msgstr "Bitcoin version"
+
+#: ../../../init.cpp:142
+msgid "Usage:"
+msgstr "Användning:"
+
+#: ../../../init.cpp:144
+msgid "Send command to -server or bitcoind\n"
+msgstr "Skicka kommando till -server eller bitcoind\n"
+
+#: ../../../init.cpp:145
+msgid "List commands\n"
+msgstr "Lista kommandon\n"
+
+#: ../../../init.cpp:146
+msgid "Get help for a command\n"
+msgstr "Få hjälp om kommandon\n"
+
+#: ../../../init.cpp:147
+msgid "Options:\n"
+msgstr "Val:\n"
+
+#: ../../../init.cpp:148
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "Ange konfigurationsfil (standard: bitcoin.conf)\n"
+
+#: ../../../init.cpp:149
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "Ange pid-fil (standard: bitcoind.pid)\n"
+
+#: ../../../init.cpp:150
+msgid "Generate coins\n"
+msgstr "Generera mynt\n"
+
+#: ../../../init.cpp:151
+msgid "Don't generate coins\n"
+msgstr "Generera inte mynt\n"
+
+#: ../../../init.cpp:152
+msgid "Start minimized\n"
+msgstr "Starta minimerad\n"
+
+#: ../../../init.cpp:153
+msgid "Specify data directory\n"
+msgstr "Ange data mappen\n"
+
+#: ../../../init.cpp:154
+msgid "Connect through socks4 proxy\n"
+msgstr "Anslut via socks4 proxy\n"
+
+#: ../../../init.cpp:155
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "Tillåt DNS uppslagningar för addnode och connect\n"
+
+#: ../../../init.cpp:156
+msgid "Add a node to connect to\n"
+msgstr "Lägg till en nod att ansluta till\n"
+
+#: ../../../init.cpp:157
+msgid "Connect only to the specified node\n"
+msgstr "Anslut endast till specifik nod\n"
+
+#: ../../../init.cpp:158
+msgid "Don't accept connections from outside\n"
+msgstr "Acceptera ej anslutningar från utsidan\n"
+
+#: ../../../init.cpp:161
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "Försöker inte använda UPnP till avslyssningsport\n"
+
+#: ../../../init.cpp:163
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "Försöker använda UPnP till avlyssningsport\n"
+
+#: ../../../init.cpp:166
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "Avgift per KB som läggs på transaktionen när du sänder\n"
+
+#: ../../../init.cpp:168
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "Accepterar kommandorad och JSON-RPC kommando\n"
+
+#: ../../../init.cpp:171
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "Kör i bakgrund som daemon och accepterar kommando\n"
+
+#: ../../../init.cpp:173
+msgid "Use the test network\n"
+msgstr "Använd test nätverk\n"
+
+#: ../../../init.cpp:174
+msgid "Username for JSON-RPC connections\n"
+msgstr "Användarnamn till JSON-RPC anslutning\n"
+
+#: ../../../init.cpp:175
+msgid "Password for JSON-RPC connections\n"
+msgstr "Lösenord till JSON-RPC anslutning\n"
+
+#: ../../../init.cpp:176
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "Lyssnar på JSON-RPC anslutningar på <port> (standard: 8332)\n"
+
+#: ../../../init.cpp:177
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "Tillåt JSON-RPC anslutningar från specifik IP-adress\n"
+
+#: ../../../init.cpp:178
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "Skicka kommando till noden som körs på <ip> (standard: 127.0.0.1)\n"
+
+#: ../../../init.cpp:179
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "Sätt nyckel pool storlek till <n> (standard: 100)\n"
+
+#: ../../../init.cpp:180
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "Scanna om block kedja efter saknade plånbokstransaktioner\n"
+
+#: ../../../init.cpp:184
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"SSL val: (Se på Bitcoin Wiki för SSL installation instruktioner)\n"
+
+#: ../../../init.cpp:185
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "Använd OpenSSL (https) till JSON-RPC anslutningar\n"
+
+#: ../../../init.cpp:186
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "Server certifikatfil (standard: server.cert)\n"
+
+#: ../../../init.cpp:187
+msgid "Server private key (default: server.pem)\n"
+msgstr "Server privat nyckel (standard: server.pem)\n"
+
+#: ../../../init.cpp:188
+msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+msgstr "Acceptabla krypteringar (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"
+
+#: ../../../init.cpp:192
+msgid "This help message\n"
+msgstr "Detta hjälpmeddelande\n"
+
+#: ../../../init.cpp:329
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "Kan inte sätta lås på data mappen %s. Bitcoin körs troligen redan."
+
+#: ../../../init.cpp:355
+msgid "Error loading addr.dat \n"
+msgstr "Fel vid laddning av addr.dat \n"
+
+#: ../../../init.cpp:361
+msgid "Error loading blkindex.dat \n"
+msgstr "Fel vid laddning av blkindex.dat \n"
+
+#: ../../../init.cpp:368
+msgid "Error loading wallet.dat \n"
+msgstr "Fel vid laddning av wallet.dat \n"
+
+#: ../../../init.cpp:448
+msgid "Invalid -proxy address"
+msgstr "Ogiltig -proxy adress"
+
+#: ../../../init.cpp:471
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "Ogiltig belopp på -paytxfee=<belopp>"
+
+#: ../../../init.cpp:475
+msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."
+msgstr "Varning: -paytxfee är satt väldigt högt. Denna är transaktionsavgiften som du kommer att betala om du skickar en transaktion."
+
+#: ../../../main.cpp:1866
+msgid "Warning: Disk space is low "
+msgstr "Varning: Diskutrymme är låg "
+
+#: ../../../main.cpp:3999
+#, 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 "Fel: Denna transaktion kräver en transaktionsavgift minst %s för dess belopp, komplexitet, eller användning av nyligen mottagna pengar "
+
+#: ../../../main.cpp:4001
+msgid "Error: Transaction creation failed "
+msgstr "Fel: Misslyckades att skapa transaktion "
+
+#: ../../../main.cpp:4006
+#: ../../../ui.cpp:1951
+#: ../../../ui.cpp:1956
+#: ../../../ui.cpp:2102
+#: ../../../ui.cpp:2255
+msgid "Sending..."
+msgstr "Skickar..."
+
+#: ../../../main.cpp:4010
+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 "Fel: Transaktionen blev nekad. Detta kan hända om några av dina mynt i din plånbok var redan spenderad. Till exempel om du använde en kopia av wallet.dat och mynten var redan spenderad i kopian, men som inte var markerad som spenderad här."
+
+#: ../../../main.cpp:4023
+msgid "Invalid amount"
+msgstr "Ogiltig belopp"
+
+#: ../../../main.cpp:4025
+#: ../../../ui.cpp:2169
+#: ../../../ui.cpp:2240
+msgid "Insufficient funds"
+msgstr "Otillräckligt med pengar"
+
+#: ../../../main.cpp:4030
+msgid "Invalid bitcoin address"
+msgstr "Ogiltig bitcoin adress"
+
+#: ../../../net.cpp:1505
+#, c-format
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "Det gick inte att binda till port %d på denna dator. Bitcoin körs troligen redan."
+
+#: ../../../rpc.cpp:1816
+#: ../../../rpc.cpp:1818
+#, c-format
+msgid "To use the %s option"
+msgstr "För att använda %s val"
+
+#: ../../../rpc.cpp:1820
+#, 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 ""
+"Varning: %s, du måste sätta rpcpassword=<lösenord>\n"
+"i konfigurationsfilen: %s\n"
+"Om filen inte existerar, skapa med ägare med filbehörigheten -readable-only.\n"
+
+#: ../../../rpc.cpp:1988
+#, 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 ""
+"Du måste sätta rpcpassword=<lösenord> i konfigurationsfilen:\n"
+"%s\n"
+"Om filen inte existerar, skapa med ägare med filbehörighete -readable-only."
+
+#: ../../../ui.cpp:211
+#, 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 "Denna transaktion är över storleksbegränsningen. Du kan fortfarande skicka mot en avgift på %s, som går till noderna som bearbetar din transaktion och hjälper att stödja nätverket. Vill du fortfarande betala avgiften?"
+
+#: ../../../ui.cpp:311
+msgid "Status"
+msgstr "Status"
+
+#: ../../../ui.cpp:312
+msgid "Date"
+msgstr "Datum"
+
+#: ../../../ui.cpp:313
+msgid "Description"
+msgstr "Beskrivning"
+
+#: ../../../ui.cpp:314
+msgid "Debit"
+msgstr "Debitera"
+
+#: ../../../ui.cpp:315
+msgid "Credit"
+msgstr "Kreditera"
+
+#: ../../../ui.cpp:521
+#, c-format
+msgid "Open for %d blocks"
+msgstr "Öppna för %d blocks"
+
+#: ../../../ui.cpp:523
+#, c-format
+msgid "Open until %s"
+msgstr "Öppen tills %s"
+
+#: ../../../ui.cpp:529
+#, c-format
+msgid "%d/offline?"
+msgstr "%d/offline?"
+
+#: ../../../ui.cpp:531
+#, c-format
+msgid "%d/unconfirmed"
+msgstr "%d/obekräftade"
+
+#: ../../../ui.cpp:533
+#, c-format
+msgid "%d confirmations"
+msgstr "%d bekräftelser"
+
+#: ../../../ui.cpp:618
+msgid "Generated"
+msgstr "Genererad"
+
+#: ../../../ui.cpp:626
+#, fuzzy, c-format
+msgid "Generated (%s matures in %d more blocks)"
+msgstr "Genererad (%s mogna i %d fler block)"
+
+#: ../../../ui.cpp:630
+msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
+msgstr "Genererad - Varning: Denna block har inte blivit mottagen av någon annan nod och kommer troligtvis inte bli accepterad"
+
+#: ../../../ui.cpp:634
+msgid "Generated (not accepted)"
+msgstr "Genererad (ej accepterad)"
+
+#: ../../../ui.cpp:644
+msgid "From: "
+msgstr "Från: "
+
+#: ../../../ui.cpp:668
+msgid "Received with: "
+msgstr "Mottagen med: "
+
+#: ../../../ui.cpp:714
+msgid "Payment to yourself"
+msgstr "Betalning till dig själv"
+
+#: ../../../ui.cpp:748
+msgid "To: "
+msgstr "Till: "
+
+#: ../../../ui.cpp:1063
+msgid " Generating"
+msgstr " Generering"
+
+#: ../../../ui.cpp:1065
+msgid "(not connected)"
+msgstr "(inte ansluten)"
+
+#: ../../../ui.cpp:1068
+#, c-format
+msgid " %d connections %d blocks %d transactions"
+msgstr " %d anslutningar %d block %d transaktioner"
+
+#: ../../../ui.cpp:1173
+#: ../../../ui.cpp:2566
+msgid "New Receiving Address"
+msgstr "Ny Mottagningsadress"
+
+#: ../../../ui.cpp:1174
+#: ../../../ui.cpp:2567
+msgid ""
+"You should use a new address for each payment you receive.\n"
+"\n"
+"Label"
+msgstr ""
+"Du borde använda en ny adress för varje betalning som du mottar.\n"
+"\n"
+"Etikett"
+
+#: ../../../ui.cpp:1246
+msgid "<b>Status:</b> "
+msgstr "<b>Status:</b> "
+
+#: ../../../ui.cpp:1251
+msgid ", has not been successfully broadcast yet"
+msgstr ", has not been successfully broadcast yet"
+
+#: ../../../ui.cpp:1253
+#, c-format
+msgid ", broadcast through %d node"
+msgstr ", broadcast genom %d nod"
+
+#: ../../../ui.cpp:1255
+#, c-format
+msgid ", broadcast through %d nodes"
+msgstr ", broadcast genom %d noder"
+
+#: ../../../ui.cpp:1259
+msgid "<b>Date:</b> "
+msgstr "<b>Datum:</b> "
+
+#: ../../../ui.cpp:1267
+msgid "<b>Source:</b> Generated<br>"
+msgstr "<b>Källa:</b> Genererad<br>"
+
+#: ../../../ui.cpp:1273
+#: ../../../ui.cpp:1291
+msgid "<b>From:</b> "
+msgstr "<b>Från:</b> "
+
+#: ../../../ui.cpp:1291
+msgid "unknown"
+msgstr "okänd"
+
+#: ../../../ui.cpp:1292
+#: ../../../ui.cpp:1316
+#: ../../../ui.cpp:1375
+msgid "<b>To:</b> "
+msgstr "<b>Till:</b> "
+
+#: ../../../ui.cpp:1295
+msgid " (yours, label: "
+msgstr " (din, etikett: "
+
+#: ../../../ui.cpp:1297
+msgid " (yours)"
+msgstr " (ditt)"
+
+#: ../../../ui.cpp:1334
+#: ../../../ui.cpp:1346
+#: ../../../ui.cpp:1392
+#: ../../../ui.cpp:1409
+msgid "<b>Credit:</b> "
+msgstr "<b>Kredit:</b> "
+
+#: ../../../ui.cpp:1336
+#, fuzzy, c-format
+msgid "(%s matures in %d more blocks)"
+msgstr "(%s matures in %d more blocks)"
+
+#: ../../../ui.cpp:1338
+msgid "(not accepted)"
+msgstr "(ej accepterad)"
+
+#: ../../../ui.cpp:1383
+#: ../../../ui.cpp:1391
+#: ../../../ui.cpp:1406
+msgid "<b>Debit:</b> "
+msgstr "<b>Debit:</b> "
+
+#: ../../../ui.cpp:1397
+msgid "<b>Transaction fee:</b> "
+msgstr "<b>Transaktionsavgift:</b> "
+
+#: ../../../ui.cpp:1413
+#, fuzzy
+msgid "<b>Net amount:</b> "
+msgstr "<b>Nät belopp:</b> "
+
+#: ../../../ui.cpp:1420
+msgid "Message:"
+msgstr "Meddelande:"
+
+#: ../../../ui.cpp:1422
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: ../../../ui.cpp:1425
+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 "Genererad mynt måste vänta 120 block innan dem kan användas.När du genererat denna block, skickades en broadcast till nätet och lades till block kedjan. Om den misslyckas att lägga till kedjan så kommer det ändras till \"not accepted\" och är icke brukbar. Detta kan hända om en annan nod genererat en block några sekunder efter din."
+
+#: ../../../ui.cpp:1605
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "Kan inte skriva autostart/bitcoin.desktop fil"
+
+#: ../../../ui.cpp:1641
+msgid "Main"
+msgstr "Huvud"
+
+#: ../../../ui.cpp:1651
+msgid "&Start Bitcoin on window system startup"
+msgstr "&Starta Bitcoin vid uppstart i windows"
+
+#: ../../../ui.cpp:1658
+msgid "&Minimize on close"
+msgstr "&Minimera vid stängning"
+
+#: ../../../ui.cpp:1800
+#, c-format
+msgid "version %s"
+msgstr "version %s"
+
+#: ../../../ui.cpp:1923
+msgid "Error in amount "
+msgstr "Fel i belopp "
+
+#: ../../../ui.cpp:1923
+#: ../../../ui.cpp:1928
+#: ../../../ui.cpp:1933
+#: ../../../ui.cpp:1968
+#: ../../../uibase.cpp:55
+msgid "Send Coins"
+msgstr "Skicka mynt"
+
+#: ../../../ui.cpp:1928
+msgid "Amount exceeds your balance "
+msgstr "Belopp överskrider din balans "
+
+#: ../../../ui.cpp:1933
+msgid "Total exceeds your balance when the "
+msgstr "Totals överskrider din balans när "
+
+#: ../../../ui.cpp:1933
+msgid " transaction fee is included "
+msgstr " transaktionsavgift är inkluderad "
+
+#: ../../../ui.cpp:1951
+msgid "Payment sent "
+msgstr "Betalning skickad "
+
+#: ../../../ui.cpp:1968
+msgid "Invalid address "
+msgstr "Ogiltig adress "
+
+#: ../../../ui.cpp:2023
+#, c-format
+msgid "Sending %s to %s"
+msgstr "Skickar %s till %s"
+
+#: ../../../ui.cpp:2096
+#: ../../../ui.cpp:2129
+msgid "CANCELLED"
+msgstr "AVBRUTEN"
+
+#: ../../../ui.cpp:2100
+msgid "Cancelled"
+msgstr "Avbruten"
+
+#: ../../../ui.cpp:2102
+msgid "Transfer cancelled "
+msgstr "Överföring avbruten "
+
+#: ../../../ui.cpp:2155
+msgid "Error: "
+msgstr "Fel: "
+
+#: ../../../ui.cpp:2174
+msgid "Connecting..."
+msgstr "Ansluter..."
+
+#: ../../../ui.cpp:2179
+msgid "Unable to connect"
+msgstr "Det gick inte att ansluta"
+
+#: ../../../ui.cpp:2184
+msgid "Requesting public key..."
+msgstr "Efterfrågar publik nyckel..."
+
+#: ../../../ui.cpp:2196
+msgid "Received public key..."
+msgstr "Mottagen publik nyckel..."
+
+#: ../../../ui.cpp:2210
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "Mottagaren accepterar inte transaktioner skickat från IP adress"
+
+#: ../../../ui.cpp:2212
+msgid "Transfer was not accepted"
+msgstr "Överföringen var inte accepterad"
+
+#: ../../../ui.cpp:2221
+msgid "Invalid response received"
+msgstr "Ogiltig respons mottagen"
+
+#: ../../../ui.cpp:2236
+msgid "Creating transaction..."
+msgstr "Skapar transation..."
+
+#: ../../../ui.cpp:2248
+#, 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 "Denna transaktion kräver en transaktionsavgift minst %s för dess belopp, komplexitet, eller användning av nyligen mottagna pengar"
+
+#: ../../../ui.cpp:2250
+msgid "Transaction creation failed"
+msgstr "Misslyckades skapa transaktion"
+
+#: ../../../ui.cpp:2257
+msgid "Transaction aborted"
+msgstr "Transaktion avbruten"
+
+#: ../../../ui.cpp:2265
+msgid "Lost connection, transaction cancelled"
+msgstr "Förlorad anslutning, transaktionen avbruten"
+
+#: ../../../ui.cpp:2281
+msgid "Sending payment..."
+msgstr "Skickar betalning..."
+
+#: ../../../ui.cpp:2287
+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 "Transaktionen blev nekad. Detta kan hända om några av dina mynt i din plånbok var redan spenderad. Till exempel om du använde en kopia av wallet.dat och mynten var redan spenderad i kopian, men som inte var markerad som spenderad här."
+
+#: ../../../ui.cpp:2296
+msgid "Waiting for confirmation..."
+msgstr "Väntar på bekräftelse..."
+
+#: ../../../ui.cpp:2314
+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 ""
+"Betalning var skickat, men mottagaren kunde inte verifiera det.\n"
+"Transaktionen är registrerad och kommer att kreditera mottagaren,\n"
+"men kommentar informationen kommer att vara tom."
+
+#: ../../../ui.cpp:2323
+msgid "Payment was sent, but an invalid response was received"
+msgstr "Betalning var skickad, men en ogiltig respons var mottagen"
+
+#: ../../../ui.cpp:2329
+msgid "Payment completed"
+msgstr "Betalning slutförd"
+
+#: ../../../ui.cpp:2371
+#: ../../../ui.cpp:2517
+#: ../../../ui.cpp:2554
+msgid "Name"
+msgstr "Namn"
+
+#: ../../../ui.cpp:2372
+#: ../../../ui.cpp:2517
+#: ../../../ui.cpp:2554
+msgid "Address"
+msgstr "Adress"
+
+#: ../../../ui.cpp:2374
+#: ../../../ui.cpp:2529
+msgid "Label"
+msgstr "Etikett"
+
+#: ../../../ui.cpp:2375
+#: ../../../uibase.cpp:837
+msgid "Bitcoin Address"
+msgstr "Bitcoin Adress"
+
+#: ../../../ui.cpp:2499
+msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. "
+msgstr "Denna är en av dina egna adresser för mottagning av betalningar och kan inte slås in i adressboken. "
+
+#: ../../../ui.cpp:2517
+#: ../../../ui.cpp:2523
+msgid "Edit Address"
+msgstr "Ändra Adress"
+
+#: ../../../ui.cpp:2529
+msgid "Edit Address Label"
+msgstr "Ändra Address Etikett"
+
+#: ../../../ui.cpp:2554
+#: ../../../ui.cpp:2560
+msgid "Add Address"
+msgstr "Lägg till Adress"
+
+#: ../../../ui.cpp:2637
+msgid "Bitcoin"
+msgstr "Bitcoin"
+
+#: ../../../ui.cpp:2639
+msgid "Bitcoin - Generating"
+msgstr "Bitcoin - Genererar"
+
+#: ../../../ui.cpp:2641
+msgid "Bitcoin - (not connected)"
+msgstr "Bitcoin - (ej ansluten)"
+
+#: ../../../ui.cpp:2720
+msgid "&Open Bitcoin"
+msgstr "&Öppna Bitcoin"
+
+#: ../../../ui.cpp:2721
+msgid "&Send Bitcoins"
+msgstr "&Skicka Bitcoins"
+
+#: ../../../ui.cpp:2722
+msgid "O&ptions..."
+msgstr "&Inställningar..."
+
+#: ../../../ui.cpp:2725
+#: ../../../uibase.cpp:25
+msgid "E&xit"
+msgstr "&Avsluta"
+
+#: ../../../ui.cpp:2951
+msgid "Program has crashed and will terminate. "
+msgstr "Programmet har krachat och kommer att avslutas. "
+
+#: ../../../uibase.cpp:28
+msgid "&File"
+msgstr "&Fil"
+
+#: ../../../uibase.cpp:32
+msgid "&Your Receiving Addresses..."
+msgstr "&Dina Mottagningsadresser..."
+
+#: ../../../uibase.cpp:36
+msgid "&Options..."
+msgstr "&Inställningar..."
+
+#: ../../../uibase.cpp:39
+msgid "&Settings"
+msgstr "&Inställningar"
+
+#: ../../../uibase.cpp:43
+msgid "&About..."
+msgstr "&Om..."
+
+#: ../../../uibase.cpp:46
+msgid "&Help"
+msgstr "&Hjälp"
+
+#: ../../../uibase.cpp:56
+msgid "Address Book"
+msgstr "Adressbok"
+
+#: ../../../uibase.cpp:69
+msgid "Your Bitcoin Address:"
+msgstr "Din Bitcoin Adress:"
+
+#: ../../../uibase.cpp:76
+msgid " &New... "
+msgstr " &Nytt... "
+
+#: ../../../uibase.cpp:79
+#: ../../../uibase.cpp:780
+#: ../../../uibase.cpp:883
+msgid " &Copy to Clipboard "
+msgstr " &Kopiera till Urklipp "
+
+#: ../../../uibase.cpp:93
+msgid "Balance:"
+msgstr "Balans:"
+
+#: ../../../uibase.cpp:109
+msgid " All"
+msgstr " Alla"
+
+#: ../../../uibase.cpp:109
+msgid " Sent"
+msgstr " Skickat"
+
+#: ../../../uibase.cpp:109
+msgid " Received"
+msgstr " Mottagen"
+
+#: ../../../uibase.cpp:109
+msgid " In Progress"
+msgstr " Pågående"
+
+#: ../../../uibase.cpp:130
+msgid "All Transactions"
+msgstr "Alla Transaktioner"
+
+#: ../../../uibase.cpp:141
+msgid "Sent/Received"
+msgstr "Skickat/Mottagen"
+
+#: ../../../uibase.cpp:152
+msgid "Sent"
+msgstr "Skickat"
+
+#: ../../../uibase.cpp:163
+msgid "Received"
+msgstr "Mottagen"
+
+#: ../../../uibase.cpp:302
+#: ../../../uibase.cpp:443
+#: ../../../uibase.cpp:542
+#: ../../../uibase.cpp:722
+#: ../../../uibase.cpp:783
+#: ../../../uibase.cpp:892
+#: ../../../uibase.cpp:981
+msgid "OK"
+msgstr "OK"
+
+#: ../../../uibase.cpp:345
+msgid "&Start Bitcoin on system startup"
+msgstr "&Starta Bitcoin vid system uppstart"
+
+#: ../../../uibase.cpp:348
+msgid "&Minimize to the tray instead of the taskbar"
+msgstr "&Minimerar till systemfältet istället för aktivitetsfält"
+
+#: ../../../uibase.cpp:351
+#, fuzzy
+msgid "Map port using &UPnP"
+msgstr "Mapp port använder &UPnP"
+
+#: ../../../uibase.cpp:354
+msgid "M&inimize to the tray on close"
+msgstr "M&inimera till systemfältet vid stängning"
+
+#: ../../../uibase.cpp:360
+msgid "&Connect through socks4 proxy: "
+msgstr "&Anslut via socks4 proxy: "
+
+#: ../../../uibase.cpp:371
+msgid "Proxy &IP:"
+msgstr "Proxy &IP:"
+
+#: ../../../uibase.cpp:379
+msgid " &Port:"
+msgstr " &Port:"
+
+#: ../../../uibase.cpp:392
+#, fuzzy
+msgid "Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended."
+msgstr "Frivillig transaktionsavgift per KB som garanterar att din transaktion bearbetas snabbt. Flesta transaktioner är 1KB. Most transactions are 1KB. Avgift 0.01 rekommenderas."
+
+#: ../../../uibase.cpp:399
+msgid "Pay transaction fee:"
+msgstr "Betala transaktionsavgift:"
+
+#: ../../../uibase.cpp:420
+msgid "// [don't translate] Test panel 2 for future expansion"
+msgstr ""
+
+#: ../../../uibase.cpp:424
+msgid "// [don't translate] Let's not start multiple pages until the first page is filled up"
+msgstr ""
+
+#: ../../../uibase.cpp:446
+#: ../../../uibase.cpp:668
+#: ../../../uibase.cpp:727
+#: ../../../uibase.cpp:786
+#: ../../../uibase.cpp:895
+#: ../../../uibase.cpp:984
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../../../uibase.cpp:449
+msgid "&Apply"
+msgstr "&Använd"
+
+#: ../../../uibase.cpp:508
+msgid "Bitcoin "
+msgstr "Bitcoin "
+
+#: ../../../uibase.cpp:514
+msgid "version"
+msgstr "version"
+
+#: ../../../uibase.cpp:525
+#, fuzzy
+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 ""
+"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."
+
+#: ../../../uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "Ange en Bitcoin adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+
+#: ../../../uibase.cpp:595
+msgid "Pay &To:"
+msgstr "Betala &Till:"
+
+#: ../../../uibase.cpp:610
+msgid "&Paste"
+msgstr "&Klistra in"
+
+#: ../../../uibase.cpp:613
+msgid " Address &Book..."
+msgstr " Adress&bok..."
+
+#: ../../../uibase.cpp:620
+msgid "&Amount:"
+msgstr "&Belopp:"
+
+#: ../../../uibase.cpp:630
+#, fuzzy
+msgid "T&ransfer:"
+msgstr "T&ransfer:"
+
+#: ../../../uibase.cpp:636
+msgid " Standard"
+msgstr " Standard"
+
+#: ../../../uibase.cpp:663
+msgid "&Send"
+msgstr "&Skicka"
+
+#: ../../../uibase.cpp:711
+msgid ""
+"\n"
+"\n"
+"Connecting..."
+msgstr ""
+"\n"
+"\n"
+"Ansluter..."
+
+#: ../../../uibase.cpp:761
+#, fuzzy
+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 "Dessa är dina Bitcoin adresser för mottagning av betalningar. Du rekommenderas att ge olika till varje avsändare så du kan ha koll på vem som betalar dig. Den markerade adressen är visar i huvudfönstret."
+
+#: ../../../uibase.cpp:774
+#: ../../../uibase.cpp:886
+msgid "&Edit..."
+msgstr "&Redigera..."
+
+#: ../../../uibase.cpp:777
+#: ../../../uibase.cpp:889
+msgid " &New Address... "
+msgstr " &Ny Adress... "
+
+#: ../../../uibase.cpp:849
+msgid "Sending"
+msgstr "Skickar"
+
+#: ../../../uibase.cpp:857
+#, fuzzy
+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 "Dessa är dina Bitcoin adresser för mottagning av betalningar. Du kan ge olika till varje avsändare så du kan ha koll på vem som betalar dig. Den markerade adressen är visar i huvudfönstret."
+
+#: ../../../uibase.cpp:870
+msgid "Receiving"
+msgstr "Mottagning"
+
+#: ../../../uibase.cpp:880
+msgid "&Delete"
+msgstr "&Ta bort"
+
+#: ../../../util.cpp:866
+#, fuzzy
+msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly."
+msgstr "Varning: Var god och kolla att din dator har rätt datum och klockslag. Om din klocka är fel så kommer Bitcoin inte att fungera."
+
+#: ../../../util.cpp:899
+msgid "beta"
+msgstr "beta"
+
+#: ../../../uibase.h:147
+msgid "Transaction Details"
+msgstr "Transaktion detaljer"
+
+#: ../../../uibase.h:199
+msgid "Options"
+msgstr "Inställningar"
+
+#: ../../../uibase.h:228
+msgid "About Bitcoin"
+msgstr "Om Bitcoin"
+
+#: ../../../uibase.h:337
+msgid "Your Bitcoin Addresses"
+msgstr "Dina Bitcoin Adresser"
+
+#~ msgid " beta"
+#~ msgstr " beta"
diff --git a/locale/zh_cn/LC_MESSAGES/bitcoin.mo b/locale/zh_cn/LC_MESSAGES/bitcoin.mo
new file mode 100644
index 0000000000..0c50c0b32d
--- /dev/null
+++ b/locale/zh_cn/LC_MESSAGES/bitcoin.mo
Binary files differ
diff --git a/locale/zh_cn/LC_MESSAGES/bitcoin.po b/locale/zh_cn/LC_MESSAGES/bitcoin.po
new file mode 100644
index 0000000000..8190eb54c7
--- /dev/null
+++ b/locale/zh_cn/LC_MESSAGES/bitcoin.po
@@ -0,0 +1,1017 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-21 14:19+0800\n"
+"PO-Revision-Date: 2011-05-28 17:08+0800\n"
+"Last-Translator: Dean Lee <xslidian@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Language: zh_CN\n"
+"X-Source-Language: C\n"
+"X-Poedit-Bookmarks: 77,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
+"X-Poedit-SearchPath-0: ../../..\n"
+
+#: ../../../src/init.cpp:140
+msgid " beta"
+msgstr " 测试版"
+
+#: ../../../src/init.cpp:142
+msgid "Bitcoin version"
+msgstr "Bitcoin 版本"
+
+#: ../../../src/init.cpp:143
+msgid "Usage:"
+msgstr "用法:"
+
+#: ../../../src/init.cpp:145
+msgid "Send command to -server or bitcoind\n"
+msgstr "发送命令给 -server 或 bitcoin\n"
+
+#: ../../../src/init.cpp:146
+msgid "List commands\n"
+msgstr "列出命令\n"
+
+#: ../../../src/init.cpp:147
+msgid "Get help for a command\n"
+msgstr "获取命令的帮助\n"
+
+#: ../../../src/init.cpp:148
+msgid "Options:\n"
+msgstr "选项:\n"
+
+#: ../../../src/init.cpp:149
+msgid "Specify configuration file (default: bitcoin.conf)\n"
+msgstr "指定配置文件 (默认: bitcoin.conf)\n"
+
+#: ../../../src/init.cpp:150
+msgid "Specify pid file (default: bitcoind.pid)\n"
+msgstr "指定 pid 文件 (默认: bitcoin.pid)\n"
+
+#: ../../../src/init.cpp:151
+msgid "Generate coins\n"
+msgstr "生成货币\n"
+
+#: ../../../src/init.cpp:152
+msgid "Don't generate coins\n"
+msgstr "不要生成货币\n"
+
+#: ../../../src/init.cpp:153
+msgid "Start minimized\n"
+msgstr "启动时最小化\n"
+
+#: ../../../src/init.cpp:154
+msgid "Specify data directory\n"
+msgstr "指定数据目录\n"
+
+#: ../../../src/init.cpp:155
+msgid "Connect through socks4 proxy\n"
+msgstr "通过 socks4 代理连接\n"
+
+#: ../../../src/init.cpp:156
+msgid "Allow DNS lookups for addnode and connect\n"
+msgstr "允许 DNS 查找新增结点和连接\n"
+
+#: ../../../src/init.cpp:157
+msgid "Add a node to connect to\n"
+msgstr "添加一个连接结点\n"
+
+#: ../../../src/init.cpp:158
+msgid "Connect only to the specified node\n"
+msgstr "只连接特定结点\n"
+
+#: ../../../src/init.cpp:159
+msgid "Don't accept connections from outside\n"
+msgstr "不要接受外部传来的连接\n"
+
+#: ../../../src/init.cpp:162
+msgid "Don't attempt to use UPnP to map the listening port\n"
+msgstr "不要尝试使用 UPnP 映射监听端口\n"
+
+#: ../../../src/init.cpp:164
+msgid "Attempt to use UPnP to map the listening port\n"
+msgstr "尝试使用 UPnP 映射监听端口\n"
+
+#: ../../../src/init.cpp:167
+msgid "Fee per KB to add to transactions you send\n"
+msgstr "您为每 KB 支付所增加的交易佣金\n"
+
+#: ../../../src/init.cpp:169
+msgid "Accept command line and JSON-RPC commands\n"
+msgstr "允许命令行和 JSON-RPC 控制\n"
+
+#: ../../../src/init.cpp:172
+msgid "Run in the background as a daemon and accept commands\n"
+msgstr "在后台运行并接收命令\n"
+
+#: ../../../src/init.cpp:174
+msgid "Use the test network\n"
+msgstr "使用测试网络\n"
+
+#: ../../../src/init.cpp:175
+msgid "Username for JSON-RPC connections\n"
+msgstr "JSON-RPC 连接的用户名\n"
+
+#: ../../../src/init.cpp:176
+msgid "Password for JSON-RPC connections\n"
+msgstr "JSON-RPC 连接的密码\n"
+
+#: ../../../src/init.cpp:177
+msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n"
+msgstr "在端口 <port> 监听 JSON-RPC 连接 (默认: 8332)\n"
+
+#: ../../../src/init.cpp:178
+msgid "Allow JSON-RPC connections from specified IP address\n"
+msgstr "允许来自特定 IP 地址的 JSON-RPC 连接\n"
+
+#: ../../../src/init.cpp:179
+msgid "Send commands to node running on <ip> (default: 127.0.0.1)\n"
+msgstr "发送命令给运行的结点,IP 地址 <ip> (默认: 127.0.0.1)\n"
+
+#: ../../../src/init.cpp:180
+msgid "Set key pool size to <n> (default: 100)\n"
+msgstr "设置密钥池大小为 <n> (默认: 100)\n"
+
+#: ../../../src/init.cpp:181
+msgid "Rescan the block chain for missing wallet transactions\n"
+msgstr "重新扫描货币包链来检测丢失的货币交易\n"
+
+#: ../../../src/init.cpp:185
+msgid ""
+"\n"
+"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n"
+msgstr ""
+"\n"
+"SSL 选项: (SSL 设置步骤请参见 Bitcoin Wiki)\n"
+
+#: ../../../src/init.cpp:186
+msgid "Use OpenSSL (https) for JSON-RPC connections\n"
+msgstr "使用 OpenSSL (https) 进行 JSON-RPC 连接\n"
+
+#: ../../../src/init.cpp:187
+msgid "Server certificate file (default: server.cert)\n"
+msgstr "服务器证书 (默认: server.cert)\n"
+
+#: ../../../src/init.cpp:188
+msgid "Server private key (default: server.pem)\n"
+msgstr "服务器私有密钥 (默认: server.pem)\n"
+
+#: ../../../src/init.cpp:189
+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:193
+msgid "This help message\n"
+msgstr "本帮助信息\n"
+
+#: ../../../src/init.cpp:330
+#, c-format
+msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running."
+msgstr "无法获取数据目录 %s 的锁。 Bitcoin 可能已经启动。"
+
+#: ../../../src/init.cpp:356
+msgid "Error loading addr.dat \n"
+msgstr "加载 addr.dat 出错 \n"
+
+#: ../../../src/init.cpp:362
+msgid "Error loading blkindex.dat \n"
+msgstr "加载 blkindex.dat 出错 \n"
+
+#: ../../../src/init.cpp:369
+msgid "Error loading wallet.dat \n"
+msgstr "加载 wallet.dat 出错 \n"
+
+#: ../../../src/init.cpp:449
+msgid "Invalid -proxy address"
+msgstr "无效 -proxy 地址"
+
+#: ../../../src/init.cpp:472
+msgid "Invalid amount for -paytxfee=<amount>"
+msgstr "无效的金额 -paytxfee=<amount>"
+
+#: ../../../src/init.cpp:476
+msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."
+msgstr "警告: -paytxfee 设置得过高。 这个参数是您发送一笔交易要支付的佣金。"
+
+#: ../../../src/main.cpp:1866
+msgid "Warning: Disk space is low "
+msgstr "警告: 磁盘空间不足"
+
+#: ../../../src/main.cpp:3990
+#, 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:3992
+msgid "Error: Transaction creation failed "
+msgstr "错误: 交易创建失败"
+
+#: ../../../src/main.cpp:3997
+#: ../../../src/ui.cpp:1927
+#: ../../../src/ui.cpp:1932
+#: ../../../src/ui.cpp:2076
+#: ../../../src/ui.cpp:2229
+msgid "Sending..."
+msgstr "正在发送..."
+
+#: ../../../src/main.cpp:4001
+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:4014
+msgid "Invalid amount"
+msgstr "无效金额"
+
+#: ../../../src/main.cpp:4016
+#: ../../../src/ui.cpp:2143
+#: ../../../src/ui.cpp:2214
+msgid "Insufficient funds"
+msgstr "余额不足"
+
+#: ../../../src/main.cpp:4021
+msgid "Invalid bitcoin address"
+msgstr "无效 bitcoin 地址"
+
+#: ../../../src/net.cpp:1503
+#, c-format
+msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running."
+msgstr "无法在这台电脑上绑定 %d 端口。 Bitcoin 可能已经在运行。"
+
+#: ../../../src/rpc.cpp:1802
+#: ../../../src/rpc.cpp:1804
+#, c-format
+msgid "To use the %s option"
+msgstr "使用 %s 选项"
+
+#: ../../../src/rpc.cpp:1806
+#, 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=<password>\n"
+"配置文件为: %s\n"
+"如果文件不存在,请创建文件并只给创建者提供只读访问权限。\n"
+
+#: ../../../src/rpc.cpp:1974
+#, 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=<password> :\n"
+"%s\n"
+"如果文件不存在,请创建文件并只给创建者提供只读访问权限。"
+
+#: ../../../src/ui.cpp:204
+#, 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 的佣金来进行,佣金用来支付为您的交易计算的结点来帮助支撑网络。 您是否要支付佣金?"
+
+#: ../../../src/ui.cpp:303
+msgid "Status"
+msgstr "状态"
+
+#: ../../../src/ui.cpp:304
+msgid "Date"
+msgstr "日期"
+
+#: ../../../src/ui.cpp:305
+msgid "Description"
+msgstr "描述"
+
+#: ../../../src/ui.cpp:306
+msgid "Debit"
+msgstr "付款人"
+
+#: ../../../src/ui.cpp:307
+msgid "Credit"
+msgstr "信用"
+
+#: ../../../src/ui.cpp:513
+#, c-format
+msgid "Open for %d blocks"
+msgstr "%d 个货币包开放"
+
+#: ../../../src/ui.cpp:515
+#, c-format
+msgid "Open until %s"
+msgstr "开放直到 %s"
+
+#: ../../../src/ui.cpp:521
+#, c-format
+msgid "%d/offline?"
+msgstr "%d/离线?"
+
+#: ../../../src/ui.cpp:523
+#, c-format
+msgid "%d/unconfirmed"
+msgstr "%d/未确认"
+
+#: ../../../src/ui.cpp:525
+#, c-format
+msgid "%d confirmations"
+msgstr "%d 确认"
+
+#: ../../../src/ui.cpp:610
+msgid "Generated"
+msgstr "已生成"
+
+#: ../../../src/ui.cpp:618
+#, c-format
+msgid "Generated (%s matures in %d more blocks)"
+msgstr "已生成 (%s 成熟 %d 新增货币包)"
+
+#: ../../../src/ui.cpp:622
+msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!"
+msgstr "已生成 - 警告: 这个货币包没有被任何其他结点收到,因此很可能不会被接受!"
+
+#: ../../../src/ui.cpp:626
+msgid "Generated (not accepted)"
+msgstr "已生成 (未被接受)"
+
+#: ../../../src/ui.cpp:636
+msgid "From: "
+msgstr "来自: "
+
+#: ../../../src/ui.cpp:660
+msgid "Received with: "
+msgstr "伴随接收: "
+
+#: ../../../src/ui.cpp:706
+msgid "Payment to yourself"
+msgstr "支付给您自己"
+
+#: ../../../src/ui.cpp:740
+msgid "To: "
+msgstr "到: "
+
+#: ../../../src/ui.cpp:1055
+msgid " Generating"
+msgstr " 生成中"
+
+#: ../../../src/ui.cpp:1057
+msgid "(not connected)"
+msgstr "(未连接)"
+
+#: ../../../src/ui.cpp:1060
+#, c-format
+msgid " %d connections %d blocks %d transactions"
+msgstr " %d 个连接 %d 个货币包 %d 个交易 "
+
+#: ../../../src/ui.cpp:1165
+#: ../../../src/ui.cpp:2529
+msgid "New Receiving Address"
+msgstr "新建接收地址"
+
+#: ../../../src/ui.cpp:1166
+#: ../../../src/ui.cpp:2530
+msgid ""
+"You should use a new address for each payment you receive.\n"
+"\n"
+"Label"
+msgstr ""
+"您应该为您收到的每次付款使用不同的地址。\n"
+"\n"
+"标签"
+
+#: ../../../src/ui.cpp:1235
+msgid "<b>Status:</b> "
+msgstr "<b>状态:</b> "
+
+#: ../../../src/ui.cpp:1240
+msgid ", has not been successfully broadcast yet"
+msgstr ",尚未被成功广播"
+
+#: ../../../src/ui.cpp:1242
+#, c-format
+msgid ", broadcast through %d node"
+msgstr ",通过 %d 个结点广播"
+
+#: ../../../src/ui.cpp:1244
+#, c-format
+msgid ", broadcast through %d nodes"
+msgstr ",通过 %d 个结点广播"
+
+#: ../../../src/ui.cpp:1248
+msgid "<b>Date:</b> "
+msgstr "<b>日期:</b>"
+
+#: ../../../src/ui.cpp:1256
+msgid "<b>Source:</b> Generated<br>"
+msgstr "<b>来源:</b> 生成<br>"
+
+#: ../../../src/ui.cpp:1262
+#: ../../../src/ui.cpp:1280
+msgid "<b>From:</b> "
+msgstr "<b>从:</b> "
+
+#: ../../../src/ui.cpp:1280
+msgid "unknown"
+msgstr "未知"
+
+#: ../../../src/ui.cpp:1281
+#: ../../../src/ui.cpp:1305
+#: ../../../src/ui.cpp:1364
+msgid "<b>To:</b> "
+msgstr "<b>到:</b> "
+
+#: ../../../src/ui.cpp:1284
+msgid " (yours, label: "
+msgstr " (您的标签: "
+
+#: ../../../src/ui.cpp:1286
+msgid " (yours)"
+msgstr " (您的)"
+
+#: ../../../src/ui.cpp:1323
+#: ../../../src/ui.cpp:1335
+#: ../../../src/ui.cpp:1381
+#: ../../../src/ui.cpp:1398
+msgid "<b>Credit:</b> "
+msgstr "<b>信用:</b> "
+
+#: ../../../src/ui.cpp:1325
+#, c-format
+msgid "(%s matures in %d more blocks)"
+msgstr "(%s 收获在 %d 更多的货币包)"
+
+#: ../../../src/ui.cpp:1327
+msgid "(not accepted)"
+msgstr "(未被接受)"
+
+#: ../../../src/ui.cpp:1372
+#: ../../../src/ui.cpp:1380
+#: ../../../src/ui.cpp:1395
+msgid "<b>Debit:</b> "
+msgstr "<b>付款人:</b> "
+
+#: ../../../src/ui.cpp:1386
+msgid "<b>Transaction fee:</b> "
+msgstr "<b>交易佣金:</b> "
+
+#: ../../../src/ui.cpp:1402
+msgid "<b>Net amount:</b> "
+msgstr "<b>网络金额:</b> "
+
+#: ../../../src/ui.cpp:1409
+msgid "Message:"
+msgstr "消息:"
+
+#: ../../../src/ui.cpp:1411
+msgid "Comment:"
+msgstr "评论"
+
+#: ../../../src/ui.cpp:1414
+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 个货币包之后才能够使用。 当您生成了一个货币包后,它被广播给网络来加入货币包链中。 如果它无法加入货币包链中,他将会标记为\"不被接受\"且不能被支付。 这种情况可能因为在您生成这个货币包之后的几秒钟内有别人也生成了货币包而发生。"
+
+#: ../../../src/ui.cpp:1594
+msgid "Cannot write autostart/bitcoin.desktop file"
+msgstr "无法写入 autostart/bitcoin.desktop 文件"
+
+#: ../../../src/ui.cpp:1630
+msgid "Main"
+msgstr "主要"
+
+#: ../../../src/ui.cpp:1638
+msgid "&Start Bitcoin on window system startup"
+msgstr "开机自动启动 Bitcoin(&S)"
+
+#: ../../../src/ui.cpp:1645
+msgid "&Minimize on close"
+msgstr "关闭时最小化(&M)"
+
+#: ../../../src/ui.cpp:1787
+#, c-format
+msgid "version %s"
+msgstr "版本 %s"
+
+#: ../../../src/ui.cpp:1899
+msgid "Error in amount "
+msgstr "金额有误 "
+
+#: ../../../src/ui.cpp:1899
+#: ../../../src/ui.cpp:1904
+#: ../../../src/ui.cpp:1909
+#: ../../../src/ui.cpp:1944
+#: ../../../src/uibase.cpp:55
+msgid "Send Coins"
+msgstr "发送货币"
+
+#: ../../../src/ui.cpp:1904
+msgid "Amount exceeds your balance "
+msgstr "金额超出您的账户余额"
+
+#: ../../../src/ui.cpp:1909
+msgid "Total exceeds your balance when the "
+msgstr "总费用超出您的账户余额当 "
+
+#: ../../../src/ui.cpp:1909
+msgid " transaction fee is included "
+msgstr " 交易佣金已包括"
+
+#: ../../../src/ui.cpp:1927
+msgid "Payment sent "
+msgstr "付款已发送"
+
+#: ../../../src/ui.cpp:1944
+msgid "Invalid address "
+msgstr "无效地址 "
+
+#: ../../../src/ui.cpp:1997
+#, c-format
+msgid "Sending %s to %s"
+msgstr "发送 %s 给 %s"
+
+#: ../../../src/ui.cpp:2070
+#: ../../../src/ui.cpp:2103
+msgid "CANCELLED"
+msgstr "已取消"
+
+#: ../../../src/ui.cpp:2074
+msgid "Cancelled"
+msgstr "已取消"
+
+#: ../../../src/ui.cpp:2076
+msgid "Transfer cancelled "
+msgstr "传输已取消 "
+
+#: ../../../src/ui.cpp:2129
+msgid "Error: "
+msgstr "错误: "
+
+#: ../../../src/ui.cpp:2148
+msgid "Connecting..."
+msgstr "正在连接..."
+
+#: ../../../src/ui.cpp:2153
+msgid "Unable to connect"
+msgstr "无法连接"
+
+#: ../../../src/ui.cpp:2158
+msgid "Requesting public key..."
+msgstr "正在请求公共密钥..."
+
+#: ../../../src/ui.cpp:2170
+msgid "Received public key..."
+msgstr "收到公共密钥..."
+
+#: ../../../src/ui.cpp:2184
+msgid "Recipient is not accepting transactions sent by IP address"
+msgstr "收款人不接受来自 IP 地址的交易"
+
+#: ../../../src/ui.cpp:2186
+msgid "Transfer was not accepted"
+msgstr "传输没有被接受"
+
+#: ../../../src/ui.cpp:2195
+msgid "Invalid response received"
+msgstr "接收到无效回复"
+
+#: ../../../src/ui.cpp:2210
+msgid "Creating transaction..."
+msgstr "正在创建交易..."
+
+#: ../../../src/ui.cpp:2222
+#, 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 "这笔交易因为它最近收到的付款的数量,交易难度或者使用情况,需要至少 %s 交易佣金"
+
+#: ../../../src/ui.cpp:2224
+msgid "Transaction creation failed"
+msgstr "交易创建失败"
+
+#: ../../../src/ui.cpp:2231
+msgid "Transaction aborted"
+msgstr "交易中止"
+
+#: ../../../src/ui.cpp:2239
+msgid "Lost connection, transaction cancelled"
+msgstr "失去连接,交易已取消"
+
+#: ../../../src/ui.cpp:2255
+msgid "Sending payment..."
+msgstr "正在发送付款..."
+
+#: ../../../src/ui.cpp:2261
+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 文件,而且货币在另一个副本里使用但没有在这里标记。"
+
+#: ../../../src/ui.cpp:2270
+msgid "Waiting for confirmation..."
+msgstr "正在等待确认..."
+
+#: ../../../src/ui.cpp:2288
+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 ""
+"付款已发送,但是收款人无法进行确认。\n"
+"交易已经被记录,并且支付给收款人,\n"
+"但是评论信息可能是空的。"
+
+#: ../../../src/ui.cpp:2297
+msgid "Payment was sent, but an invalid response was received"
+msgstr "支付已发送,但是收到无效回复"
+
+#: ../../../src/ui.cpp:2303
+msgid "Payment completed"
+msgstr "付款完成"
+
+#: ../../../src/ui.cpp:2334
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2517
+msgid "Name"
+msgstr "姓名"
+
+#: ../../../src/ui.cpp:2335
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2517
+msgid "Address"
+msgstr "地址"
+
+#: ../../../src/ui.cpp:2337
+#: ../../../src/ui.cpp:2492
+msgid "Label"
+msgstr "标签"
+
+#: ../../../src/ui.cpp:2338
+#: ../../../src/uibase.cpp:837
+msgid "Bitcoin Address"
+msgstr "Bitcoin 地址"
+
+#: ../../../src/ui.cpp:2462
+msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. "
+msgstr "这是您拥有的接收付款的地址之一,它不能够进入这个地址簿。 "
+
+#: ../../../src/ui.cpp:2480
+#: ../../../src/ui.cpp:2486
+msgid "Edit Address"
+msgstr "编辑地址"
+
+#: ../../../src/ui.cpp:2492
+msgid "Edit Address Label"
+msgstr "编辑地址标签"
+
+#: ../../../src/ui.cpp:2517
+#: ../../../src/ui.cpp:2523
+msgid "Add Address"
+msgstr "添加地址"
+
+#: ../../../src/ui.cpp:2600
+msgid "Bitcoin"
+msgstr "Bitcoin"
+
+#: ../../../src/ui.cpp:2602
+msgid "Bitcoin - Generating"
+msgstr "Bitcoin - 生成中"
+
+#: ../../../src/ui.cpp:2604
+msgid "Bitcoin - (not connected)"
+msgstr "Bitcoin - (未连接)"
+
+#: ../../../src/ui.cpp:2683
+msgid "&Open Bitcoin"
+msgstr "打开 Bitcoin(&O)"
+
+#: ../../../src/ui.cpp:2684
+msgid "&Send Bitcoins"
+msgstr "发送 Bitcoins(&S)"
+
+#: ../../../src/ui.cpp:2685
+msgid "O&ptions..."
+msgstr "选项(&P)..."
+
+#: ../../../src/ui.cpp:2688
+#: ../../../src/uibase.cpp:25
+msgid "E&xit"
+msgstr "退出(&X)"
+
+#: ../../../src/ui.cpp:2904
+msgid "Program has crashed and will terminate. "
+msgstr "程序崩溃,即将关闭。 "
+
+#: ../../../src/uibase.cpp:28
+msgid "&File"
+msgstr "文件(&F)"
+
+#: ../../../src/uibase.cpp:32
+msgid "&Your Receiving Addresses..."
+msgstr "您的接收地址(&Y)..."
+
+#: ../../../src/uibase.cpp:36
+msgid "&Options..."
+msgstr "选项(&O)..."
+
+#: ../../../src/uibase.cpp:39
+msgid "&Settings"
+msgstr "设置(&S)"
+
+#: ../../../src/uibase.cpp:43
+msgid "&About..."
+msgstr "关于(&A)..."
+
+#: ../../../src/uibase.cpp:46
+msgid "&Help"
+msgstr "帮助(&H)"
+
+#: ../../../src/uibase.cpp:56
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../../../src/uibase.cpp:69
+msgid "Your Bitcoin Address:"
+msgstr "您的 Bitcoin 地址:"
+
+#: ../../../src/uibase.cpp:76
+msgid " &New... "
+msgstr " 新建(&N)... "
+
+#: ../../../src/uibase.cpp:79
+#: ../../../src/uibase.cpp:780
+#: ../../../src/uibase.cpp:883
+msgid " &Copy to Clipboard "
+msgstr " 复制到剪贴板(&C)"
+
+#: ../../../src/uibase.cpp:93
+msgid "Balance:"
+msgstr "账户余额:"
+
+#: ../../../src/uibase.cpp:109
+msgid " All"
+msgstr "全部"
+
+#: ../../../src/uibase.cpp:109
+msgid " Sent"
+msgstr " 已发送"
+
+#: ../../../src/uibase.cpp:109
+msgid " Received"
+msgstr " 已接收"
+
+#: ../../../src/uibase.cpp:109
+msgid " In Progress"
+msgstr "处理中"
+
+#: ../../../src/uibase.cpp:130
+msgid "All Transactions"
+msgstr "所有交易"
+
+#: ../../../src/uibase.cpp:141
+msgid "Sent/Received"
+msgstr "已发送/已接收"
+
+#: ../../../src/uibase.cpp:152
+msgid "Sent"
+msgstr "已发送"
+
+#: ../../../src/uibase.cpp:163
+msgid "Received"
+msgstr "已接收"
+
+#: ../../../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 "确定"
+
+#: ../../../src/uibase.cpp:345
+msgid "&Start Bitcoin on system startup"
+msgstr "开机自动启动(&S)"
+
+#: ../../../src/uibase.cpp:348
+msgid "&Minimize to the tray instead of the taskbar"
+msgstr "最小化到系统托盘(&M)"
+
+#: ../../../src/uibase.cpp:351
+msgid "Map port using &UPnP"
+msgstr "使用 &UPnP 映射端口"
+
+#: ../../../src/uibase.cpp:354
+msgid "M&inimize to the tray on close"
+msgstr "关闭时最小化到托盘(&I)"
+
+#: ../../../src/uibase.cpp:360
+msgid "&Connect through socks4 proxy: "
+msgstr "通过 socks4 代理连接(&C): "
+
+#: ../../../src/uibase.cpp:371
+msgid "Proxy &IP:"
+msgstr "代理服务器(&I):"
+
+#: ../../../src/uibase.cpp:379
+msgid " &Port:"
+msgstr " 端口(&P):"
+
+#: ../../../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 "可以选择按照KB支付交易佣金来确保您的交易得到迅速处理。 大多数交易需要 1KB。 建议支付 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 ""
+
+#: ../../../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 "取消"
+
+#: ../../../src/uibase.cpp:449
+msgid "&Apply"
+msgstr "应用(&A)"
+
+#: ../../../src/uibase.cpp:508
+msgid "Bitcoin "
+msgstr "Bitcoin "
+
+#: ../../../src/uibase.cpp:514
+msgid "version"
+msgstr "版本"
+
+#: ../../../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 ""
+"版权所有 (c) 2009-2010 Bitcoin 开发人员\n"
+"这是一个实验软件。\n"
+"分发遵循 MIT/X11 软件许可协议,请参见附带的 license.txt 文件或访问\n"
+"http://www.opensource.org/licenses/mit-license.php。\n"
+"本产品使用了 OpenSSL Project 开发的 OpenSSL Toolkit\n"
+"(http://www.openssl.org/),以及 Eric Young(eay@cryptsoft.com)\n"
+"编写的加密软件和 Thomas Bernard 编写的 UPnP 软件。"
+
+#: ../../../src/uibase.cpp:581
+msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+msgstr "输入 Bitcoin 地址 (比如 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"
+
+#: ../../../src/uibase.cpp:595
+msgid "Pay &To:"
+msgstr "付款给(&T):"
+
+#: ../../../src/uibase.cpp:610
+msgid "&Paste"
+msgstr "粘贴(&P)"
+
+#: ../../../src/uibase.cpp:613
+msgid " Address &Book..."
+msgstr " 地址簿(&B)..."
+
+#: ../../../src/uibase.cpp:620
+msgid "&Amount:"
+msgstr "数量(&A):"
+
+#: ../../../src/uibase.cpp:630
+msgid "T&ransfer:"
+msgstr "传输(&R):"
+
+#: ../../../src/uibase.cpp:636
+msgid " Standard"
+msgstr "标准"
+
+#: ../../../src/uibase.cpp:663
+msgid "&Send"
+msgstr "发送(&S)"
+
+#: ../../../src/uibase.cpp:711
+msgid ""
+"\n"
+"\n"
+"Connecting..."
+msgstr ""
+"\n"
+"\n"
+"正在连接..."
+
+#: ../../../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 "这些是您用来接收付款的 Bitcoin 地址。 您可能需要给每一个付款人一个不同的地址从而可以最终每一笔交易是谁支付的。 下面高亮的地址是您的主窗口正在使用的地址。"
+
+#: ../../../src/uibase.cpp:774
+#: ../../../src/uibase.cpp:886
+msgid "&Edit..."
+msgstr "编辑(&E)..."
+
+#: ../../../src/uibase.cpp:777
+#: ../../../src/uibase.cpp:889
+msgid " &New Address... "
+msgstr " 新建地址(&N)..."
+
+#: ../../../src/uibase.cpp:849
+msgid "Sending"
+msgstr "发送人地址"
+
+#: ../../../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 "这些是您用来接收付款的 Bitcoin 地址。 您可以给每一个付款人一个不同的地址从而可以最终每一笔交易是谁支付的。 下面高亮的地址是您的主窗口正在使用的地址。"
+
+#: ../../../src/uibase.cpp:870
+msgid "Receiving"
+msgstr "我的接收地址"
+
+#: ../../../src/uibase.cpp:880
+msgid "&Delete"
+msgstr "删除(&D)"
+
+#: ../../../src/util.cpp:866
+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:899
+msgid "-beta"
+msgstr "-测试版"
+
+#: ../../../src/uibase.h:147
+msgid "Transaction Details"
+msgstr "交易详情"
+
+#: ../../../src/uibase.h:199
+msgid "Options"
+msgstr "选项"
+
+#: ../../../src/uibase.h:228
+msgid "About Bitcoin"
+msgstr "关于 Bitcoin"
+
+#: ../../../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 BETA"
+
+#~ msgid "n/a"
+#~ msgstr "n/a"
+
+#~ msgid "Can't include a message when sending to a Bitcoin address"
+#~ msgstr "发送到 Bitcoin 地址时无法包含信息"
+
+#~ msgid ""
+#~ "Optional transaction fee you give to the nodes that process your "
+#~ "transactions."
+#~ msgstr ""
+#~ "可选择向处理您交易的节点支付交易佣金。"
+
+#~ msgid "&Limit coin generation to"
+#~ msgstr "限制货币生成(&L)"
+
+#~ msgid "processors"
+#~ msgstr "处理器"
+
+#~ msgid "&From:"
+#~ msgstr "来自(&F):"
+
+#~ msgid "&Message:"
+#~ msgstr "信息(&M):"
+
+#~ msgid ""
+#~ "It's good policy to use a new address for each payment you receive.\n"
+#~ "\n"
+#~ "Label"
+#~ msgstr ""
+#~ "最好能为您收到的每次付款使用不同的地址。\n"
+#~ "\n"
+#~ "标签"
+
+#~ msgid "Will appear as \"From: Unknown\""
+#~ msgstr "将显示为“来自: 未知”"
diff --git a/share/setup.nsi b/share/setup.nsi
index b17e553372..2fa4d17aa5 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -4,12 +4,12 @@ RequestExecutionLevel highest
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.3.22
+!define VERSION 0.3.23
!define COMPANY "Bitcoin project"
!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}
@@ -39,12 +39,12 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile bitcoin-0.3.22-win32-setup.exe
+OutFile bitcoin-0.3.23-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
ShowInstDetails show
-VIProductVersion 0.3.22.0
+VIProductVersion 0.3.23.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
@@ -59,16 +59,15 @@ 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 /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
@@ -108,7 +107,6 @@ done${UNSECTION_ID}:
# Uninstaller sections
Section /o -un.Main UNSEC0000
Delete /REBOOTOK $INSTDIR\bitcoin.exe
- Delete /REBOOTOK $INSTDIR\libeay32.dll
Delete /REBOOTOK $INSTDIR\license.txt
Delete /REBOOTOK $INSTDIR\readme.txt
RMDir /r /REBOOTOK $INSTDIR\daemon
diff --git a/src/base58.h b/src/base58.h
index 580bd3fc63..c2729d4770 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -38,6 +38,8 @@ inline std::string EncodeBase58(const unsigned char* pbegin, const unsigned char
// Convert bignum to std::string
std::string str;
+ // Expected size increase from base58 conversion is approximately 137%
+ // use 138% to be safe
str.reserve((pend - pbegin) * 138 / 100 + 1);
CBigNum dv;
CBigNum rem;
diff --git a/src/bignum.h b/src/bignum.h
index 5b4c78e7fa..5eaa4028b7 100644
--- a/src/bignum.h
+++ b/src/bignum.h
@@ -228,10 +228,13 @@ public:
{
std::vector<unsigned char> vch2(vch.size() + 4);
unsigned int nSize = vch.size();
+ // BIGNUM's byte stream format expects 4 bytes of
+ // big endian size data info at the front
vch2[0] = (nSize >> 24) & 0xff;
vch2[1] = (nSize >> 16) & 0xff;
vch2[2] = (nSize >> 8) & 0xff;
vch2[3] = (nSize >> 0) & 0xff;
+ // swap data to big endian
reverse_copy(vch.begin(), vch.end(), vch2.begin() + 4);
BN_mpi2bn(&vch2[0], vch2.size(), this);
}
diff --git a/src/db.cpp b/src/db.cpp
index 0e5522298b..b67e2a6452 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -848,12 +848,11 @@ bool LoadWallet(bool& fFirstRunRet)
{
// Create new keyUser and set as default key
RandAddSeedPerfmon();
- keyUser.MakeNewKey();
- if (!AddKey(keyUser))
- return false;
- if (!SetAddressBookName(PubKeyToAddress(keyUser.GetPubKey()), ""))
- return false;
- CWalletDB().WriteDefaultKey(keyUser.GetPubKey());
+
+ CWalletDB walletdb;
+ vchDefaultKey = GetKeyFromKeyPool();
+ walletdb.WriteDefaultKey(vchDefaultKey);
+ walletdb.WriteName(PubKeyToAddress(vchDefaultKey), "");
}
CreateThread(ThreadFlushWalletDB, NULL);
diff --git a/src/init.cpp b/src/init.cpp
index 73f4e207cd..b683e66782 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -144,7 +144,6 @@ bool AppInit2(int argc, char* argv[])
if (mapArgs.count("-?") || mapArgs.count("--help"))
{
- string beta = VERSION_IS_BETA ? _(" beta") : "";
string strUsage = string() +
_("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
@@ -159,6 +158,7 @@ bool AppInit2(int argc, char* argv[])
" -gen=0 \t\t " + _("Don't generate coins\n") +
" -min \t\t " + _("Start minimized\n") +
" -datadir=<dir> \t\t " + _("Specify data directory\n") +
+ " -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)\n") +
" -proxy=<ip:port> \t " + _("Connect through socks4 proxy\n") +
" -dns \t " + _("Allow DNS lookups for addnode and connect\n") +
" -addnode=<ip> \t " + _("Add a node to connect to\n") +
@@ -390,7 +390,7 @@ bool AppInit2(int argc, char* argv[])
{
printf("Rescanning last %i blocks (from block %i)...\n", pindexBest->nHeight - pindexRescan->nHeight, pindexRescan->nHeight);
nStart = GetTimeMillis();
- ScanForWalletTransactions(pindexRescan);
+ ScanForWalletTransactions(pindexRescan, true);
printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart);
}
@@ -422,6 +422,13 @@ bool AppInit2(int argc, char* argv[])
return false;
}
+ if (mapArgs.count("-timeout"))
+ {
+ int nNewTimeout = GetArg("-timeout", 5000);
+ if (nNewTimeout > 0 && nNewTimeout < 600000)
+ nConnectTimeout = nNewTimeout;
+ }
+
if (mapArgs.count("-printblock"))
{
string strMatch = mapArgs["-printblock"];
diff --git a/src/irc.cpp b/src/irc.cpp
index a262eaba41..cde934e80c 100644
--- a/src/irc.cpp
+++ b/src/irc.cpp
@@ -268,11 +268,11 @@ void ThreadIRCSeed2(void* parg)
while (!fShutdown)
{
//CAddress addrConnect("216.155.130.130:6667"); // chat.freenode.net
- CAddress addrConnect("92.243.23.21:6667"); // irc.lfnet.org
+ CAddress addrConnect("92.243.23.21", 6667); // irc.lfnet.org
if (!fTOR)
{
//struct hostent* phostent = gethostbyname("chat.freenode.net");
- CAddress addrIRC("irc.lfnet.org:6667", 0, true);
+ CAddress addrIRC("irc.lfnet.org", 6667, true);
if (addrIRC.IsValid())
addrConnect = addrIRC;
}
@@ -342,9 +342,16 @@ void ThreadIRCSeed2(void* parg)
Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str());
}
}
-
- Send(hSocket, fTestNet ? "JOIN #bitcoinTEST\r" : "JOIN #bitcoin\r");
- Send(hSocket, fTestNet ? "WHO #bitcoinTEST\r" : "WHO #bitcoin\r");
+
+ if (fTestNet) {
+ Send(hSocket, "JOIN #bitcoinTEST\r");
+ Send(hSocket, "WHO #bitcoinTEST\r");
+ } else {
+ // randomly join #bitcoin00-#bitcoin99
+ int channel_number = GetRandInt(100);
+ Send(hSocket, strprintf("JOIN #bitcoin%02d\r", channel_number).c_str());
+ Send(hSocket, strprintf("WHO #bitcoin%02d\r", channel_number).c_str());
+ }
int64 nStart = GetTime();
string strLine;
diff --git a/src/main.cpp b/src/main.cpp
index 0ecbeafd93..108842f3a1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -735,13 +735,13 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
}
// Don't accept it if it can't get into a block
- if (nFees < GetMinFee(1000))
+ if (nFees < GetMinFee(1000, true, true))
return error("AcceptToMemoryPool() : not enough fees");
// Continuously rate-limit free transactions
// This mitigates 'penny-flooding' -- sending thousands of free transactions just to
// be annoying or make other's transactions take longer to confirm.
- if (nFees < MIN_TX_FEE)
+ if (nFees < MIN_RELAY_TX_FEE)
{
static CCriticalSection cs;
static double dFreeCount;
@@ -888,7 +888,7 @@ bool CWalletTx::AcceptWalletTransaction(CTxDB& txdb, bool fCheckInputs)
return false;
}
-int ScanForWalletTransactions(CBlockIndex* pindexStart)
+int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
{
int ret = 0;
@@ -901,7 +901,7 @@ int ScanForWalletTransactions(CBlockIndex* pindexStart)
block.ReadFromDisk(pindex, true);
BOOST_FOREACH(CTransaction& tx, block.vtx)
{
- if (AddToWalletIfInvolvingMe(tx, &block))
+ if (AddToWalletIfInvolvingMe(tx, &block, fUpdate))
ret++;
}
pindex = pindex->pnext;
@@ -3333,7 +3333,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
// Transaction fee required depends on block size
bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority));
- int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree);
+ int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, true);
// Connecting shouldn't fail due to dependency on other memory pool transactions
// because we're already processing them in order of dependency
@@ -3858,9 +3858,18 @@ bool CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CWalletTx&
dPriority += (double)nCredit * pcoin.first->GetDepthInMainChain();
}
- // Fill a vout back to self with any change
- int64 nChange = nValueIn - nTotalValue;
- if (nChange >= CENT)
+ int64 nChange = nValueIn - nValue - nFeeRet;
+
+ // if sub-cent change is required, the fee must be raised to at least MIN_TX_FEE
+ // or until nChange becomes zero
+ if (nFeeRet < MIN_TX_FEE && nChange > 0 && nChange < CENT)
+ {
+ int64 nMoveToFee = min(nChange, MIN_TX_FEE - nFeeRet);
+ nChange -= nMoveToFee;
+ nFeeRet += nMoveToFee;
+ }
+
+ if (nChange > 0)
{
// Note: We use a new key here to keep it from being obvious which side is the change.
// The drawback is that by not reusing a previous key, the change may be lost if a
diff --git a/src/main.h b/src/main.h
index 33c4892732..7aa6d41c30 100644
--- a/src/main.h
+++ b/src/main.h
@@ -37,6 +37,7 @@ static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
static const int64 COIN = 100000000;
static const int64 CENT = 1000000;
static const int64 MIN_TX_FEE = 50000;
+static const int64 MIN_RELAY_TX_FEE = 10000;
static const int64 MAX_MONEY = 21000000 * COIN;
inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
static const int COINBASE_MATURITY = 100;
@@ -88,7 +89,6 @@ class CReserveKey;
class CTxDB;
class CTxIndex;
-
bool CheckDiskSpace(uint64 nAdditionalBytes=0);
FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode="rb");
FILE* AppendBlockFile(unsigned int& nFileRet);
@@ -96,7 +96,7 @@ bool AddKey(const CKey& key);
std::vector<unsigned char> GenerateNewKey();
bool AddToWallet(const CWalletTx& wtxIn);
void WalletUpdateSpent(const COutPoint& prevout);
-int ScanForWalletTransactions(CBlockIndex* pindexStart);
+int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
void ReacceptWalletTransactions();
bool LoadBlockIndex(bool fAllowNew=true);
void PrintBlockTree();
@@ -609,12 +609,14 @@ public:
return dPriority > COIN * 144 / 250;
}
- int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true) const
+ int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, bool fForRelay=false) const
{
- // Base fee is 1 cent per kilobyte
+ // Base fee is either MIN_TX_FEE or MIN_RELAY_TX_FEE
+ int64 nBaseFee = fForRelay ? MIN_RELAY_TX_FEE : MIN_TX_FEE;
+
unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK);
unsigned int nNewBlockSize = nBlockSize + nBytes;
- int64 nMinFee = (1 + (int64)nBytes / 1000) * MIN_TX_FEE;
+ int64 nMinFee = (1 + (int64)nBytes / 1000) * nBaseFee;
if (fAllowFree)
{
@@ -633,11 +635,11 @@ public:
}
}
- // To limit dust spam, require MIN_TX_FEE if any output is less than 0.01
- if (nMinFee < MIN_TX_FEE)
+ // To limit dust spam, require MIN_TX_FEE/MIN_RELAY_TX_FEE if any output is less than 0.01
+ if (nMinFee < nBaseFee)
BOOST_FOREACH(const CTxOut& txout, vout)
if (txout.nValue < CENT)
- nMinFee = MIN_TX_FEE;
+ nMinFee = nBaseFee;
// Raise the price as the block approaches full
if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2)
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 57ece3ba29..c3a964e8fc 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -7,14 +7,14 @@ USE_UPNP:=0
INCLUDEPATHS= \
-I"C:\boost-1.43.0-mgw" \
-I"C:\db-4.7.25.NC-mgw\build_unix" \
- -I"C:\openssl-1.0.0c-mgw\include" \
+ -I"C:\openssl-1.0.0d-mgw\include" \
-I"C:\wxWidgets-2.9.1-mgw\lib\gcc_lib\mswud" \
-I"C:\wxWidgets-2.9.1-mgw\include"
LIBPATHS= \
-L"C:\boost-1.43.0-mgw\stage\lib" \
-L"C:\db-4.7.25.NC-mgw\build_unix" \
- -L"C:\openssl-1.0.0c-mgw" \
+ -L"C:\openssl-1.0.0d-mgw" \
-L"C:\wxWidgets-2.9.1-mgw\lib\gcc_lib"
WXLIBS= \
@@ -26,9 +26,10 @@ LIBS= \
-l boost_program_options-mgw45-mt-s-1_43 \
-l boost_thread-mgw45-mt-s-1_43 \
-l db_cxx \
- -l eay32
+ -l ssl \
+ -l crypto
-DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH
+DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
DEBUGFLAGS=-g -D__WXDEBUG__
CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
diff --git a/src/net.cpp b/src/net.cpp
index 2d896271f1..8b439efdca 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -56,11 +56,16 @@ map<CInv, int64> mapAlreadyAskedFor;
// Settings
int fUseProxy = false;
+int nConnectTimeout = 5000;
CAddress addrProxy("127.0.0.1",9050);
+unsigned short GetListenPort()
+{
+ return (unsigned short)(GetArg("-port", GetDefaultPort()));
+}
void CNode::PushGetBlocks(CBlockIndex* pindexBegin, uint256 hashEnd)
{
@@ -77,7 +82,7 @@ void CNode::PushGetBlocks(CBlockIndex* pindexBegin, uint256 hashEnd)
-bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet)
+bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet, int nTimeout)
{
hSocketRet = INVALID_SOCKET;
@@ -89,12 +94,90 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet)
setsockopt(hSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&set, sizeof(int));
#endif
- bool fRoutable = !(addrConnect.GetByte(3) == 10 || (addrConnect.GetByte(3) == 192 && addrConnect.GetByte(2) == 168));
- bool fProxy = (fUseProxy && fRoutable);
+ bool fProxy = (fUseProxy && addrConnect.IsRoutable());
struct sockaddr_in sockaddr = (fProxy ? addrProxy.GetSockAddr() : addrConnect.GetSockAddr());
+#ifdef __WXMSW__
+ u_long fNonblock = 1;
+ if (ioctlsocket(hSocket, FIONBIO, &fNonblock) == SOCKET_ERROR)
+#else
+ int fFlags = fcntl(hSocket, F_GETFL, 0);
+ if (fcntl(hSocket, F_SETFL, fFlags | O_NONBLOCK) == -1)
+#endif
+ {
+ closesocket(hSocket);
+ return false;
+ }
+
+
if (connect(hSocket, (struct sockaddr*)&sockaddr, sizeof(sockaddr)) == SOCKET_ERROR)
{
+ // WSAEINVAL is here because some legacy version of winsock uses it
+ if (WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK || WSAGetLastError() == WSAEINVAL)
+ {
+ struct timeval timeout;
+ timeout.tv_sec = nTimeout / 1000;
+ timeout.tv_usec = (nTimeout % 1000) * 1000;
+
+ fd_set fdset;
+ FD_ZERO(&fdset);
+ FD_SET(hSocket, &fdset);
+ int nRet = select(hSocket + 1, NULL, &fdset, NULL, &timeout);
+ if (nRet == 0)
+ {
+ printf("connection timeout\n");
+ closesocket(hSocket);
+ return false;
+ }
+ if (nRet == SOCKET_ERROR)
+ {
+ printf("select() for connection failed: %i\n",WSAGetLastError());
+ closesocket(hSocket);
+ return false;
+ }
+ socklen_t nRetSize = sizeof(nRet);
+#ifdef __WXMSW__
+ if (getsockopt(hSocket, SOL_SOCKET, SO_ERROR, (char*)(&nRet), &nRetSize) == SOCKET_ERROR)
+#else
+ if (getsockopt(hSocket, SOL_SOCKET, SO_ERROR, &nRet, &nRetSize) == SOCKET_ERROR)
+#endif
+ {
+ printf("getsockopt() for connection failed: %i\n",WSAGetLastError());
+ closesocket(hSocket);
+ return false;
+ }
+ if (nRet != 0)
+ {
+ printf("connect() failed after select(): %i\n",nRet);
+ closesocket(hSocket);
+ return false;
+ }
+ }
+#ifdef __WXMSW__
+ else if (WSAGetLastError() != WSAEISCONN)
+#else
+ else
+#endif
+ {
+ printf("connect() failed: %s\n",WSAGetLastError());
+ closesocket(hSocket);
+ return false;
+ }
+ }
+
+ /*
+ this isn't even strictly necessary
+ CNode::ConnectNode immediately turns the socket back to non-blocking
+ but we'll turn it back to blocking just in case
+ */
+#ifdef __WXMSW__
+ fNonblock = 0;
+ if (ioctlsocket(hSocket, FIONBIO, &fNonblock) == SOCKET_ERROR)
+#else
+ fFlags = fcntl(hSocket, F_GETFL, 0);
+ if (fcntl(hSocket, F_SETFL, fFlags & !O_NONBLOCK) == SOCKET_ERROR)
+#endif
+ {
closesocket(hSocket);
return false;
}
@@ -758,9 +841,12 @@ void ThreadSocketHandler2(void* parg)
if (nSelect == SOCKET_ERROR)
{
int nErr = WSAGetLastError();
- printf("socket select error %d\n", nErr);
- for (int i = 0; i <= hSocketMax; i++)
- FD_SET(i, &fdsetRecv);
+ if (hSocketMax > -1)
+ {
+ printf("socket select error %d\n", nErr);
+ for (int i = 0; i <= hSocketMax; i++)
+ FD_SET(i, &fdsetRecv);
+ }
FD_ZERO(&fdsetSend);
FD_ZERO(&fdsetError);
Sleep(timeout.tv_usec/1000);
@@ -970,7 +1056,7 @@ void ThreadMapPort2(void* parg)
printf("ThreadMapPort started\n");
char port[6];
- sprintf(port, "%d", GetDefaultPort());
+ sprintf(port, "%d", GetListenPort());
const char * rootdescurl = 0;
const char * multicastif = 0;
@@ -1063,7 +1149,7 @@ void DNSAddressSeed()
for (int seed_idx = 0; seed_idx < ARRAYLEN(strDNSSeed); seed_idx++) {
vector<CAddress> vaddr;
- if (Lookup(strDNSSeed[seed_idx], vaddr, NODE_NETWORK, true))
+ if (Lookup(strDNSSeed[seed_idx], vaddr, NODE_NETWORK, -1, true))
{
BOOST_FOREACH (CAddress& addr, vaddr)
{
@@ -1440,14 +1526,11 @@ void ThreadMessageHandler2(void* parg)
-
-
-
bool BindListenPort(string& strError)
{
strError = "";
int nOne = 1;
- addrLocalHost.port = htons(GetDefaultPort());
+ addrLocalHost.port = htons(GetListenPort());
#ifdef __WXMSW__
// Initialize Windows Sockets
@@ -1499,7 +1582,7 @@ bool BindListenPort(string& strError)
memset(&sockaddr, 0, sizeof(sockaddr));
sockaddr.sin_family = AF_INET;
sockaddr.sin_addr.s_addr = INADDR_ANY; // bind to all IPs on this computer
- sockaddr.sin_port = htons(GetDefaultPort());
+ sockaddr.sin_port = htons(GetListenPort());
if (::bind(hListenSocket, (struct sockaddr*)&sockaddr, sizeof(sockaddr)) == SOCKET_ERROR)
{
int nErr = WSAGetLastError();
@@ -1561,7 +1644,7 @@ void StartNode(void* parg)
printf("ipv4 %s: %s\n", ifa->ifa_name, pszIP);
// Take the first IP that isn't loopback 127.x.x.x
- CAddress addr(*(unsigned int*)&s4->sin_addr, 0, nLocalServices);
+ CAddress addr(*(unsigned int*)&s4->sin_addr, GetListenPort(), nLocalServices);
if (addr.IsValid() && addr.GetByte(3) != 127)
{
addrLocalHost = addr;
diff --git a/src/net.h b/src/net.h
index 6bbcd64e42..8a55856eed 100644
--- a/src/net.h
+++ b/src/net.h
@@ -19,6 +19,7 @@ class CRequestTracker;
class CNode;
class CBlockIndex;
extern int nBestHeight;
+extern int nConnectTimeout;
@@ -32,7 +33,7 @@ enum
-bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet);
+bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet, int nTimeout=nConnectTimeout);
bool Lookup(const char *pszName, std::vector<CAddress>& vaddr, int nServices, int nMaxSolutions, bool fAllowLookup = false, int portDefault = 0, bool fAllowPort = false);
bool Lookup(const char *pszName, CAddress& addr, int nServices, bool fAllowLookup = false, int portDefault = 0, bool fAllowPort = false);
bool GetMyExternalIP(unsigned int& ipRet);
@@ -283,13 +284,29 @@ public:
return (memcmp(pchReserved, pchIPv4, sizeof(pchIPv4)) == 0);
}
+ bool IsRFC1918() const
+ {
+ return IsIPv4() && (GetByte(3) == 10 ||
+ (GetByte(3) == 192 && GetByte(2) == 168) ||
+ (GetByte(3) == 172 &&
+ (GetByte(2) >= 16 && GetByte(2) <= 31)));
+ }
+
+ bool IsRFC3927() const
+ {
+ return IsIPv4() && (GetByte(3) == 169 && GetByte(2) == 254);
+ }
+
+ bool IsLocal() const
+ {
+ return IsIPv4() && (GetByte(3) == 127 ||
+ GetByte(3) == 0);
+ }
+
bool IsRoutable() const
{
return IsValid() &&
- !(GetByte(3) == 10 ||
- (GetByte(3) == 192 && GetByte(2) == 168) ||
- GetByte(3) == 127 ||
- GetByte(3) == 0);
+ !(IsRFC1918() || IsRFC3927() || IsLocal());
}
bool IsValid() const
diff --git a/src/rpc.cpp b/src/rpc.cpp
index b05a13e23b..ad1abe333e 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -204,12 +204,26 @@ double GetDifficulty()
{
// Floating point number that is a multiple of the minimum difficulty,
// minimum difficulty = 1.0.
+
if (pindexBest == NULL)
return 1.0;
- int nShift = 256 - 32 - 31; // to fit in a uint
- double dMinimum = (CBigNum().SetCompact(bnProofOfWorkLimit.GetCompact()) >> nShift).getuint();
- double dCurrently = (CBigNum().SetCompact(pindexBest->nBits) >> nShift).getuint();
- return dMinimum / dCurrently;
+ int nShift = (pindexBest->nBits >> 24) & 0xff;
+
+ double dDiff =
+ (double)0x0000ffff / (double)(pindexBest->nBits & 0x00ffffff);
+
+ while (nShift < 29)
+ {
+ dDiff *= 256.0;
+ nShift++;
+ }
+ while (nShift > 29)
+ {
+ dDiff /= 256.0;
+ nShift--;
+ }
+
+ return dDiff;
}
Value getdifficulty(const Array& params, bool fHelp)
diff --git a/src/serialize.h b/src/serialize.h
index 8e7677a2eb..0d66d6a956 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -33,7 +33,7 @@ class CDataStream;
class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000;
-static const int VERSION = 32200;
+static const int VERSION = 32300;
static const char* pszSubVer = "";
static const bool VERSION_IS_BETA = true;
diff --git a/src/ui.cpp b/src/ui.cpp
index f24449cccb..0a7d45578f 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -22,6 +22,13 @@ CMyTaskBarIcon* ptaskbaricon = NULL;
bool fClosedToTray = false;
wxLocale g_locale;
+#ifdef __WXMSW__
+double nScaleX = 1.0;
+double nScaleY = 1.0;
+#else
+static const double nScaleX = 1.0;
+static const double nScaleY = 1.0;
+#endif
@@ -267,9 +274,10 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent)
fOnSetFocusAddress = false;
fRefresh = false;
m_choiceFilter->SetSelection(0);
- double dResize = 1.0;
+ double dResize = nScaleX;
#ifdef __WXMSW__
SetIcon(wxICON(bitcoin));
+ SetSize(dResize * GetSize().GetWidth(), nScaleY * GetSize().GetHeight());
#else
SetIcon(bitcoin80_xpm);
SetBackgroundColour(m_toolBar->GetBackgroundColour());
@@ -1223,6 +1231,9 @@ void CMainFrame::OnListItemActivated(wxListEvent& event)
CTxDetailsDialog::CTxDetailsDialog(wxWindow* parent, CWalletTx wtx) : CTxDetailsDialogBase(parent)
{
+#ifdef __WXMSW__
+ SetSize(nScaleX * GetSize().GetWidth(), nScaleY * GetSize().GetHeight());
+#endif
CRITICAL_BLOCK(cs_mapAddressBook)
{
string strHTML;
@@ -1637,6 +1648,8 @@ COptionsDialog::COptionsDialog(wxWindow* parent) : COptionsDialogBase(parent)
SelectPage(0);
#ifndef __WXMSW__
SetSize(1.0 * GetSize().GetWidth(), 1.2 * GetSize().GetHeight());
+#else
+ SetSize(nScaleX * GetSize().GetWidth(), nScaleY * GetSize().GetHeight());
#endif
#if defined(__WXGTK__) || defined(__WXMAC_OSX__)
m_checkBoxStartOnSystemStartup->SetLabel(_("&Start Bitcoin on window system startup"));
@@ -1807,6 +1820,8 @@ CAboutDialog::CAboutDialog(wxWindow* parent) : CAboutDialogBase(parent)
fontTmp.SetPointSize(8);
m_staticTextMain->SetFont(fontTmp);
SetSize(GetSize().GetWidth() + 44, GetSize().GetHeight() + 10);
+#else
+ SetSize(nScaleX * GetSize().GetWidth(), nScaleY * GetSize().GetHeight());
#endif
}
@@ -1841,12 +1856,21 @@ CSendDialog::CSendDialog(wxWindow* parent, const wxString& strAddress) : CSendDi
fontTmp.SetPointSize(9);
m_staticTextInstructions->SetFont(fontTmp);
SetSize(725, 180);
+#else
+ SetSize(nScaleX * GetSize().GetWidth(), nScaleY * GetSize().GetHeight());
#endif
// Set Icon
- wxIcon iconSend;
- iconSend.CopyFromBitmap(wxBitmap(send16noshadow_xpm));
- SetIcon(iconSend);
+ if (nScaleX == 1.0 && nScaleY == 1.0) // We don't have icons of the proper size otherwise
+ {
+ wxIcon iconSend;
+ iconSend.CopyFromBitmap(wxBitmap(send16noshadow_xpm));
+ SetIcon(iconSend);
+ }
+#ifdef __WXMSW__
+ else
+ SetIcon(wxICON(bitcoin));
+#endif
// Fixup the tab order
m_buttonPaste->MoveAfterInTabOrder(m_buttonCancel);
@@ -1996,6 +2020,8 @@ CSendingDialog::CSendingDialog(wxWindow* parent, const CAddress& addrIn, int64 n
fWorkDone = false;
#ifndef __WXMSW__
SetSize(1.2 * GetSize().GetWidth(), 1.08 * GetSize().GetHeight());
+#else
+ SetSize(nScaleX * GetSize().GetWidth(), nScaleY * GetSize().GetHeight());
#endif
SetTitle(strprintf(_("Sending %s to %s"), FormatMoney(nPrice).c_str(), wtx.mapValue["to"].c_str()));
@@ -2319,6 +2345,10 @@ void CSendingDialog::OnReply3(CDataStream& vRecv)
CAddressBookDialog::CAddressBookDialog(wxWindow* parent, const wxString& strInitSelected, int nPageIn, bool fDuringSendIn) : CAddressBookDialogBase(parent)
{
+#ifdef __WXMSW__
+ SetSize(nScaleX * GetSize().GetWidth(), nScaleY * GetSize().GetHeight());
+#endif
+
// Set initially selected page
wxNotebookEvent event;
event.SetSelection(nPageIn);
@@ -2330,9 +2360,16 @@ CAddressBookDialog::CAddressBookDialog(wxWindow* parent, const wxString& strInit
m_buttonCancel->Show(false);
// Set Icon
- wxIcon iconAddressBook;
- iconAddressBook.CopyFromBitmap(wxBitmap(addressbook16_xpm));
- SetIcon(iconAddressBook);
+ if (nScaleX == 1.0 && nScaleY == 1.0) // We don't have icons of the proper size otherwise
+ {
+ wxIcon iconAddressBook;
+ iconAddressBook.CopyFromBitmap(wxBitmap(addressbook16_xpm));
+ SetIcon(iconAddressBook);
+ }
+#ifdef __WXMSW__
+ else
+ SetIcon(wxICON(bitcoin));
+#endif
// Init column headers
m_listCtrlSending->InsertColumn(0, _("Name"), wxLIST_FORMAT_LEFT, 200);
@@ -2848,6 +2885,16 @@ bool CMyApp::OnInit()
g_locale.AddCatalog("wxstd"); // wxWidgets standard translations, if any
g_locale.AddCatalog("bitcoin");
+#ifdef __WXMSW__
+ HDC hdc = GetDC(NULL);
+ if (hdc)
+ {
+ nScaleX = GetDeviceCaps(hdc, LOGPIXELSX) / 96.0;
+ nScaleY = GetDeviceCaps(hdc, LOGPIXELSY) / 96.0;
+ ReleaseDC(NULL, hdc);
+ }
+#endif
+
return AppInit(argc, argv);
}
diff --git a/src/util.cpp b/src/util.cpp
index 32f4b27fd6..b95e236167 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -278,7 +278,7 @@ string strprintf(const char* format, ...)
if (ret >= 0 && ret < limit)
break;
if (p != buffer)
- delete p;
+ delete[] p;
limit *= 2;
p = new char[limit];
if (p == NULL)
@@ -286,7 +286,7 @@ string strprintf(const char* format, ...)
}
string str(p, p+ret);
if (p != buffer)
- delete p;
+ delete[] p;
return str;
}
@@ -902,8 +902,10 @@ string FormatVersion(int nVersion)
string FormatFullVersion()
{
string s = FormatVersion(VERSION) + pszSubVer;
- if (VERSION_IS_BETA)
- s += _("-beta");
+ if (VERSION_IS_BETA) {
+ s += "-";
+ s += _("beta");
+ }
return s;
}
diff --git a/src/util.h b/src/util.h
index 3244595164..e7110570c6 100644
--- a/src/util.h
+++ b/src/util.h
@@ -104,6 +104,8 @@ T* alignup(T* p)
typedef int socklen_t;
#else
#define WSAGetLastError() errno
+#define WSAEINVAL EINVAL
+#define WSAEALREADY EALREADY
#define WSAEWOULDBLOCK EWOULDBLOCK
#define WSAEMSGSIZE EMSGSIZE
#define WSAEINTR EINTR