diff options
23 files changed, 1216 insertions, 738 deletions
@@ -23,7 +23,7 @@ or are controversial. The master branch is regularly built and tested, but is not guaranteed to be completely stable. Tags are regularly created to indicate new official, stable release versions of Bitcoin. If you would like to -help test the Bitcoin core, please contact QA@Bitcoin.org. +help test the Bitcoin core, please contact QA@BitcoinTesting.org. Feature branches are created when there are major new features being worked on by several people. diff --git a/contrib/BitcoinTemplate.dmg b/contrib/BitcoinTemplate.dmg Binary files differnew file mode 100644 index 0000000000..ca86308e05 --- /dev/null +++ b/contrib/BitcoinTemplate.dmg diff --git a/contrib/create_osx_dmg.sh b/contrib/create_osx_dmg.sh new file mode 100755 index 0000000000..af164e56cf --- /dev/null +++ b/contrib/create_osx_dmg.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash +# +# Creates a Bitcoin.dmg OSX file from the contrib/BitcoinTemplate.dmg file +# +# Recipe from: http://digital-sushi.org/entry/how-to-create-a-disk-image-installer-for-apple-mac-os-x/ +# +# To make a prettier BitcoinTemplate.dmg: +# + open (mount) BitcoinTemplate.dmg +# + change the file properties, icon positions, background image, etc +# + eject, then commit the changed BitcoinTemplate.dmg +# + +CWD=$(pwd) + +if [ $# -lt 1 ]; then + if [ $(basename $CWD) == "contrib" ] + then + TOP=$(dirname $CWD) + else + echo "Usage: $0 /path/to/bitcoin/tree" + exit 1 + fi +else + TOP=$1 +fi + +CONTRIB=$TOP/contrib +BUILD_DIR=/tmp/bitcoin_osx_build + +# First, compile bitcoin and bitcoind +cd "$TOP/src" +if [ ! -e bitcoin ]; then make -f makefile.osx bitcoin; fi +if [ ! -e bitcoind ]; then make -f makefile.osx bitcoind; fi +strip bitcoin bitcoind + +mkdir -p "$BUILD_DIR" +cd "$BUILD_DIR" + +rm -f Bitcoin.sparseimage +hdiutil convert "$CONTRIB/BitcoinTemplate.dmg" -format UDSP -o Bitcoin +hdiutil mount Bitcoin.sparseimage + +# Copy over placeholders in /Volumes/Bitcoin +cp "$TOP/src/bitcoind" /Volumes/Bitcoin/ +cp "$TOP/src/bitcoin" /Volumes/Bitcoin/Bitcoin.app/Contents/MacOS/ + +# Create source code .zip +cd "$TOP" +git archive -o /Volumes/Bitcoin/bitcoin.zip $(git branch 2>/dev/null|grep -e ^* | cut -d ' ' -f 2) + +# Fix permissions +chmod -Rf go-w /Volumes/Bitcoin + +cd "$BUILD_DIR" +hdiutil eject /Volumes/Bitcoin +rm -f "$CWD/Bitcoin.dmg" +hdiutil convert Bitcoin.sparseimage -format UDBZ -o "$CWD/Bitcoin.dmg" + +cd "$CWD" +rm -rf "$BUILD_DIR" diff --git a/contrib/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml index 61ea50e4fe..61ea50e4fe 100644 --- a/contrib/boost-win32.yml +++ b/contrib/gitian-descriptors/boost-win32.yml diff --git a/contrib/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 52b10bc33f..52b10bc33f 100644 --- a/contrib/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml diff --git a/contrib/gitian.yml b/contrib/gitian-descriptors/gitian.yml index efa9cb8c10..efa9cb8c10 100644 --- a/contrib/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml diff --git a/contrib/wxwidgets-win32.yml b/contrib/gitian-descriptors/wxwidgets-win32.yml index 3d49d7b35e..3d49d7b35e 100644 --- a/contrib/wxwidgets-win32.yml +++ b/contrib/gitian-descriptors/wxwidgets-win32.yml diff --git a/contrib/wxwidgets.yml b/contrib/gitian-descriptors/wxwidgets.yml index 0509615101..0509615101 100644 --- a/contrib/wxwidgets.yml +++ b/contrib/gitian-descriptors/wxwidgets.yml diff --git a/contrib/gitian-downloader/bluematt-key.pgp b/contrib/gitian-downloader/bluematt-key.pgp Binary files differnew file mode 100644 index 0000000000..fb6d9eb284 --- /dev/null +++ b/contrib/gitian-downloader/bluematt-key.pgp diff --git a/contrib/gitian-downloader/devrandom-key.pgp b/contrib/gitian-downloader/devrandom-key.pgp Binary files differnew file mode 100644 index 0000000000..71898127ba --- /dev/null +++ b/contrib/gitian-downloader/devrandom-key.pgp diff --git a/contrib/gitian-downloader/gavinandresen-key.pgp b/contrib/gitian-downloader/gavinandresen-key.pgp Binary files differnew file mode 100644 index 0000000000..f81f44e874 --- /dev/null +++ b/contrib/gitian-downloader/gavinandresen-key.pgp diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config new file mode 100644 index 0000000000..d21bb07808 --- /dev/null +++ b/contrib/gitian-downloader/linux-download-config @@ -0,0 +1,30 @@ +--- +name: bitcoin +urls: +- http://bitcoin.org/bitcoin-latest-linux-gitian.zip +rss: +- url: http://sourceforge.net/api/file/index/project-id/244765/mtime/desc/limit/100/rss + xpath: //item/link/text() + pattern: bitcoin-\d+.\d+.\d+-linux-gitian.zip +signers: + 0A82509767C7D4A5D14DA2301AE1D35043E08E54: + weight: 40 + name: BlueMatt + key: bluematt + BF6273FAEF7CC0BA1F562E50989F6B3048A116B5: + weight: 40 + name: Devrandom + key: devrandom + D762373D24904A3E42F33B08B9A408E71DAAC974: + weight: 40 + name: Sipa + key: sipa + 77E72E69DA7EE0A148C06B21B34821D4944DE5F7: + weight: 40 + name: tcatm + key: tcatm + 01CDF4627A3B88AAE4A571C87588242FBE38D3A8: + weight: 40 + name: "Gavin Andresen" + key: gavinandresen +minimum_weight: 120 diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-downloader/sipa-key.pgp Binary files differnew file mode 100644 index 0000000000..086c9eb42e --- /dev/null +++ b/contrib/gitian-downloader/sipa-key.pgp diff --git a/contrib/gitian-downloader/tcatm-key.pgp b/contrib/gitian-downloader/tcatm-key.pgp Binary files differnew file mode 100644 index 0000000000..baaec76b8c --- /dev/null +++ b/contrib/gitian-downloader/tcatm-key.pgp diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config new file mode 100644 index 0000000000..c0de21c48f --- /dev/null +++ b/contrib/gitian-downloader/win32-download-config @@ -0,0 +1,30 @@ +--- +name: bitcoin +urls: +- http://bitcoin.org/bitcoin-latest-win32-gitian.zip +rss: +- url: http://sourceforge.net/api/file/index/project-id/244765/mtime/desc/limit/100/rss + xpath: //item/link/text() + pattern: bitcoin-\d+.\d+.\d+-win32-gitian.zip +signers: + 0A82509767C7D4A5D14DA2301AE1D35043E08E54: + weight: 40 + name: BlueMatt + key: bluematt + BF6273FAEF7CC0BA1F562E50989F6B3048A116B5: + weight: 40 + name: Devrandom + key: devrandom + D762373D24904A3E42F33B08B9A408E71DAAC974: + weight: 40 + name: Sipa + key: sipa + 77E72E69DA7EE0A148C06B21B34821D4944DE5F7: + weight: 40 + name: tcatm + key: tcatm + 01CDF4627A3B88AAE4A571C87588242FBE38D3A8: + weight: 40 + name: "Gavin Andresen" + key: gavinandresen +minimum_weight: 120 diff --git a/doc/release-process.txt b/doc/release-process.txt index bcda64dbed..2e8b93e11b 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -33,6 +33,27 @@ 2. windows 32-bit binary + source 3. windows installer +* repackage gitian builds: + + * Windows .zip and setup.exe: + $ mkdir bitcoin-$VERSION-win32 + $ cd bitcoin-$VERSION-win32 + $ unzip bitcoin-$VERSION-win32-gitian.zip + $ mv bitcoin-$VERSION-win32-setup.exe .. + $ cd ..; zip bitcoin-$VERSION-win32.zip bitcoin-$VERSION-win32 + + * Linux .tar.gz: + $ mkdir bitcoin-$VERSION-linux + $ cd bitcoin-$VERSION-linux + $ unzip bitcoin-$VERSION-linux-gitian.zip + $ cd ..; tar czvf bitcoin-$VERSION-linux.tar.gz bitcoin-$VERSION-linux + +* perform Mac build + * From the bitcoin source dir + $ cd contrib + $ ./create_osx_dmg.sh + $ mv Bitcoin.dmg bitcoin-$VERSION-macosx.dmg + * upload source and builds to SF * create SHA1SUMS for builds, and PGP-sign it diff --git a/locale/de/LC_MESSAGES/bitcoin.mo b/locale/de/LC_MESSAGES/bitcoin.mo Binary files differindex 622661faf7..bd03fd27c3 100644 --- a/locale/de/LC_MESSAGES/bitcoin.mo +++ b/locale/de/LC_MESSAGES/bitcoin.mo diff --git a/locale/nl/LC_MESSAGES/bitcoin.mo b/locale/nl/LC_MESSAGES/bitcoin.mo Binary files differindex 836e91d41b..13467f225b 100644 --- a/locale/nl/LC_MESSAGES/bitcoin.mo +++ b/locale/nl/LC_MESSAGES/bitcoin.mo diff --git a/locale/nl/LC_MESSAGES/bitcoin.po b/locale/nl/LC_MESSAGES/bitcoin.po index 986a1e5d98..5074f21828 100644 --- a/locale/nl/LC_MESSAGES/bitcoin.po +++ b/locale/nl/LC_MESSAGES/bitcoin.po @@ -2,9 +2,9 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \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" +"POT-Creation-Date: 2011-09-22 19:03+0100\n" +"PO-Revision-Date: 2011-09-22 19:19+0100\n" +"Last-Translator: Pieter Wuille <pieter.wuille@gmail.com>\n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -12,116 +12,488 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-Basepath: .\n" +"X-Poedit-Language: Dutch\n" "X-Poedit-SearchPath-0: ../../..\n" -#: ../../../src/net.cpp:1499 +#: ../../../src/init.cpp:163 +msgid "Bitcoin version" +msgstr "Bitcoin versie" + +#: ../../../src/init.cpp:164 +msgid "Usage:" +msgstr "Mededeling:" + +#: ../../../src/init.cpp:166 +msgid "Send command to -server or bitcoind\n" +msgstr "Zend commando naar -server of bitcoind\n" + +#: ../../../src/init.cpp:167 +msgid "List commands\n" +msgstr "List van commando's\n" + +#: ../../../src/init.cpp:168 +msgid "Get help for a command\n" +msgstr "Toon hulp voor een commando\n" + +#: ../../../src/init.cpp:169 +msgid "Options:\n" +msgstr "Opties:\n" + +#: ../../../src/init.cpp:170 +msgid "Specify configuration file (default: bitcoin.conf)\n" +msgstr "Specifieer configuratiebestand (standaard: bitcoin.conf)\n" + +#: ../../../src/init.cpp:171 +msgid "Specify pid file (default: bitcoind.pid)\n" +msgstr "Specifieer pid-bestand (standaard: bitcoind.pid)\n" + +#: ../../../src/init.cpp:172 +msgid "Generate coins\n" +msgstr "Genereer coins\n" + +#: ../../../src/init.cpp:173 +msgid "Don't generate coins\n" +msgstr "Genereer geen coins\n" + +#: ../../../src/init.cpp:174 +msgid "Start minimized\n" +msgstr "Geminimaliseerd starten\n" + +#: ../../../src/init.cpp:175 +msgid "Specify data directory\n" +msgstr "Stel datamap in\n" + +#: ../../../src/init.cpp:176 +msgid "Specify connection timeout (in milliseconds)\n" +msgstr "Gelieve de time-out tijd te specifieren (in milliseconden)\n" + +#: ../../../src/init.cpp:177 +msgid "Connect through socks4 proxy\n" +msgstr "Verbind via socks4 proxy\n" + +#: ../../../src/init.cpp:178 +msgid "Allow DNS lookups for addnode and connect\n" +msgstr "Sta DNS-opzoeking toe voor addnode en connect\n" + +#: ../../../src/init.cpp:179 +msgid "Add a node to connect to\n" +msgstr "Voeg een node toe om mee te verbinden\n" + +#: ../../../src/init.cpp:180 +msgid "Connect only to the specified node\n" +msgstr "Verbind alleen met deze node\n" + +#: ../../../src/init.cpp:181 +msgid "Don't accept connections from outside\n" +msgstr "Sta geen verbindingen van buitenaf toe\n" + +#: ../../../src/init.cpp:184 +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:186 +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:189 +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:191 +msgid "Accept command line and JSON-RPC commands\n" +msgstr "Aanvaard commandolijn en JSON-RPC commando's\n" + +#: ../../../src/init.cpp:194 +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:196 +msgid "Use the test network\n" +msgstr "Gebruik het test-netwerk\n" + +#: ../../../src/init.cpp:197 +msgid "Username for JSON-RPC connections\n" +msgstr "Gebruikersnaam voor JSON-RPC verbindingen\n" + +#: ../../../src/init.cpp:198 +msgid "Password for JSON-RPC connections\n" +msgstr "Wachtwoord voor JSON-RPC verbindingen\n" + +#: ../../../src/init.cpp:199 +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:200 +msgid "Allow JSON-RPC connections from specified IP address\n" +msgstr "Enkel JSON-RPC verbindingen van opgegeven IP adres toestaan\n" + +#: ../../../src/init.cpp:201 +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:202 +msgid "Set key pool size to <n> (default: 100)\n" +msgstr "Stel sleutelpoelgrootte in op <n> (standaard: 100)\n" + +#: ../../../src/init.cpp:203 +msgid "Rescan the block chain for missing wallet transactions\n" +msgstr "Doorzoek de blokken database voor ontbrekende portefeuille-transacties\n" + +#: ../../../src/init.cpp:207 +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:208 +msgid "Use OpenSSL (https) for JSON-RPC connections\n" +msgstr "Gebruik OpenSSL (https) voor JSON-RPC verbindingen\n" + +#: ../../../src/init.cpp:209 +msgid "Server certificate file (default: server.cert)\n" +msgstr "Certificaat-bestand voor server (standaard: server.cert)\n" + +#: ../../../src/init.cpp:210 +msgid "Server private key (default: server.pem)\n" +msgstr "Geheime sleutel voor server (standaard: server.pem)\n" + +#: ../../../src/init.cpp:211 +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:215 +msgid "This help message\n" +msgstr "Dit helpbericht\n" + +#: ../../../src/init.cpp:353 +#, 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:379 +msgid "Error loading addr.dat \n" +msgstr "Fout bij laden van bestand addr.dat \n" + +#: ../../../src/init.cpp:385 +msgid "Error loading blkindex.dat \n" +msgstr "Fout bij laden van bestand blkindex.dat \n" + +#: ../../../src/init.cpp:396 +msgid "Error loading wallet.dat: Wallet corrupted \n" +msgstr "Fout bij laden van bestand wallet.dat: portefeuille beschadigd \n" + +#: ../../../src/init.cpp:398 +msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" +msgstr "Fout bij laden van bestand wallet.dat: portefeuille vereist nieuwere versie van Bitcoin\n" + +#: ../../../src/init.cpp:400 +msgid "Error loading wallet.dat \n" +msgstr "Fout bij laden van bestand wallet.dat \n" + +#: ../../../src/init.cpp:489 +msgid "Invalid -proxy address" +msgstr "Foutief -proxy adres" + +#: ../../../src/init.cpp:514 +msgid "Invalid amount for -paytxfee=<amount>" +msgstr "Ongeldig bedrag voor -paytxfee=<bedrag>" + +#: ../../../src/init.cpp:518 +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/rpc.cpp:2035 +#: ../../../src/rpc.cpp:2037 +#, c-format +msgid "To use the %s option" +msgstr "Om de %s optie te gebruiken" + +#: ../../../src/rpc.cpp:2039 +#, 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:2215 +#, 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> 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." + +#: ../../../src/net.cpp:1616 #, c-format 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." -#: ../../../src/ui.cpp:202 +#: ../../../src/util.cpp:1008 +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:1042 +msgid "beta" +msgstr "beta" + +#: ../../../src/wallet.cpp:1073 +msgid "Error: Wallet locked, unable to create transaction " +msgstr "Fout: portefeuille is op slot, kan geen transactie aanmaken" + +#: ../../../src/wallet.cpp:1081 +#, 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/wallet.cpp:1083 +msgid "Error: Transaction creation failed " +msgstr "Fout: Aanmaken van transactie mislukt " + +#: ../../../src/wallet.cpp:1088 +msgid "Sending..." +msgstr "Versturen..." + +#: ../../../src/wallet.cpp:1092 +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/wallet.cpp:1104 +msgid "Invalid amount" +msgstr "Foutieve hoeveelheid" + +#: ../../../src/wallet.cpp:1106 +msgid "Insufficient funds" +msgstr "Onvoldoende saldo" + +#: ../../../src/main.cpp:1398 +#: ../../../src/bak/main.cpp:1414 +msgid "Warning: Disk space is low " +msgstr "Waarschuwing: Weinig schijfruimte over " + +#: ../../../src/ui.cpp:217 +#: ../../../src/bak/ui.cpp:216 #, 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?" -#: ../../../src/ui.cpp:301 +#: ../../../src/ui.cpp:261 +#: ../../../src/ui.cpp:1247 +msgid "Enter the current passphrase to the wallet." +msgstr "Geef het huidige wachtwoord voor de portefeuille." + +#: ../../../src/ui.cpp:262 +#: ../../../src/ui.cpp:1183 +#: ../../../src/ui.cpp:1200 +#: ../../../src/ui.cpp:1248 +#: ../../../src/ui.cpp:1272 +#: ../../../src/ui.cpp:1292 +msgid "Passphrase" +msgstr "Wachtwoord" + +#: ../../../src/ui.cpp:268 +msgid "Please supply the current wallet decryption passphrase." +msgstr "Geef het huidige wachtwoord voor de portefeille" + +#: ../../../src/ui.cpp:276 +#: ../../../src/ui.cpp:1257 +#: ../../../src/ui.cpp:1314 +msgid "The passphrase entered for the wallet decryption was incorrect." +msgstr "Het wachtwoord voor het openen van de portefeulle is foutief." + +#: ../../../src/ui.cpp:353 +#: ../../../src/bak/ui.cpp:316 msgid "Status" msgstr "Status" -#: ../../../src/ui.cpp:302 +#: ../../../src/ui.cpp:354 +#: ../../../src/bak/ui.cpp:317 msgid "Date" msgstr "Datum" -#: ../../../src/ui.cpp:303 +#: ../../../src/ui.cpp:355 +#: ../../../src/bak/ui.cpp:318 msgid "Description" msgstr "Beschrijving" -#: ../../../src/ui.cpp:304 +#: ../../../src/ui.cpp:356 +#: ../../../src/bak/ui.cpp:319 msgid "Debit" msgstr "Debet" -#: ../../../src/ui.cpp:305 +#: ../../../src/ui.cpp:357 +#: ../../../src/bak/ui.cpp:320 msgid "Credit" msgstr "Credit" -#: ../../../src/ui.cpp:511 +#: ../../../src/ui.cpp:568 +#: ../../../src/bak/ui.cpp:526 #, c-format msgid "Open for %d blocks" msgstr "Open gedurende %d blokken" -#: ../../../src/ui.cpp:513 +#: ../../../src/ui.cpp:570 +#: ../../../src/bak/ui.cpp:528 #, c-format msgid "Open until %s" msgstr "Open tot %s" -#: ../../../src/ui.cpp:519 +#: ../../../src/ui.cpp:576 +#: ../../../src/bak/ui.cpp:534 #, c-format msgid "%d/offline?" msgstr "%d/offline?" -#: ../../../src/ui.cpp:521 +#: ../../../src/ui.cpp:578 +#: ../../../src/bak/ui.cpp:536 #, c-format msgid "%d/unconfirmed" msgstr "%d/niet bevestigd" -#: ../../../src/ui.cpp:523 +#: ../../../src/ui.cpp:580 +#: ../../../src/bak/ui.cpp:538 #, c-format msgid "%d confirmations" msgstr "%d bevestigingen" -#: ../../../src/ui.cpp:608 +#: ../../../src/ui.cpp:665 +#: ../../../src/bak/ui.cpp:623 msgid "Generated" msgstr "Gegenereerd" -#: ../../../src/ui.cpp:616 +#: ../../../src/ui.cpp:673 +#: ../../../src/bak/ui.cpp:631 #, c-format msgid "Generated (%s matures in %d more blocks)" msgstr "Gegenereerd (%s wordt volwassen over %d blokken)" -#: ../../../src/ui.cpp:620 +#: ../../../src/ui.cpp:677 +#: ../../../src/bak/ui.cpp:635 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!" -#: ../../../src/ui.cpp:624 +#: ../../../src/ui.cpp:681 +#: ../../../src/bak/ui.cpp:639 msgid "Generated (not accepted)" msgstr "Gegenereerd (niet geaccepteerd)" -#: ../../../src/ui.cpp:634 +#: ../../../src/ui.cpp:691 +#: ../../../src/bak/ui.cpp:649 msgid "From: " msgstr "Van: " -#: ../../../src/ui.cpp:658 +#: ../../../src/ui.cpp:715 +#: ../../../src/bak/ui.cpp:673 msgid "Received with: " -msgstr "Ontvangen op: " +msgstr "Ontvangen met: " -#: ../../../src/ui.cpp:704 +#: ../../../src/ui.cpp:760 +#: ../../../src/bak/ui.cpp:719 msgid "Payment to yourself" msgstr "Betaling aan uzelf" -#: ../../../src/ui.cpp:738 +#: ../../../src/ui.cpp:794 +#: ../../../src/bak/ui.cpp:753 msgid "To: " msgstr "Naar: " -#: ../../../src/ui.cpp:1053 +#: ../../../src/ui.cpp:1109 +#: ../../../src/bak/ui.cpp:1068 msgid " Generating" msgstr " Genereren..." -#: ../../../src/ui.cpp:1055 +#: ../../../src/ui.cpp:1111 +#: ../../../src/bak/ui.cpp:1070 msgid "(not connected)" msgstr "(niet verbonden)" -#: ../../../src/ui.cpp:1058 +#: ../../../src/ui.cpp:1114 +#: ../../../src/bak/ui.cpp:1073 #, c-format msgid " %d connections %d blocks %d transactions" msgstr " %d verbindingen %d blokken %d transacties" -#: ../../../src/ui.cpp:1163 -#: ../../../src/ui.cpp:2527 +#: ../../../src/ui.cpp:1171 +msgid "Wallet already encrypted." +msgstr "Portefeuille reeds versleuteld." + +#: ../../../src/ui.cpp:1182 +msgid "" +"Enter the new passphrase to the wallet.\n" +"Please use a passphrase of 10 or more random characters, or eight or more words." +msgstr "" +"Geef het nieuwe wachtwoord voor de portefeuille.\n" +"Gebruik een wachtwoord van 10 of meer willekeurige characters, of 8 of meer woorden." + +#: ../../../src/ui.cpp:1189 +#: ../../../src/ui.cpp:1280 +msgid "Error: The supplied passphrase was too short." +msgstr "Fout: het wachtwoord is kort." + +#: ../../../src/ui.cpp:1193 +msgid "" +"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!\n" +"Are you sure you wish to encrypt your wallet?" +msgstr "" +"WAARSCHUWING: Indien u uw portefeuille versleutelt en het wachtwoord verliest, zal u AL UW BITCOINS VERLIEZEN!\n" +"Bent u zeker dat u de portfeuille wenst te versleutelen?" + +#: ../../../src/ui.cpp:1199 +msgid "Please re-enter your new wallet passphrase." +msgstr "Voer uw portefeuille-wachtwoord opnieuw in." + +#: ../../../src/ui.cpp:1208 +#: ../../../src/ui.cpp:1302 +msgid "Error: the supplied passphrases didn't match." +msgstr "Fout: de ingevoerde wachtwoorden komen niet overeen." + +#: ../../../src/ui.cpp:1218 +msgid "Wallet encryption failed." +msgstr "Versleutelen van de portefeuille mislukt." + +#: ../../../src/ui.cpp:1225 +msgid "" +"Wallet Encrypted.\n" +"Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer." +msgstr "" +"Portefeuille versleuteld.\n" +"Denk eraan dat uw portefeuille versleutelen geen volledige bescherming biedt tegen malware die uw computer zou geinfecteerd hebben." + +#: ../../../src/ui.cpp:1236 +msgid "Wallet is unencrypted, please encrypt it first." +msgstr "Portefeuille is onversleuteld. Versleutel ze eerst." + +#: ../../../src/ui.cpp:1271 +msgid "Enter the new passphrase for the wallet." +msgstr "Voer nieuw wachtwoord voor de portefeuille in." + +#: ../../../src/ui.cpp:1291 +msgid "Re-enter the new passphrase for the wallet." +msgstr "Voer nieuw wachtwoord voor de portefeuille opnieuw in." + +#: ../../../src/ui.cpp:1323 +msgid "Wallet Passphrase Changed." +msgstr "Portefeuille-wachtwoord gewijzigd." + +#: ../../../src/ui.cpp:1379 +#: ../../../src/ui.cpp:2825 +#: ../../../src/bak/ui.cpp:1178 +#: ../../../src/bak/ui.cpp:2571 msgid "New Receiving Address" msgstr "Nieuw Ontvangstadres" -#: ../../../src/ui.cpp:1164 -#: ../../../src/ui.cpp:2528 +#: ../../../src/ui.cpp:1380 +#: ../../../src/ui.cpp:2826 +#: ../../../src/bak/ui.cpp:1179 +#: ../../../src/bak/ui.cpp:2572 msgid "" "You should use a new address for each payment you receive.\n" "\n" @@ -131,248 +503,299 @@ msgstr "" "\n" "Label" -#: ../../../src/ui.cpp:1233 +#: ../../../src/ui.cpp:1464 +#: ../../../src/bak/ui.cpp:1251 msgid "<b>Status:</b> " msgstr "<b>Status:</b> " -#: ../../../src/ui.cpp:1238 +#: ../../../src/ui.cpp:1469 +#: ../../../src/bak/ui.cpp:1256 msgid ", has not been successfully broadcast yet" msgstr ", is nog niet succesvol verstuurd naar het netwerk" -#: ../../../src/ui.cpp:1240 +#: ../../../src/ui.cpp:1471 +#: ../../../src/bak/ui.cpp:1258 #, c-format msgid ", broadcast through %d node" msgstr ", verstuurd via %d node" -#: ../../../src/ui.cpp:1242 +#: ../../../src/ui.cpp:1473 +#: ../../../src/bak/ui.cpp:1260 #, c-format msgid ", broadcast through %d nodes" msgstr ", verstuurd via %d nodes" -#: ../../../src/ui.cpp:1246 +#: ../../../src/ui.cpp:1477 +#: ../../../src/bak/ui.cpp:1264 msgid "<b>Date:</b> " msgstr "<b>Datum:</b> " -#: ../../../src/ui.cpp:1254 +#: ../../../src/ui.cpp:1485 +#: ../../../src/bak/ui.cpp:1272 msgid "<b>Source:</b> Generated<br>" msgstr "<b>Bron:</b> Gegenereerd<br>" -#: ../../../src/ui.cpp:1260 -#: ../../../src/ui.cpp:1278 +#: ../../../src/ui.cpp:1491 +#: ../../../src/ui.cpp:1508 +#: ../../../src/bak/ui.cpp:1278 +#: ../../../src/bak/ui.cpp:1296 msgid "<b>From:</b> " msgstr "<b>Van:</b> " -#: ../../../src/ui.cpp:1278 +#: ../../../src/ui.cpp:1508 +#: ../../../src/bak/ui.cpp:1296 msgid "unknown" msgstr "onbekend" -#: ../../../src/ui.cpp:1279 -#: ../../../src/ui.cpp:1303 -#: ../../../src/ui.cpp:1362 +#: ../../../src/ui.cpp:1509 +#: ../../../src/ui.cpp:1533 +#: ../../../src/ui.cpp:1592 +#: ../../../src/bak/ui.cpp:1297 +#: ../../../src/bak/ui.cpp:1321 +#: ../../../src/bak/ui.cpp:1380 msgid "<b>To:</b> " msgstr "<b>Naar:</b> " -#: ../../../src/ui.cpp:1282 +#: ../../../src/ui.cpp:1512 +#: ../../../src/bak/ui.cpp:1300 msgid " (yours, label: " msgstr " (van jou, label: " -#: ../../../src/ui.cpp:1284 +#: ../../../src/ui.cpp:1514 +#: ../../../src/bak/ui.cpp:1302 msgid " (yours)" msgstr " (van jou)" -#: ../../../src/ui.cpp:1321 -#: ../../../src/ui.cpp:1333 -#: ../../../src/ui.cpp:1379 -#: ../../../src/ui.cpp:1396 +#: ../../../src/ui.cpp:1551 +#: ../../../src/ui.cpp:1563 +#: ../../../src/ui.cpp:1609 +#: ../../../src/ui.cpp:1626 +#: ../../../src/bak/ui.cpp:1339 +#: ../../../src/bak/ui.cpp:1351 +#: ../../../src/bak/ui.cpp:1397 +#: ../../../src/bak/ui.cpp:1414 msgid "<b>Credit:</b> " msgstr "<b>Credit:</b>" -#: ../../../src/ui.cpp:1323 +#: ../../../src/ui.cpp:1553 +#: ../../../src/bak/ui.cpp:1341 #, c-format msgid "(%s matures in %d more blocks)" msgstr "(%s wordt volwassen over %d blokken)" -#: ../../../src/ui.cpp:1325 +#: ../../../src/ui.cpp:1555 +#: ../../../src/bak/ui.cpp:1343 msgid "(not accepted)" msgstr "(niet geaccepteerd)" -#: ../../../src/ui.cpp:1370 -#: ../../../src/ui.cpp:1378 -#: ../../../src/ui.cpp:1393 +#: ../../../src/ui.cpp:1600 +#: ../../../src/ui.cpp:1608 +#: ../../../src/ui.cpp:1623 +#: ../../../src/bak/ui.cpp:1388 +#: ../../../src/bak/ui.cpp:1396 +#: ../../../src/bak/ui.cpp:1411 msgid "<b>Debit:</b> " msgstr "<b>Debet:</b>" -#: ../../../src/ui.cpp:1384 +#: ../../../src/ui.cpp:1614 +#: ../../../src/bak/ui.cpp:1402 msgid "<b>Transaction fee:</b> " msgstr "<b>Transactiefooi:</b> " -#: ../../../src/ui.cpp:1400 +#: ../../../src/ui.cpp:1630 +#: ../../../src/bak/ui.cpp:1418 msgid "<b>Net amount:</b> " msgstr "<b>Nettobedrag:</b> " -#: ../../../src/ui.cpp:1407 +#: ../../../src/ui.cpp:1637 +#: ../../../src/bak/ui.cpp:1425 msgid "Message:" msgstr "Mededeling:" -#: ../../../src/ui.cpp:1409 +#: ../../../src/ui.cpp:1639 +#: ../../../src/bak/ui.cpp:1427 msgid "Comment:" msgstr "Commentaar:" -#: ../../../src/ui.cpp:1412 +#: ../../../src/ui.cpp:1642 +#: ../../../src/bak/ui.cpp:1430 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." -#: ../../../src/ui.cpp:1592 +#: ../../../src/ui.cpp:1826 +#: ../../../src/bak/ui.cpp:1610 msgid "Cannot write autostart/bitcoin.desktop file" msgstr "Kan niet schrijven naar het bestand autostart/bitcoin.desktop" -#: ../../../src/ui.cpp:1628 +#: ../../../src/ui.cpp:1862 +#: ../../../src/bak/ui.cpp:1646 msgid "Main" msgstr "Algemeen" -#: ../../../src/ui.cpp:1636 +#: ../../../src/ui.cpp:1872 +#: ../../../src/bak/ui.cpp:1656 msgid "&Start Bitcoin on window system startup" msgstr "&Start Bitcoin wanneer het systeem opstart" -#: ../../../src/ui.cpp:1643 +#: ../../../src/ui.cpp:1879 +#: ../../../src/bak/ui.cpp:1663 msgid "&Minimize on close" msgstr "&Minimaliseer bij sluiten van het venster" -#: ../../../src/ui.cpp:1785 +#: ../../../src/ui.cpp:2021 +#: ../../../src/bak/ui.cpp:1805 #, c-format msgid "version %s" msgstr "versie %s" -#: ../../../src/ui.cpp:1897 +#: ../../../src/ui.cpp:2144 +#: ../../../src/bak/ui.cpp:1928 msgid "Error in amount " msgstr "Fout in hoeveelheid " -#: ../../../src/ui.cpp:1897 -#: ../../../src/ui.cpp:1902 -#: ../../../src/ui.cpp:1907 -#: ../../../src/ui.cpp:1942 -#: ../../../src/uibase.cpp:55 +#: ../../../src/ui.cpp:2144 +#: ../../../src/ui.cpp:2149 +#: ../../../src/ui.cpp:2154 +#: ../../../src/ui.cpp:2207 +#: ../../../src/uibase.cpp:61 +#: ../../../src/bak/ui.cpp:1928 +#: ../../../src/bak/ui.cpp:1933 +#: ../../../src/bak/ui.cpp:1938 +#: ../../../src/bak/ui.cpp:1973 msgid "Send Coins" msgstr "Verstuur coins" -#: ../../../src/ui.cpp:1902 +#: ../../../src/ui.cpp:2149 +#: ../../../src/bak/ui.cpp:1933 msgid "Amount exceeds your balance " msgstr "Hoeveelheid overschrijdt uw huidige balans " -#: ../../../src/ui.cpp:1907 +#: ../../../src/ui.cpp:2154 +#: ../../../src/bak/ui.cpp:1938 msgid "Total exceeds your balance when the " msgstr "Totaal overschrijdt uw huidige balans wanneer de " -#: ../../../src/ui.cpp:1907 +#: ../../../src/ui.cpp:2154 +#: ../../../src/bak/ui.cpp:1938 msgid " transaction fee is included " msgstr " transactiefooi is meegerekend " -#: ../../../src/ui.cpp:1925 +#: ../../../src/ui.cpp:2181 +#: ../../../src/bak/ui.cpp:1956 msgid "Payment sent " msgstr "Betaling verzonden " -#: ../../../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 +#: ../../../src/ui.cpp:2207 +#: ../../../src/bak/ui.cpp:1973 msgid "Invalid address " msgstr "Foutief adres " -#: ../../../src/ui.cpp:1995 +#: ../../../src/ui.cpp:2262 +#: ../../../src/bak/ui.cpp:2028 #, c-format msgid "Sending %s to %s" msgstr "%s versturen naar %s" -#: ../../../src/ui.cpp:2068 -#: ../../../src/ui.cpp:2101 +#: ../../../src/ui.cpp:2335 +#: ../../../src/ui.cpp:2368 +#: ../../../src/bak/ui.cpp:2101 +#: ../../../src/bak/ui.cpp:2134 msgid "CANCELLED" msgstr "GEANNULEERD" -#: ../../../src/ui.cpp:2072 +#: ../../../src/ui.cpp:2339 +#: ../../../src/bak/ui.cpp:2105 msgid "Cancelled" msgstr "Geannuleerd" -#: ../../../src/ui.cpp:2074 +#: ../../../src/ui.cpp:2341 +#: ../../../src/bak/ui.cpp:2107 msgid "Transfer cancelled " msgstr "Transactie geannuleerd " -#: ../../../src/ui.cpp:2127 +#: ../../../src/ui.cpp:2394 +#: ../../../src/bak/ui.cpp:2160 msgid "Error: " msgstr "Fout: " -#: ../../../src/ui.cpp:2141 -#: ../../../src/ui.cpp:2212 -#: ../../../src/main.cpp:4018 -msgid "Insufficient funds" -msgstr "Onvoldoende saldo" - -#: ../../../src/ui.cpp:2146 +#: ../../../src/ui.cpp:2413 +#: ../../../src/bak/ui.cpp:2179 msgid "Connecting..." msgstr "Verbinden..." -#: ../../../src/ui.cpp:2151 +#: ../../../src/ui.cpp:2418 +#: ../../../src/bak/ui.cpp:2184 msgid "Unable to connect" msgstr "Kan niet verbinden" -#: ../../../src/ui.cpp:2156 +#: ../../../src/ui.cpp:2423 +#: ../../../src/bak/ui.cpp:2189 msgid "Requesting public key..." msgstr "Aanvragen van publieke sleutel..." -#: ../../../src/ui.cpp:2168 +#: ../../../src/ui.cpp:2435 +#: ../../../src/bak/ui.cpp:2201 msgid "Received public key..." msgstr "Publieke sleutel ontvangen..." -#: ../../../src/ui.cpp:2182 +#: ../../../src/ui.cpp:2449 +#: ../../../src/bak/ui.cpp:2215 msgid "Recipient is not accepting transactions sent by IP address" msgstr "Ontvanger aanvaardt geen transacties via IP adres" -#: ../../../src/ui.cpp:2184 +#: ../../../src/ui.cpp:2451 +#: ../../../src/bak/ui.cpp:2217 msgid "Transfer was not accepted" msgstr "Transactie niet geaccepteerd" -#: ../../../src/ui.cpp:2193 +#: ../../../src/ui.cpp:2460 +#: ../../../src/bak/ui.cpp:2226 msgid "Invalid response received" msgstr "Foutief antwoord ontvangen" -#: ../../../src/ui.cpp:2208 +#: ../../../src/ui.cpp:2473 +#: ../../../src/bak/ui.cpp:2241 msgid "Creating transaction..." msgstr "Transactie aanmaken..." -#: ../../../src/ui.cpp:2220 +#: ../../../src/ui.cpp:2496 +#: ../../../src/bak/ui.cpp:2253 #, 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 "Deze transactie vergt een fooi van ten minste %s omwille van zijn bedrag, complexiteit, of gebruik van recent ontvangen fonden" -#: ../../../src/ui.cpp:2222 +#: ../../../src/ui.cpp:2498 +#: ../../../src/bak/ui.cpp:2255 msgid "Transaction creation failed" msgstr "Aanmaken van transactie mislukt" -#: ../../../src/ui.cpp:2229 +#: ../../../src/ui.cpp:2508 +#: ../../../src/bak/ui.cpp:2262 msgid "Transaction aborted" msgstr "Transactie geannuleerd" -#: ../../../src/ui.cpp:2237 +#: ../../../src/ui.cpp:2516 +#: ../../../src/bak/ui.cpp:2270 msgid "Lost connection, transaction cancelled" msgstr "Verbinding verloren, transactie geannuleerd" -#: ../../../src/ui.cpp:2253 +#: ../../../src/ui.cpp:2532 +#: ../../../src/bak/ui.cpp:2286 msgid "Sending payment..." msgstr "Betaling versturen..." -#: ../../../src/ui.cpp:2259 +#: ../../../src/ui.cpp:2544 +#: ../../../src/bak/ui.cpp:2292 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." -#: ../../../src/ui.cpp:2268 +#: ../../../src/ui.cpp:2553 +#: ../../../src/bak/ui.cpp:2301 msgid "Waiting for confirmation..." msgstr "Wachten op bevestiging..." -#: ../../../src/ui.cpp:2286 +#: ../../../src/ui.cpp:2570 +#: ../../../src/bak/ui.cpp:2319 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" @@ -382,149 +805,112 @@ msgstr "" "De transactie is opgenomen en wordt uitbetaald aan de ontvanger,\n" "maar het mededelings-veld blijft blanco." -#: ../../../src/ui.cpp:2295 +#: ../../../src/ui.cpp:2579 +#: ../../../src/bak/ui.cpp:2328 msgid "Payment was sent, but an invalid response was received" msgstr "Betaling is verstuurd, maar een foutief antword is ontvangen." -#: ../../../src/ui.cpp:2301 +#: ../../../src/ui.cpp:2585 +#: ../../../src/bak/ui.cpp:2334 msgid "Payment completed" msgstr "Betaling voltooid" -#: ../../../src/ui.cpp:2332 -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2515 +#: ../../../src/ui.cpp:2627 +#: ../../../src/ui.cpp:2773 +#: ../../../src/ui.cpp:2813 +#: ../../../src/bak/ui.cpp:2376 +#: ../../../src/bak/ui.cpp:2522 +#: ../../../src/bak/ui.cpp:2559 msgid "Name" msgstr "Naam" -#: ../../../src/ui.cpp:2333 -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2515 +#: ../../../src/ui.cpp:2628 +#: ../../../src/ui.cpp:2773 +#: ../../../src/ui.cpp:2813 +#: ../../../src/bak/ui.cpp:2377 +#: ../../../src/bak/ui.cpp:2522 +#: ../../../src/bak/ui.cpp:2559 msgid "Address" msgstr "Adres" -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2490 +#: ../../../src/ui.cpp:2630 +#: ../../../src/ui.cpp:2785 +#: ../../../src/bak/ui.cpp:2379 +#: ../../../src/bak/ui.cpp:2534 msgid "Label" msgstr "Label" -#: ../../../src/ui.cpp:2336 -#: ../../../src/uibase.cpp:837 +#: ../../../src/ui.cpp:2631 +#: ../../../src/uibase.cpp:847 +#: ../../../src/bak/ui.cpp:2380 msgid "Bitcoin Address" msgstr "Bitcoin-adres" -#: ../../../src/ui.cpp:2460 +#: ../../../src/ui.cpp:2755 +#: ../../../src/bak/ui.cpp:2504 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. " -#: ../../../src/ui.cpp:2478 -#: ../../../src/ui.cpp:2484 +#: ../../../src/ui.cpp:2773 +#: ../../../src/ui.cpp:2779 +#: ../../../src/bak/ui.cpp:2522 +#: ../../../src/bak/ui.cpp:2528 msgid "Edit Address" msgstr "Bewerk adres" -#: ../../../src/ui.cpp:2490 +#: ../../../src/ui.cpp:2785 +#: ../../../src/bak/ui.cpp:2534 msgid "Edit Address Label" msgstr "Bewerk adreslabel" -#: ../../../src/ui.cpp:2515 -#: ../../../src/ui.cpp:2521 +#: ../../../src/ui.cpp:2813 +#: ../../../src/ui.cpp:2819 +#: ../../../src/bak/ui.cpp:2559 +#: ../../../src/bak/ui.cpp:2565 msgid "Add Address" msgstr "Adres toevoegen" -#: ../../../src/ui.cpp:2598 +#: ../../../src/ui.cpp:2906 +#: ../../../src/bak/ui.cpp:2642 msgid "Bitcoin" msgstr "Bitcoin" -#: ../../../src/ui.cpp:2600 +#: ../../../src/ui.cpp:2908 +#: ../../../src/bak/ui.cpp:2644 msgid "Bitcoin - Generating" msgstr "Bitcoin - Genereren..." -#: ../../../src/ui.cpp:2602 +#: ../../../src/ui.cpp:2910 +#: ../../../src/bak/ui.cpp:2646 msgid "Bitcoin - (not connected)" msgstr "Bitcoin - (niet verbonden)" -#: ../../../src/ui.cpp:2681 +#: ../../../src/ui.cpp:2989 +#: ../../../src/bak/ui.cpp:2725 msgid "&Open Bitcoin" msgstr "&Open Bitcoin" -#: ../../../src/ui.cpp:2682 +#: ../../../src/ui.cpp:2990 +#: ../../../src/bak/ui.cpp:2726 msgid "&Send Bitcoins" msgstr "&Verstuur Bitcoins" -#: ../../../src/ui.cpp:2683 +#: ../../../src/ui.cpp:2991 +#: ../../../src/bak/ui.cpp:2727 msgid "O&ptions..." msgstr "O&pties" -#: ../../../src/ui.cpp:2686 +#: ../../../src/ui.cpp:2994 #: ../../../src/uibase.cpp:25 +#: ../../../src/bak/ui.cpp:2730 msgid "E&xit" msgstr "A&fsluiten" -#: ../../../src/ui.cpp:2902 +#: ../../../src/ui.cpp:3220 +#: ../../../src/bak/ui.cpp:2956 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." -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." - -#: ../../../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" @@ -533,152 +919,160 @@ msgstr "&Bestand" msgid "&Your Receiving Addresses..." msgstr "&Uw ontvangstadressen..." -#: ../../../src/uibase.cpp:36 +#: ../../../src/uibase.cpp:35 +msgid "&Encrypt Wallet..." +msgstr "&Versleutel portefeuille..." + +#: ../../../src/uibase.cpp:38 +msgid "&Change Wallet Encryption Passphrase..." +msgstr "&Wijzig portefeuille-wachtwoord..." + +#: ../../../src/uibase.cpp:42 msgid "&Options..." msgstr "&Opties..." -#: ../../../src/uibase.cpp:39 +#: ../../../src/uibase.cpp:45 msgid "&Settings" msgstr "&Eigenschappen" -#: ../../../src/uibase.cpp:43 +#: ../../../src/uibase.cpp:49 msgid "&About..." msgstr "&Over..." -#: ../../../src/uibase.cpp:46 +#: ../../../src/uibase.cpp:52 msgid "&Help" msgstr "&Help" -#: ../../../src/uibase.cpp:56 +#: ../../../src/uibase.cpp:62 msgid "Address Book" msgstr "Adresboek" -#: ../../../src/uibase.cpp:69 +#: ../../../src/uibase.cpp:75 msgid "Your Bitcoin Address:" msgstr "Uw bitcoin-adres:" -#: ../../../src/uibase.cpp:76 +#: ../../../src/uibase.cpp:82 msgid " &New... " msgstr " &Nieuw... " -#: ../../../src/uibase.cpp:79 -#: ../../../src/uibase.cpp:780 -#: ../../../src/uibase.cpp:883 +#: ../../../src/uibase.cpp:85 +#: ../../../src/uibase.cpp:790 +#: ../../../src/uibase.cpp:893 msgid " &Copy to Clipboard " msgstr " &Kopieer naar plakbord " -#: ../../../src/uibase.cpp:93 +#: ../../../src/uibase.cpp:99 msgid "Balance:" msgstr "Balans:" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " All" msgstr " Alles" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " Sent" msgstr " Verstuurd" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " Received" msgstr " Ontvangen" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " In Progress" msgstr " Wordt verwerkt" -#: ../../../src/uibase.cpp:130 +#: ../../../src/uibase.cpp:136 msgid "All Transactions" msgstr "Alle transacties" -#: ../../../src/uibase.cpp:141 +#: ../../../src/uibase.cpp:147 msgid "Sent/Received" msgstr "Verstuurd/Ontvangen" -#: ../../../src/uibase.cpp:152 +#: ../../../src/uibase.cpp:158 msgid "Sent" msgstr "Verstuurd" -#: ../../../src/uibase.cpp:163 +#: ../../../src/uibase.cpp:169 msgid "Received" msgstr "Ontvangen" -#: ../../../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 +#: ../../../src/uibase.cpp:312 +#: ../../../src/uibase.cpp:453 +#: ../../../src/uibase.cpp:552 +#: ../../../src/uibase.cpp:732 +#: ../../../src/uibase.cpp:793 +#: ../../../src/uibase.cpp:902 +#: ../../../src/uibase.cpp:991 msgid "OK" msgstr "OK" -#: ../../../src/uibase.cpp:345 +#: ../../../src/uibase.cpp:355 msgid "&Start Bitcoin on system startup" msgstr "&Start Bitcoin wanneer het systeem opstart" -#: ../../../src/uibase.cpp:348 +#: ../../../src/uibase.cpp:358 msgid "&Minimize to the tray instead of the taskbar" msgstr "&Minimaliseer tot systeemvak in plaats van de taakbalk" -#: ../../../src/uibase.cpp:351 +#: ../../../src/uibase.cpp:361 msgid "Map port using &UPnP" msgstr "Portmapping via &UPnP" -#: ../../../src/uibase.cpp:354 +#: ../../../src/uibase.cpp:364 msgid "M&inimize to the tray on close" msgstr "M&inimaliseer tot taakbalk bij sluiten" -#: ../../../src/uibase.cpp:360 -msgid "&Connect through socks4 proxy: " -msgstr "&Verbind via socks4 proxy: " +#: ../../../src/uibase.cpp:370 +msgid "&Connect through socks4 proxy (requires restart to apply): " +msgstr "&Verbind via socks4 proxy (vereist herstart):" -#: ../../../src/uibase.cpp:371 +#: ../../../src/uibase.cpp:381 msgid "Proxy &IP:" msgstr "Proxy &IP:" -#: ../../../src/uibase.cpp:379 +#: ../../../src/uibase.cpp:389 msgid " &Port:" msgstr " &Poort:" -#: ../../../src/uibase.cpp:392 +#: ../../../src/uibase.cpp:402 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 +#: ../../../src/uibase.cpp:409 msgid "Pay transaction fee:" msgstr "Transactiefooi:" -#: ../../../src/uibase.cpp:420 +#: ../../../src/uibase.cpp:430 msgid "// [don't translate] Test panel 2 for future expansion" msgstr "" -#: ../../../src/uibase.cpp:424 +#: ../../../src/uibase.cpp:434 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 +#: ../../../src/uibase.cpp:456 +#: ../../../src/uibase.cpp:678 +#: ../../../src/uibase.cpp:737 +#: ../../../src/uibase.cpp:796 +#: ../../../src/uibase.cpp:905 +#: ../../../src/uibase.cpp:994 msgid "Cancel" msgstr "Annuleren" -#: ../../../src/uibase.cpp:449 +#: ../../../src/uibase.cpp:459 msgid "&Apply" msgstr "&Toepassen" -#: ../../../src/uibase.cpp:508 +#: ../../../src/uibase.cpp:518 msgid "Bitcoin " msgstr "Bitcoin " -#: ../../../src/uibase.cpp:514 +#: ../../../src/uibase.cpp:524 msgid "version" msgstr "versie" -#: ../../../src/uibase.cpp:525 +#: ../../../src/uibase.cpp:535 msgid "" "Copyright (c) 2009-2011 Bitcoin Developers\n" "\n" @@ -703,39 +1097,39 @@ msgstr "" "software geschreven door Eric Young (eay@cryptsoft.com)) en UPnP software geschreven\n" "door Thomas Bernard." -#: ../../../src/uibase.cpp:581 +#: ../../../src/uibase.cpp:591 msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" msgstr "Voer een bitcoin-adres (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -#: ../../../src/uibase.cpp:595 +#: ../../../src/uibase.cpp:605 msgid "Pay &To:" msgstr "Betaal &aan:" -#: ../../../src/uibase.cpp:610 +#: ../../../src/uibase.cpp:620 msgid "&Paste" msgstr "&Plakken" -#: ../../../src/uibase.cpp:613 +#: ../../../src/uibase.cpp:623 msgid " Address &Book..." msgstr " Adres&boek..." -#: ../../../src/uibase.cpp:620 +#: ../../../src/uibase.cpp:630 msgid "&Amount:" msgstr "&Hoeveelheid:" -#: ../../../src/uibase.cpp:630 +#: ../../../src/uibase.cpp:640 msgid "T&ransfer:" msgstr "O&verdracht:" -#: ../../../src/uibase.cpp:636 +#: ../../../src/uibase.cpp:646 msgid " Standard" msgstr " Standaard" -#: ../../../src/uibase.cpp:663 +#: ../../../src/uibase.cpp:673 msgid "&Send" msgstr "&Versturen" -#: ../../../src/uibase.cpp:711 +#: ../../../src/uibase.cpp:721 msgid "" "\n" "\n" @@ -745,229 +1139,57 @@ msgstr "" "\n" "Verbinden..." -#: ../../../src/uibase.cpp:761 +#: ../../../src/uibase.cpp:771 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." -#: ../../../src/uibase.cpp:774 -#: ../../../src/uibase.cpp:886 +#: ../../../src/uibase.cpp:784 +#: ../../../src/uibase.cpp:896 msgid "&Edit..." msgstr "&Bewerken..." -#: ../../../src/uibase.cpp:777 -#: ../../../src/uibase.cpp:889 +#: ../../../src/uibase.cpp:787 +#: ../../../src/uibase.cpp:899 msgid " &New Address... " msgstr " &Nieuw adres... " -#: ../../../src/uibase.cpp:849 +#: ../../../src/uibase.cpp:859 msgid "Sending" msgstr "Versturen..." -#: ../../../src/uibase.cpp:857 +#: ../../../src/uibase.cpp:867 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." -#: ../../../src/uibase.cpp:870 +#: ../../../src/uibase.cpp:880 msgid "Receiving" msgstr "Ontvangen..." -#: ../../../src/uibase.cpp:880 +#: ../../../src/uibase.cpp:890 msgid "&Delete" msgstr "&Verwijderen" -#: ../../../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:161 -msgid "Specify connection timeout (in milliseconds)\n" -msgstr "Gelieve de time-out tijd te specifieren (in milliseconden)\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/bak/wallet.cpp:957 +msgid "Invalid bitcoin address" +msgstr "Foutief bitcoin-adres" -#: ../../../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/bak/uibase.cpp:360 +msgid "&Connect through socks4 proxy: " +msgstr "&Verbind via socks4 proxy: " -#: ../../../src/uibase.h:147 +#: ../../../src/uibase.h:151 msgid "Transaction Details" msgstr "Transactiedetails" -#: ../../../src/uibase.h:199 +#: ../../../src/uibase.h:203 msgid "Options" msgstr "Opties" -#: ../../../src/uibase.h:228 +#: ../../../src/uibase.h:232 msgid "About Bitcoin" msgstr "Over Bitcoin" -#: ../../../src/uibase.h:337 +#: ../../../src/uibase.h:341 msgid "Your Bitcoin Addresses" msgstr "Uw bitcoin-adressen" + diff --git a/locale/zh_cn/LC_MESSAGES/bitcoin.po b/locale/zh_cn/LC_MESSAGES/bitcoin.po index e870a16400..f53367e34c 100644 --- a/locale/zh_cn/LC_MESSAGES/bitcoin.po +++ b/locale/zh_cn/LC_MESSAGES/bitcoin.po @@ -2,8 +2,8 @@ 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" +"POT-Creation-Date: 2011-09-06 21:58+0100\n" +"PO-Revision-Date: 2011-09-17 19:08+0800\n" "Last-Translator: Dean Lee <xslidian@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,127 +17,131 @@ msgstr "" "X-Poedit-Bookmarks: 77,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" "X-Poedit-SearchPath-0: ../../..\n" -#: ../../../src/init.cpp:142 +#: ../../../src/init.cpp:163 msgid "Bitcoin version" msgstr "Bitcoin 版本" -#: ../../../src/init.cpp:143 +#: ../../../src/init.cpp:164 msgid "Usage:" msgstr "用法:" -#: ../../../src/init.cpp:145 +#: ../../../src/init.cpp:166 msgid "Send command to -server or bitcoind\n" msgstr "发送命令给 -server 或 bitcoin\n" -#: ../../../src/init.cpp:146 +#: ../../../src/init.cpp:167 msgid "List commands\n" msgstr "列出命令\n" -#: ../../../src/init.cpp:147 +#: ../../../src/init.cpp:168 msgid "Get help for a command\n" msgstr "获取命令的帮助\n" -#: ../../../src/init.cpp:148 +#: ../../../src/init.cpp:169 msgid "Options:\n" msgstr "选项:\n" -#: ../../../src/init.cpp:149 +#: ../../../src/init.cpp:170 msgid "Specify configuration file (default: bitcoin.conf)\n" msgstr "指定配置文件 (默认: bitcoin.conf)\n" -#: ../../../src/init.cpp:150 +#: ../../../src/init.cpp:171 msgid "Specify pid file (default: bitcoind.pid)\n" msgstr "指定 pid 文件 (默认: bitcoin.pid)\n" -#: ../../../src/init.cpp:151 +#: ../../../src/init.cpp:172 msgid "Generate coins\n" msgstr "生成货币\n" -#: ../../../src/init.cpp:152 +#: ../../../src/init.cpp:173 msgid "Don't generate coins\n" msgstr "不要生成货币\n" -#: ../../../src/init.cpp:153 +#: ../../../src/init.cpp:174 msgid "Start minimized\n" msgstr "启动时最小化\n" -#: ../../../src/init.cpp:154 +#: ../../../src/init.cpp:175 msgid "Specify data directory\n" msgstr "指定数据目录\n" -#: ../../../src/init.cpp:155 +#: ../../../src/init.cpp:176 +msgid "Specify connection timeout (in milliseconds)\n" +msgstr "指定连接超时时间 (毫秒)\n" + +#: ../../../src/init.cpp:177 msgid "Connect through socks4 proxy\n" msgstr "通过 socks4 代理连接\n" -#: ../../../src/init.cpp:156 +#: ../../../src/init.cpp:178 msgid "Allow DNS lookups for addnode and connect\n" msgstr "允许 DNS 查找新增结点和连接\n" -#: ../../../src/init.cpp:157 +#: ../../../src/init.cpp:179 msgid "Add a node to connect to\n" msgstr "添加一个连接结点\n" -#: ../../../src/init.cpp:158 +#: ../../../src/init.cpp:180 msgid "Connect only to the specified node\n" msgstr "只连接特定结点\n" -#: ../../../src/init.cpp:159 +#: ../../../src/init.cpp:181 msgid "Don't accept connections from outside\n" msgstr "不要接受外部传来的连接\n" -#: ../../../src/init.cpp:162 +#: ../../../src/init.cpp:184 msgid "Don't attempt to use UPnP to map the listening port\n" msgstr "不要尝试使用 UPnP 映射监听端口\n" -#: ../../../src/init.cpp:164 +#: ../../../src/init.cpp:186 msgid "Attempt to use UPnP to map the listening port\n" msgstr "尝试使用 UPnP 映射监听端口\n" -#: ../../../src/init.cpp:167 +#: ../../../src/init.cpp:189 msgid "Fee per KB to add to transactions you send\n" msgstr "您为每 KB 支付所增加的交易佣金\n" -#: ../../../src/init.cpp:169 +#: ../../../src/init.cpp:191 msgid "Accept command line and JSON-RPC commands\n" msgstr "允许命令行和 JSON-RPC 控制\n" -#: ../../../src/init.cpp:172 +#: ../../../src/init.cpp:194 msgid "Run in the background as a daemon and accept commands\n" msgstr "在后台运行并接收命令\n" -#: ../../../src/init.cpp:174 +#: ../../../src/init.cpp:196 msgid "Use the test network\n" msgstr "使用测试网络\n" -#: ../../../src/init.cpp:175 +#: ../../../src/init.cpp:197 msgid "Username for JSON-RPC connections\n" msgstr "JSON-RPC 连接的用户名\n" -#: ../../../src/init.cpp:176 +#: ../../../src/init.cpp:198 msgid "Password for JSON-RPC connections\n" msgstr "JSON-RPC 连接的密码\n" -#: ../../../src/init.cpp:177 +#: ../../../src/init.cpp:199 msgid "Listen for JSON-RPC connections on <port> (default: 8332)\n" msgstr "在端口 <port> 监听 JSON-RPC 连接 (默认: 8332)\n" -#: ../../../src/init.cpp:178 +#: ../../../src/init.cpp:200 msgid "Allow JSON-RPC connections from specified IP address\n" msgstr "允许来自特定 IP 地址的 JSON-RPC 连接\n" -#: ../../../src/init.cpp:179 +#: ../../../src/init.cpp:201 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 +#: ../../../src/init.cpp:202 msgid "Set key pool size to <n> (default: 100)\n" msgstr "设置密钥池大小为 <n> (默认: 100)\n" -#: ../../../src/init.cpp:181 +#: ../../../src/init.cpp:203 msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "重新扫描货币包链来检测丢失的货币交易\n" +msgstr "重新扫描货币包链来检测丢失的钱包交易\n" -#: ../../../src/init.cpp:185 +#: ../../../src/init.cpp:207 msgid "" "\n" "SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" @@ -145,106 +149,79 @@ msgstr "" "\n" "SSL 选项: (SSL 设置步骤请参见 Bitcoin Wiki)\n" -#: ../../../src/init.cpp:186 +#: ../../../src/init.cpp:208 msgid "Use OpenSSL (https) for JSON-RPC connections\n" msgstr "使用 OpenSSL (https) 进行 JSON-RPC 连接\n" -#: ../../../src/init.cpp:187 +#: ../../../src/init.cpp:209 msgid "Server certificate file (default: server.cert)\n" msgstr "服务器证书 (默认: server.cert)\n" -#: ../../../src/init.cpp:188 +#: ../../../src/init.cpp:210 msgid "Server private key (default: server.pem)\n" msgstr "服务器私有密钥 (默认: server.pem)\n" -#: ../../../src/init.cpp:189 +#: ../../../src/init.cpp:211 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 +#: ../../../src/init.cpp:215 msgid "This help message\n" msgstr "本帮助信息\n" -#: ../../../src/init.cpp:330 +#: ../../../src/init.cpp:353 #, c-format msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." msgstr "无法获取数据目录 %s 的锁。 Bitcoin 可能已经启动。" -#: ../../../src/init.cpp:356 +#: ../../../src/init.cpp:379 msgid "Error loading addr.dat \n" msgstr "加载 addr.dat 出错 \n" -#: ../../../src/init.cpp:362 +#: ../../../src/init.cpp:385 msgid "Error loading blkindex.dat \n" msgstr "加载 blkindex.dat 出错 \n" -#: ../../../src/init.cpp:369 +#: ../../../src/init.cpp:396 +msgid "Error loading wallet.dat: Wallet corrupted \n" +msgstr "加载 wallet.dat 出错: 钱包已损坏 \n" + +#: ../../../src/init.cpp:398 +msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" +msgstr "加载 wallet.dat 出错: 钱包要求更高版本的 Bitcoin \n" + +#: ../../../src/init.cpp:400 msgid "Error loading wallet.dat \n" msgstr "加载 wallet.dat 出错 \n" -#: ../../../src/init.cpp:449 +#: ../../../src/init.cpp:489 msgid "Invalid -proxy address" msgstr "无效 -proxy 地址" -#: ../../../src/init.cpp:472 +#: ../../../src/init.cpp:514 msgid "Invalid amount for -paytxfee=<amount>" msgstr "无效的金额 -paytxfee=<amount>" -#: ../../../src/init.cpp:476 +#: ../../../src/init.cpp:518 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 +#: ../../../src/main.cpp:1398 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 +#: ../../../src/net.cpp:1610 #, 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 +#: ../../../src/rpc.cpp:2005 +#: ../../../src/rpc.cpp:2007 #, c-format msgid "To use the %s option" msgstr "使用 %s 选项" -#: ../../../src/rpc.cpp:1806 +#: ../../../src/rpc.cpp:2009 #, c-format msgid "" "Warning: %s, you must set rpcpassword=<password>\n" @@ -255,7 +232,7 @@ msgstr "" "配置文件为: %s\n" "如果文件不存在，请创建文件并只给创建者提供只读访问权限。\n" -#: ../../../src/rpc.cpp:1974 +#: ../../../src/rpc.cpp:2185 #, c-format msgid "" "You must set rpcpassword=<password> in the configuration file:\n" @@ -266,109 +243,195 @@ msgstr "" "%s\n" "如果文件不存在，请创建文件并只给创建者提供只读访问权限。" -#: ../../../src/ui.cpp:204 +#: ../../../src/ui.cpp:217 #, 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 +#: ../../../src/ui.cpp:261 +#: ../../../src/ui.cpp:1247 +msgid "Enter the current passphrase to the wallet." +msgstr "输入钱包当前的口令。" + +#: ../../../src/ui.cpp:262 +#: ../../../src/ui.cpp:1183 +#: ../../../src/ui.cpp:1200 +#: ../../../src/ui.cpp:1248 +#: ../../../src/ui.cpp:1272 +#: ../../../src/ui.cpp:1292 +msgid "Passphrase" +msgstr "口令" + +#: ../../../src/ui.cpp:268 +msgid "Please supply the current wallet decryption passphrase." +msgstr "请输入钱包当前的解密口令。" + +#: ../../../src/ui.cpp:276 +#: ../../../src/ui.cpp:1257 +#: ../../../src/ui.cpp:1314 +msgid "The passphrase entered for the wallet decryption was incorrect." +msgstr "钱包解密口令不正确。" + +#: ../../../src/ui.cpp:353 msgid "Status" msgstr "状态" -#: ../../../src/ui.cpp:304 +#: ../../../src/ui.cpp:354 msgid "Date" msgstr "日期" -#: ../../../src/ui.cpp:305 +#: ../../../src/ui.cpp:355 msgid "Description" msgstr "描述" -#: ../../../src/ui.cpp:306 +#: ../../../src/ui.cpp:356 msgid "Debit" msgstr "付款人" -#: ../../../src/ui.cpp:307 +#: ../../../src/ui.cpp:357 msgid "Credit" msgstr "信用" -#: ../../../src/ui.cpp:513 +#: ../../../src/ui.cpp:568 #, c-format msgid "Open for %d blocks" msgstr "%d 个货币包开放" -#: ../../../src/ui.cpp:515 +#: ../../../src/ui.cpp:570 #, c-format msgid "Open until %s" msgstr "开放直到 %s" -#: ../../../src/ui.cpp:521 +#: ../../../src/ui.cpp:576 #, c-format msgid "%d/offline?" msgstr "%d/离线?" -#: ../../../src/ui.cpp:523 +#: ../../../src/ui.cpp:578 #, c-format msgid "%d/unconfirmed" msgstr "%d/未确认" -#: ../../../src/ui.cpp:525 +#: ../../../src/ui.cpp:580 #, c-format msgid "%d confirmations" msgstr "%d 确认" -#: ../../../src/ui.cpp:610 +#: ../../../src/ui.cpp:665 msgid "Generated" msgstr "已生成" -#: ../../../src/ui.cpp:618 +#: ../../../src/ui.cpp:673 #, c-format msgid "Generated (%s matures in %d more blocks)" msgstr "已生成 (%s 成熟 %d 新增货币包)" -#: ../../../src/ui.cpp:622 +#: ../../../src/ui.cpp:677 msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" msgstr "已生成 - 警告: 这个货币包没有被任何其他结点收到，因此很可能不会被接受!" -#: ../../../src/ui.cpp:626 +#: ../../../src/ui.cpp:681 msgid "Generated (not accepted)" msgstr "已生成 (未被接受)" -#: ../../../src/ui.cpp:636 +#: ../../../src/ui.cpp:691 msgid "From: " msgstr "来自: " -#: ../../../src/ui.cpp:660 +#: ../../../src/ui.cpp:715 msgid "Received with: " msgstr "伴随接收: " -#: ../../../src/ui.cpp:706 +#: ../../../src/ui.cpp:760 msgid "Payment to yourself" msgstr "支付给您自己" -#: ../../../src/ui.cpp:740 +#: ../../../src/ui.cpp:794 msgid "To: " msgstr "到: " -#: ../../../src/ui.cpp:1055 +#: ../../../src/ui.cpp:1109 msgid " Generating" msgstr " 生成中" -#: ../../../src/ui.cpp:1057 +#: ../../../src/ui.cpp:1111 msgid "(not connected)" msgstr "(未连接)" -#: ../../../src/ui.cpp:1060 +#: ../../../src/ui.cpp:1114 #, c-format msgid " %d connections %d blocks %d transactions" msgstr " %d 个连接 %d 个货币包 %d 个交易 " -#: ../../../src/ui.cpp:1165 -#: ../../../src/ui.cpp:2529 +#: ../../../src/ui.cpp:1171 +msgid "Wallet already encrypted." +msgstr "钱包已加密。" + +#: ../../../src/ui.cpp:1182 +msgid "" +"Enter the new passphrase to the wallet.\n" +"Please use a passphrase of 10 or more random characters, or eight or more words." +msgstr "" +"输入钱包的新口令。\n" +"请使用 10 个或更多字符，或 8 个或更多单词的口令。" + +#: ../../../src/ui.cpp:1189 +#: ../../../src/ui.cpp:1280 +msgid "Error: The supplied passphrase was too short." +msgstr "错误: 所输口令太短。" + +#: ../../../src/ui.cpp:1193 +msgid "" +"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR BITCOINS!\n" +"Are you sure you wish to encrypt your wallet?" +msgstr "" +"警告: 如果您加密钱包又丢失口令，将失去全部 BITCOINS!\n" +"是否确实想加密钱包?" + +#: ../../../src/ui.cpp:1199 +msgid "Please re-enter your new wallet passphrase." +msgstr "请重新输入新的钱包口令。" + +#: ../../../src/ui.cpp:1208 +#: ../../../src/ui.cpp:1302 +msgid "Error: the supplied passphrases didn't match." +msgstr "错误: 所输口令不匹配。" + +#: ../../../src/ui.cpp:1218 +msgid "Wallet encryption failed." +msgstr "钱包加密失败。" + +#: ../../../src/ui.cpp:1225 +msgid "" +"Wallet Encrypted.\n" +"Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer." +msgstr "" +"钱包已加密。\n" +"请记住，加密钱包无法完全保护您的 bitcoins 不被计算机感染的恶意软件窃取。" + +#: ../../../src/ui.cpp:1236 +msgid "Wallet is unencrypted, please encrypt it first." +msgstr "钱包未加密，请先加密。" + +#: ../../../src/ui.cpp:1271 +msgid "Enter the new passphrase for the wallet." +msgstr "输入钱包的新口令。" + +#: ../../../src/ui.cpp:1291 +msgid "Re-enter the new passphrase for the wallet." +msgstr "重新输入钱包的新口令。" + +#: ../../../src/ui.cpp:1323 +msgid "Wallet Passphrase Changed." +msgstr "钱包口令已更改。" + +#: ../../../src/ui.cpp:1379 +#: ../../../src/ui.cpp:2825 msgid "New Receiving Address" msgstr "新建接收地址" -#: ../../../src/ui.cpp:1166 -#: ../../../src/ui.cpp:2530 +#: ../../../src/ui.cpp:1380 +#: ../../../src/ui.cpp:2826 msgid "" "You should use a new address for each payment you receive.\n" "\n" @@ -378,234 +441,248 @@ msgstr "" "\n" "标签" -#: ../../../src/ui.cpp:1235 +#: ../../../src/ui.cpp:1464 msgid "<b>Status:</b> " msgstr "<b>状态:</b> " -#: ../../../src/ui.cpp:1240 +#: ../../../src/ui.cpp:1469 msgid ", has not been successfully broadcast yet" msgstr "，尚未被成功广播" -#: ../../../src/ui.cpp:1242 +#: ../../../src/ui.cpp:1471 #, c-format msgid ", broadcast through %d node" msgstr "，通过 %d 个结点广播" -#: ../../../src/ui.cpp:1244 +#: ../../../src/ui.cpp:1473 #, c-format msgid ", broadcast through %d nodes" msgstr "，通过 %d 个结点广播" -#: ../../../src/ui.cpp:1248 +#: ../../../src/ui.cpp:1477 msgid "<b>Date:</b> " msgstr "<b>日期:</b>" -#: ../../../src/ui.cpp:1256 +#: ../../../src/ui.cpp:1485 msgid "<b>Source:</b> Generated<br>" msgstr "<b>来源:</b> 生成<br>" -#: ../../../src/ui.cpp:1262 -#: ../../../src/ui.cpp:1280 +#: ../../../src/ui.cpp:1491 +#: ../../../src/ui.cpp:1508 msgid "<b>From:</b> " msgstr "<b>从:</b> " -#: ../../../src/ui.cpp:1280 +#: ../../../src/ui.cpp:1508 msgid "unknown" msgstr "未知" -#: ../../../src/ui.cpp:1281 -#: ../../../src/ui.cpp:1305 -#: ../../../src/ui.cpp:1364 +#: ../../../src/ui.cpp:1509 +#: ../../../src/ui.cpp:1533 +#: ../../../src/ui.cpp:1592 msgid "<b>To:</b> " msgstr "<b>到:</b> " -#: ../../../src/ui.cpp:1284 +#: ../../../src/ui.cpp:1512 msgid " (yours, label: " msgstr " (您的标签: " -#: ../../../src/ui.cpp:1286 +#: ../../../src/ui.cpp:1514 msgid " (yours)" msgstr " (您的)" -#: ../../../src/ui.cpp:1323 -#: ../../../src/ui.cpp:1335 -#: ../../../src/ui.cpp:1381 -#: ../../../src/ui.cpp:1398 +#: ../../../src/ui.cpp:1551 +#: ../../../src/ui.cpp:1563 +#: ../../../src/ui.cpp:1609 +#: ../../../src/ui.cpp:1626 msgid "<b>Credit:</b> " msgstr "<b>信用:</b> " -#: ../../../src/ui.cpp:1325 +#: ../../../src/ui.cpp:1553 #, c-format msgid "(%s matures in %d more blocks)" msgstr "(%s 收获在 %d 更多的货币包)" -#: ../../../src/ui.cpp:1327 +#: ../../../src/ui.cpp:1555 msgid "(not accepted)" msgstr "(未被接受)" -#: ../../../src/ui.cpp:1372 -#: ../../../src/ui.cpp:1380 -#: ../../../src/ui.cpp:1395 +#: ../../../src/ui.cpp:1600 +#: ../../../src/ui.cpp:1608 +#: ../../../src/ui.cpp:1623 msgid "<b>Debit:</b> " msgstr "<b>付款人:</b> " -#: ../../../src/ui.cpp:1386 +#: ../../../src/ui.cpp:1614 msgid "<b>Transaction fee:</b> " msgstr "<b>交易佣金:</b> " -#: ../../../src/ui.cpp:1402 +#: ../../../src/ui.cpp:1630 msgid "<b>Net amount:</b> " msgstr "<b>网络金额:</b> " -#: ../../../src/ui.cpp:1409 +#: ../../../src/ui.cpp:1637 msgid "Message:" msgstr "消息:" -#: ../../../src/ui.cpp:1411 +#: ../../../src/ui.cpp:1639 msgid "Comment:" msgstr "评论" -#: ../../../src/ui.cpp:1414 +#: ../../../src/ui.cpp:1642 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 +#: ../../../src/ui.cpp:1826 msgid "Cannot write autostart/bitcoin.desktop file" msgstr "无法写入 autostart/bitcoin.desktop 文件" -#: ../../../src/ui.cpp:1630 +#: ../../../src/ui.cpp:1862 msgid "Main" msgstr "主要" -#: ../../../src/ui.cpp:1638 +#: ../../../src/ui.cpp:1872 msgid "&Start Bitcoin on window system startup" msgstr "开机自动启动 Bitcoin(&S)" -#: ../../../src/ui.cpp:1645 +#: ../../../src/ui.cpp:1879 msgid "&Minimize on close" msgstr "关闭时最小化(&M)" -#: ../../../src/ui.cpp:1787 +#: ../../../src/ui.cpp:2021 #, c-format msgid "version %s" msgstr "版本 %s" -#: ../../../src/ui.cpp:1899 +#: ../../../src/ui.cpp:2144 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 +#: ../../../src/ui.cpp:2144 +#: ../../../src/ui.cpp:2149 +#: ../../../src/ui.cpp:2154 +#: ../../../src/ui.cpp:2207 +#: ../../../src/uibase.cpp:61 msgid "Send Coins" msgstr "发送货币" -#: ../../../src/ui.cpp:1904 +#: ../../../src/ui.cpp:2149 msgid "Amount exceeds your balance " msgstr "金额超出您的账户余额" -#: ../../../src/ui.cpp:1909 +#: ../../../src/ui.cpp:2154 msgid "Total exceeds your balance when the " msgstr "总费用超出您的账户余额当 " -#: ../../../src/ui.cpp:1909 +#: ../../../src/ui.cpp:2154 msgid " transaction fee is included " msgstr " 交易佣金已包括" -#: ../../../src/ui.cpp:1927 +#: ../../../src/ui.cpp:2181 msgid "Payment sent " msgstr "付款已发送" -#: ../../../src/ui.cpp:1944 +#: ../../../src/ui.cpp:2181 +#: ../../../src/ui.cpp:2191 +#: ../../../src/ui.cpp:2341 +#: ../../../src/ui.cpp:2506 +#: ../../../src/wallet.cpp:1088 +msgid "Sending..." +msgstr "正在发送..." + +#: ../../../src/ui.cpp:2207 msgid "Invalid address " msgstr "无效地址 " -#: ../../../src/ui.cpp:1997 +#: ../../../src/ui.cpp:2262 #, c-format msgid "Sending %s to %s" msgstr "发送 %s 给 %s" -#: ../../../src/ui.cpp:2070 -#: ../../../src/ui.cpp:2103 +#: ../../../src/ui.cpp:2335 +#: ../../../src/ui.cpp:2368 msgid "CANCELLED" msgstr "已取消" -#: ../../../src/ui.cpp:2074 +#: ../../../src/ui.cpp:2339 msgid "Cancelled" msgstr "已取消" -#: ../../../src/ui.cpp:2076 +#: ../../../src/ui.cpp:2341 msgid "Transfer cancelled " msgstr "传输已取消 " -#: ../../../src/ui.cpp:2129 +#: ../../../src/ui.cpp:2394 msgid "Error: " msgstr "错误: " -#: ../../../src/ui.cpp:2148 +#: ../../../src/ui.cpp:2408 +#: ../../../src/ui.cpp:2477 +#: ../../../src/wallet.cpp:1106 +msgid "Insufficient funds" +msgstr "余额不足" + +#: ../../../src/ui.cpp:2413 msgid "Connecting..." msgstr "正在连接..." -#: ../../../src/ui.cpp:2153 +#: ../../../src/ui.cpp:2418 msgid "Unable to connect" msgstr "无法连接" -#: ../../../src/ui.cpp:2158 +#: ../../../src/ui.cpp:2423 msgid "Requesting public key..." msgstr "正在请求公共密钥..." -#: ../../../src/ui.cpp:2170 +#: ../../../src/ui.cpp:2435 msgid "Received public key..." msgstr "收到公共密钥..." -#: ../../../src/ui.cpp:2184 +#: ../../../src/ui.cpp:2449 msgid "Recipient is not accepting transactions sent by IP address" msgstr "收款人不接受来自 IP 地址的交易" -#: ../../../src/ui.cpp:2186 +#: ../../../src/ui.cpp:2451 msgid "Transfer was not accepted" msgstr "传输没有被接受" -#: ../../../src/ui.cpp:2195 +#: ../../../src/ui.cpp:2460 msgid "Invalid response received" msgstr "接收到无效回复" -#: ../../../src/ui.cpp:2210 +#: ../../../src/ui.cpp:2473 msgid "Creating transaction..." msgstr "正在创建交易..." -#: ../../../src/ui.cpp:2222 +#: ../../../src/ui.cpp:2496 #, 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 +#: ../../../src/ui.cpp:2498 msgid "Transaction creation failed" msgstr "交易创建失败" -#: ../../../src/ui.cpp:2231 +#: ../../../src/ui.cpp:2508 msgid "Transaction aborted" msgstr "交易中止" -#: ../../../src/ui.cpp:2239 +#: ../../../src/ui.cpp:2516 msgid "Lost connection, transaction cancelled" msgstr "失去连接，交易已取消" -#: ../../../src/ui.cpp:2255 +#: ../../../src/ui.cpp:2532 msgid "Sending payment..." msgstr "正在发送付款..." -#: ../../../src/ui.cpp:2261 +#: ../../../src/ui.cpp:2544 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 文件，而且货币在另一个副本里使用但没有在这里标记。" +msgstr "交易被拒绝。 这可能是因为您账户中的一部分货币已经被使用，比如您使用了一个复制的 wallet.dat 文件，而且货币在另一个副本里支付但没有在这里标记。" -#: ../../../src/ui.cpp:2270 +#: ../../../src/ui.cpp:2553 msgid "Waiting for confirmation..." msgstr "正在等待确认..." -#: ../../../src/ui.cpp:2288 +#: ../../../src/ui.cpp:2570 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" @@ -615,84 +692,84 @@ msgstr "" "交易已经被记录，并且支付给收款人，\n" "但是评论信息可能是空的。" -#: ../../../src/ui.cpp:2297 +#: ../../../src/ui.cpp:2579 msgid "Payment was sent, but an invalid response was received" msgstr "支付已发送，但是收到无效回复" -#: ../../../src/ui.cpp:2303 +#: ../../../src/ui.cpp:2585 msgid "Payment completed" msgstr "付款完成" -#: ../../../src/ui.cpp:2334 -#: ../../../src/ui.cpp:2480 -#: ../../../src/ui.cpp:2517 +#: ../../../src/ui.cpp:2627 +#: ../../../src/ui.cpp:2773 +#: ../../../src/ui.cpp:2813 msgid "Name" msgstr "姓名" -#: ../../../src/ui.cpp:2335 -#: ../../../src/ui.cpp:2480 -#: ../../../src/ui.cpp:2517 +#: ../../../src/ui.cpp:2628 +#: ../../../src/ui.cpp:2773 +#: ../../../src/ui.cpp:2813 msgid "Address" msgstr "地址" -#: ../../../src/ui.cpp:2337 -#: ../../../src/ui.cpp:2492 +#: ../../../src/ui.cpp:2630 +#: ../../../src/ui.cpp:2785 msgid "Label" msgstr "标签" -#: ../../../src/ui.cpp:2338 -#: ../../../src/uibase.cpp:837 +#: ../../../src/ui.cpp:2631 +#: ../../../src/uibase.cpp:847 msgid "Bitcoin Address" msgstr "Bitcoin 地址" -#: ../../../src/ui.cpp:2462 +#: ../../../src/ui.cpp:2755 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 +#: ../../../src/ui.cpp:2773 +#: ../../../src/ui.cpp:2779 msgid "Edit Address" msgstr "编辑地址" -#: ../../../src/ui.cpp:2492 +#: ../../../src/ui.cpp:2785 msgid "Edit Address Label" msgstr "编辑地址标签" -#: ../../../src/ui.cpp:2517 -#: ../../../src/ui.cpp:2523 +#: ../../../src/ui.cpp:2813 +#: ../../../src/ui.cpp:2819 msgid "Add Address" msgstr "添加地址" -#: ../../../src/ui.cpp:2600 +#: ../../../src/ui.cpp:2906 msgid "Bitcoin" msgstr "Bitcoin" -#: ../../../src/ui.cpp:2602 +#: ../../../src/ui.cpp:2908 msgid "Bitcoin - Generating" msgstr "Bitcoin - 生成中" -#: ../../../src/ui.cpp:2604 +#: ../../../src/ui.cpp:2910 msgid "Bitcoin - (not connected)" msgstr "Bitcoin - (未连接)" -#: ../../../src/ui.cpp:2683 +#: ../../../src/ui.cpp:2989 msgid "&Open Bitcoin" msgstr "打开 Bitcoin(&O)" -#: ../../../src/ui.cpp:2684 +#: ../../../src/ui.cpp:2990 msgid "&Send Bitcoins" msgstr "发送 Bitcoins(&S)" -#: ../../../src/ui.cpp:2685 +#: ../../../src/ui.cpp:2991 msgid "O&ptions..." msgstr "选项(&P)..." -#: ../../../src/ui.cpp:2688 +#: ../../../src/ui.cpp:2994 #: ../../../src/uibase.cpp:25 msgid "E&xit" msgstr "退出(&X)" -#: ../../../src/ui.cpp:2904 +#: ../../../src/ui.cpp:3220 msgid "Program has crashed and will terminate. " msgstr "程序崩溃，即将关闭。 " @@ -704,152 +781,160 @@ msgstr "文件(&F)" msgid "&Your Receiving Addresses..." msgstr "您的接收地址(&Y)..." -#: ../../../src/uibase.cpp:36 +#: ../../../src/uibase.cpp:35 +msgid "&Encrypt Wallet..." +msgstr "加密钱包(&E)..." + +#: ../../../src/uibase.cpp:38 +msgid "&Change Wallet Encryption Passphrase..." +msgstr "更改钱包加密口令(&C)..." + +#: ../../../src/uibase.cpp:42 msgid "&Options..." msgstr "选项(&O)..." -#: ../../../src/uibase.cpp:39 +#: ../../../src/uibase.cpp:45 msgid "&Settings" msgstr "设置(&S)" -#: ../../../src/uibase.cpp:43 +#: ../../../src/uibase.cpp:49 msgid "&About..." msgstr "关于(&A)..." -#: ../../../src/uibase.cpp:46 +#: ../../../src/uibase.cpp:52 msgid "&Help" msgstr "帮助(&H)" -#: ../../../src/uibase.cpp:56 +#: ../../../src/uibase.cpp:62 msgid "Address Book" msgstr "地址簿" -#: ../../../src/uibase.cpp:69 +#: ../../../src/uibase.cpp:75 msgid "Your Bitcoin Address:" msgstr "您的 Bitcoin 地址:" -#: ../../../src/uibase.cpp:76 +#: ../../../src/uibase.cpp:82 msgid " &New... " msgstr " 新建(&N)... " -#: ../../../src/uibase.cpp:79 -#: ../../../src/uibase.cpp:780 -#: ../../../src/uibase.cpp:883 +#: ../../../src/uibase.cpp:85 +#: ../../../src/uibase.cpp:790 +#: ../../../src/uibase.cpp:893 msgid " &Copy to Clipboard " msgstr " 复制到剪贴板(&C)" -#: ../../../src/uibase.cpp:93 +#: ../../../src/uibase.cpp:99 msgid "Balance:" msgstr "账户余额:" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " All" msgstr "全部" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " Sent" msgstr " 已发送" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " Received" msgstr " 已接收" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " In Progress" msgstr "处理中" -#: ../../../src/uibase.cpp:130 +#: ../../../src/uibase.cpp:136 msgid "All Transactions" msgstr "所有交易" -#: ../../../src/uibase.cpp:141 +#: ../../../src/uibase.cpp:147 msgid "Sent/Received" msgstr "已发送/已接收" -#: ../../../src/uibase.cpp:152 +#: ../../../src/uibase.cpp:158 msgid "Sent" msgstr "已发送" -#: ../../../src/uibase.cpp:163 +#: ../../../src/uibase.cpp:169 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 +#: ../../../src/uibase.cpp:312 +#: ../../../src/uibase.cpp:453 +#: ../../../src/uibase.cpp:552 +#: ../../../src/uibase.cpp:732 +#: ../../../src/uibase.cpp:793 +#: ../../../src/uibase.cpp:902 +#: ../../../src/uibase.cpp:991 msgid "OK" msgstr "确定" -#: ../../../src/uibase.cpp:345 +#: ../../../src/uibase.cpp:355 msgid "&Start Bitcoin on system startup" msgstr "开机自动启动(&S)" -#: ../../../src/uibase.cpp:348 +#: ../../../src/uibase.cpp:358 msgid "&Minimize to the tray instead of the taskbar" msgstr "最小化到系统托盘(&M)" -#: ../../../src/uibase.cpp:351 +#: ../../../src/uibase.cpp:361 msgid "Map port using &UPnP" msgstr "使用 &UPnP 映射端口" -#: ../../../src/uibase.cpp:354 +#: ../../../src/uibase.cpp:364 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:370 +msgid "&Connect through socks4 proxy (requires restart to apply): " +msgstr "通过 socks4 代理连接 (重启生效) (&C): " -#: ../../../src/uibase.cpp:371 +#: ../../../src/uibase.cpp:381 msgid "Proxy &IP:" msgstr "代理服务器(&I):" -#: ../../../src/uibase.cpp:379 +#: ../../../src/uibase.cpp:389 msgid " &Port:" msgstr " 端口(&P):" -#: ../../../src/uibase.cpp:392 +#: ../../../src/uibase.cpp:402 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 +#: ../../../src/uibase.cpp:409 msgid "Pay transaction fee:" msgstr "支付交易佣金:" -#: ../../../src/uibase.cpp:420 +#: ../../../src/uibase.cpp:430 msgid "// [don't translate] Test panel 2 for future expansion" msgstr "" -#: ../../../src/uibase.cpp:424 +#: ../../../src/uibase.cpp:434 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 +#: ../../../src/uibase.cpp:456 +#: ../../../src/uibase.cpp:678 +#: ../../../src/uibase.cpp:737 +#: ../../../src/uibase.cpp:796 +#: ../../../src/uibase.cpp:905 +#: ../../../src/uibase.cpp:994 msgid "Cancel" msgstr "取消" -#: ../../../src/uibase.cpp:449 +#: ../../../src/uibase.cpp:459 msgid "&Apply" msgstr "应用(&A)" -#: ../../../src/uibase.cpp:508 +#: ../../../src/uibase.cpp:518 msgid "Bitcoin " msgstr "Bitcoin " -#: ../../../src/uibase.cpp:514 +#: ../../../src/uibase.cpp:524 msgid "version" msgstr "版本" -#: ../../../src/uibase.cpp:525 +#: ../../../src/uibase.cpp:535 msgid "" "Copyright (c) 2009-2011 Bitcoin Developers\n" "\n" @@ -870,39 +955,39 @@ msgstr "" "(http://www.openssl.org/)，以及 Eric Young(eay@cryptsoft.com)\n" "编写的加密软件和 Thomas Bernard 编写的 UPnP 软件。" -#: ../../../src/uibase.cpp:581 +#: ../../../src/uibase.cpp:591 msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" msgstr "输入 Bitcoin 地址 (比如 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -#: ../../../src/uibase.cpp:595 +#: ../../../src/uibase.cpp:605 msgid "Pay &To:" msgstr "付款给(&T):" -#: ../../../src/uibase.cpp:610 +#: ../../../src/uibase.cpp:620 msgid "&Paste" msgstr "粘贴(&P)" -#: ../../../src/uibase.cpp:613 +#: ../../../src/uibase.cpp:623 msgid " Address &Book..." msgstr " 地址簿(&B)..." -#: ../../../src/uibase.cpp:620 +#: ../../../src/uibase.cpp:630 msgid "&Amount:" msgstr "数量(&A):" -#: ../../../src/uibase.cpp:630 +#: ../../../src/uibase.cpp:640 msgid "T&ransfer:" msgstr "传输(&R):" -#: ../../../src/uibase.cpp:636 +#: ../../../src/uibase.cpp:646 msgid " Standard" msgstr "标准" -#: ../../../src/uibase.cpp:663 +#: ../../../src/uibase.cpp:673 msgid "&Send" msgstr "发送(&S)" -#: ../../../src/uibase.cpp:711 +#: ../../../src/uibase.cpp:721 msgid "" "\n" "\n" @@ -912,56 +997,80 @@ msgstr "" "\n" "正在连接..." -#: ../../../src/uibase.cpp:761 +#: ../../../src/uibase.cpp:771 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 +#: ../../../src/uibase.cpp:784 +#: ../../../src/uibase.cpp:896 msgid "&Edit..." msgstr "编辑(&E)..." -#: ../../../src/uibase.cpp:777 -#: ../../../src/uibase.cpp:889 +#: ../../../src/uibase.cpp:787 +#: ../../../src/uibase.cpp:899 msgid " &New Address... " msgstr " 新建地址(&N)..." -#: ../../../src/uibase.cpp:849 +#: ../../../src/uibase.cpp:859 msgid "Sending" msgstr "发送人地址" -#: ../../../src/uibase.cpp:857 +#: ../../../src/uibase.cpp:867 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 +#: ../../../src/uibase.cpp:880 msgid "Receiving" msgstr "我的接收地址" -#: ../../../src/uibase.cpp:880 +#: ../../../src/uibase.cpp:890 msgid "&Delete" msgstr "删除(&D)" -#: ../../../src/util.cpp:866 +#: ../../../src/util.cpp:870 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 +#: ../../../src/util.cpp:904 msgid "beta" msgstr "测试版" -#: ../../../src/uibase.h:147 +#: ../../../src/wallet.cpp:1073 +msgid "Error: Wallet locked, unable to create transaction " +msgstr "错误: 钱包已锁定，无法创建交易 " + +#: ../../../src/wallet.cpp:1081 +#, 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/wallet.cpp:1083 +msgid "Error: Transaction creation failed " +msgstr "错误: 交易创建失败" + +#: ../../../src/wallet.cpp:1092 +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/wallet.cpp:1104 +msgid "Invalid amount" +msgstr "无效金额" + +#: ../../../src/uibase.h:151 msgid "Transaction Details" msgstr "交易详情" -#: ../../../src/uibase.h:199 +#: ../../../src/uibase.h:203 msgid "Options" msgstr "选项" -#: ../../../src/uibase.h:228 +#: ../../../src/uibase.h:232 msgid "About Bitcoin" msgstr "关于 Bitcoin" -#: ../../../src/uibase.h:337 +#: ../../../src/uibase.h:341 msgid "Your Bitcoin Addresses" msgstr "您的 Bitcoin 地址" + +#~ msgid "Invalid bitcoin address" +#~ msgstr "无效 bitcoin 地址" diff --git a/src/main.cpp b/src/main.cpp index fc520df8ec..e732ddcf5d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1751,9 +1751,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) { static map<unsigned int, vector<unsigned char> > mapReuseKey; RandAddSeedPerfmon(); - if (fDebug) + if (fDebug) { printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); - printf("received: %s (%d bytes)\n", strCommand.c_str(), vRecv.size()); + printf("received: %s (%d bytes)\n", strCommand.c_str(), vRecv.size()); + } if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0) { printf("dropmessagestest DROPPING RECV MESSAGE\n"); @@ -1945,7 +1946,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) pfrom->AddInventoryKnown(inv); bool fAlreadyHave = AlreadyHave(txdb, inv); - printf(" got inventory: %s %s\n", inv.ToString().c_str(), fAlreadyHave ? "have" : "new"); + if (fDebug) + printf(" got inventory: %s %s\n", inv.ToString().c_str(), fAlreadyHave ? "have" : "new"); if (!fAlreadyHave) pfrom->AskFor(inv); diff --git a/src/net.cpp b/src/net.cpp index 509d8905f9..2e257a6efc 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1713,7 +1713,7 @@ void StartNode(void* parg) printf("Error: CreateThread(ThreadIRCSeed) failed\n"); // Send and receive from sockets, accept connections - CreateThread(ThreadSocketHandler, NULL, true); + CreateThread(ThreadSocketHandler, NULL); // Initiate outbound connections if (!CreateThread(ThreadOpenConnections, NULL)) @@ -282,9 +282,10 @@ public: nHeaderStart = vSend.size(); vSend << CMessageHeader(pszCommand, 0); nMessageStart = vSend.size(); - if (fDebug) + if (fDebug) { printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); - printf("sending: %s ", pszCommand); + printf("sending: %s ", pszCommand); + } } void AbortMessage() @@ -295,7 +296,9 @@ public: nHeaderStart = -1; nMessageStart = -1; cs_vSend.Leave(); - printf("(aborted)\n"); + + if (fDebug) + printf("(aborted)\n"); } void EndMessage() @@ -324,8 +327,9 @@ public: memcpy((char*)&vSend[nHeaderStart] + offsetof(CMessageHeader, nChecksum), &nChecksum, sizeof(nChecksum)); } - printf("(%d bytes) ", nSize); - printf("\n"); + if (fDebug) { + printf("(%d bytes)\n", nSize); + } nHeaderStart = -1; nMessageStart = -1; |