From 3a8029f0335dbdb039eccb7bddc88fb0cd1ff971 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 11 May 2011 16:50:14 -0400 Subject: Update nTime after nExtraNonce to avoid potential race (extraNonce being reset due to just-occurred time change after nTime is set) --- rpc.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpc.cpp b/rpc.cpp index 90e7f15a91..2175dddb4b 100644 --- a/rpc.cpp +++ b/rpc.cpp @@ -1330,15 +1330,15 @@ Value getwork(const Array& params, bool fHelp) vNewBlock.push_back(pblock); } - // Update nTime - pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); - pblock->nNonce = 0; - // Update nExtraNonce static unsigned int nExtraNonce = 0; static int64 nPrevTime = 0; IncrementExtraNonce(pblock, pindexPrev, nExtraNonce, nPrevTime); + // Update nTime + pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); + pblock->nNonce = 0; + // Save mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, nExtraNonce); -- cgit v1.2.3 From aa4a9c5250f94c82a9e4077a1b56ba634a9841fa Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 11 May 2011 17:12:47 -0400 Subject: Reset extraNonce only every 15 seconds, just in case some miner is updating time himself and stuff --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 4c8f20c1e4..bf7c99349d 100644 --- a/main.cpp +++ b/main.cpp @@ -3448,7 +3448,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& { // Update nExtraNonce int64 nNow = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); - if (++nExtraNonce >= 0x7f && nNow > nPrevTime+1) + if (++nExtraNonce >= 0x7f && nNow > nPrevTime+15) { nExtraNonce = 1; nPrevTime = nNow; -- cgit v1.2.3 From 02d87b3aa375810bcd63dcf72637e788a75fc7d4 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Sun, 12 Jun 2011 20:16:54 -0400 Subject: Reset extraNonce only when prevBlock changes, so miners can continue updating the time on their work until it's stale --- main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main.cpp b/main.cpp index bf7c99349d..d71d411644 100644 --- a/main.cpp +++ b/main.cpp @@ -3447,12 +3447,13 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce, int64& nPrevTime) { // Update nExtraNonce - int64 nNow = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); - if (++nExtraNonce >= 0x7f && nNow > nPrevTime+15) + static uint256 hashPrevBlock; + if (hashPrevBlock != pblock->hashPrevBlock) { - nExtraNonce = 1; - nPrevTime = nNow; + nExtraNonce = 0; + hashPrevBlock = pblock->hashPrevBlock; } + ++nExtraNonce; pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nBits << CBigNum(nExtraNonce); pblock->hashMerkleRoot = pblock->BuildMerkleTree(); } -- cgit v1.2.3 From 49c8e53ee2c2705fd0a8731458cb776dad7e1f6e Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Mon, 25 Jul 2011 11:59:41 -0400 Subject: Save coinbase, not just extraNonce --- src/rpc.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rpc.cpp b/src/rpc.cpp index 9e7cfc5b3c..2a458423ce 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1581,7 +1581,8 @@ Value getwork(const Array& params, bool fHelp) if (IsInitialBlockDownload()) throw JSONRPCError(-10, "Bitcoin is downloading blocks..."); - static map > mapNewBlock; + typedef map > mapNewBlock_t; + static mapNewBlock_t mapNewBlock; static vector vNewBlock; static CReserveKey reservekey(pwalletMain); @@ -1624,7 +1625,7 @@ Value getwork(const Array& params, bool fHelp) pblock->nNonce = 0; // Save - mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, nExtraNonce); + mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig); // Prebuild hash buffers char pmidstate[32]; @@ -1657,11 +1658,10 @@ Value getwork(const Array& params, bool fHelp) if (!mapNewBlock.count(pdata->hashMerkleRoot)) return false; CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first; - unsigned int nExtraNonce = mapNewBlock[pdata->hashMerkleRoot].second; pblock->nTime = pdata->nTime; pblock->nNonce = pdata->nNonce; - pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nBits << CBigNum(nExtraNonce); + pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second; pblock->hashMerkleRoot = pblock->BuildMerkleTree(); return CheckWork(pblock, *pwalletMain, reservekey); -- cgit v1.2.3 From 83f4cd156e9d52bd7c4351336dfa4806a43ee4e4 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Tue, 6 Sep 2011 16:39:05 -0400 Subject: Bugfix: Use timestamp in coinbase rather than "bits", needed to ensure coinbase txn is unique even if address is the same --- src/main.cpp | 7 +++---- src/main.h | 2 +- src/rpc.cpp | 9 ++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 480d2d8bbf..10308bc9dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2794,7 +2794,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) } -void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce, int64& nPrevTime) +void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce) { // Update nExtraNonce static uint256 hashPrevBlock; @@ -2804,7 +2804,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& hashPrevBlock = pblock->hashPrevBlock; } ++nExtraNonce; - pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nBits << CBigNum(nExtraNonce); + pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nTime << CBigNum(nExtraNonce); pblock->hashMerkleRoot = pblock->BuildMerkleTree(); } @@ -2902,7 +2902,6 @@ void static BitcoinMiner(CWallet *pwallet) // Each thread has its own key and counter CReserveKey reservekey(pwallet); unsigned int nExtraNonce = 0; - int64 nPrevTime = 0; while (fGenerateBitcoins) { @@ -2929,7 +2928,7 @@ void static BitcoinMiner(CWallet *pwallet) auto_ptr pblock(CreateNewBlock(reservekey)); if (!pblock.get()) return; - IncrementExtraNonce(pblock.get(), pindexPrev, nExtraNonce, nPrevTime); + IncrementExtraNonce(pblock.get(), pindexPrev, nExtraNonce); printf("Running BitcoinMiner with %d transactions in block\n", pblock->vtx.size()); diff --git a/src/main.h b/src/main.h index 97a40d3ec9..0b05febb4d 100644 --- a/src/main.h +++ b/src/main.h @@ -96,7 +96,7 @@ bool ProcessMessages(CNode* pfrom); bool SendMessages(CNode* pto, bool fSendTrickle); void GenerateBitcoins(bool fGenerate, CWallet* pwallet); CBlock* CreateNewBlock(CReserveKey& reservekey); -void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce, int64& nPrevTime); +void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce); void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1); bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey); bool CheckProofOfWork(uint256 hash, unsigned int nBits); diff --git a/src/rpc.cpp b/src/rpc.cpp index 2a458423ce..33cfa77b40 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1615,15 +1615,14 @@ Value getwork(const Array& params, bool fHelp) vNewBlock.push_back(pblock); } - // Update nExtraNonce - static unsigned int nExtraNonce = 0; - static int64 nPrevTime = 0; - IncrementExtraNonce(pblock, pindexPrev, nExtraNonce, nPrevTime); - // Update nTime pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); pblock->nNonce = 0; + // Update nExtraNonce + static unsigned int nExtraNonce = 0; + IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); + // Save mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig); -- cgit v1.2.3 From 3448ce56f4e74d0b3ada15924c535c72e7dbc03d Mon Sep 17 00:00:00 2001 From: cjdelisle Date: Thu, 8 Sep 2011 20:50:00 -0400 Subject: wxWidgets needs to be at least version 2.9.1 because wallet crypto uses ToStdString() which is not in 2.9.0 --- doc/build-unix.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/build-unix.txt b/doc/build-unix.txt index 8f0c568eda..4ecf15aa33 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -32,8 +32,7 @@ or Boost 1.37: sudo apt-get install libboost1.37-dev If using Boost 1.37, append -mt to the boost libraries in the makefile. -Requires wxWidgets 2.9.0 or greater, which uses UTF-8. Don't try 2.8, it -won't work. +Requires wxWidgets 2.9.1 or newer. You need to download wxWidgets from http://www.wxwidgets.org/downloads/ and build it yourself. See the build instructions and configure parameters -- cgit v1.2.3 From 02959124791830bad7762abd105e5934cccde60e Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 9 Sep 2011 11:49:49 -0400 Subject: Update gitian build descriptors to produce proper builds. Thanks to makomk for finding the bugs here and devrandom for passing them along (see https://bitcointalk.org/index.php?topic=42198.msg514312#msg514312) --- contrib/gitian-win32.yml | 1 + contrib/gitian.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/gitian-win32.yml b/contrib/gitian-win32.yml index 963c381393..52b10bc33f 100644 --- a/contrib/gitian-win32.yml +++ b/contrib/gitian-win32.yml @@ -10,6 +10,7 @@ packages: - "unzip" - "nsis" - "faketime" +- "wine" reference_datetime: "2011-01-30 00:00:00" remotes: - "url": "https://github.com/bitcoin/bitcoin.git" diff --git a/contrib/gitian.yml b/contrib/gitian.yml index 8d0abf8994..efa9cb8c10 100644 --- a/contrib/gitian.yml +++ b/contrib/gitian.yml @@ -34,7 +34,7 @@ script: | mkdir wxWidgets-2.9.2 cd wxWidgets-2.9.2 unzip ../wxWidgets-2.9.2-x32-gitian.zip - unzip -f ../wxWidgets-2.9.2-x64-gitian.zip + unzip -o ../wxWidgets-2.9.2-x64-gitian.zip cp -a bin/$GBUILD_BITS/wx/config/gtk2-unicode-static-2.9 $INSTDIR/bin/wx-config for lib in wx_gtk2u wxregexu wxtiff; do ar rc $INSTDIR/lib/lib${lib}-2.9.a bin/$GBUILD_BITS/$lib/*.o -- cgit v1.2.3 From b4af75c07f857793decdfafcc71a87c1063f1e7e Mon Sep 17 00:00:00 2001 From: Alex B Date: Sun, 11 Sep 2011 22:08:43 +0200 Subject: Spanish translation update --- locale/es/LC_MESSAGES/bitcoin.po | 1025 +++++++++++++++++++++----------------- 1 file changed, 567 insertions(+), 458 deletions(-) diff --git a/locale/es/LC_MESSAGES/bitcoin.po b/locale/es/LC_MESSAGES/bitcoin.po index c67886e676..1787c4891b 100644 --- a/locale/es/LC_MESSAGES/bitcoin.po +++ b/locale/es/LC_MESSAGES/bitcoin.po @@ -2,126 +2,433 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-24 20:21-0500\n" -"PO-Revision-Date: 2011-05-24 20:23-0500\n" -"Last-Translator: Ariel Patiño \n" +"POT-Creation-Date: 2011-09-06 21:58+0100\n" +"PO-Revision-Date: 2011-09-06 22:19+0100\n" +"Last-Translator: Alex B \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-Basepath: .\n" "X-Poedit-SearchPath-0: ../../..\n" -#: ../../../src/net.cpp:1503 +#: ../../../src/init.cpp:163 +msgid "Bitcoin version" +msgstr "versión Bitcoin" + +#: ../../../src/init.cpp:164 +msgid "Usage:" +msgstr "Uso:" + +#: ../../../src/init.cpp:166 +msgid "Send command to -server or bitcoind\n" +msgstr "Envia comando a bitcoin lanzado con -server u bitcoind\n" + +#: ../../../src/init.cpp:167 +msgid "List commands\n" +msgstr "Muestra comandos\n" + +#: ../../../src/init.cpp:168 +msgid "Get help for a command\n" +msgstr "Recibir ayuda para un comando\n" + +#: ../../../src/init.cpp:169 +msgid "Options:\n" +msgstr "Opciones:\n" + +#: ../../../src/init.cpp:170 +msgid "Specify configuration file (default: bitcoin.conf)\n" +msgstr "Especifica archivo de configuración (predeterminado: bitcoin.conf)\n" + +#: ../../../src/init.cpp:171 +msgid "Specify pid file (default: bitcoind.pid)\n" +msgstr "Especifica archivo pid (predeterminado: bitcoin.pid)\n" + +#: ../../../src/init.cpp:172 +msgid "Generate coins\n" +msgstr "Genera monedas\n" + +#: ../../../src/init.cpp:173 +msgid "Don't generate coins\n" +msgstr "No generar monedas\n" + +#: ../../../src/init.cpp:174 +msgid "Start minimized\n" +msgstr "Arranca minimizado\n" + +#: ../../../src/init.cpp:175 +msgid "Specify data directory\n" +msgstr "Especifica directorio para los datos\n" + +#: ../../../src/init.cpp:176 +msgid "Specify connection timeout (in milliseconds)\n" +msgstr "Especifica tiempo de espera para conexion (en milisegundos)\n" + +#: ../../../src/init.cpp:177 +msgid "Connect through socks4 proxy\n" +msgstr "Conecta mediante proxy socks4\n" + +#: ../../../src/init.cpp:178 +msgid "Allow DNS lookups for addnode and connect\n" +msgstr "Permite búsqueda DNS para addnode y connect\n" + +#: ../../../src/init.cpp:179 +msgid "Add a node to connect to\n" +msgstr "Agrega un nodo para conectarse\n" + +#: ../../../src/init.cpp:180 +msgid "Connect only to the specified node\n" +msgstr "Conecta solo al nodo especificado\n" + +#: ../../../src/init.cpp:181 +msgid "Don't accept connections from outside\n" +msgstr "No aceptar conexiones desde el exterior\n" + +#: ../../../src/init.cpp:184 +msgid "Don't attempt to use UPnP to map the listening port\n" +msgstr "No intentar usar UPnP para mapear el puerto de entrada\n" + +#: ../../../src/init.cpp:186 +msgid "Attempt to use UPnP to map the listening port\n" +msgstr "Intenta usar UPnP para mapear el puerto de escucha.\n" + +#: ../../../src/init.cpp:189 +msgid "Fee per KB to add to transactions you send\n" +msgstr "Comisión por KB para agregar a las transacciones que envias\n" + +#: ../../../src/init.cpp:191 +msgid "Accept command line and JSON-RPC commands\n" +msgstr "Aceptar comandos consola y JSON-RPC\n" + +#: ../../../src/init.cpp:194 +msgid "Run in the background as a daemon and accept commands\n" +msgstr "Correr como demonio y acepta comandos\n" + +#: ../../../src/init.cpp:196 +msgid "Use the test network\n" +msgstr "Usa la red de pruebas\n" + +#: ../../../src/init.cpp:197 +msgid "Username for JSON-RPC connections\n" +msgstr "Usuario para las conexiones JSON-RPC\n" + +#: ../../../src/init.cpp:198 +msgid "Password for JSON-RPC connections\n" +msgstr "Contraseña para las conexiones JSON-RPC\n" + +#: ../../../src/init.cpp:199 +msgid "Listen for JSON-RPC connections on (default: 8332)\n" +msgstr "Escucha conexiones JSON-RPC en el puerto (predeterminado: 8332)\n" + +#: ../../../src/init.cpp:200 +msgid "Allow JSON-RPC connections from specified IP address\n" +msgstr "Permite conexiones JSON-RPC desde la dirección IP especificada\n" + +#: ../../../src/init.cpp:201 +msgid "Send commands to node running on (default: 127.0.0.1)\n" +msgstr "Envia comando al nodo situado en (predeterminado: 127.0.0.1)\n" + +#: ../../../src/init.cpp:202 +msgid "Set key pool size to (default: 100)\n" +msgstr "Ajusta el numero de claves en reserva (predeterminado: 100)\n" + +#: ../../../src/init.cpp:203 +msgid "Rescan the block chain for missing wallet transactions\n" +msgstr "Rescanea la cadena de bloques para transacciones perdidas de la cartera\n" + +#: ../../../src/init.cpp:207 +msgid "" +"\n" +"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" +msgstr "" +"\n" +"Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)\n" + +#: ../../../src/init.cpp:208 +msgid "Use OpenSSL (https) for JSON-RPC connections\n" +msgstr "Usa OpenSSL (https) para las conexiones JSON-RPC\n" + +#: ../../../src/init.cpp:209 +msgid "Server certificate file (default: server.cert)\n" +msgstr "Archivo de certificado del servidor (Predeterminado: server.cert)\n" + +#: ../../../src/init.cpp:210 +msgid "Server private key (default: server.pem)\n" +msgstr "Clave privada del servidor (Predeterminado: server.pem)\n" + +#: ../../../src/init.cpp:211 +msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" +msgstr "Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" + +#: ../../../src/init.cpp:215 +msgid "This help message\n" +msgstr "Este mensaje de ayuda\n" + +#: ../../../src/init.cpp:353 +#, c-format +msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." +msgstr "No se puede obtener permiso de trabajo en la carpeta de datos %s. Probablemente Bitcoin ya se está ejecutando." + +#: ../../../src/init.cpp:379 +msgid "Error loading addr.dat \n" +msgstr "Error cargando addr.dat \n" + +#: ../../../src/init.cpp:385 +msgid "Error loading blkindex.dat \n" +msgstr "Error cargando blkindex.dat \n" + +#: ../../../src/init.cpp:396 +msgid "Error loading wallet.dat: Wallet corrupted \n" +msgstr "Error cargando wallet.dat: Cartera dañada \n" + +#: ../../../src/init.cpp:398 +msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" +msgstr "Error cargando el archivo wallet.dat: Se necesita una versión mas nueva de Bitcoin \n" + +#: ../../../src/init.cpp:400 +msgid "Error loading wallet.dat \n" +msgstr "Error cargando wallet.dat \n" + +#: ../../../src/init.cpp:489 +msgid "Invalid -proxy address" +msgstr "Dirección -proxy no valida" + +#: ../../../src/init.cpp:514 +msgid "Invalid amount for -paytxfee=" +msgstr "Cantidad inválida para -paytxfee=" + +#: ../../../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 "Precaución: -paytxfee es muy alta. Esta es la comisión que pagarás si envias una transacción." + +#: ../../../src/main.cpp:1398 +msgid "Warning: Disk space is low " +msgstr "Cuidado: Poco espacio en el disco duro" + +#: ../../../src/net.cpp:1610 #, c-format msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." -msgstr "No es posible escuchar en el puerto %d en este computador. Probablemente el cliente Bitcoin ya se está ejecutando." +msgstr "No es posible escuchar en el puerto %d en este ordenador. Probablemente Bitcoin ya se está ejecutando." -#: ../../../src/ui.cpp:204 +#: ../../../src/rpc.cpp:2005 +#: ../../../src/rpc.cpp:2007 +#, c-format +msgid "To use the %s option" +msgstr "Para usar la opción %s" + +#: ../../../src/rpc.cpp:2009 +#, c-format +msgid "" +"Warning: %s, you must set rpcpassword=\n" +"in the configuration file: %s\n" +"If the file does not exist, create it with owner-readable-only file permissions.\n" +msgstr "" +"Precaución: %s, debes especificar rpcpassword=\n" +"en el archivo de configuración: %s\n" +"Si el archivo no existe, debes crearlo con permisos de lectura al autor solamente.\n" + +#: ../../../src/rpc.cpp:2185 +#, c-format +msgid "" +"You must set rpcpassword= in the configuration file:\n" +"%s\n" +"If the file does not exist, create it with owner-readable-only file permissions." +msgstr "" +"Debes especificar rpcpassword= en el archivo de configuración:\n" +"%s\n" +"Si el archivo no existe, debes crearlo con permisos de lectura al autor solamente." + +#: ../../../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 "Esta transacción supera el límite. Puede seguir enviandola con una comisión de %s, que va a los nodos que procesan su transacción y ayuda a mantener la red. ¿Quiere pagar la comisión?" +msgstr "Esta transacción supera el límite. Puedes seguir enviandola incluyendo una comisión de %s que se va a repartir entre los nodos que procesan su transacción y ayudan a mantener la red. ¿Quieres seguir con la transacción?" + +#: ../../../src/ui.cpp:261 +#: ../../../src/ui.cpp:1247 +msgid "Enter the current passphrase to the wallet." +msgstr "Introduce la contraseña actual de la cartera." -#: ../../../src/ui.cpp:303 +#: ../../../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 "Contraseña" + +#: ../../../src/ui.cpp:268 +msgid "Please supply the current wallet decryption passphrase." +msgstr "Por favor introduce la contraseña actual de la cartera." + +#: ../../../src/ui.cpp:276 +#: ../../../src/ui.cpp:1257 +#: ../../../src/ui.cpp:1314 +msgid "The passphrase entered for the wallet decryption was incorrect." +msgstr "La contraseña introducida para decriptar la cartera es incorrecta." + +#: ../../../src/ui.cpp:353 msgid "Status" msgstr "Estado" -#: ../../../src/ui.cpp:304 +#: ../../../src/ui.cpp:354 msgid "Date" msgstr "Fecha" -#: ../../../src/ui.cpp:305 +#: ../../../src/ui.cpp:355 msgid "Description" msgstr "Descripción" -#: ../../../src/ui.cpp:306 +#: ../../../src/ui.cpp:356 msgid "Debit" msgstr "Débito" -#: ../../../src/ui.cpp:307 +#: ../../../src/ui.cpp:357 msgid "Credit" msgstr "Crédito" -#: ../../../src/ui.cpp:513 +#: ../../../src/ui.cpp:568 #, c-format msgid "Open for %d blocks" msgstr "Abrir para %d bloques" -#: ../../../src/ui.cpp:515 +#: ../../../src/ui.cpp:570 #, c-format msgid "Open until %s" msgstr "Abrir hasta %s" -#: ../../../src/ui.cpp:521 +#: ../../../src/ui.cpp:576 #, c-format msgid "%d/offline?" msgstr "%d/desconectado?" -#: ../../../src/ui.cpp:523 +#: ../../../src/ui.cpp:578 #, c-format msgid "%d/unconfirmed" msgstr "%d/no confirmado" -#: ../../../src/ui.cpp:525 +#: ../../../src/ui.cpp:580 #, c-format msgid "%d confirmations" msgstr "%d confirmaciones" -#: ../../../src/ui.cpp:610 +#: ../../../src/ui.cpp:665 msgid "Generated" msgstr "Generado" -#: ../../../src/ui.cpp:618 +#: ../../../src/ui.cpp:673 #, c-format msgid "Generated (%s matures in %d more blocks)" msgstr "Generado (%s madura en %d bloques)" -#: ../../../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 "Generado - Cuidado: Este bloque no se recibió de otros nodos y probablemente no sea aceptado!" -#: ../../../src/ui.cpp:626 +#: ../../../src/ui.cpp:681 msgid "Generated (not accepted)" msgstr "Generado (no aceptado)" -#: ../../../src/ui.cpp:636 +#: ../../../src/ui.cpp:691 msgid "From: " msgstr "De: " -#: ../../../src/ui.cpp:660 +#: ../../../src/ui.cpp:715 msgid "Received with: " msgstr "Recibido con: " -#: ../../../src/ui.cpp:706 +#: ../../../src/ui.cpp:760 msgid "Payment to yourself" -msgstr "Pago para usted mismo" +msgstr "Pago a ti mismo" -#: ../../../src/ui.cpp:740 +#: ../../../src/ui.cpp:794 msgid "To: " msgstr "Para: " -#: ../../../src/ui.cpp:1055 +#: ../../../src/ui.cpp:1109 msgid " Generating" msgstr " Generando" -#: ../../../src/ui.cpp:1057 +#: ../../../src/ui.cpp:1111 msgid "(not connected)" msgstr "(no conectado)" -#: ../../../src/ui.cpp:1060 +#: ../../../src/ui.cpp:1114 #, c-format msgid " %d connections %d blocks %d transactions" msgstr " %d conexiones %d bloques %d transacciones" -#: ../../../src/ui.cpp:1165 -#: ../../../src/ui.cpp:2529 +#: ../../../src/ui.cpp:1171 +msgid "Wallet already encrypted." +msgstr "La cartera ya esta encriptada." + +#: ../../../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 "" +"Introduce la nueva contraseña de cartera.\n" +"Por favor utiliza un contraseña de 10 o mas caracteres aleatorios, u ocho o mas palabras." + +#: ../../../src/ui.cpp:1189 +#: ../../../src/ui.cpp:1280 +msgid "Error: The supplied passphrase was too short." +msgstr "Error: La contraseña introducida es demasiado corta." + +#: ../../../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 "" +"ATENCION: ¡Si encriptas tu cartera y pierdes la contraseña perderas TODOS TUS BITCOINS!\n" +"¿Seguro que quieres seguir encriptando la cartera?" + +#: ../../../src/ui.cpp:1199 +msgid "Please re-enter your new wallet passphrase." +msgstr "Por favor vuelve introducir la nueva contraseña." + +#: ../../../src/ui.cpp:1208 +#: ../../../src/ui.cpp:1302 +msgid "Error: the supplied passphrases didn't match." +msgstr "Error: las contraseñas no son identicas." + +#: ../../../src/ui.cpp:1218 +msgid "Wallet encryption failed." +msgstr "Encriptacion de cartera fallida." + +#: ../../../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 "" +"Cartera Encriptada.\n" +"Recuerda que encriptando tu cartera no garantiza mantener a salvo tus bitcoins en caso de tener viruses en el ordenador." + +#: ../../../src/ui.cpp:1236 +msgid "Wallet is unencrypted, please encrypt it first." +msgstr "Cartera no encriptada, intenta encriptar primero." + +#: ../../../src/ui.cpp:1271 +msgid "Enter the new passphrase for the wallet." +msgstr "Introduce la nueva contraseña para la cartera." + +#: ../../../src/ui.cpp:1291 +msgid "Re-enter the new passphrase for the wallet." +msgstr "Reintroduce la nueva contraseña para la cartera." + +#: ../../../src/ui.cpp:1323 +msgid "Wallet Passphrase Changed." +msgstr "Contraseña de cartera cambiada." + +#: ../../../src/ui.cpp:1379 +#: ../../../src/ui.cpp:2825 msgid "New Receiving Address" msgstr "Nueva dirección de recepción" -#: ../../../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" @@ -131,399 +438,338 @@ msgstr "" "\n" "Etiqueta" -#: ../../../src/ui.cpp:1235 +#: ../../../src/ui.cpp:1464 msgid "Status: " msgstr "Estado: " -#: ../../../src/ui.cpp:1240 +#: ../../../src/ui.cpp:1469 msgid ", has not been successfully broadcast yet" msgstr ", no ha sido emitido satisfactoriamente todavía" -#: ../../../src/ui.cpp:1242 +#: ../../../src/ui.cpp:1471 #, c-format msgid ", broadcast through %d node" msgstr ", emitido mediante %d nodo" -#: ../../../src/ui.cpp:1244 +#: ../../../src/ui.cpp:1473 #, c-format msgid ", broadcast through %d nodes" msgstr ", emitido mediante %d nodos" -#: ../../../src/ui.cpp:1248 +#: ../../../src/ui.cpp:1477 msgid "Date: " msgstr "Fecha: " -#: ../../../src/ui.cpp:1256 +#: ../../../src/ui.cpp:1485 msgid "Source: Generated
" msgstr "Fuente: Generado
" -#: ../../../src/ui.cpp:1262 -#: ../../../src/ui.cpp:1280 +#: ../../../src/ui.cpp:1491 +#: ../../../src/ui.cpp:1508 msgid "From: " msgstr "De: " -#: ../../../src/ui.cpp:1280 +#: ../../../src/ui.cpp:1508 msgid "unknown" msgstr "desconocido" -#: ../../../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 "To: " msgstr "Para: " -#: ../../../src/ui.cpp:1284 +#: ../../../src/ui.cpp:1512 msgid " (yours, label: " -msgstr "(suya, etiqueta: " +msgstr "(tuya, etiqueta: " -#: ../../../src/ui.cpp:1286 +#: ../../../src/ui.cpp:1514 msgid " (yours)" -msgstr "(suya)" +msgstr "(tuya)" -#: ../../../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 "Credit: " msgstr "Crédito: " -#: ../../../src/ui.cpp:1325 +#: ../../../src/ui.cpp:1553 #, c-format msgid "(%s matures in %d more blocks)" msgstr "(%s madura en %d bloques)" -#: ../../../src/ui.cpp:1327 +#: ../../../src/ui.cpp:1555 msgid "(not accepted)" msgstr "(no aceptada)" -#: ../../../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 "Debit: " msgstr "Débito: " -#: ../../../src/ui.cpp:1386 +#: ../../../src/ui.cpp:1614 msgid "Transaction fee: " msgstr "Comisión transacción: " -#: ../../../src/ui.cpp:1402 +#: ../../../src/ui.cpp:1630 msgid "Net amount: " -msgstr "Cantidad de la red: " +msgstr "Cantidad total: " -#: ../../../src/ui.cpp:1409 +#: ../../../src/ui.cpp:1637 msgid "Message:" msgstr "Mensaje:" -#: ../../../src/ui.cpp:1411 +#: ../../../src/ui.cpp:1639 msgid "Comment:" msgstr "Comentario:" -#: ../../../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 "Las monedas generadas deben esperar 120 bloques antes de ser gastadas. Cuando usted generó este bloque, fue emitido a la red para ser agregado a la cadena de bloques. Si falla al incluirse en la cadena, cambiará a \"no aceptado\" y no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque apenas a unos segundos del suyo." +msgstr "Las monedas generadas deben esperar 120 bloques antes de ser gastadas. Cuando has generado este bloque se emitió a la red para ser agregado en la cadena de bloques. Si falla al incluirse en la cadena, cambiará a \"no aceptado\" y no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque casi al mismo tiempo que el tuyo." -#: ../../../src/ui.cpp:1594 +#: ../../../src/ui.cpp:1826 msgid "Cannot write autostart/bitcoin.desktop file" msgstr "No se puede escribir el fichero autostart/bitcoin.desktop" -#: ../../../src/ui.cpp:1630 +#: ../../../src/ui.cpp:1862 msgid "Main" msgstr "Principal" -#: ../../../src/ui.cpp:1638 +#: ../../../src/ui.cpp:1872 msgid "&Start Bitcoin on window system startup" -msgstr "&Arrancar Bitcoin al iniciar el sistema" +msgstr "&Arranca Bitcoin al iniciar el sistema" -#: ../../../src/ui.cpp:1645 +#: ../../../src/ui.cpp:1879 msgid "&Minimize on close" -msgstr "&Minimizar al cerrar" +msgstr "&Minimiza al cerrar" -#: ../../../src/ui.cpp:1787 +#: ../../../src/ui.cpp:2021 #, c-format msgid "version %s" msgstr "versión %s" -#: ../../../src/ui.cpp:1899 +#: ../../../src/ui.cpp:2144 msgid "Error in amount " msgstr "Error en la cantidad " -#: ../../../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 "Enviar monedas" +msgstr "Envia monedas" -#: ../../../src/ui.cpp:1904 +#: ../../../src/ui.cpp:2149 msgid "Amount exceeds your balance " msgstr "La cantidad excede su balance " -#: ../../../src/ui.cpp:1909 +#: ../../../src/ui.cpp:2154 msgid "Total exceeds your balance when the " msgstr "El total excede su balance cuando el " -#: ../../../src/ui.cpp:1909 +#: ../../../src/ui.cpp:2154 msgid " transaction fee is included " -msgstr " la comisión de la transaccion está incluida " +msgstr " la comisión de la transacción está incluida " -#: ../../../src/ui.cpp:1927 +#: ../../../src/ui.cpp:2181 msgid "Payment sent " msgstr "Pago enviado " -#: ../../../src/ui.cpp:1927 -#: ../../../src/ui.cpp:1932 -#: ../../../src/ui.cpp:2076 -#: ../../../src/ui.cpp:2229 -#: ../../../src/main.cpp:3997 +#: ../../../src/ui.cpp:2181 +#: ../../../src/ui.cpp:2191 +#: ../../../src/ui.cpp:2341 +#: ../../../src/ui.cpp:2506 +#: ../../../src/wallet.cpp:1088 msgid "Sending..." msgstr "Enviando..." -#: ../../../src/ui.cpp:1944 +#: ../../../src/ui.cpp:2207 msgid "Invalid address " msgstr "Dirección inválida " -#: ../../../src/ui.cpp:1997 +#: ../../../src/ui.cpp:2262 #, c-format msgid "Sending %s to %s" msgstr "Enviando %s a %s" -#: ../../../src/ui.cpp:2070 -#: ../../../src/ui.cpp:2103 +#: ../../../src/ui.cpp:2335 +#: ../../../src/ui.cpp:2368 msgid "CANCELLED" msgstr "CANCELADO" -#: ../../../src/ui.cpp:2074 +#: ../../../src/ui.cpp:2339 msgid "Cancelled" msgstr "Cancelado" -#: ../../../src/ui.cpp:2076 +#: ../../../src/ui.cpp:2341 msgid "Transfer cancelled " msgstr "Transferencia cancelada " -#: ../../../src/ui.cpp:2129 +#: ../../../src/ui.cpp:2394 msgid "Error: " msgstr "Error: " -#: ../../../src/ui.cpp:2143 -#: ../../../src/ui.cpp:2214 -#: ../../../src/main.cpp:4016 +#: ../../../src/ui.cpp:2408 +#: ../../../src/ui.cpp:2477 +#: ../../../src/wallet.cpp:1106 msgid "Insufficient funds" msgstr "Fondos insuficientes" -#: ../../../src/ui.cpp:2148 +#: ../../../src/ui.cpp:2413 msgid "Connecting..." msgstr "Conectando..." -#: ../../../src/ui.cpp:2153 +#: ../../../src/ui.cpp:2418 msgid "Unable to connect" msgstr "No es posible conectar" -#: ../../../src/ui.cpp:2158 +#: ../../../src/ui.cpp:2423 msgid "Requesting public key..." msgstr "Pidiendo clave pública..." -#: ../../../src/ui.cpp:2170 +#: ../../../src/ui.cpp:2435 msgid "Received public key..." msgstr "Clave pública recibida..." -#: ../../../src/ui.cpp:2184 +#: ../../../src/ui.cpp:2449 msgid "Recipient is not accepting transactions sent by IP address" -msgstr "El destinatario no está aceptando transacciones enviadas por direcciones IP" +msgstr "El destinatario no accepta transacciones enviadas a direcciones IP" -#: ../../../src/ui.cpp:2186 +#: ../../../src/ui.cpp:2451 msgid "Transfer was not accepted" msgstr "La transferencia no fue aceptada" -#: ../../../src/ui.cpp:2195 +#: ../../../src/ui.cpp:2460 msgid "Invalid response received" msgstr "Respuesta inválida recibida" -#: ../../../src/ui.cpp:2210 +#: ../../../src/ui.cpp:2473 msgid "Creating transaction..." msgstr "Creando transacción..." -#: ../../../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 "Esta transacción requiere de una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente" +msgstr "Esta transacción requiere una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente" -#: ../../../src/ui.cpp:2224 +#: ../../../src/ui.cpp:2498 msgid "Transaction creation failed" msgstr "Fallo al crear la transacción." -#: ../../../src/ui.cpp:2231 +#: ../../../src/ui.cpp:2508 msgid "Transaction aborted" msgstr "Transacción abortada" -#: ../../../src/ui.cpp:2239 +#: ../../../src/ui.cpp:2516 msgid "Lost connection, transaction cancelled" msgstr "Conexión perdida, transacción cancelada" -#: ../../../src/ui.cpp:2255 +#: ../../../src/ui.cpp:2532 msgid "Sending payment..." msgstr "Enviando pago..." -#: ../../../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 "La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas fue gastada, o si ha usado una copia de wallet.dat y las monedas fueron gastadas en la copia pero no fueron marcadas como gastadas aqui." +msgstr "La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui." -#: ../../../src/ui.cpp:2270 +#: ../../../src/ui.cpp:2553 msgid "Waiting for confirmation..." msgstr "Esperando confirmación..." -#: ../../../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" "but the comment information will be blank." msgstr "" -"El pago fue enviado, pero el receptor no pudo verificarlo.\n" -"La transacción se grabó y dará el crédito al receptor,\n" -"pero la información en los comentarios quedará en blanco." +"El pago se ha enviado, pero el receptor no pudo verificarlo.\n" +"La transacción se grabó y el saldo fue transferido\n" +"pero la información de los comentarios quedará en blanco." -#: ../../../src/ui.cpp:2297 +#: ../../../src/ui.cpp:2579 msgid "Payment was sent, but an invalid response was received" msgstr "El pago fue enviado, pero se recibió una respuesta inválida" -#: ../../../src/ui.cpp:2303 +#: ../../../src/ui.cpp:2585 msgid "Payment completed" msgstr "Pago completado" -#: ../../../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 "Nombre" -#: ../../../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 "Dirección" -#: ../../../src/ui.cpp:2337 -#: ../../../src/ui.cpp:2492 +#: ../../../src/ui.cpp:2630 +#: ../../../src/ui.cpp:2785 msgid "Label" msgstr "Etiqueta" -#: ../../../src/ui.cpp:2338 -#: ../../../src/uibase.cpp:837 +#: ../../../src/ui.cpp:2631 +#: ../../../src/uibase.cpp:847 msgid "Bitcoin Address" msgstr "Dirección 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 "Esta es una de sus direcciones para recibir pagos y no puede incluirse en la libreta de direcciones. " -#: ../../../src/ui.cpp:2480 -#: ../../../src/ui.cpp:2486 +#: ../../../src/ui.cpp:2773 +#: ../../../src/ui.cpp:2779 msgid "Edit Address" msgstr "Editar dirección" -#: ../../../src/ui.cpp:2492 +#: ../../../src/ui.cpp:2785 msgid "Edit Address Label" msgstr "Editar etiqueta dirección" -#: ../../../src/ui.cpp:2517 -#: ../../../src/ui.cpp:2523 +#: ../../../src/ui.cpp:2813 +#: ../../../src/ui.cpp:2819 msgid "Add Address" msgstr "Agregar dirección" -#: ../../../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 - Generando" -#: ../../../src/ui.cpp:2604 +#: ../../../src/ui.cpp:2910 msgid "Bitcoin - (not connected)" msgstr "Bitcoin - (no conectado)" -#: ../../../src/ui.cpp:2683 +#: ../../../src/ui.cpp:2989 msgid "&Open Bitcoin" msgstr "&Abrir Bitcoin" -#: ../../../src/ui.cpp:2684 +#: ../../../src/ui.cpp:2990 msgid "&Send Bitcoins" msgstr "&Enviar Bitcoin" -#: ../../../src/ui.cpp:2685 +#: ../../../src/ui.cpp:2991 msgid "O&ptions..." msgstr "O&pciones" -#: ../../../src/ui.cpp:2688 +#: ../../../src/ui.cpp:2994 #: ../../../src/uibase.cpp:25 msgid "E&xit" msgstr "S&alir" -#: ../../../src/ui.cpp:2904 +#: ../../../src/ui.cpp:3220 msgid "Program has crashed and will terminate. " msgstr "El programa ha detectado un error y va a cerrarse. " -#: ../../../src/main.cpp:1866 -msgid "Warning: Disk space is low " -msgstr "Cuidado: Poco espacio en disco " - -#: ../../../src/main.cpp:3990 -#, c-format -msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " -msgstr "Error: Esta transacción requiere de una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente " - -#: ../../../src/main.cpp:3992 -msgid "Error: Transaction creation failed " -msgstr "Error: La creación de la transacción falló " - -#: ../../../src/main.cpp:4001 -msgid "Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here." -msgstr "Error: La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya fue gastada, o si ha usado un copia de wallet.dat y las monedas fueron gastadas en la copia pero no han sido marcadas como gastadas aqui." - -#: ../../../src/main.cpp:4014 -msgid "Invalid amount" -msgstr "Cantidad erronea" - -#: ../../../src/main.cpp:4021 -msgid "Invalid bitcoin address" -msgstr "Dirección Bitcoin inválida" - -#: ../../../src/rpc.cpp:1802 -#: ../../../src/rpc.cpp:1804 -#, c-format -msgid "To use the %s option" -msgstr "Para usar la opción %s" - -#: ../../../src/rpc.cpp:1806 -#, c-format -msgid "" -"Warning: %s, you must set rpcpassword=\n" -"in the configuration file: %s\n" -"If the file does not exist, create it with owner-readable-only file permissions.\n" -msgstr "" -"Precaución: %s, debes especificar rpcpassword=\n" -"en el archivo de configuración: %s\n" -"Si el archivo no existe, debes crearlo con permisos de lectura al autor solamente.\n" - -#: ../../../src/rpc.cpp:1974 -#, c-format -msgid "" -"You must set rpcpassword= in the configuration file:\n" -"%s\n" -"If the file does not exist, create it with owner-readable-only file permissions." -msgstr "" -"Debes especificar rpcpassword= en el archivo de configuración:\n" -"%s\n" -"Si el archivo no existe, debes crearlo con permisos de lectura al autor solamente." - -#: ../../../src/util.cpp:866 -msgid "Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly." -msgstr "Precaución: Por favor revisa que la fecha y hora de tu computador son correctas. Si tu reloj está mal, Bitcoin no funcionará correctamente." - -#: ../../../src/util.cpp:899 -msgid "beta" -msgstr "beta" - #: ../../../src/uibase.cpp:28 msgid "&File" msgstr "&Archivo" @@ -532,152 +778,160 @@ msgstr "&Archivo" msgid "&Your Receiving Addresses..." msgstr "&Tus direcciones de recepción..." -#: ../../../src/uibase.cpp:36 +#: ../../../src/uibase.cpp:35 +msgid "&Encrypt Wallet..." +msgstr "&Encriptar cartera..." + +#: ../../../src/uibase.cpp:38 +msgid "&Change Wallet Encryption Passphrase..." +msgstr "&Cambiar contraseña de cartera..." + +#: ../../../src/uibase.cpp:42 msgid "&Options..." msgstr "&Opciones..." -#: ../../../src/uibase.cpp:39 +#: ../../../src/uibase.cpp:45 msgid "&Settings" msgstr "&Configuración" -#: ../../../src/uibase.cpp:43 +#: ../../../src/uibase.cpp:49 msgid "&About..." msgstr "&Acerca de..." -#: ../../../src/uibase.cpp:46 +#: ../../../src/uibase.cpp:52 msgid "&Help" msgstr "&Ayuda" -#: ../../../src/uibase.cpp:56 +#: ../../../src/uibase.cpp:62 msgid "Address Book" msgstr "Libreta de direcciones" -#: ../../../src/uibase.cpp:69 +#: ../../../src/uibase.cpp:75 msgid "Your Bitcoin Address:" msgstr "Su dirección Bitcoin:" -#: ../../../src/uibase.cpp:76 +#: ../../../src/uibase.cpp:82 msgid " &New... " msgstr " &Nuevo... " -#: ../../../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 " &Copiar al portapapeles " -#: ../../../src/uibase.cpp:93 +#: ../../../src/uibase.cpp:99 msgid "Balance:" msgstr "Balance:" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " All" msgstr " Todo" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " Sent" msgstr " Enviado" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " Received" msgstr " Recibido" -#: ../../../src/uibase.cpp:109 +#: ../../../src/uibase.cpp:115 msgid " In Progress" msgstr " En progreso" -#: ../../../src/uibase.cpp:130 +#: ../../../src/uibase.cpp:136 msgid "All Transactions" msgstr "Todas las transacciones" -#: ../../../src/uibase.cpp:141 +#: ../../../src/uibase.cpp:147 msgid "Sent/Received" msgstr "Enviado/Recibido" -#: ../../../src/uibase.cpp:152 +#: ../../../src/uibase.cpp:158 msgid "Sent" msgstr "Enviado" -#: ../../../src/uibase.cpp:163 +#: ../../../src/uibase.cpp:169 msgid "Received" msgstr "Recibido" -#: ../../../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 "&Arrancar Bitcoin al iniciar el sistema" +msgstr "&Arranca Bitcoin al iniciar el sistema" -#: ../../../src/uibase.cpp:348 +#: ../../../src/uibase.cpp:358 msgid "&Minimize to the tray instead of the taskbar" -msgstr "&Minimizar a la bandeja en vez de a la barra de tareas" +msgstr "&Minimiza a la bandeja en vez de a la barra de tareas" -#: ../../../src/uibase.cpp:351 +#: ../../../src/uibase.cpp:361 msgid "Map port using &UPnP" -msgstr "Mapear el puerto usando &UPnP" +msgstr "Mapea el puerto usando &UPnP" -#: ../../../src/uibase.cpp:354 +#: ../../../src/uibase.cpp:364 msgid "M&inimize to the tray on close" -msgstr "M&inimizar a la bandeja al cerrar" +msgstr "M&inimiza a la bandeja al cerrar" -#: ../../../src/uibase.cpp:360 -msgid "&Connect through socks4 proxy: " -msgstr "&Conectar usando un proxy socks4: " +#: ../../../src/uibase.cpp:370 +msgid "&Connect through socks4 proxy (requires restart to apply): " +msgstr "&Conecta usando un proxy socks4 (necesita reinicio): " -#: ../../../src/uibase.cpp:371 +#: ../../../src/uibase.cpp:381 msgid "Proxy &IP:" -msgstr "Proxy &IP:" +msgstr "&IP proxy:" -#: ../../../src/uibase.cpp:379 +#: ../../../src/uibase.cpp:389 msgid " &Port:" msgstr " &Puerto:" -#: ../../../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 "Comisión opcional a las transacciones por KB que ayuda a asegurar que tus transacciones son procesadas rápidamente. La mayoría de las transacciones son de 1KB. Se recomienda una comisión de 0.01." -#: ../../../src/uibase.cpp:399 +#: ../../../src/uibase.cpp:409 msgid "Pay transaction fee:" msgstr "Comisión de la transacción:" -#: ../../../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 "Cancelar" -#: ../../../src/uibase.cpp:449 +#: ../../../src/uibase.cpp:459 msgid "&Apply" msgstr "&Aplicar" -#: ../../../src/uibase.cpp:508 +#: ../../../src/uibase.cpp:518 msgid "Bitcoin " msgstr "Bitcoin " -#: ../../../src/uibase.cpp:514 +#: ../../../src/uibase.cpp:524 msgid "version" msgstr "versión" -#: ../../../src/uibase.cpp:525 +#: ../../../src/uibase.cpp:535 msgid "" "Copyright (c) 2009-2011 Bitcoin Developers\n" "\n" @@ -701,39 +955,39 @@ msgstr "" "OpenSSL Toolkit (http://www.openssl.org/) y software criptográfico escrito por \n" "Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard." -#: ../../../src/uibase.cpp:581 +#: ../../../src/uibase.cpp:591 msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -msgstr "Ponga una dirección Bitcoin (ejemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" +msgstr "Introduce una dirección Bitcoin (ejemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)" -#: ../../../src/uibase.cpp:595 +#: ../../../src/uibase.cpp:605 msgid "Pay &To:" msgstr "Pagar &A:" -#: ../../../src/uibase.cpp:610 +#: ../../../src/uibase.cpp:620 msgid "&Paste" msgstr "&Pegar" -#: ../../../src/uibase.cpp:613 +#: ../../../src/uibase.cpp:623 msgid " Address &Book..." msgstr " Libreta &Direcciones..." -#: ../../../src/uibase.cpp:620 +#: ../../../src/uibase.cpp:630 msgid "&Amount:" msgstr "&Cantidad:" -#: ../../../src/uibase.cpp:630 +#: ../../../src/uibase.cpp:640 msgid "T&ransfer:" msgstr "T&ransferir:" -#: ../../../src/uibase.cpp:636 +#: ../../../src/uibase.cpp:646 msgid " Standard" msgstr " Estándar" -#: ../../../src/uibase.cpp:663 +#: ../../../src/uibase.cpp:673 msgid "&Send" -msgstr "&Enviar" +msgstr "&Envia" -#: ../../../src/uibase.cpp:711 +#: ../../../src/uibase.cpp:721 msgid "" "\n" "\n" @@ -743,225 +997,80 @@ msgstr "" "\n" "Conenctando..." -#: ../../../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 "Estas son tus direcciones Bitcoin para recibir pagos. Puedes darle una diferente a cada emisor para saber quien te está pagando. La dirección resaltada se muestra en la ventana principal." -#: ../../../src/uibase.cpp:774 -#: ../../../src/uibase.cpp:886 +#: ../../../src/uibase.cpp:784 +#: ../../../src/uibase.cpp:896 msgid "&Edit..." -msgstr "&Editar..." +msgstr "&Edita..." -#: ../../../src/uibase.cpp:777 -#: ../../../src/uibase.cpp:889 +#: ../../../src/uibase.cpp:787 +#: ../../../src/uibase.cpp:899 msgid " &New Address... " msgstr " &Nueva dirección... " -#: ../../../src/uibase.cpp:849 +#: ../../../src/uibase.cpp:859 msgid "Sending" msgstr "Enviando" -#: ../../../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 "Estas son tus direcciones Bitcoin para recibir pagos. Puedes darle una diferente a cada emisor para saber quien te está pagando. La dirección resaltada se muestra en la ventana principal." -#: ../../../src/uibase.cpp:870 +#: ../../../src/uibase.cpp:880 msgid "Receiving" msgstr "Recibiendo" -#: ../../../src/uibase.cpp:880 +#: ../../../src/uibase.cpp:890 msgid "&Delete" -msgstr "&Borrar" - -#: ../../../src/init.cpp:142 -msgid "Bitcoin version" -msgstr "versión Bitcoin" - -#: ../../../src/init.cpp:143 -msgid "Usage:" -msgstr "Uso:" - -#: ../../../src/init.cpp:145 -msgid "Send command to -server or bitcoind\n" -msgstr "Enviar comando a bitcoin corriendo con -server o a bitcoind\n" - -#: ../../../src/init.cpp:146 -msgid "List commands\n" -msgstr "Lista de comandos\n" - -#: ../../../src/init.cpp:147 -msgid "Get help for a command\n" -msgstr "Recibir ayuda para un comando\n" - -#: ../../../src/init.cpp:148 -msgid "Options:\n" -msgstr "Opciones:\n" - -#: ../../../src/init.cpp:149 -msgid "Specify configuration file (default: bitcoin.conf)\n" -msgstr "Especificar archivo de configuración (predeterminado: bitcoin.conf)\n" - -#: ../../../src/init.cpp:150 -msgid "Specify pid file (default: bitcoind.pid)\n" -msgstr "Especificar archivo pid (predeterminado: bitcoin.pid)\n" - -#: ../../../src/init.cpp:151 -msgid "Generate coins\n" -msgstr "Generar monedas\n" - -#: ../../../src/init.cpp:152 -msgid "Don't generate coins\n" -msgstr "No generar monedas\n" - -#: ../../../src/init.cpp:153 -msgid "Start minimized\n" -msgstr "Arrancar minimizado\n" - -#: ../../../src/init.cpp:154 -msgid "Specify data directory\n" -msgstr "Especificar directorio para los datos\n" - -#: ../../../src/init.cpp:155 -msgid "Connect through socks4 proxy\n" -msgstr "Conectar mediante proxy socks4\n" - -#: ../../../src/init.cpp:156 -msgid "Allow DNS lookups for addnode and connect\n" -msgstr "Permitir búsqueda DNS para addnode y connect\n" - -#: ../../../src/init.cpp:157 -msgid "Add a node to connect to\n" -msgstr "Agregar un nodo para conectarse\n" +msgstr "&Borra" -#: ../../../src/init.cpp:158 -msgid "Connect only to the specified node\n" -msgstr "Conectar solo al nodo especificado\n" - -#: ../../../src/init.cpp:159 -msgid "Don't accept connections from outside\n" -msgstr "No aceptar conexiones desde el exterior\n" - -#: ../../../src/init.cpp:162 -msgid "Don't attempt to use UPnP to map the listening port\n" -msgstr "No intentar usar UPnP para mapear el puerto de entrada\n" - -#: ../../../src/init.cpp:164 -msgid "Attempt to use UPnP to map the listening port\n" -msgstr "Intentar usar UPnP para mapear el puerto de escucha.\n" - -#: ../../../src/init.cpp:167 -msgid "Fee per KB to add to transactions you send\n" -msgstr "Comisión por KB para agregar a las transacciones que envias\n" - -#: ../../../src/init.cpp:169 -msgid "Accept command line and JSON-RPC commands\n" -msgstr "Aceptar comandos por línea de comandos y JSON-RPC\n" - -#: ../../../src/init.cpp:172 -msgid "Run in the background as a daemon and accept commands\n" -msgstr "Correr en el fondo como demonio y aceptar comandos\n" - -#: ../../../src/init.cpp:174 -msgid "Use the test network\n" -msgstr "Usar la red de pruebas\n" - -#: ../../../src/init.cpp:175 -msgid "Username for JSON-RPC connections\n" -msgstr "Usuario para las conexiones JSON-RPC\n" - -#: ../../../src/init.cpp:176 -msgid "Password for JSON-RPC connections\n" -msgstr "Contraseña para las conexiones JSON-RPC\n" - -#: ../../../src/init.cpp:177 -msgid "Listen for JSON-RPC connections on (default: 8332)\n" -msgstr "Escuchar conexiones JSON-RPC en el puerto (predeterminado: 8332)\n" - -#: ../../../src/init.cpp:178 -msgid "Allow JSON-RPC connections from specified IP address\n" -msgstr "Permitir conexiones JSON-RPC desde la dirección IP especificada\n" - -#: ../../../src/init.cpp:179 -msgid "Send commands to node running on (default: 127.0.0.1)\n" -msgstr "Enviar comando al nodo ejecutándose en (predeterminado: 127.0.0.1)\n" - -#: ../../../src/init.cpp:180 -msgid "Set key pool size to (default: 100)\n" -msgstr "Ajustar el tamaño de la llave (key) de la piscina (pool) a (predeterminado: 100)\n" - -#: ../../../src/init.cpp:181 -msgid "Rescan the block chain for missing wallet transactions\n" -msgstr "Re-escanear la cadena de bloques para transacciones perdidas de la billetera\n" - -#: ../../../src/init.cpp:185 -msgid "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)\n" -msgstr "" -"\n" -"Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)\n" - -#: ../../../src/init.cpp:186 -msgid "Use OpenSSL (https) for JSON-RPC connections\n" -msgstr "Usar OpenSSL (https) para las conexiones JSON-RPC\n" - -#: ../../../src/init.cpp:187 -msgid "Server certificate file (default: server.cert)\n" -msgstr "Archivo de certificado del servidor (Predeterminado: server.cert)\n" +#: ../../../src/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 "Precaución: Por favor revisa que la fecha y hora de tu ordenador son correctas. Si tu reloj está mal Bitcoin no funcionará correctamente." -#: ../../../src/init.cpp:188 -msgid "Server private key (default: server.pem)\n" -msgstr "Clave privada del servidor (Predeterminado: server.pem)\n" +#: ../../../src/util.cpp:904 +msgid "beta" +msgstr "beta" -#: ../../../src/init.cpp:189 -msgid "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" -msgstr "Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n" +#: ../../../src/wallet.cpp:1073 +msgid "Error: Wallet locked, unable to create transaction " +msgstr "Error: Cartera bloqueada, no se puede crear la transacción" -#: ../../../src/init.cpp:193 -msgid "This help message\n" -msgstr "Este mensaje de ayuda\n" - -#: ../../../src/init.cpp:330 +#: ../../../src/wallet.cpp:1081 #, c-format -msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." -msgstr "No se puede obtener el bloqueo en el directorio de datos %s. Probablemente el cliente de Bitcoin ya se está ejecutando." - -#: ../../../src/init.cpp:356 -msgid "Error loading addr.dat \n" -msgstr "Error cargando addr.dat \n" - -#: ../../../src/init.cpp:362 -msgid "Error loading blkindex.dat \n" -msgstr "Error cargando blkindex.dat \n" - -#: ../../../src/init.cpp:369 -msgid "Error loading wallet.dat \n" -msgstr "Error cargando wallet.dat \n" +msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " +msgstr "Error: Esta transacción requiere de una comisión de al menos %s por su cantidad, complejidad o uso de fondos recibidos recientemente " -#: ../../../src/init.cpp:449 -msgid "Invalid -proxy address" -msgstr "Dirección proxy - inválida" +#: ../../../src/wallet.cpp:1083 +msgid "Error: Transaction creation failed " +msgstr "Error: La creación de la transacción falló " -#: ../../../src/init.cpp:472 -msgid "Invalid amount for -paytxfee=" -msgstr "Cantidad inválida para -paytxfee=" +#: ../../../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 "Error: La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui." -#: ../../../src/init.cpp:476 -msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." -msgstr "Precaución: -paytxfee está configurado muy alto. Esta es la comisión que pagarás si envias una transacción." +#: ../../../src/wallet.cpp:1104 +msgid "Invalid amount" +msgstr "Cantidad erronea" -#: ../../../src/uibase.h:147 +#: ../../../src/uibase.h:151 msgid "Transaction Details" msgstr "Detalles de la transacción" -#: ../../../src/uibase.h:199 +#: ../../../src/uibase.h:203 msgid "Options" msgstr "Opciones" -#: ../../../src/uibase.h:228 +#: ../../../src/uibase.h:232 msgid "About Bitcoin" msgstr "Acerca de Bitcoin" -#: ../../../src/uibase.h:337 +#: ../../../src/uibase.h:341 msgid "Your Bitcoin Addresses" msgstr "Sus direcciones Bitcoin" + +#~ msgid "Invalid bitcoin address" +#~ msgstr "Dirección Bitcoin inválida" -- cgit v1.2.3 From c4149423f906c1bdf7b781196c3f083bf66c2215 Mon Sep 17 00:00:00 2001 From: Michael Bemmerl Date: Sun, 7 Aug 2011 01:55:46 +0200 Subject: Updated German translation --- locale/de/LC_MESSAGES/bitcoin.po | 274 +++++++++++++++++++-------------------- 1 file changed, 136 insertions(+), 138 deletions(-) diff --git a/locale/de/LC_MESSAGES/bitcoin.po b/locale/de/LC_MESSAGES/bitcoin.po index 94ecc96926..59381c11e6 100644 --- a/locale/de/LC_MESSAGES/bitcoin.po +++ b/locale/de/LC_MESSAGES/bitcoin.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-17 02:21+0100\n" -"PO-Revision-Date: 2011-07-17 02:54+0100\n" +"POT-Creation-Date: 2011-08-07 01:46+0100\n" +"PO-Revision-Date: 2011-08-07 01:47+0100\n" "Last-Translator: Michael Bemmerl \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -169,28 +169,28 @@ msgstr "Anzunehmende Verschlüsselungen (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNU msgid "This help message\n" msgstr "Diese Anleitung\n" -#: ../../../src/init.cpp:351 +#: ../../../src/init.cpp:352 #, c-format msgid "Cannot obtain a lock on data directory %s. Bitcoin is probably already running." msgstr "Erhalte keine Datensperre für das Datenverzeichnis %s. Bitcoin läuft wahrscheinlich bereits." -#: ../../../src/init.cpp:377 +#: ../../../src/init.cpp:378 msgid "Error loading addr.dat \n" msgstr "Fehler beim Laden von addr.dat \n" -#: ../../../src/init.cpp:383 +#: ../../../src/init.cpp:384 msgid "Error loading blkindex.dat \n" msgstr "Fehler beim Laden von blkindex.dat \n" -#: ../../../src/init.cpp:394 +#: ../../../src/init.cpp:395 msgid "Error loading wallet.dat: Wallet corrupted \n" msgstr "Fehler beim Laden von wallet.dat: Brieftasche beschädigt \n" -#: ../../../src/init.cpp:396 +#: ../../../src/init.cpp:397 msgid "Error loading wallet.dat: Wallet requires newer version of Bitcoin \n" msgstr "Fehler beim Laden von wallet.dat: Die Brieftasche benötigt eine neuere Version von Bitcoin \n" -#: ../../../src/init.cpp:398 +#: ../../../src/init.cpp:399 msgid "Error loading wallet.dat \n" msgstr "Fehler beim Laden von wallet.dat \n" @@ -206,22 +206,22 @@ msgstr "Ungültiger Betrag für -paytxfee=" msgid "Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction." msgstr "Warnung: -paytxfee ist sehr hoch gesetzt. Das ist die Überweisungsgebühr, die Sie für das Senden einer Überweisung zahlen." -#: ../../../src/main.cpp:1430 +#: ../../../src/main.cpp:1427 msgid "Warning: Disk space is low " msgstr "Warnung: Festplatte fast voll " -#: ../../../src/net.cpp:1615 +#: ../../../src/net.cpp:1616 #, c-format msgid "Unable to bind to port %d on this computer. Bitcoin is probably already running." msgstr "Kann nicht zu Port %d auf diesem Computer verbinden. Bitcoin läuft wahrscheinlich bereits." -#: ../../../src/rpc.cpp:2100 -#: ../../../src/rpc.cpp:2102 +#: ../../../src/rpc.cpp:2086 +#: ../../../src/rpc.cpp:2088 #, c-format msgid "To use the %s option" msgstr "Um die %s-Option zu nutzen" -#: ../../../src/rpc.cpp:2104 +#: ../../../src/rpc.cpp:2090 #, c-format msgid "" "Warning: %s, you must set rpcpassword=\n" @@ -232,7 +232,7 @@ msgstr "" "in der Konfigurationsdatei %s einstellen.\n" "Wenn die Datei nicht existiert, erstellen Sie sie mit ausschließlich Besitzer-Leserechten.\n" -#: ../../../src/rpc.cpp:2277 +#: ../../../src/rpc.cpp:2263 #, c-format msgid "" "You must set rpcpassword= in the configuration file:\n" @@ -248,13 +248,13 @@ msgstr "" msgid "This transaction is over the size limit. You can still send it for a fee of %s, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?" msgstr "Diese Überweisung übersteigt das Betragslimit. Sie können sie trotzdem tätigen, aber es wird eine Gebühr von %s erhoben, die an den Teilnehmer ausgeschüttet wird, der Ihre Überweisung bearbeitet und dadurch hilft, das Netzwerk am laufen zu halten. Möchten Sie die Gebühr entrichten?" -#: ../../../src/ui.cpp:259 +#: ../../../src/ui.cpp:260 #: ../../../src/ui.cpp:1246 msgid "Enter the current passphrase to the wallet." msgstr "Geben Sie die derzeitige Passphrase der Brieftasche ein." # See http://dict.leo.org/forum/viewUnsolvedquery.php?idThread=465865&idForum=2&lp=ende&lang=de -#: ../../../src/ui.cpp:260 +#: ../../../src/ui.cpp:261 #: ../../../src/ui.cpp:1182 #: ../../../src/ui.cpp:1199 #: ../../../src/ui.cpp:1247 @@ -263,83 +263,83 @@ msgstr "Geben Sie die derzeitige Passphrase der Brieftasche ein." msgid "Passphrase" msgstr "Passphrase" -#: ../../../src/ui.cpp:266 +#: ../../../src/ui.cpp:267 msgid "Please supply the current wallet decryption passphrase." msgstr "Bitte geben Sie die derzeitige Passphrase zur Entschlüsselung der Brieftasche an." -#: ../../../src/ui.cpp:274 +#: ../../../src/ui.cpp:275 #: ../../../src/ui.cpp:1258 #: ../../../src/ui.cpp:1315 msgid "The passphrase entered for the wallet decryption was incorrect." msgstr "Die eingegebene Passphrase zur Entschlüsselung der Brieftasche war inkorrekt." -#: ../../../src/ui.cpp:351 +#: ../../../src/ui.cpp:352 msgid "Status" msgstr "Status" -#: ../../../src/ui.cpp:352 +#: ../../../src/ui.cpp:353 msgid "Date" msgstr "Datum" -#: ../../../src/ui.cpp:353 +#: ../../../src/ui.cpp:354 msgid "Description" msgstr "Beschreibung" -#: ../../../src/ui.cpp:354 +#: ../../../src/ui.cpp:355 msgid "Debit" msgstr "Belastungen" -#: ../../../src/ui.cpp:355 +#: ../../../src/ui.cpp:356 msgid "Credit" msgstr "Gutschriften" -#: ../../../src/ui.cpp:566 +#: ../../../src/ui.cpp:567 #, c-format msgid "Open for %d blocks" msgstr "Offen für %d Blöcke" -#: ../../../src/ui.cpp:568 +#: ../../../src/ui.cpp:569 #, c-format msgid "Open until %s" msgstr "Offen bis %s" -#: ../../../src/ui.cpp:574 +#: ../../../src/ui.cpp:575 #, c-format msgid "%d/offline?" msgstr "%d/Offline?" -#: ../../../src/ui.cpp:576 +#: ../../../src/ui.cpp:577 #, c-format msgid "%d/unconfirmed" msgstr "%d/nicht bestätigt" -#: ../../../src/ui.cpp:578 +#: ../../../src/ui.cpp:579 #, c-format msgid "%d confirmations" msgstr "%d Bestätigungen" -#: ../../../src/ui.cpp:663 +#: ../../../src/ui.cpp:664 msgid "Generated" msgstr "Erzeugt" -#: ../../../src/ui.cpp:671 +#: ../../../src/ui.cpp:672 #, c-format msgid "Generated (%s matures in %d more blocks)" msgstr "Erzeugt (%s reifen nach %d weiteren Blöcken)" -#: ../../../src/ui.cpp:675 +#: ../../../src/ui.cpp:676 msgid "Generated - Warning: This block was not received by any other nodes and will probably not be accepted!" msgstr "Erzeugt - Warnung: Dieser Block wurde von keinem anderen Teilnehmer empfangen und wird wahrscheinlich nicht akzeptiert werden!" -#: ../../../src/ui.cpp:679 +#: ../../../src/ui.cpp:680 msgid "Generated (not accepted)" msgstr "Erzeugt (nicht akzeptiert)" -#: ../../../src/ui.cpp:689 +#: ../../../src/ui.cpp:690 msgid "From: " msgstr "Von: " -#: ../../../src/ui.cpp:713 +#: ../../../src/ui.cpp:714 msgid "Received with: " msgstr "Empfangen durch: " @@ -427,12 +427,12 @@ msgid "Wallet Passphrase Changed." msgstr "Die Passphrase der Brieftasche wurde geändert." #: ../../../src/ui.cpp:1381 -#: ../../../src/ui.cpp:2816 +#: ../../../src/ui.cpp:2814 msgid "New Receiving Address" msgstr "&Neue Empfangs-Adresse" #: ../../../src/ui.cpp:1382 -#: ../../../src/ui.cpp:2817 +#: ../../../src/ui.cpp:2815 msgid "" "You should use a new address for each payment you receive.\n" "\n" @@ -469,221 +469,221 @@ msgid "Source: Generated
" msgstr "Quelle: Erzeugt
" #: ../../../src/ui.cpp:1493 -#: ../../../src/ui.cpp:1511 +#: ../../../src/ui.cpp:1510 msgid "From: " msgstr "Von: " -#: ../../../src/ui.cpp:1511 +#: ../../../src/ui.cpp:1510 msgid "unknown" msgstr "Unbekannt" -#: ../../../src/ui.cpp:1512 -#: ../../../src/ui.cpp:1536 -#: ../../../src/ui.cpp:1595 +#: ../../../src/ui.cpp:1511 +#: ../../../src/ui.cpp:1535 +#: ../../../src/ui.cpp:1594 msgid "To: " msgstr "An: " -#: ../../../src/ui.cpp:1515 +#: ../../../src/ui.cpp:1514 msgid " (yours, label: " msgstr " (Eigene, Beschreibung: " -#: ../../../src/ui.cpp:1517 +#: ../../../src/ui.cpp:1516 msgid " (yours)" msgstr " (Eigene)" -#: ../../../src/ui.cpp:1554 -#: ../../../src/ui.cpp:1566 -#: ../../../src/ui.cpp:1612 -#: ../../../src/ui.cpp:1629 +#: ../../../src/ui.cpp:1553 +#: ../../../src/ui.cpp:1565 +#: ../../../src/ui.cpp:1611 +#: ../../../src/ui.cpp:1628 msgid "Credit: " msgstr "Gutschrift: " -#: ../../../src/ui.cpp:1556 +#: ../../../src/ui.cpp:1555 #, c-format msgid "(%s matures in %d more blocks)" msgstr "(%s reifen nach %d weiteren Blöcken)" -#: ../../../src/ui.cpp:1558 +#: ../../../src/ui.cpp:1557 msgid "(not accepted)" msgstr "(nicht akzeptiert)" -#: ../../../src/ui.cpp:1603 -#: ../../../src/ui.cpp:1611 -#: ../../../src/ui.cpp:1626 +#: ../../../src/ui.cpp:1602 +#: ../../../src/ui.cpp:1610 +#: ../../../src/ui.cpp:1625 msgid "Debit: " msgstr "Belastung: " -#: ../../../src/ui.cpp:1617 +#: ../../../src/ui.cpp:1616 msgid "Transaction fee: " msgstr "Überweisungsgebühr: " -#: ../../../src/ui.cpp:1633 +#: ../../../src/ui.cpp:1632 msgid "Net amount: " msgstr "Nettobetrag: " -#: ../../../src/ui.cpp:1640 +#: ../../../src/ui.cpp:1639 msgid "Message:" msgstr "Nachricht:" -#: ../../../src/ui.cpp:1642 +#: ../../../src/ui.cpp:1641 msgid "Comment:" msgstr "Kommentar:" -#: ../../../src/ui.cpp:1645 +#: ../../../src/ui.cpp:1644 msgid "Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours." msgstr "Erzeugte Münzen müssen 120 Blöcke lang reifen. Als Sie diesen Block erzeugt haben, wurde er an alle Teilnehmer übertragen, damit er zur Block-Kette hinzugefügt werden kann. Falls der Block es nicht in die Block-Kette schafft, wird die Beschreibung zu \"nicht akzeptiert\" geändert, und Sie können die Münzen nicht ausgeben. Dies kann manchmal passieren, wenn Sie und ein anderer Teilnehmer annähernd zeitgleich einen Block erzeugen." -#: ../../../src/ui.cpp:1825 +#: ../../../src/ui.cpp:1824 msgid "Cannot write autostart/bitcoin.desktop file" msgstr "Kann Datei autostart/bitcoin.desktop nicht schreiben" -#: ../../../src/ui.cpp:1861 +#: ../../../src/ui.cpp:1860 msgid "Main" msgstr "Haupt" -#: ../../../src/ui.cpp:1871 +#: ../../../src/ui.cpp:1870 msgid "&Start Bitcoin on window system startup" msgstr "Bitcoin beim &Systemstart ausführen" -#: ../../../src/ui.cpp:1878 +#: ../../../src/ui.cpp:1877 msgid "&Minimize on close" msgstr "Beim Schließen &minimieren" -#: ../../../src/ui.cpp:2020 +#: ../../../src/ui.cpp:2019 #, c-format msgid "version %s" msgstr "Version %s" -#: ../../../src/ui.cpp:2143 +#: ../../../src/ui.cpp:2142 msgid "Error in amount " msgstr "Fehler in Betrag " -#: ../../../src/ui.cpp:2143 -#: ../../../src/ui.cpp:2148 -#: ../../../src/ui.cpp:2153 -#: ../../../src/ui.cpp:2202 +#: ../../../src/ui.cpp:2142 +#: ../../../src/ui.cpp:2147 +#: ../../../src/ui.cpp:2152 +#: ../../../src/ui.cpp:2201 #: ../../../src/uibase.cpp:61 msgid "Send Coins" msgstr "Überweisen" -#: ../../../src/ui.cpp:2148 +#: ../../../src/ui.cpp:2147 msgid "Amount exceeds your balance " msgstr "Der Betrag übersteigt Ihr Guthaben " -#: ../../../src/ui.cpp:2153 +#: ../../../src/ui.cpp:2152 msgid "Total exceeds your balance when the " msgstr "Der Betrag übersteigt Ihr Guthaben, wenn man die " -#: ../../../src/ui.cpp:2153 +#: ../../../src/ui.cpp:2152 msgid " transaction fee is included " msgstr " Überweisungsgebühr berücksichtigt " -#: ../../../src/ui.cpp:2176 +#: ../../../src/ui.cpp:2175 msgid "Payment sent " msgstr "Zahlung überwiesen " -#: ../../../src/ui.cpp:2176 -#: ../../../src/ui.cpp:2185 -#: ../../../src/ui.cpp:2336 -#: ../../../src/ui.cpp:2500 -#: ../../../src/wallet.cpp:1097 +#: ../../../src/ui.cpp:2175 +#: ../../../src/ui.cpp:2184 +#: ../../../src/ui.cpp:2335 +#: ../../../src/ui.cpp:2499 +#: ../../../src/wallet.cpp:1099 msgid "Sending..." msgstr "Überweise ..." -#: ../../../src/ui.cpp:2202 +#: ../../../src/ui.cpp:2201 msgid "Invalid address " msgstr "Ungültige Adresse " -#: ../../../src/ui.cpp:2257 +#: ../../../src/ui.cpp:2256 #, c-format msgid "Sending %s to %s" msgstr "Überweise %s an %s" -#: ../../../src/ui.cpp:2330 -#: ../../../src/ui.cpp:2363 +#: ../../../src/ui.cpp:2329 +#: ../../../src/ui.cpp:2362 msgid "CANCELLED" msgstr "ANNULLIERT" -#: ../../../src/ui.cpp:2334 +#: ../../../src/ui.cpp:2333 msgid "Cancelled" msgstr "Annulliert" -#: ../../../src/ui.cpp:2336 +#: ../../../src/ui.cpp:2335 msgid "Transfer cancelled " msgstr "Überweisung annulliert " -#: ../../../src/ui.cpp:2389 +#: ../../../src/ui.cpp:2388 msgid "Error: " msgstr "Fehler: " -#: ../../../src/ui.cpp:2403 -#: ../../../src/ui.cpp:2474 -#: ../../../src/wallet.cpp:1116 +#: ../../../src/ui.cpp:2402 +#: ../../../src/ui.cpp:2473 +#: ../../../src/wallet.cpp:1118 msgid "Insufficient funds" msgstr "Unzureichende Geldmittel" -#: ../../../src/ui.cpp:2408 +#: ../../../src/ui.cpp:2407 msgid "Connecting..." msgstr "Verbinde ..." -#: ../../../src/ui.cpp:2413 +#: ../../../src/ui.cpp:2412 msgid "Unable to connect" msgstr "Kann nicht verbinden" -#: ../../../src/ui.cpp:2418 +#: ../../../src/ui.cpp:2417 msgid "Requesting public key..." msgstr "Fordere öffentlichen Schlüssel an ..." -#: ../../../src/ui.cpp:2430 +#: ../../../src/ui.cpp:2429 msgid "Received public key..." msgstr "Öffentlicher Schlüssel empfangen ..." -#: ../../../src/ui.cpp:2444 +#: ../../../src/ui.cpp:2443 msgid "Recipient is not accepting transactions sent by IP address" msgstr "Empfänger akzeptiert keine Überweisungen von IP-Adressen" -#: ../../../src/ui.cpp:2446 +#: ../../../src/ui.cpp:2445 msgid "Transfer was not accepted" msgstr "Überweisung wurde nicht akzeptiert" -#: ../../../src/ui.cpp:2455 +#: ../../../src/ui.cpp:2454 msgid "Invalid response received" msgstr "Ungültige Antwort erhalten" -#: ../../../src/ui.cpp:2470 +#: ../../../src/ui.cpp:2469 msgid "Creating transaction..." msgstr "Erstelle Überweisung ..." -#: ../../../src/ui.cpp:2489 +#: ../../../src/ui.cpp:2488 #, 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 "Diese Überweisung benötigt eine Überweisungsgebühr von mindestens %s wegen ihres Betrags, Komplexität oder der Benutzung kürzlich erhaltener Geldmittel" -#: ../../../src/ui.cpp:2491 +#: ../../../src/ui.cpp:2490 msgid "Transaction creation failed" msgstr "Überweisung konnte nicht erzeugt werden." -#: ../../../src/ui.cpp:2502 +#: ../../../src/ui.cpp:2501 msgid "Transaction aborted" msgstr "Überweisung abgebrochen" -#: ../../../src/ui.cpp:2510 +#: ../../../src/ui.cpp:2509 msgid "Lost connection, transaction cancelled" msgstr "Verbindung verloren, Überweisungsvorgang abgebrochen" -#: ../../../src/ui.cpp:2526 +#: ../../../src/ui.cpp:2525 msgid "Sending payment..." msgstr "Überweise Zahlung ..." -#: ../../../src/ui.cpp:2532 +#: ../../../src/ui.cpp:2531 msgid "The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here." msgstr "Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden." -#: ../../../src/ui.cpp:2541 +#: ../../../src/ui.cpp:2540 msgid "Waiting for confirmation..." msgstr "Warte auf Bestätigung ..." -#: ../../../src/ui.cpp:2559 +#: ../../../src/ui.cpp:2558 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" @@ -693,84 +693,84 @@ msgstr "" "Die Überweisung wurde gespeichert und wird dem Empfänger gutgeschrieben,\n" "aber die begleitende Nachricht wird leer sein." -#: ../../../src/ui.cpp:2568 +#: ../../../src/ui.cpp:2567 msgid "Payment was sent, but an invalid response was received" msgstr "Die Zahlung wurde überwiesen, aber die Antwort war fehlerhaft" -#: ../../../src/ui.cpp:2574 +#: ../../../src/ui.cpp:2573 msgid "Payment completed" msgstr "Zahlung ausgeführt" -#: ../../../src/ui.cpp:2616 -#: ../../../src/ui.cpp:2764 -#: ../../../src/ui.cpp:2804 +#: ../../../src/ui.cpp:2615 +#: ../../../src/ui.cpp:2762 +#: ../../../src/ui.cpp:2802 msgid "Name" msgstr "Name" -#: ../../../src/ui.cpp:2617 -#: ../../../src/ui.cpp:2764 -#: ../../../src/ui.cpp:2804 +#: ../../../src/ui.cpp:2616 +#: ../../../src/ui.cpp:2762 +#: ../../../src/ui.cpp:2802 msgid "Address" msgstr "Adresse" -#: ../../../src/ui.cpp:2619 -#: ../../../src/ui.cpp:2776 +#: ../../../src/ui.cpp:2618 +#: ../../../src/ui.cpp:2774 msgid "Label" msgstr "Beschreibung" -#: ../../../src/ui.cpp:2620 +#: ../../../src/ui.cpp:2619 #: ../../../src/uibase.cpp:847 msgid "Bitcoin Address" msgstr "Bitcoin-Adresse" -#: ../../../src/ui.cpp:2746 +#: ../../../src/ui.cpp:2744 msgid "This is one of your own addresses for receiving payments and cannot be entered in the address book. " msgstr "Dies ist eine Ihrer eigenen Adressen für den Zahlungseingang und kann deshalb nicht in das Adressbuch übernommen werden. " -#: ../../../src/ui.cpp:2764 -#: ../../../src/ui.cpp:2770 +#: ../../../src/ui.cpp:2762 +#: ../../../src/ui.cpp:2768 msgid "Edit Address" msgstr "Adresse bearbeiten" -#: ../../../src/ui.cpp:2776 +#: ../../../src/ui.cpp:2774 msgid "Edit Address Label" msgstr "Beschreibung der Adresse bearbeiten" -#: ../../../src/ui.cpp:2804 -#: ../../../src/ui.cpp:2810 +#: ../../../src/ui.cpp:2802 +#: ../../../src/ui.cpp:2808 msgid "Add Address" msgstr "Adresse hinzufügen" -#: ../../../src/ui.cpp:2898 +#: ../../../src/ui.cpp:2896 msgid "Bitcoin" msgstr "Bitcoin" -#: ../../../src/ui.cpp:2900 +#: ../../../src/ui.cpp:2898 msgid "Bitcoin - Generating" msgstr "Bitcoin - Erzeuge" -#: ../../../src/ui.cpp:2902 +#: ../../../src/ui.cpp:2900 msgid "Bitcoin - (not connected)" msgstr "Bitcoin - (nicht verbunden)" -#: ../../../src/ui.cpp:2981 +#: ../../../src/ui.cpp:2979 msgid "&Open Bitcoin" msgstr "Bitcoin ö&ffnen" -#: ../../../src/ui.cpp:2982 +#: ../../../src/ui.cpp:2980 msgid "&Send Bitcoins" msgstr "Bitcoins &senden" -#: ../../../src/ui.cpp:2983 +#: ../../../src/ui.cpp:2981 msgid "O&ptions..." msgstr "O&ptionen ..." -#: ../../../src/ui.cpp:2986 +#: ../../../src/ui.cpp:2984 #: ../../../src/uibase.cpp:25 msgid "E&xit" msgstr "B&eenden" -#: ../../../src/ui.cpp:3212 +#: ../../../src/ui.cpp:3210 msgid "Program has crashed and will terminate. " msgstr "Das Programm ist abgestürzt und wird beendet. " @@ -887,8 +887,8 @@ msgid "M&inimize to the tray on close" msgstr "Beim Schließen in den Infobereich m&inimieren" #: ../../../src/uibase.cpp:370 -msgid "&Connect through socks4 proxy: " -msgstr "&Per Socks4-Proxy verbinden: " +msgid "&Connect through socks4 proxy (requires restart to apply): " +msgstr "&Per Socks4-Proxy verbinden (erfordert einen Neustart): " #: ../../../src/uibase.cpp:381 msgid "Proxy &IP:" @@ -1040,31 +1040,27 @@ msgstr "Warnung: Bitte überprüfen Sie die Richtigkeit des Datums und der Uhrze msgid "beta" msgstr "Beta" -#: ../../../src/wallet.cpp:1081 +#: ../../../src/wallet.cpp:1083 msgid "Error: Wallet locked, unable to create transaction " msgstr "Fehler: Brieftasche ist verschlossen; Überweisung konnte nicht erstellt werden " -#: ../../../src/wallet.cpp:1089 +#: ../../../src/wallet.cpp:1091 #, c-format msgid "Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds " msgstr "Fehler: Diese Überweisung benötigt eine Überweisungsgebühr von mindestens %s wegen ihrer Größe, Komplexität oder der Benutzung erst kürzlich erhaltener Geldmittel " -#: ../../../src/wallet.cpp:1091 +#: ../../../src/wallet.cpp:1093 msgid "Error: Transaction creation failed " msgstr "Fehler: Überweisung konnte nicht erzeugt werden. " -#: ../../../src/wallet.cpp:1101 +#: ../../../src/wallet.cpp:1103 msgid "Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here." msgstr "Fehler: Die Überweisung wurde abgelehnt. Das kann passieren, wenn einige der Münzen in Ihrer Brieftasche bereits ausgegeben wurden, z.B. weil Sie eine Kopie der Brieftasche (wallet.dat) gemacht haben. Bitcoins, die mithilfe der Kopie ausgegeben wurden, sind in dieser Brieftasche noch nicht als ausgegeben markiert worden." -#: ../../../src/wallet.cpp:1114 +#: ../../../src/wallet.cpp:1116 msgid "Invalid amount" msgstr "Ungültiger Betrag" -#: ../../../src/wallet.cpp:1121 -msgid "Invalid bitcoin address" -msgstr "Ungültige Bitcoin-Adresse" - #: ../../../src/uibase.h:151 msgid "Transaction Details" msgstr "Überweisungsdetails" @@ -1081,3 +1077,5 @@ msgstr "Über Bitcoin" msgid "Your Bitcoin Addresses" msgstr "Ihre Bitcoin-Adressen" +#~ msgid "Invalid bitcoin address" +#~ msgstr "Ungültige Bitcoin-Adresse" -- cgit v1.2.3 From 6083295f4666a9527ec3311f1acaea941bf7bb86 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Wed, 14 Sep 2011 10:42:02 -0400 Subject: Update bitcoin icon to make nsis setup exe deterministic. This adds a 32x32 16-bit icon to the bitcoin.ico file. Though this realistically probably looks worse than the 32-bit 32x32 being displayed on a 16-bit monitor, it makes the nsis setup exe deterministic in gitian output (go figure) which makes the slight visual loss for users of very old monitors/computers worth it. --- share/pixmaps/bitcoin.ico | Bin 93256 -> 306398 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico index 734d21701e..61926807cc 100644 Binary files a/share/pixmaps/bitcoin.ico and b/share/pixmaps/bitcoin.ico differ -- cgit v1.2.3